components/imagemagick/patches/16615558.patch
author Boris Chiu <boris.chiu@oracle.com>
Fri, 13 Sep 2013 13:54:01 -0400
branchs11u1-sru
changeset 2761 91830550729b
parent 2735 38548c092c06
permissions -rw-r--r--
17199356 The ibv_devinfo command cannot print the board_id of CX-3 IB-HCA (userland) 16831066 need hardening in libibverbs (e.g., prevent double frees, interprocess sharing) 16821677 qperf can not work between Solaris/Linux
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2735
38548c092c06 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:
38548c092c06 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
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     3
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     4
--------------------------------------------------------------------------------
38548c092c06 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
38548c092c06 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
38548c092c06 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 @@
38548c092c06 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");
38548c092c06 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))
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    10
     {
38548c092c06 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);
38548c092c06 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,
38548c092c06 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);
38548c092c06 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",
38548c092c06 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);
38548c092c06 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);
38548c092c06 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);
38548c092c06 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);
38548c092c06 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);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    20
     }
38548c092c06 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);