From: cristy Date: Sun, 31 May 2015 01:06:54 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~981 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1253cd7764d10cb086c738ec6dc399ed078a3f3;p=imagemagick --- diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c index 1400f0d04..f0422f829 100644 --- a/MagickCore/quantum.c +++ b/MagickCore/quantum.c @@ -472,14 +472,15 @@ MagickExport void GetQuantumInfo(const ImageInfo *image_info, % % The format of the GetQuantumPixels method is: % -% void *QuantumPixels GetQuantumPixels(const QuantumInfo *quantum_info) +% unsigned char *QuantumPixels GetQuantumPixels( +% const QuantumInfo *quantum_info) % % A description of each parameter follows: % % o image: the image. % */ -MagickExport void *GetQuantumPixels(const QuantumInfo *quantum_info) +MagickExport unsigned char *GetQuantumPixels(const QuantumInfo *quantum_info) { const int id = GetOpenMPThreadId(); diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h index 77ebe8107..57c858a7a 100644 --- a/MagickCore/quantum.h +++ b/MagickCore/quantum.h @@ -175,9 +175,11 @@ extern MagickExport size_t ImportQuantumPixels(const Image *,CacheView *,QuantumInfo *,const QuantumType, const unsigned char *restrict,ExceptionInfo *); +extern MagickExport unsigned char + *GetQuantumPixels(const QuantumInfo *); + extern MagickExport void GetQuantumInfo(const ImageInfo *,QuantumInfo *), - *GetQuantumPixels(const QuantumInfo *), SetQuantumAlphaType(QuantumInfo *,const QuantumAlphaType), SetQuantumImageType(Image *,const QuantumType), SetQuantumMinIsWhite(QuantumInfo *,const MagickBooleanType), diff --git a/MagickCore/version.h b/MagickCore/version.h index cffc2e194..fb41b94e3 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2015 ImageMagick Studio LLC" -#define MagickSVNRevision "18670:18687M" +#define MagickSVNRevision "18685M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 0,0,0 diff --git a/coders/pnm.c b/coders/pnm.c index 607267dde..349d94e9d 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -564,7 +564,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) extent=GetQuantumExtent(image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -582,8 +582,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), - &count); + pixels=(unsigned char *) ReadBlobStream(image,extent, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) extent) status=MagickFalse; if ((image->progress_monitor != (MagickProgressMonitor) NULL) && @@ -637,7 +637,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -658,8 +658,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), - &count); + pixels=(unsigned char *) ReadBlobStream(image,extent, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) extent) status=MagickFalse; if ((image->progress_monitor != (MagickProgressMonitor) NULL) && @@ -754,7 +754,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) SetQuantumEndian(image,quantum_info,MSBEndian); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -775,8 +775,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), - &count); + pixels=(unsigned char *) ReadBlobStream(image,extent, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) extent) status=MagickFalse; if ((image->progress_monitor != (MagickProgressMonitor) NULL) && @@ -954,7 +954,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -975,8 +975,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), - &count); + pixels=(unsigned char *) ReadBlobStream(image,extent, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) extent) status=MagickFalse; if ((image->progress_monitor != (MagickProgressMonitor) NULL) && @@ -1276,7 +1276,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) extent=GetQuantumExtent(image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -1294,8 +1294,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), - &count); + pixels=(unsigned char *) ReadBlobStream(image,extent, + GetQuantumPixels(quantum_info),&count); if ((size_t) count != extent) status=MagickFalse; if ((image->progress_monitor != (MagickProgressMonitor) NULL) && @@ -1736,7 +1736,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, *q++=(unsigned char) (GetPixelLuma(image,p) >= (QuantumRange/2.0) ? '0' : '1'); *q++=' '; - if ((q-pixels+1) >= sizeof(pixels)) + if ((q-pixels+1) >= (ssize_t) sizeof(pixels)) { *q++='\n'; (void) WriteBlob(image,q-pixels,pixels); diff --git a/coders/tiff.c b/coders/tiff.c index 5f646bb94..80ccf076d 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -982,7 +982,7 @@ static void TIFFReadPhotoshopLayers(Image* image,const ImageInfo *image_info, break; } i+=4; - if (i >= layer_info->length-8) + if (i >= (ssize_t) (layer_info->length-8)) return; layers=CloneImage(image,image->columns,image->rows,MagickTrue,exception); RemoveImageProfile(layers,"tiff:37724"); diff --git a/configure b/configure index 8cd94f611..84cc6f51e 100755 --- a/configure +++ b/configure @@ -4341,7 +4341,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=18670:18687M +MAGICK_SVN_REVISION=18685M # Substitute library versioning