From: cristy Date: Sat, 7 Nov 2009 18:32:17 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10408 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c01ffd5a0ce010e23b65ed0e2842edb7b2ef7e5;p=imagemagick --- diff --git a/magick/fx.c b/magick/fx.c index e6173eab4..50281e75c 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -4529,9 +4529,6 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, MagickPixelPacket zero; - register const double - *k; - CacheView *image_view, *recolor_view; @@ -4565,6 +4562,9 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, u, v; + register const double + *k; + (void) LogMagickEvent(TransformEvent,GetMagickModule(), " Recolor image with %ldx%ld color matrix:",order,order); message=AcquireString(""); @@ -4589,7 +4589,6 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, status=MagickTrue; progress=0; GetMagickPixelPacket(image,&zero); - k=color_matrix; image_view=AcquireCacheView(image); recolor_view=AcquireCacheView(recolor_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) @@ -4601,6 +4600,9 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, pixel, recolor_pixel; + register const double + *k; + register const IndexPacket *__restrict indexes; @@ -4630,6 +4632,7 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, recolor_indexes=GetCacheViewAuthenticIndexQueue(recolor_view); pixel=zero; recolor_pixel=zero; + k=color_matrix; for (x=0; x < (long) image->columns; x++) { SetMagickPixelPacket(image,p,indexes,&pixel);