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

Merge branch 'master' into bugfix/image_util_impl

Browse source
This commit is contained in:
Blake Thompson 2015-01-09 11:00:42 -05:00
commit b2118b6c2e
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bindings/python/mapnik_image.cpp
View file

@ -54,7 +54,6 @@ using mapnik::image_reader;
using mapnik::get_image_reader;
using mapnik::type_from_filename;
using mapnik::save_to_file;
using mapnik::save_to_string;
using namespace boost::python;
@ -74,7 +73,7 @@ PyObject* tostring1( image_32 const& im)
// encode (png,jpeg)
PyObject* tostring2(image_32 const & im, std::string const& format)
{
std::string s = save_to_string(im, format);
std::string s = mapnik::save_to_string(im.data(), format);
return
#if PY_VERSION_HEX >= 0x03000000
::PyBytes_FromStringAndSize
@ -86,7 +85,7 @@ PyObject* tostring2(image_32 const & im, std::string const& format)
PyObject* tostring3(image_32 const & im, std::string const& format, mapnik::rgba_palette const& pal)
{
std::string s = save_to_string(im, format, pal);
std::string s = mapnik::save_to_string(im.data(), format, pal);
return
#if PY_VERSION_HEX >= 0x03000000
::PyBytes_FromStringAndSize

8
tests/cxx/tiff_io.cpp
View file

@ -1,8 +1,12 @@
#if defined(HAVE_TIFF)
#include "catch.hpp"
#include <mapnik/image_reader.hpp>
#include <mapnik/image_util.hpp>
#include <mapnik/util/file_io.hpp>
#include <mapnik/tiff_io.hpp>
#include "../../src/tiff_reader.cpp"
@ -273,4 +277,6 @@ SECTION("gray32f tiled") {
TIFF_READ_ONE_PIXEL
}
}
}
#endif

4
tests/visual_tests/styles/orientation.xml
View file

@ -17,12 +17,12 @@
<Style name="My Style">
<Rule>
<Filter>[nr] = 1</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45">"XYZ"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="rad_to_deg*0.7853981633974483">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = 2</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="90">"XYZ"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="180/pi*1.5707963267948966">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>