From 883929f969e63eea9bcafd5990718f5bc21aaa17 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Fri, 6 May 2011 09:17:28 +0200
Subject: [PATCH] Pcbnew: bug fix: in rare cases, solid copper areas are to
 large (minimum width not taken in account to calculate filled areas)

---
 common/build_version.cpp                                 | 2 +-
 packaging/windows/nsis/install.nsi                       | 2 +-
 .../zones_convert_brd_items_to_polygons_with_Boost.cpp   | 9 +++++----
 version.txt                                              | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/common/build_version.cpp b/common/build_version.cpp
index 3949755361..8f4bc117c0 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -6,7 +6,7 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
-#define KICAD_BUILD_VERSION "(2011-04-28)"
+#define KICAD_BUILD_VERSION "(2011-05-06)"
 #endif
 
 
diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi
index a25548afc2..648eed8500 100644
--- a/packaging/windows/nsis/install.nsi
+++ b/packaging/windows/nsis/install.nsi
@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2011.04.29"
+!define PRODUCT_VERSION "2011.05.06"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""
diff --git a/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp b/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
index 0ec3df286a..3e4d4817a6 100644
--- a/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
+++ b/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
@@ -344,6 +344,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
     }
 
     // cornerBufferPolysToSubstract contains polygons to substract.
+    // polyset_zone_solid_areas contains the main filled area
     // Calculate now actual solid areas
     if( cornerBufferPolysToSubstract.size() > 0 )
     {
@@ -352,12 +353,12 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
                                          polyset_holes );
         // Remove holes from initial area.:
         polyset_zone_solid_areas -= polyset_holes;
-
-        /* put these areas in m_FilledPolysList */
-        m_FilledPolysList.clear();
-        CopyPolygonsFromKPolygonListToFilledPolysList( this, polyset_zone_solid_areas );
     }
 
+    // put solid areas in m_FilledPolysList:
+    m_FilledPolysList.clear();
+    CopyPolygonsFromKPolygonListToFilledPolysList( this, polyset_zone_solid_areas );
+
     // Remove insulated islands:
     if( GetNet() > 0 )
         Test_For_Copper_Island_And_Remove_Insulated_Islands( aPcb );
diff --git a/version.txt b/version.txt
index c3d70fbd2e..c4e2d7f85e 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 release version:
-2011 apr 29
+2011 may 06
 files (.zip,.tgz):
-kicad-2011-04-29
+kicad-2011-05-06