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

Remove debugging outputs, fix missing semicolon.

Browse source
This commit is contained in:
Daniel Patterson 2015-06-17 20:54:44 -07:00
parent 192495ce21
commit 3059cbf231
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/image_reader.cpp
View file

@ -65,9 +65,7 @@ inline boost::optional<std::string> type_from_bytes(char const* data, size_t siz
// NOTE: Limit search to first 300 bytes. Totally arbitrary, but don't // NOTE: Limit search to first 300 bytes. Totally arbitrary, but don't
// want to search through whole buffer // want to search through whole buffer
std::cout << "Starting svg test" << std::endl;
const size_t max_svg_search = std::min(static_cast<size_t>(300), size); const size_t max_svg_search = std::min(static_cast<size_t>(300), size);
std::cout << "Searching max " << max_svg_search << " bytes " << std::endl;
for(int i=0; i < static_cast<signed>(max_svg_search)-4; i++) for(int i=0; i < static_cast<signed>(max_svg_search)-4; i++)
{ {
if (data[i] == '<' && if (data[i] == '<' &&
@ -78,7 +76,6 @@ inline boost::optional<std::string> type_from_bytes(char const* data, size_t siz
return result_type("svg"); return result_type("svg");
} }
} }
std::cout << "Did not find <svg" << std::endl;
return result_type(); return result_type();
} }

5
src/svg_reader.cpp
View file

@ -140,9 +140,6 @@ svg_reader<T>::~svg_reader() {}
template <typename T> template <typename T>
void svg_reader<T>::init() void svg_reader<T>::init()
{ {
std::cout << "******* initing svg reader" << std::endl;
using namespace mapnik::svg; using namespace mapnik::svg;
svg_path_ptr marker_path(std::make_shared<svg_storage_type>()); svg_path_ptr marker_path(std::make_shared<svg_storage_type>());
vertex_stl_adapter<svg_path_storage> stl_storage(marker_path->source()); vertex_stl_adapter<svg_path_storage> stl_storage(marker_path->source());
@ -160,8 +157,6 @@ void svg_reader<T>::init()
width_=svg.width(); width_=svg.width();
height_=svg.height(); height_=svg.height();
std::cout << "******* done svg reader" << std::endl;
} }
template <typename T> template <typename T>

2
test/unit/imaging/svg.cpp
View file

@ -62,7 +62,7 @@ SECTION("svg_blank")
mapnik::image_rgba8 raw = im.get<mapnik::image_rgba8>(); mapnik::image_rgba8 raw = im.get<mapnik::image_rgba8>();
std::string pngdata = mapnik::save_to_string<mapnik::image_rgba8>(raw,"png"); std::string pngdata = mapnik::save_to_string<mapnik::image_rgba8>(raw,"png");
CHECK(pngdata.length() == 1270 ) CHECK(pngdata.length() == 1270 );
} // END SECTION } // END SECTION