components/imagemagick/patches/16615558.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 25 Aug 2014 23:01:22 -0700
branchs11-update
changeset 3289 a9439b8746a3
parent 2721 3c9bd15584c4
permissions -rw-r--r--
Added tag s11u3-05 for changeset dc4e788d5ef5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2721
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     1
The following link explains the issue in detail:
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     2
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23117
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     3
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     4
--------------------------------------------------------------------------------
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     5
--- ImageMagick-6.8.3/coders/url.c	Mon Dec 10 05:09:00 2012
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     6
+++ ImageMagick-6.8.3/coders/url.c	Mon Apr 22 00:07:50 2013
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     7
@@ -154,12 +154,9 @@
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     8
     file=fdopen(unique_file,"wb");
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     9
   if ((unique_file == -1) || (file == (FILE *) NULL))
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    10
     {
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    11
-      read_info=DestroyImageInfo(read_info);
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    12
-      (void) CopyMagickString(image->filename,read_info->filename,
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    13
-        MaxTextExtent);
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    14
       ThrowFileException(exception,FileOpenError,"UnableToCreateTemporaryFile",
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    15
-        image->filename);
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    16
-      image=DestroyImageList(image);
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    17
+        read_info->filename);
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    18
+      read_info=DestroyImageList(read_info);
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    19
       return((Image *) NULL);
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    20
     }
3c9bd15584c4 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    21
   (void) CopyMagickString(filename,image_info->magick,MaxTextExtent);