Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix gcc warnings about float/double to int conversion after the latest changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-09 19:34:01 +00:00
parent 2a7431e130
commit ad91e1ade0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/imagbmp.cpp
View File

@@ -200,8 +200,8 @@ bool wxBMPHandler::SaveDib(wxImage *image,
case wxIMAGE_RESOLUTION_INCHES: case wxIMAGE_RESOLUTION_INCHES:
// convert resolution in inches to resolution in centimeters // convert resolution in inches to resolution in centimeters
hres *= 100*mm2inches; hres = (wxUint32)(100*mm2inches*hres);
vres *= 100*mm2inches; vres = (wxUint32)(100*mm2inches*vres);
// fall through to convert it to resolution in meters // fall through to convert it to resolution in meters
case wxIMAGE_RESOLUTION_CM: case wxIMAGE_RESOLUTION_CM:

4
src/common/imagtiff.cpp
View File

@@ -373,10 +373,10 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
{ {
float xres, yres; float xres, yres;
if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres) ) if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres) )
image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, xres); image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, wxRound(xres));
if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres) ) if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres) )
image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, yres); image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, wxRound(yres));
} }
} }