From 188ba774b91263e8dc8fe50e16e2e13c3c67409a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 22 Feb 2012 14:32:12 -0800 Subject: [PATCH] rollback part of 5dee576 - avoiding skipping nodes with <= 3 pixels as this fixed only symptoms of the hextree crash and not the root cause (note: divide by zero fix is maintained) --- include/mapnik/hextree.hpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/include/mapnik/hextree.hpp b/include/mapnik/hextree.hpp index 780c42c56..c3780a9da 100644 --- a/include/mapnik/hextree.hpp +++ b/include/mapnik/hextree.hpp @@ -394,16 +394,7 @@ private: // clip extreme alfa values void create_palette_rek(std::vector & palette, node * itr) const { - /* - NOTE: previous code did: - - // actually, ignore ones with < 3 pixels - if (itr->count >= 3) - - But this could lead to memory corruption - */ - - if (itr->count > 0) + if (itr->count >= 3) { unsigned count = itr->count; byte a = byte(itr->alphas/float(count));