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

fix imagedata visability on windows

Browse source
This commit is contained in:
Dane Springmeyer 2014-08-29 11:01:04 -07:00
parent 3638505854
commit 8d7bf7a8da
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/image_data.hpp
View file

@ -25,7 +25,6 @@
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/config.hpp>
// stl // stl
#include <cassert> #include <cassert>
@ -35,7 +34,7 @@
namespace mapnik namespace mapnik
{ {
template <typename T> template <typename T>
class MAPNIK_DECL ImageData class ImageData
{ {
public: public:
using pixel_type = T; using pixel_type = T;

2
tests/cpp_tests/image_io_test.cpp
View file

@ -21,7 +21,6 @@ int main(int argc, char** argv)
boost::optional<std::string> type; boost::optional<std::string> type;
try try
{ {
#if !defined(_MSC_VER)
mapnik::image_data_32 im(256,256); mapnik::image_data_32 im(256,256);
mapnik::image_data_32::pixel_type * data = im.getData(); mapnik::image_data_32::pixel_type * data = im.getData();
mapnik::image_data_32 * im_ptr = new mapnik::image_data_32(im.width(),im.height(),data); mapnik::image_data_32 * im_ptr = new mapnik::image_data_32(im.width(),im.height(),data);
@ -29,7 +28,6 @@ int main(int argc, char** argv)
BOOST_TEST(data == same_data); BOOST_TEST(data == same_data);
delete im_ptr; delete im_ptr;
BOOST_TEST(data == same_data); BOOST_TEST(data == same_data);
#endif
BOOST_TEST(set_working_dir(args)); BOOST_TEST(set_working_dir(args));
#if defined(HAVE_JPEG) #if defined(HAVE_JPEG)