From: cristy Date: Fri, 20 Jan 2012 23:56:26 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6324 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=564a56979706a30a3d0f920fd5f538a408efd4f1;p=imagemagick --- diff --git a/MagickCore/ImageMagick.h b/MagickCore/ImageMagick.h index 622329c38..2579ab7b8 100644 --- a/MagickCore/ImageMagick.h +++ b/MagickCore/ImageMagick.h @@ -1,5 +1,5 @@ /* - Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization + Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available. You may not use this file except in compliance with the License. diff --git a/MagickCore/api.h b/MagickCore/api.h index 0caf8e204..ca55f0d0d 100644 --- a/MagickCore/api.h +++ b/MagickCore/api.h @@ -1,5 +1,5 @@ /* - Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization + Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available. You may not use this file except in compliance with the License. diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index b06f733f7..ecb871f40 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -188,8 +188,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, *image_view; MagickBooleanType - status, - sync; + status; MagickOffsetType progress; @@ -253,6 +252,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { + MagickBooleanType + sync; + register ssize_t x; @@ -309,6 +311,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { + MagickBooleanType + sync; + PixelInfo pixel; @@ -367,6 +372,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, hue, saturation; + MagickBooleanType + sync; + register ssize_t x; @@ -387,8 +395,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, brightness=0.0; for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToHSB(GetPixelRed(image,q),GetPixelGreen(image,q), - GetPixelBlue(image,q),&hue,&saturation,&brightness); + ConvertRGBToHSB((double) GetPixelRed(image,q), + (double) GetPixelGreen(image,q),(double) GetPixelBlue(image,q), + &hue,&saturation,&brightness); SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange* hue),q); SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange* @@ -427,6 +436,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, lightness, saturation; + MagickBooleanType + sync; + register ssize_t x; @@ -447,8 +459,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, lightness=0.0; for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToHSL(GetPixelRed(image,q),GetPixelGreen(image,q), - GetPixelBlue(image,q),&hue,&saturation,&lightness); + ConvertRGBToHSL((double) GetPixelRed(image,q),(double) + GetPixelGreen(image,q),(double) GetPixelBlue(image,q), + &hue,&saturation,&lightness); SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange* hue),q); SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange* @@ -487,6 +500,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, hue, whiteness; + MagickBooleanType + sync; + register ssize_t x; @@ -507,8 +523,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, blackness=0.0; for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToHWB(GetPixelRed(image,q),GetPixelGreen(image,q), - GetPixelBlue(image,q),&hue,&whiteness,&blackness); + ConvertRGBToHWB((double) GetPixelRed(image,q),(double) + GetPixelGreen(image,q),(double) GetPixelBlue(image,q), + &hue,&whiteness,&blackness); SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange* hue),q); SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange* @@ -550,6 +567,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, Y, Z; + MagickBooleanType + sync; + register ssize_t x; @@ -653,6 +673,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { + MagickBooleanType + sync; + register ssize_t x; @@ -1061,6 +1084,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { + MagickBooleanType + sync; + PixelInfo pixel; @@ -1135,15 +1161,15 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, PixelInfo pixel; - red=ScaleQuantumToMap(image->colormap[i].red); - green=ScaleQuantumToMap(image->colormap[i].green); - blue=ScaleQuantumToMap(image->colormap[i].blue); + red=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red)); + green=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green)); + blue=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].blue)); pixel.red=x_map[red].x+y_map[green].x+z_map[blue].x+primary_info.x; pixel.green=x_map[red].y+y_map[green].y+z_map[blue].y+primary_info.y; pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z+primary_info.z; - image->colormap[i].red=ScaleMapToQuantum(pixel.red); - image->colormap[i].green=ScaleMapToQuantum(pixel.green); - image->colormap[i].blue=ScaleMapToQuantum(pixel.blue); + image->colormap[i].red=(double) ScaleMapToQuantum(pixel.red); + image->colormap[i].green=(double) ScaleMapToQuantum(pixel.green); + image->colormap[i].blue=(double) ScaleMapToQuantum(pixel.blue); } (void) SyncImage(image,exception); break; @@ -2589,9 +2615,9 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, green, red; - red=ScaleQuantumToMap(image->colormap[i].red); - green=ScaleQuantumToMap(image->colormap[i].green); - blue=ScaleQuantumToMap(image->colormap[i].blue); + red=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red)); + green=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green)); + blue=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].blue)); pixel.red=x_map[red].x+y_map[green].x+z_map[blue].x; pixel.green=x_map[red].y+y_map[green].y+z_map[blue].y; pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z; @@ -2600,11 +2626,11 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, case YCCColorspace: { #if !defined(MAGICKCORE_HDRI_SUPPORT) - image->colormap[i].red=(Quantum) (QuantumRange*YCCMap[ + image->colormap[i].red=(double) (QuantumRange*YCCMap[ RoundToYCC(1024.0*QuantumScale*pixel.red)]); - image->colormap[i].green=(Quantum) (QuantumRange*YCCMap[ + image->colormap[i].green=(double) (QuantumRange*YCCMap[ RoundToYCC(1024.0*QuantumScale*pixel.green)]); - image->colormap[i].blue=(Quantum) (QuantumRange*YCCMap[ + image->colormap[i].blue=(double) (QuantumRange*YCCMap[ RoundToYCC(1024.0*QuantumScale*pixel.blue)]); #endif break; @@ -2629,12 +2655,12 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, } default: { - image->colormap[i].red=ScaleMapToQuantum((MagickRealType) MaxMap* - QuantumScale*pixel.red); - image->colormap[i].green=ScaleMapToQuantum((MagickRealType) MaxMap* - QuantumScale*pixel.green); - image->colormap[i].blue=ScaleMapToQuantum((MagickRealType) MaxMap* - QuantumScale*pixel.blue); + image->colormap[i].red=(double) ScaleMapToQuantum((MagickRealType) + MaxMap*QuantumScale*pixel.red); + image->colormap[i].green=(double) ScaleMapToQuantum((MagickRealType) + MaxMap*QuantumScale*pixel.green); + image->colormap[i].blue=(double) ScaleMapToQuantum((MagickRealType) + MaxMap*QuantumScale*pixel.blue); break; } } diff --git a/MagickCore/composite.c b/MagickCore/composite.c index dfa66d78e..0289911b5 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -291,9 +291,6 @@ static MagickBooleanType CompositeOverImage(Image *image, ssize_t y; - size_t - channels; - /* Prepare composite image. */ @@ -325,6 +322,9 @@ static MagickBooleanType CompositeOverImage(Image *image, register ssize_t x; + size_t + channels; + if (status == MagickFalse) continue; if (modify_outside_overlay == MagickFalse) @@ -503,9 +503,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image, const char *value; - double - sans; - GeometryInfo geometry_info; @@ -531,9 +528,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickStatusType flags; - size_t - channels; - ssize_t y; @@ -1214,6 +1208,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, register ssize_t i; + size_t + channels; + if (modify_outside_overlay == MagickFalse) { if (x < x_offset) @@ -1407,6 +1404,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + double + sans; + MagickRealType pixel; diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index e8a7dd0ff..d02dae8db 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -389,6 +389,9 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, register Quantum *restrict q; + size_t + width; + /* Initialize scanline with matte color. */ diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 049b72578..7177eadda 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1102,6 +1102,8 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, edge; ssize_t + start, + stop, y; /* @@ -1153,12 +1155,14 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, edge.y2=MagickMin(max.y,(double) image->rows-1.0); inverse_affine=InverseAffineMatrix(affine); GetPixelInfo(image,&zero); + start=(ssize_t) ceil(edge.y1-0.5); + stop=(ssize_t) ceil(edge.y2-0.5); image_view=AcquireCacheView(image); source_view=AcquireCacheView(source); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) #endif - for (y=(ssize_t) ceil(edge.y1-0.5); y <= (ssize_t) floor(edge.y2+0.5); y++) + for (y=start; y <= stop; y++) { PixelInfo composite, @@ -3841,18 +3845,18 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, bounds.y2=bounds.y2 < 0.0 ? 0.0 : (size_t) floor(bounds.y2+0.5) >= image->rows ? (double) image->rows-1.0 : bounds.y2; status=MagickTrue; - start=(ssize_t) ceil(bounds.x1-0.5); - stop=(ssize_t) floor(bounds.x2+0.5); image_view=AcquireCacheView(image); if (primitive_info->coordinates == 1) { /* Draw point. */ + start=(ssize_t) ceil(bounds.y1-0.5); + stop=(ssize_t) floor(bounds.y2+0.5); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif - for (y=(ssize_t) ceil(bounds.y1-0.5); y <= (ssize_t) floor(bounds.y2+0.5); y++) + for (y=start; y <= stop; y++) { MagickBooleanType sync; @@ -3866,8 +3870,14 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, register Quantum *restrict q; + ssize_t + start, + stop; + if (status == MagickFalse) continue; + start=(ssize_t) ceil(bounds.x1-0.5); + stop=(ssize_t) floor(bounds.x2+0.5); x=start; q=GetCacheViewAuthenticPixels(image_view,x,y,(size_t) (stop-x+1), 1,exception); @@ -3903,10 +3913,12 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, */ if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); + start=(ssize_t) ceil(bounds.y1-0.5); + stop=(ssize_t) floor(bounds.y2+0.5); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) #endif - for (y=(ssize_t) ceil(bounds.y1-0.5); y <= (ssize_t) floor(bounds.y2+0.5); y++) + for (y=start; y <= stop; y++) { const int id = GetOpenMPThreadId(); @@ -3925,8 +3937,14 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, register ssize_t x; + ssize_t + start, + stop; + if (status == MagickFalse) continue; + start=(ssize_t) ceil(bounds.x1-0.5); + stop=(ssize_t) floor(bounds.x2+0.5); q=GetCacheViewAuthenticPixels(image_view,start,y,(size_t) (stop-start+1),1, exception); if (q == (Quantum *) NULL) diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index ddb9877ae..de9ade01e 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -409,7 +409,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ClutImage) + #pragma omp critical (MagickCore_ClutImage) #endif proceed=SetImageProgress(image,ClutImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -795,7 +795,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ColorDecisionListImageChannel) + #pragma omp critical (MagickCore_ColorDecisionListImageChannel) #endif proceed=SetImageProgress(image,ColorDecisionListCorrectImageTag, progress++,image->rows); @@ -951,7 +951,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ContrastImage) + #pragma omp critical (MagickCore_ContrastImage) #endif proceed=SetImageProgress(image,ContrastImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -1023,6 +1023,9 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, register ssize_t i; + size_t + number_channels; + ssize_t y; @@ -1035,8 +1038,8 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); black=(double *) AcquireQuantumMemory(GetPixelChannels(image),sizeof(*black)); white=(double *) AcquireQuantumMemory(GetPixelChannels(image),sizeof(*white)); - histogram=(double *) AcquireQuantumMemory(MaxMap+1UL, - GetPixelChannels(image)*sizeof(*histogram)); + histogram=(double *) AcquireQuantumMemory(MaxMap+1UL,GetPixelChannels(image)* + sizeof(*histogram)); stretch_map=(double *) AcquireQuantumMemory(MaxMap+1UL, GetPixelChannels(image)*sizeof(*stretch_map)); if ((black == (double *) NULL) || (white == (double *) NULL) || @@ -1089,10 +1092,11 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, /* Find the histogram boundaries by locating the black/white levels. */ + number_channels=GetPixelChannels(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) #endif - for (i=0; i < (ssize_t) GetPixelChannels(image); i++) + for (i=0; i < number_channels; i++) { double intensity; @@ -1125,10 +1129,11 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, */ (void) ResetMagickMemory(stretch_map,0,(MaxMap+1)*GetPixelChannels(image)* sizeof(*stretch_map)); + number_channels=GetPixelChannels(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) #endif - for (i=0; i < (ssize_t) GetPixelChannels(image); i++) + for (i=0; i < (ssize_t) number_channels; i++) { register ssize_t j; @@ -1244,7 +1249,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ContrastStretchImage) + #pragma omp critical (MagickCore_ContrastStretchImage) #endif proceed=SetImageProgress(image,ContrastStretchImageTag,progress++, image->rows); @@ -1437,7 +1442,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_EnhanceImage) + #pragma omp critical (MagickCore_EnhanceImage) #endif proceed=SetImageProgress(image,EnhanceImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -1497,6 +1502,9 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, register ssize_t i; + size_t + number_channels; + ssize_t y; @@ -1562,10 +1570,11 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, /* Integrate the histogram to get the equalization map. */ + number_channels=GetPixelChannels(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) #endif - for (i=0; i < (ssize_t) GetPixelChannels(image); i++) + for (i=0; i < (size_t) number_channels; i++) { MagickRealType intensity; @@ -1582,10 +1591,11 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, } (void) ResetMagickMemory(equalize_map,0,(MaxMap+1)*GetPixelChannels(image)* sizeof(*equalize_map)); + number_channels=GetPixelChannels(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) #endif - for (i=0; i < (ssize_t) GetPixelChannels(image); i++) + for (i=0; i < (ssize_t) number_channels; i++) { register ssize_t j; @@ -1702,7 +1712,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_EqualizeImage) + #pragma omp critical (MagickCore_EqualizeImage) #endif proceed=SetImageProgress(image,EqualizeImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -1787,7 +1797,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, (void) ResetMagickMemory(gamma_map,0,(MaxMap+1)*sizeof(*gamma_map)); if (gamma != 0.0) #if defined(MAGICKCORE_OPENMP_SUPPORT) && (MaxMap > 256) - #pragma omp parallel for + #pragma omp parallel for #endif for (i=0; i <= (ssize_t) MaxMap; i++) gamma_map[i]=(MagickRealType) ScaleMapToQuantum(( @@ -1798,7 +1808,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, Gamma-correct colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -1869,7 +1879,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_GammaImage) + #pragma omp critical (MagickCore_GammaImage) #endif proceed=SetImageProgress(image,GammaCorrectImageTag,progress++, image->rows); @@ -2066,7 +2076,7 @@ MagickExport MagickBooleanType HaldClutImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_HaldClutImage) + #pragma omp critical (MagickCore_HaldClutImage) #endif proceed=SetImageProgress(image,HaldClutImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -2168,7 +2178,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -2243,7 +2253,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_LevelImage) + #pragma omp critical (MagickCore_LevelImage) #endif proceed=SetImageProgress(image,LevelImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -2403,7 +2413,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_LevelizeImage) + #pragma omp critical (MagickCore_LevelizeImage) #endif proceed=SetImageProgress(image,LevelizeImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -2835,7 +2845,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, Modulate colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) switch (colorspace) @@ -2934,7 +2944,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ModulateImage) + #pragma omp critical (MagickCore_ModulateImage) #endif proceed=SetImageProgress(image,ModulateImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -3003,7 +3013,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, Negate colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -3031,7 +3041,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, if (grayscale != MagickFalse) { #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3087,7 +3097,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_NegateImage) + #pragma omp critical (MagickCore_NegateImage) #endif proceed=SetImageProgress(image,NegateImageTag,progress++, image->rows); @@ -3148,7 +3158,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_NegateImage) + #pragma omp critical (MagickCore_NegateImage) #endif proceed=SetImageProgress(image,NegateImageTag,progress++,image->rows); if (proceed == MagickFalse) @@ -3303,7 +3313,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, Sigmoidal-contrast enhance colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -3374,7 +3384,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, proceed; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SigmoidalContrastImage) + #pragma omp critical (MagickCore_SigmoidalContrastImage) #endif proceed=SetImageProgress(image,SigmoidalContrastImageTag,progress++, image->rows); diff --git a/MagickCore/feature.c b/MagickCore/feature.c index 058c3dd01..bba543820 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -181,8 +181,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, length; ssize_t - y, - z; + y; unsigned int number_grays; @@ -1127,6 +1126,9 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, #endif for (i=0; i < 4; i++) { + ssize_t + z; + for (z=0; z < (ssize_t) number_grays; z++) { register ssize_t diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c index 8b8faa032..658aa2c01 100644 --- a/MagickCore/fourier.c +++ b/MagickCore/fourier.c @@ -657,7 +657,7 @@ MagickExport Image *ForwardFourierTransformImage(const Image *image, status=MagickTrue; is_gray=IsImageGray(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel sections + #pragma omp parallel sections #endif { #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickCore/identify.c b/MagickCore/identify.c index 48a7341a7..ff9a40410 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -418,6 +418,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, channel_statistics=(ChannelStatistics *) NULL; channel_features=(ChannelFeatures *) NULL; colorspace=image->colorspace; + scale=1; if (ping == MagickFalse) { size_t diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 3db76f669..df87e50c3 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,7 +12,9 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -/* #undef BUILD_MODULES */ +#ifndef MAGICKCORE_BUILD_MODULES +#define MAGICKCORE_BUILD_MODULES 1 +#endif /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -95,7 +97,9 @@ #endif /* Define if you have FlashPIX library */ -/* #undef FPX_DELEGATE */ +#ifndef MAGICKCORE_FPX_DELEGATE +#define MAGICKCORE_FPX_DELEGATE 1 +#endif /* Define if you have FreeType (TrueType font) library */ #ifndef MAGICKCORE_FREETYPE_DELEGATE @@ -219,7 +223,9 @@ #endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_CL_CL_H */ +#ifndef MAGICKCORE_HAVE_CL_CL_H +#define MAGICKCORE_HAVE_CL_CL_H 1 +#endif /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_COMPLEX_H @@ -442,15 +448,15 @@ #endif /* Define if you have the header file. */ -#ifndef MAGICKCORE_HAVE_LCMS2_H -#define MAGICKCORE_HAVE_LCMS2_H 1 -#endif +/* #undef HAVE_LCMS2_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ /* Define if you have the header file. */ -/* #undef HAVE_LCMS_H */ +#ifndef MAGICKCORE_HAVE_LCMS_H +#define MAGICKCORE_HAVE_LCMS_H 1 +#endif /* Define if you have the header file. */ /* #undef HAVE_LCMS_LCMS_H */ @@ -1188,7 +1194,9 @@ #endif /* Define if you have JBIG library */ -/* #undef JBIG_DELEGATE */ +#ifndef MAGICKCORE_JBIG_DELEGATE +#define MAGICKCORE_JBIG_DELEGATE 1 +#endif /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1217,7 +1225,9 @@ #endif /* Define if you have LQR library */ -/* #undef LQR_DELEGATE */ +#ifndef MAGICKCORE_LQR_DELEGATE +#define MAGICKCORE_LQR_DELEGATE 1 +#endif /* Define if using libltdl to support dynamically loadable modules */ #ifndef MAGICKCORE_LTDL_DELEGATE @@ -1229,7 +1239,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/usr/lib64/freetype-freeworld:/opt/modules/pkg/intel/f77/10.0.025/lib:/opt/intel/lib/intel64:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tracker-0.12:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1283,7 +1293,9 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -/* #undef OPENEXR_DELEGATE */ +#ifndef MAGICKCORE_OPENEXR_DELEGATE +#define MAGICKCORE_OPENEXR_DELEGATE 1 +#endif /* Name of package */ #ifndef MAGICKCORE_PACKAGE @@ -1511,7 +1523,9 @@ #endif /* Define if you have WEBP library */ -/* #undef WEBP_DELEGATE */ +#ifndef MAGICKCORE_WEBP_DELEGATE +#define MAGICKCORE_WEBP_DELEGATE 1 +#endif /* Define to use the Windows GDI32 library */ /* #undef WINGDI32_DELEGATE */ @@ -1581,7 +1595,9 @@ /* #undef _MINIX */ /* Define this for the OpenCL Accelerator */ -/* #undef _OPENCL */ +#ifndef MAGICKCORE__OPENCL +#define MAGICKCORE__OPENCL 1 +#endif /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 3d9165424..a2d5e785f 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "6505" +#define MagickSVNRevision "exported" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-01-19" +#define MagickReleaseDate "2012-01-20" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/coders/cals.c b/coders/cals.c index 6ebcb7842..43bba845a 100644 --- a/coders/cals.c +++ b/coders/cals.c @@ -417,6 +417,7 @@ static ssize_t WriteCALSRecord(Image *image,const char *data) count; i=0; + count=0; if (data != (const char *) NULL) { p=data; diff --git a/coders/inline.c b/coders/inline.c index 56ba3e72d..d9ba97e77 100644 --- a/coders/inline.c +++ b/coders/inline.c @@ -137,6 +137,7 @@ static Image *ReadINLINEImage(const ImageInfo *image_info, quantum=MagickMin((size_t) GetBlobSize(image),MagickMaxBufferExtent); inline_image=(unsigned char *) AcquireQuantumMemory(quantum, sizeof(*inline_image)); + count=0; for (i=0; inline_image != (unsigned char *) NULL; i+=count) { count=(ssize_t) ReadBlob(image,quantum,inline_image+i);