From 0a36c74030b07bb3b0c2b1e10fa07a022e2a103f Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 3 Oct 2010 02:10:53 +0000 Subject: [PATCH] --- magick/cache.c | 44 ++++++++++++++++++++++---------------------- magick/colorspace.c | 24 ++++++++++++------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/magick/cache.c b/magick/cache.c index 46ec77ba2..34c3372cd 100644 --- a/magick/cache.c +++ b/magick/cache.c @@ -3346,9 +3346,9 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, { p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, EdgeX(x+u,cache_info->columns),EdgeY(y+v,cache_info->rows), - 1UL,1UL,virtual_nexus[0],exception); + 1UL,1UL,*virtual_nexus,exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case RandomVirtualPixelMethod: @@ -3358,18 +3358,18 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, RandomX(cache_info->random_info,cache_info->columns), RandomY(cache_info->random_info,cache_info->rows),1UL,1UL, - virtual_nexus[0],exception); + *virtual_nexus,exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case DitherVirtualPixelMethod: { p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, DitherX(x+u,cache_info->columns),DitherY(y+v,cache_info->rows), - 1UL,1UL,virtual_nexus[0],exception); + 1UL,1UL,*virtual_nexus,exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case TileVirtualPixelMethod: @@ -3377,10 +3377,10 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, x_modulo=VirtualPixelModulo(x+u,cache_info->columns); y_modulo=VirtualPixelModulo(y+v,cache_info->rows); p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, - x_modulo.remainder,y_modulo.remainder,1UL,1UL,virtual_nexus[0], + x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus, exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case MirrorVirtualPixelMethod: @@ -3394,10 +3394,10 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, y_modulo.remainder=(ssize_t) cache_info->rows- y_modulo.remainder-1L; p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, - x_modulo.remainder,y_modulo.remainder,1UL,1UL,virtual_nexus[0], + x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus, exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case CheckerTileVirtualPixelMethod: @@ -3411,10 +3411,10 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, break; } p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, - x_modulo.remainder,y_modulo.remainder,1UL,1UL,virtual_nexus[0], + x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus, exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case HorizontalTileVirtualPixelMethod: @@ -3428,10 +3428,10 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, x_modulo=VirtualPixelModulo(x+u,cache_info->columns); y_modulo=VirtualPixelModulo(y+v,cache_info->rows); p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, - x_modulo.remainder,y_modulo.remainder,1UL,1UL,virtual_nexus[0], + x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus, exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case VerticalTileVirtualPixelMethod: @@ -3445,10 +3445,10 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, x_modulo=VirtualPixelModulo(x+u,cache_info->columns); y_modulo=VirtualPixelModulo(y+v,cache_info->rows); p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, - x_modulo.remainder,y_modulo.remainder,1UL,1UL,virtual_nexus[0], + x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus, exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case HorizontalTileEdgeVirtualPixelMethod: @@ -3456,9 +3456,9 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, x_modulo=VirtualPixelModulo(x+u,cache_info->columns); p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, x_modulo.remainder,EdgeY(y+v,cache_info->rows),1UL,1UL, - virtual_nexus[0],exception); + *virtual_nexus,exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } case VerticalTileEdgeVirtualPixelMethod: @@ -3466,9 +3466,9 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, y_modulo=VirtualPixelModulo(y+v,cache_info->rows); p=GetVirtualPixelsFromNexus(image,virtual_pixel_method, EdgeX(x+u,cache_info->columns),y_modulo.remainder,1UL,1UL, - virtual_nexus[0],exception); + *virtual_nexus,exception); virtual_indexes=GetVirtualIndexesFromNexus(cache_info, - virtual_nexus[0]); + *virtual_nexus); break; } } @@ -3484,10 +3484,10 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image, Transfer a run of pixels. */ p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x+u,y+v, - (size_t) length,1UL,virtual_nexus[0],exception); + (size_t) length,1UL,*virtual_nexus,exception); if (p == (const PixelPacket *) NULL) break; - virtual_indexes=GetVirtualIndexesFromNexus(cache_info,virtual_nexus[0]); + virtual_indexes=GetVirtualIndexesFromNexus(cache_info,*virtual_nexus); (void) memcpy(q,p,(size_t) length*sizeof(*p)); q+=length; if ((indexes != (IndexPacket *) NULL) && diff --git a/magick/colorspace.c b/magick/colorspace.c index 109b26b57..ea01368b9 100644 --- a/magick/colorspace.c +++ b/magick/colorspace.c @@ -833,7 +833,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, case sRGBColorspace: { /* - Linear RGB to nonlinear sRGB (http://www.w3.org/Graphics/Color/sRGB): + Linear sRGB to nonlinear RGB (http://www.w3.org/Graphics/Color/sRGB): R = 1.0*R+0.0*G+0.0*B G = 0.0*R+0.1*G+0.0*B @@ -848,19 +848,19 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, v; v=(MagickRealType) i/(MagickRealType) MaxMap; - if (((MagickRealType) i/(MagickRealType) MaxMap) <= 0.03928f) + if (((MagickRealType) i/(MagickRealType) MaxMap) <= 0.04045f) v/=12.92f; else - v=(MagickRealType) MaxMap*pow((((double) i/MaxMap)+0.055)/1.055,2.4); - x_map[i].x=1.0f*v; - y_map[i].x=0.0f*v; - z_map[i].x=0.0f*v; - x_map[i].y=0.0f*v; - y_map[i].y=1.0f*v; - z_map[i].y=0.0f*v; - x_map[i].z=0.0f*v; - y_map[i].z=0.0f*v; - z_map[i].z=1.0f*v; + v=(MagickRealType) pow((((double) i/MaxMap)+0.055)/1.055,2.4); + x_map[i].x=1.0f*MaxMap*v; + y_map[i].x=0.0f*MaxMap*v; + z_map[i].x=0.0f*MaxMap*v; + x_map[i].y=0.0f*MaxMap*v; + y_map[i].y=1.0f*MaxMap*v; + z_map[i].y=0.0f*MaxMap*v; + x_map[i].z=0.0f*MaxMap*v; + y_map[i].z=0.0f*MaxMap*v; + z_map[i].z=1.0f*MaxMap*v; } break; } -- 2.40.0