From: cristy Date: Wed, 14 Dec 2011 02:39:30 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6542 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d26338ffb761a86f047d7bbb9a596800f53c8649;p=imagemagick --- diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 334b3f261..d8443ed68 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -3657,7 +3657,7 @@ MagickExport void InitializePixelChannelMap(Image *image) register ssize_t i; - size_t + ssize_t n; assert(image != (Image *) NULL); @@ -3689,7 +3689,7 @@ if (0) for (i=0; i < (ssize_t) image->number_meta_channels; i++) SetPixelChannelMap(image,(PixelChannel) (MetaPixelChannel+i),CopyPixelTrait, n++); - image->number_channels=n; + image->number_channels=(size_t) n; if (image->debug != MagickFalse) LogPixelChannels(image); (void) SetPixelChannelMask(image,image->channel_mask); diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h index 944b2ef11..3bedb3916 100644 --- a/MagickCore/pixel.h +++ b/MagickCore/pixel.h @@ -80,7 +80,7 @@ typedef struct _PixelChannelMap PixelTrait traits; - int + ssize_t offset; } PixelChannelMap;