From 8e8bc6c74595a6f0f0c62f2aa3d3bd632f46b7dd Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 28 Aug 2014 20:52:18 -0700 Subject: [PATCH] dodge linking error with image_data on windows - refs #2396 --- tests/cpp_tests/image_io_test.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/cpp_tests/image_io_test.cpp b/tests/cpp_tests/image_io_test.cpp index 2767bc2e0..ddd5b2baf 100644 --- a/tests/cpp_tests/image_io_test.cpp +++ b/tests/cpp_tests/image_io_test.cpp @@ -21,14 +21,15 @@ int main(int argc, char** argv) boost::optional type; try { +#if !defined(_MSC_VER) mapnik::image_data_32 im(256,256); - unsigned char* bytes = im.getBytes(); - mapnik::image_data_32 * im_ptr = new mapnik::image_data_32(im.width(),im.height(),static_cast(bytes)); - unsigned char* same_bytes = im_ptr->getBytes(); - BOOST_TEST(bytes == same_bytes); + 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::pixel_type * same_data = im_ptr->getData(); + BOOST_TEST(data == same_data); delete im_ptr; - BOOST_TEST(bytes == same_bytes); - + BOOST_TEST(data == same_data); +#endif BOOST_TEST(set_working_dir(args)); #if defined(HAVE_JPEG)