Changeset 475

Timestamp:

10/26/09 19:05:08 (4 weeks ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/ChangeLog (modified) (1 diff)
• ImageMagick/trunk/ImageMagick.spec (modified) (1 diff)
• ImageMagick/trunk/config/configure.xml (modified) (1 diff)
• ImageMagick/trunk/libtool (modified) (1 diff)
• ImageMagick/trunk/magick/property.c (modified) (2 diffs)
• ImageMagick/trunk/magick/version.h (modified) (1 diff)
• ImageMagick/trunk/version.sh (modified) (1 diff)
• VisualMagick/trunk/bin/configure.xml (modified) (1 diff)
• VisualMagick/trunk/installer/inc/version.isx (modified) (1 diff)

ImageMagick/trunk/ChangeLog

@@ -2 +2 @@
   * Only call InstantiateXComponent() if X11 support is included.
   * Correct hue computation for the HSB colorspace.
+  * Convert SVG clipping path points from unsigned to long.
 
 2009-10-23  6.5.7-1 Samuel Thibault  <samuel.thibault@ens-l...>

ImageMagick/trunk/ImageMagick.spec

@@ -1 +1 @@
 %define VERSION  6.5.7
-%define Patchlevel  3
+%define Patchlevel  2
 
 Name:           ImageMagick

ImageMagick/trunk/config/configure.xml

@@ -9 +9 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x657"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,7,3"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,7,2"/>
   <configure name="RELEASE_DATE" value="2009-10-26"/>
   <configure name="CONFIGURE" value="./configure "/>

ImageMagick/trunk/libtool

@@ -2 +2 @@
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.5.7-3
+# Generated automatically by config.status (ImageMagick) 6.5.7-2
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

ImageMagick/trunk/magick/property.c

@@ -1660 +1660 @@
         for (i=0; i < 3; i++)
         {
-          y=(long) ReadPropertyMSBLong(&blob,&length);
-          x=(long) ReadPropertyMSBLong(&blob,&length);
+          unsigned long 
+            xx,
+            yy;
+
+          yy=ReadPropertyMSBLong(&blob,&length);
+          xx=ReadPropertyMSBLong(&blob,&length);
+          x=(long) xx;
+          if (xx > 2147483647)
+            x=xx-4294967295-1;
+          y=(long) yy;
+          if (yy > 2147483647)
+            y=yy-4294967295-1;
           point[i].x=(double) x/4096/4096;
           point[i].y=1.0-(double) y/4096/4096;
@@ -1840 +1850 @@
             blob+=24;
             length-=24;
+            break;
+          }
+        /*
+          Add sub-path knot
+        */
+        for (i=0; i < 3; i++)
+        {
+          unsigned long 
+            xx,
+            yy;
+
+          yy=ReadPropertyMSBLong(&blob,&length);
+          xx=ReadPropertyMSBLong(&blob,&length);
+          x=(long) xx;
+          if (xx > 2147483647)
+            x=xx-4294967295-1;
+          y=(long) yy;
+          if (yy > 2147483647)
+            y=yy-4294967295-1;
+          point[i].x=(double) x*columns/4096/4096;
+          point[i].y=(double) y*rows/4096/4096;
+        }
+        if (in_subpath == MagickFalse)
+          {
+            (void) FormatMagickString(message,MaxTextExtent,"M %g,%g\n",
+              point[1].x,point[1].y);
+            for (i=0; i < 3; i++)
+            {
+              first[i]=point[i];
+              last[i]=point[i];
+            }
           }
         else
           {
-            /*
-              Add sub-path knot
-            */
+            if ((last[1].x == last[2].x) && (last[1].y == last[2].y) &&
+                (point[0].x == point[1].x) && (point[0].y == point[1].y))
+              (void) FormatMagickString(message,MaxTextExtent,"L %g,%g\n",
+                point[1].x,point[1].y);
+            else
+              (void) FormatMagickString(message,MaxTextExtent,
+                "C %g,%g %g,%g %g,%g\n",last[2].x,last[2].y,
+                point[0].x,point[0].y,point[1].x,point[1].y);
             for (i=0; i < 3; i++)
-            {
-              y=(long) ReadPropertyMSBLong(&blob,&length);
-              x=(long) ReadPropertyMSBLong(&blob,&length);
-              point[i].x=(double) x*columns/4096/4096;
-              point[i].y=(double) y*rows/4096/4096;
-            }
-            if (in_subpath == MagickFalse)
-              {
-                (void) FormatMagickString(message,MaxTextExtent,"M %g,%g\n",
-                  point[1].x,point[1].y);
-                for (i=0; i < 3; i++)
-                {
-                  first[i]=point[i];
-                  last[i]=point[i];
-                }
-              }
+              last[i]=point[i];
+          }
+        (void) ConcatenateString(&path,message);
+        in_subpath=MagickTrue;
+        knot_count--;
+        /*
+          Close the subpath if there are no more knots.
+        */
+        if (knot_count == 0)
+          {
+            if ((last[1].x == last[2].x) && (last[1].y == last[2].y) &&
+                (first[0].x == first[1].x) && (first[0].y == first[1].y))
+              (void) FormatMagickString(message,MaxTextExtent,"L %g,%g Z\n",
+                first[1].x,first[1].y);
             else
               {
-                if ((last[1].x == last[2].x) && (last[1].y == last[2].y) &&
-                    (point[0].x == point[1].x) && (point[0].y == point[1].y))
-                  (void) FormatMagickString(message,MaxTextExtent,"L %g,%g\n",
-                    point[1].x,point[1].y);
-                else
-                  (void) FormatMagickString(message,MaxTextExtent,
-                    "C %g,%g %g,%g %g,%g\n",last[2].x,last[2].y,
-                    point[0].x,point[0].y,point[1].x,point[1].y);
-                for (i=0; i < 3; i++)
-                  last[i]=point[i];
+                (void) FormatMagickString(message,MaxTextExtent,
+                  "C %g,%g %g,%g %g,%g Z\n",last[2].x,last[2].y,
+                  first[0].x,first[0].y,first[1].x,first[1].y);
+                (void) ConcatenateString(&path,message);
               }
-            (void) ConcatenateString(&path,message);
-            in_subpath=MagickTrue;
-            knot_count--;
-            /*
-              Close the subpath if there are no more knots.
-            */
-            if (knot_count == 0)
-              {
-                if ((last[1].x == last[2].x) && (last[1].y == last[2].y) &&
-                    (first[0].x == first[1].x) && (first[0].y == first[1].y))
-                  (void) FormatMagickString(message,MaxTextExtent,"L %g,%g Z\n",
-                    first[1].x,first[1].y);
-                else
-                  {
-                    (void) FormatMagickString(message,MaxTextExtent,
-                      "C %g,%g %g,%g %g,%g Z\n",last[2].x,last[2].y,
-                      first[0].x,first[0].y,first[1].x,first[1].y);
-                    (void) ConcatenateString(&path,message);
-                  }
-                in_subpath=MagickFalse;
-              }
+            in_subpath=MagickFalse;
           }
-          break;
+        break;
       }
       case 6:

ImageMagick/trunk/magick/version.h

@@ -31 +31 @@
 #define MagickLibVersionText  "6.5.7"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-3"
+#define MagickLibSubversion  "-2"
 #define MagickReleaseDate  "2009-10-26"
 #define MagickChangeDate   "20091026"

ImageMagick/trunk/version.sh

@@ -13 +13 @@
 PACKAGE_VERSION='6.5.7'
 PACKAGE_LIB_VERSION="0x657"
-PACKAGE_RELEASE="3"
+PACKAGE_RELEASE="2"
 PACKAGE_LIB_VERSION_NUMBER="6,5,7,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`

VisualMagick/trunk/bin/configure.xml

@@ -9 +9 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x657"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,7,3"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,7,2"/>
   <configure name="RELEASE_DATE" value="2009-11-15"/>
   <configure name="VERSION" value="6.5.7"/>

VisualMagick/trunk/installer/inc/version.isx

@@ -19 +19 @@
 #define public MagickPackageName "ImageMagick"
 #define public MagickPackageVersion "6.5.7"
-#define public MagickPackageVersionAddendum "-3"
+#define public MagickPackageVersionAddendum "-2"
 #define public MagickPackageReleaseDate "2009-11-15"