(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index ec69556fa155bb0a508ac86b53452685c2d54c57..8242bc4e8baff56f687c377536993a5dc8db1da2 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9533:9553M"
+#define MagickSVNRevision  "9533:9576M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-10-08"
+#define MagickReleaseDate  "2012-10-10"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/PerlMagick/t/wmf/read.t b/PerlMagick/t/wmf/read.t
index 620eb96ddc8d6b3f90e78b478b9e4ee0bd6039c5..26400b49b9a3a3edbffae5ba408c1f31e02d0340 100644 (file)
--- a/PerlMagick/t/wmf/read.t
+++ b/PerlMagick/t/wmf/read.t
@@ -15,8 +15,8 @@ require 't/subroutines.pl';
 chdir 't/wmf' || die 'Cd failed';
 
 testReadCompare('wizard.wmf', '../reference/wmf/wizard.miff',
-                q//, 0.000001, 0.6);
+                q//, 0.00001, 0.8);
 ++$test;
 testReadCompare('clock.wmf', '../reference/wmf/clock.miff',
-                q//, 0.000001, 0.6);
+                q//, 0.00001, 0.8);
 

diff --git a/coders/txt.c b/coders/txt.c
index 0ea542e6233bb8679fb8bbfd7d1a5de6f43c70d7..5428cafa90d1e5763fdbbff7e43d8853057f2ec2 100644 (file)
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -447,6 +447,13 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
     range=GetQuantumRange(image->depth);
     for (y=0; y < (ssize_t) image->rows; y++)
     {
+      double
+        alpha,
+        black,
+        blue,
+        green,
+        red;
+
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         if (ReadBlobString(image,text) == (char *) NULL)
@@ -458,15 +465,15 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (image->alpha_trait == BlendPixelTrait)
               {
                 count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf",&x_offset,
-                  &y_offset,&pixel.red,&pixel.alpha);
-                pixel.green=pixel.red;
-                pixel.blue=pixel.red;
+                  &y_offset,&red,&alpha);
+                green=red;
+                blue=red;
                 break;
               }
             count=(ssize_t) sscanf(text,"%ld,%ld: (%lf",&x_offset,&y_offset,
-              &pixel.red);
-            pixel.green=pixel.red;
-            pixel.blue=pixel.red;
+              &red);
+            green=red;
+            blue=red;
             break;       
           }
           case CMYKColorspace:
@@ -474,12 +481,11 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (image->alpha_trait == BlendPixelTrait)
               {
                 count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf,%lf",
-                  &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
-                  &pixel.black,&pixel.alpha);
+                  &x_offset,&y_offset,&red,&green,&blue,&black,&alpha);
                 break;
               }
             count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",&x_offset,
-              &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black);
+              &y_offset,&red,&green,&blue,&black);
             break;
           }
           default:
@@ -487,20 +493,19 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (image->alpha_trait == BlendPixelTrait)
               {
                 count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",
-                  &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
-                  &pixel.alpha);
+                  &x_offset,&y_offset,&red,&green,&blue,&alpha);
                 break;
               }
             count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf",&x_offset,
-              &y_offset,&pixel.red,&pixel.green,&pixel.blue);
+              &y_offset,&red,&green,&blue);
             break;       
           }
         }
-        pixel.red=ScaleAnyToQuantum(pixel.red,range);
-        pixel.green=ScaleAnyToQuantum(pixel.green,range);
-        pixel.blue=ScaleAnyToQuantum(pixel.blue,range);
-        pixel.black=ScaleAnyToQuantum(pixel.black,range);
-        pixel.alpha=ScaleAnyToQuantum(pixel.alpha,range);
+        pixel.red=ScaleAnyToQuantum((QuantumAny) (red+0.5),range);
+        pixel.green=ScaleAnyToQuantum((QuantumAny) (green+0.5),range);
+        pixel.blue=ScaleAnyToQuantum((QuantumAny) (blue+0.5),range);
+        pixel.black=ScaleAnyToQuantum((QuantumAny) (black+0.5),range);
+        pixel.alpha=ScaleAnyToQuantum((QuantumAny) (alpha+0.5),range);
         q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
         if (q == (Quantum *) NULL)
           continue;

diff --git a/configure b/configure
index 15381183a698e8d8bebaef86f31486b21ded16e5..560385c8dd416c82b235a95faaa21a27b76f2292 100755 (executable)
--- a/configure
+++ b/configure
@@ -3670,7 +3670,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=9533:9553M
+MAGICK_SVN_REVISION=9533:9576M