From: cristy Date: Tue, 27 Oct 2009 02:05:08 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10449 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9743320fe0688068bf6b110aee39b0f929d68201;p=imagemagick --- diff --git a/ChangeLog b/ChangeLog index fb77ee564..37fd01a39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2009-10-26 6.5.7-2 Chris Madison * 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 * Braille coder fix for DirectClass images diff --git a/ImageMagick.spec b/ImageMagick.spec index 303d8d0ff..adbe6d2d5 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.7 -%define Patchlevel 3 +%define Patchlevel 2 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 4d71eb2f3..bb058f60c 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index 23e67186c..f0cc226b8 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # 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. # diff --git a/magick/property.c b/magick/property.c index 1657f06c6..d4b04e531 100644 --- a/magick/property.c +++ b/magick/property.c @@ -1659,8 +1659,18 @@ static char *TracePSClippath(const unsigned char *blob,size_t length, */ 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; } @@ -1839,65 +1849,73 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length, */ blob+=24; length-=24; + break; } - else + /* + 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) { - /* - Add sub-path knot - */ + (void) FormatMagickString(message,MaxTextExtent,"M %g,%g\n", + 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; + first[i]=point[i]; + last[i]=point[i]; } - 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 + { + 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) 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) 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; + (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; } - break; + break; } case 6: case 7: diff --git a/magick/version.h b/magick/version.h index 48b6cb7ac..9cae80c20 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x657 #define MagickLibVersionText "6.5.7" #define MagickLibVersionNumber 2,0,0 -#define MagickLibSubversion "-3" +#define MagickLibSubversion "-2" #define MagickReleaseDate "2009-10-26" #define MagickChangeDate "20091026" #define MagickAuthoritativeURL "http://www.imagemagick.org" diff --git a/version.sh b/version.sh index cadc1721b..52033443b 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). 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` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"