From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 30 Dec 2012 17:33:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4513
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e03a12a669dd4e2b4698dc86b3c014a6057595eb;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index b09e79948..aa0a0d2a5 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1923,7 +1923,7 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
                 status=ClonePixelCachePixels(clone_info,cache_info,exception);
               if (status != MagickFalse)
                 {
-                  if (cache_info->reference_count == 1) 
+                  if (cache_info->reference_count == 1)
                     cache_info->nexus_info=(NexusInfo **) NULL;
                   destroy=MagickTrue;
                   image->cache=clone_image.cache;
@@ -4913,10 +4913,6 @@ static MagickBooleanType SetCacheAlphaChannel(Image *image,const Quantum alpha,
   image->alpha_trait=BlendPixelTrait;
   status=MagickTrue;
   image_view=AcquireVirtualCacheView(image,exception);  /* must be virtual */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(status) \
-    magick_threads(image,image,image->rows,1)
-#endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     register Quantum
diff --git a/coders/dpx.c b/coders/dpx.c
index 3109ec8d4..303e79814 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -17,7 +17,7 @@
 %                                March 2001                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 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.  You may  %
diff --git a/coders/rgb.c b/coders/rgb.c
index 641269906..a401dba17 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 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.  You may  %
@@ -1383,7 +1383,6 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,
             if (status == MagickFalse)
               break;
           }
-        (void) CloseBlob(image);
         if (quantum_type == RGBAQuantum)
           {
             (void) CloseBlob(image);