merge with remote 2.3.x

This commit is contained in:
Dane Springmeyer 2013-10-14 17:51:17 -04:00
commit fc0ca0d847

View File

@ -684,7 +684,7 @@ void save_as_png8_hex(T1 & file,
//transparency values per palette index
std::vector<mapnik::rgba> pal;
tree.create_palette(pal);
assert(int(pal.size()) <= colors);
assert(int(pal.size()) <= opts.colors);
std::vector<mapnik::rgb> palette;
std::vector<unsigned> alphaTable;
for(unsigned i=0; i<pal.size(); i++)