From 4c2740ec0f18a2e657d53377031fc2dfce974f08 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 4 Mar 2005 19:23:28 +0000 Subject: [PATCH] Small warning fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagjpeg.cpp | 6 +++--- src/common/imagpng.cpp | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index fed0d78859..776a84482b 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -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 { diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index e5d7fd48a5..007bfadaf0 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -738,9 +738,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos int iHeight = image->GetHeight(); int iWidth = image->GetWidth(); - unsigned char uchMaskRed = bHasMask ? image->GetMaskRed() : 0; - unsigned char uchMaskGreen = bHasMask ? image->GetMaskGreen() : 0; - unsigned char uchMaskBlue = bHasMask ? image->GetMaskBlue() : 0; + unsigned char uchMaskRed = 0, uchMaskGreen = 0, uchMaskBlue = 0; + + if ( bHasMask ) + { + uchMaskRed = image->GetMaskRed(); + uchMaskGreen = image->GetMaskGreen(); + uchMaskBlue = image->GetMaskBlue(); + } + unsigned char *pColors = image->GetData(); for (int y = 0; y != iHeight; ++y) -- 2.45.2