mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

metadata
Wenzel Jakob 2011-08-24 11:15:56 -04:00
parent 84ef32d946 93e11f9e13
commit c9b76559aa
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mitsuba/core/platform.h
View File

@ -55,7 +55,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 <stdint_msvc.h> // Does not exist in MSVC. Use a replacement
#if _MSC_VER < 1600
#include <stdint_msvc.h> // Does not exist in MSVC. Use a replacement
#else
#include <stdint.h>
#endif
#if _MSC_VER >= 1400
#include <memory.h>
#include <string.h>

6
src/libcore/bitmap.cpp
View File

@ -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);
}