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

Fix warnings detected by MSVC in libcore/bitmap.cpp

metadata
Edgar Velazquez-Armendariz 2013-01-26 23:35:02 -05:00
parent 50d596ece7
commit de7eb79521
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/bitmap.cpp
View File

@ -238,7 +238,7 @@ extern "C" {
p->mgr.free_in_buffer = 0; p->mgr.free_in_buffer = 0;
} }
METHODDEF(void) jpeg_error_exit (j_common_ptr cinfo) { METHODDEF(void) jpeg_error_exit (j_common_ptr cinfo) throw(std::runtime_error) {
char msg[JMSG_LENGTH_MAX]; char msg[JMSG_LENGTH_MAX];
(*cinfo->err->format_message) (cinfo, msg); (*cinfo->err->format_message) (cinfo, msg);
SLog(EError, "Critcal libjpeg error: %s", msg); SLog(EError, "Critcal libjpeg error: %s", msg);
@ -1370,7 +1370,7 @@ void Bitmap::writePNG(Stream *stream, int compression) const {
text[i].compression = PNG_TEXT_COMPRESSION_NONE; text[i].compression = PNG_TEXT_COMPRESSION_NONE;
} }
png_set_text(png_ptr, info_ptr, text, keys.size()); png_set_text(png_ptr, info_ptr, text, (int) keys.size());
if (m_gamma == -1) if (m_gamma == -1)
png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, PNG_sRGB_INTENT_ABSOLUTE); png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, PNG_sRGB_INTENT_ABSOLUTE);