X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a679df67de32f77c2bc3846b720b1c5e3bab06f..7ec698211d5d82a009ac80fb354059e9af497508:/src/common/imagjpeg.cpp diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index fed0d78859..da980d2dd4 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "imagjpeg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -365,13 +361,13 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONX) && image->HasOption(wxIMAGE_OPTION_RESOLUTIONY) ) { - resX = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX); - resY = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY); + resX = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX); + resY = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY); } else if ( image->HasOption(wxIMAGE_OPTION_RESOLUTION) ) { resX = - resY = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION); + resY = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION); } else {