sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid a few -Wsign-conversion warnings

Browse source
This commit is contained in:
Dane Springmeyer 2015-07-30 11:10:23 -07:00
parent 76e761b2f0
commit a552518541
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/jpeg_io.hpp
View file

@ -85,8 +85,8 @@ void save_as_jpeg(T1 & file,int quality, T2 const& image)
struct jpeg_compress_struct cinfo;
struct jpeg_error_mgr jerr;
int width=image.width();
int height=image.height();
int width = static_cast<int>(image.width());
int height = static_cast<int>(image.height());
cinfo.err = jpeg_std_error(&jerr);
jpeg_create_compress(&cinfo);

22
include/mapnik/webp_io.hpp
View file

@ -80,20 +80,20 @@ inline int import_image(T2 const& im_in,
image<typename T2::pixel> const& data = im_in.data();
std::size_t width = im_in.width();
std::size_t height = im_in.height();
int stride = sizeof(typename T2::pixel_type) * width;
std::size_t stride = sizeof(typename T2::pixel_type) * width;
if (data.width() == width &&
data.height() == height)
{
if (alpha)
{
return WebPPictureImportRGBA(&pic, data.bytes(), stride);
return WebPPictureImportRGBA(&pic, data.bytes(), static_cast<int>(stride));
}
else
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1
return WebPPictureImportRGBX(&pic, data.bytes(), stride);
return WebPPictureImportRGBX(&pic, data.bytes(), static_cast<int>(stride));
#else
return WebPPictureImportRGBA(&pic, data.bytes(), stride);
return WebPPictureImportRGBA(&pic, data.bytes(), static_cast<int>(stride));
#endif
}
}
@ -109,14 +109,14 @@ inline int import_image(T2 const& im_in,
}
if (alpha)
{
return WebPPictureImportRGBA(&pic, im.bytes(), stride);
return WebPPictureImportRGBA(&pic, im.bytes(), static_cast<int>(stride));
}
else
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1
return WebPPictureImportRGBX(&pic, im.bytes(), stride);
return WebPPictureImportRGBX(&pic, im.bytes(), static_cast<int>(stride));
#else
return WebPPictureImportRGBA(&pic, im.bytes(), stride);
return WebPPictureImportRGBA(&pic, im.bytes(), static_cast<int>(stride));
#endif
}
}
@ -127,17 +127,17 @@ inline int import_image(image_rgba8 const& im,
WebPPicture & pic,
bool alpha)
{
int stride = sizeof(image_rgba8::pixel_type) * im.width();
std::size_t stride = sizeof(image_rgba8::pixel_type) * im.width();
if (alpha)
{
return WebPPictureImportRGBA(&pic, im.bytes(), stride);
return WebPPictureImportRGBA(&pic, im.bytes(), static_cast<int>(stride));
}
else
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1
return WebPPictureImportRGBX(&pic, im.bytes(), stride);
return WebPPictureImportRGBX(&pic, im.bytes(), static_cast<int>(stride));
#else
return WebPPictureImportRGBA(&pic, im.bytes(), stride);
return WebPPictureImportRGBA(&pic, im.bytes(), static_cast<int>(stride));
#endif
}
}