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

fix -Wheader-hygiene warnings

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-10 13:40:48 -08:00
parent 821c4d2115
commit 1582f681ae
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
benchmark/compare_images.hpp
View file

@ -1,11 +1,10 @@
#ifndef __MAPNIK_COMPARE_IMAGES_HPP__ #ifndef MAPNIK_COMPARE_IMAGES_HPP
#define __MAPNIK_COMPARE_IMAGES_HPP__ #define MAPNIK_COMPARE_IMAGES_HPP
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/image_util.hpp> #include <mapnik/image_util.hpp>
#include <mapnik/image_reader.hpp> #include <mapnik/image_reader.hpp>
using namespace mapnik;
namespace benchmark { namespace benchmark {
@ -23,15 +22,15 @@ namespace benchmark {
throw mapnik::image_reader_exception("Failed to load: " + src_fn); throw mapnik::image_reader_exception("Failed to load: " + src_fn);
} }
const image_any desc_any = reader1->read(0,0,reader1->width(), reader1->height()); const mapnik::image_any desc_any = reader1->read(0,0,reader1->width(), reader1->height());
const image_any src_any = reader2->read(0,0,reader2->width(), reader2->height()); const mapnik::image_any src_any = reader2->read(0,0,reader2->width(), reader2->height());
image_rgba8 const& dest = util::get<image_rgba8>(desc_any); mapnik::image_rgba8 const& dest = mapnik::util::get<mapnik::image_rgba8>(desc_any);
image_rgba8 const& src = util::get<image_rgba8>(src_any); mapnik::image_rgba8 const& src = mapnik::util::get<mapnik::image_rgba8>(src_any);
return compare(dest, src, 0, true) == 0; return compare(dest, src, 0, true) == 0;
} }
} }
#endif // __MAPNIK_COMPARE_IMAGES_HPP__ #endif // MAPNIK_COMPARE_IMAGES_HPP