]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/imagjpeg.cpp
Permission for flood-fill code clarified
[wxWidgets.git] / src / common / imagjpeg.cpp
index 42b995aae9b664f0eacbe676ba1f53dd8b48d68b..776a84482befe92bf1e3483630c5cfeeb0743285 100644 (file)
@@ -356,8 +356,8 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     // 'Quality' is a number between 0 (terrible) and 100 (very good).
     // The default (in jcparam.c, jpeg_set_defaults) is 75,
     // and force_baseline is TRUE.
-    if (image->HasOption(wxT("quality")))
-        jpeg_set_quality(&cinfo, image->GetOptionInt(wxT("quality")), TRUE);
+    if (image->HasOption(wxIMAGE_OPTION_QUALITY))
+        jpeg_set_quality(&cinfo, image->GetOptionInt(wxIMAGE_OPTION_QUALITY), TRUE);
 
     // set the resolution fields in the output file
     UINT16 resX,
@@ -365,13 +365,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
     {