(no commit message)

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index b09e79948f259b29b1502a95dcade4003cafd816..aa0a0d2a54e159954bc335ceaacc92be08088642 100644 (file)
--- 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 3109ec8d441c8404f5c3f28c2c6dcc8b2b30918b..303e798141c8f85ad78bbbacaac8a01ccdf00693 100644 (file)
--- 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 64126990602cb82003d63e41b43e8d669224e2b0..a401dba1780a7ee5c490d1a5320262c6939bc490 100644 (file)
--- 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);