sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle case of empty octrees. #540

Browse source
This commit is contained in:
Marcin Rudowski 2010-03-24 17:36:39 +00:00
parent 8369278662
commit 3426e7a0ac
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/octree.hpp
View file

@ -122,6 +122,11 @@ namespace mapnik {
~octree() { delete root_;} ~octree() { delete root_;}
unsigned colors()
{
return colors_;
}
void setMaxColors(unsigned max_colors) void setMaxColors(unsigned max_colors)
{ {
max_colors_ = max_colors; max_colors_ = max_colors;

4
include/mapnik/png_io.hpp
View file

@ -131,7 +131,7 @@ namespace mapnik {
byte index = 0; byte index = 0;
int idx = -1; int idx = -1;
for(int j=levels-1; j>0; j--){ for(int j=levels-1; j>0; j--){
if (U2ALPHA(val)>=limits[j]) { if (U2ALPHA(val)>=limits[j] && trees[j].colors()>0) {
index = idx = trees[j].quantize(c); index = idx = trees[j].quantize(c);
break; break;
} }
@ -177,7 +177,7 @@ namespace mapnik {
byte index = 0; byte index = 0;
int idx=-1; int idx=-1;
for(int j=levels-1; j>0; j--){ for(int j=levels-1; j>0; j--){
if (U2ALPHA(val)>=limits[j]) { if (U2ALPHA(val)>=limits[j] && trees[j].colors()>0) {
index = idx = trees[j].quantize(c); index = idx = trees[j].quantize(c);
break; break;
} }