From 93e11f9e137d09898f0fbe753ac6feb709261e6e Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Tue, 23 Aug 2011 22:19:13 -0400 Subject: [PATCH] two more patches from Edgar --- include/mitsuba/core/platform.h | 6 +++++- src/libcore/bitmap.cpp | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/mitsuba/core/platform.h b/include/mitsuba/core/platform.h index b50567e2..485dfd0f 100644 --- a/include/mitsuba/core/platform.h +++ b/include/mitsuba/core/platform.h @@ -54,7 +54,11 @@ #pragma warning(disable : 4251) // 'field' : class 'A' needs to have dll-interface to be used by clients of class 'B' #pragma warning(disable : 4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning) #pragma warning(disable : 4996) // Secure SCL warnings - #include // Does not exist in MSVC. Use a replacement + #if _MSC_VER < 1600 + #include // Does not exist in MSVC. Use a replacement + #else + #include + #endif #if _MSC_VER >= 1400 #include #include diff --git a/src/libcore/bitmap.cpp b/src/libcore/bitmap.cpp index 5e64306e..4b9178ab 100644 --- a/src/libcore/bitmap.cpp +++ b/src/libcore/bitmap.cpp @@ -97,17 +97,17 @@ private: * ========================== */ static void png_flush_data(png_structp png_ptr) { - voidp flush_io_ptr = png_get_io_ptr(png_ptr); + png_voidp flush_io_ptr = png_get_io_ptr(png_ptr); ((Stream *) flush_io_ptr)->flush(); } static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) { - voidp read_io_ptr = png_get_io_ptr(png_ptr); + png_voidp read_io_ptr = png_get_io_ptr(png_ptr); ((Stream *) read_io_ptr)->read(data, length); } static void png_write_data(png_structp png_ptr, png_bytep data, png_size_t length) { - voidp write_io_ptr = png_get_io_ptr(png_ptr); + png_voidp write_io_ptr = png_get_io_ptr(png_ptr); ((Stream *) write_io_ptr)->write(data, length); }