From: cristy Date: Fri, 14 Dec 2012 00:31:38 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4596 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fab8364c296d7edd2588b7af56b7b7dfb015d871;p=imagemagick --- diff --git a/MagickCore/fx.c b/MagickCore/fx.c index e86b4ded1..438df2d1b 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -3407,6 +3407,10 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, { #define MorphImageTag "Morph/Image" + double + alpha, + beta; + Image *morph_image, *morph_images; @@ -3417,10 +3421,6 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, MagickOffsetType scene; - double - alpha, - beta; - register const Image *next; @@ -4864,10 +4864,7 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark, stegano_view=DestroyCacheView(stegano_view); watermark_view=DestroyCacheView(watermark_view); if (status == MagickFalse) - { - stegano_image=DestroyImage(stegano_image); - return((Image *) NULL); - } + stegano_image=DestroyImage(stegano_image); return(stegano_image); } @@ -5010,10 +5007,7 @@ MagickExport Image *StereoAnaglyphImage(const Image *left_image, } } if (status == MagickFalse) - { - stereo_image=DestroyImage(stereo_image); - return((Image *) NULL); - } + stereo_image=DestroyImage(stereo_image); return(stereo_image); }