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

fix unused typedef warning in image_util

Browse source
This commit is contained in:
Dane Springmeyer 2015-05-15 14:41:51 -07:00
parent f1e6be4572
commit 7a0cf4d750
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/image_util.cpp
View file

@ -2410,8 +2410,8 @@ MAPNIK_DECL unsigned compare<image_rgba8>(image_rgba8 const& im1, image_rgba8 co
{ {
for (unsigned int y = 0; y < im1.height(); ++y) for (unsigned int y = 0; y < im1.height(); ++y)
{ {
const std::uint32_t * row_from = im1.get_row(y); const pixel_type * row_from = im1.get_row(y);
const std::uint32_t * row_from2 = im2.get_row(y); const pixel_type * row_from2 = im2.get_row(y);
int x = 0; int x = 0;
for (; x < ROUND_DOWN(im1.width(),4); x +=4 ) for (; x < ROUND_DOWN(im1.width(),4); x +=4 )
{ {
@ -2444,8 +2444,8 @@ MAPNIK_DECL unsigned compare<image_rgba8>(image_rgba8 const& im1, image_rgba8 co
__m128i m_thres = _mm_set1_epi8(thres); __m128i m_thres = _mm_set1_epi8(thres);
for (unsigned int y = 0; y < im1.height(); ++y) for (unsigned int y = 0; y < im1.height(); ++y)
{ {
const std::uint32_t * row_from = im1.get_row(y); const pixel_type * row_from = im1.get_row(y);
const std::uint32_t * row_from2 = im2.get_row(y); const pixel_type * row_from2 = im2.get_row(y);
int x = 0; int x = 0;
for (; x < ROUND_DOWN(im1.width(),4); x +=4 ) for (; x < ROUND_DOWN(im1.width(),4); x +=4 )
{ {
@ -2494,8 +2494,8 @@ MAPNIK_DECL unsigned compare<image_rgba8>(image_rgba8 const& im1, image_rgba8 co
#else #else
for (unsigned int y = 0; y < im1.height(); ++y) for (unsigned int y = 0; y < im1.height(); ++y)
{ {
const std::uint32_t * row_from = im1.get_row(y); const pixel_type * row_from = im1.get_row(y);
const std::uint32_t * row_from2 = im2.get_row(y); const pixel_type * row_from2 = im2.get_row(y);
for (unsigned int x = 0; x < im1.width(); ++x) for (unsigned int x = 0; x < im1.width(); ++x)
{ {
unsigned rgba = row_from[x]; unsigned rgba = row_from[x];