diff --git a/ChangeLog b/ChangeLog index f6fdd2a..04bbaa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-01-19 Fred Kiefer + + * Source/art/blit.m(MPRE): Remove compiler warning. + * Source/art/image.m(-DPSimage:::::::::::): Correct parameter + types. Fixes bug #41274. + 2013-01-08 Fred Kiefer * configure: Remove duplicate addition of Xext. diff --git a/Source/art/blit.m b/Source/art/blit.m index d9b045a..3592d0d 100644 --- a/Source/art/blit.m +++ b/Source/art/blit.m @@ -318,7 +318,7 @@ static void MPRE(run_opaque) (render_run_t *ri, int num) COPY_ASSEMBLE_PIXEL(v, ri->r, ri->g, ri->b) v = v + (v << 16); - if (((int)dst&2) && num) + if (((NSUInteger)dst&2) && num) { *dst++ = v; num--; diff --git a/Source/art/image.m b/Source/art/image.m index d6a5b9c..e041138 100644 --- a/Source/art/image.m +++ b/Source/art/image.m @@ -606,9 +606,9 @@ seem to cause edges to be off by a pixel - (void)DPSimage: (NSAffineTransform *) matrix - : (int) pixelsWide : (int) pixelsHigh - : (int) bitsPerSample : (int) samplesPerPixel - : (int) bitsPerPixel : (int) bytesPerRow : (BOOL) isPlanar + : (NSInteger) pixelsWide : (NSInteger) pixelsHigh + : (NSInteger) bitsPerSample : (NSInteger) samplesPerPixel + : (NSInteger) bitsPerPixel : (NSInteger) bytesPerRow : (BOOL) isPlanar : (BOOL) hasAlpha : (NSString *) colorSpaceName : (const unsigned char *const [5]) data {