components/imagemagick/patches/la.patch
author Mohana Rao Gorai <mohana.gorai@oracle.com>
Tue, 20 Aug 2013 07:16:40 +0200
branchs11u1-sru
changeset 2735 38548c092c06
parent 168 5884bc1edfdf
child 3798 c0f7a9f723ca
child 6072 a1b208a8235a
permissions -rw-r--r--
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd 15803946 problem in UTILITY/IMAGEMAGICK 16615558 problem in UTILITY/IMAGEMAGICK 16690414 convert(1) dumps core while converting PDF to JPEG 16843035 I think we forgot to ship some imagemagick headers
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: 168
diff changeset
     1
To avoid dependency on libtool/libltdl, change "*.la" extension
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
     2
to "*.so"
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
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: 168
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: 168
diff changeset
     5
--- ImageMagick-6.7.8/magick/module.c	Sun Dec 18 17:54:26 2011
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
     6
+++ ImageMagick-6.7.8/magick/module.c	Thu Oct  4 00:00:46 2012
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
     7
@@ -72,7 +72,7 @@
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
     8
   Define declarations.
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
     9
 */
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    10
 #if defined(MAGICKCORE_LTDL_DELEGATE)
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    11
-#  define ModuleGlobExpression "*.la"
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    12
+#  define ModuleGlobExpression "*.so"
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    13
 #else
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    14
 #  if defined(_DEBUG)
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    15
 #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    16
@@ -1454,7 +1454,7 @@
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    17
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    18
   assert(name != (char *) NULL);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    19
 #if defined(MAGICKCORE_LTDL_DELEGATE)
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    20
-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    21
+  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    22
   (void) LocaleLower(name);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    23
 #else
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    24
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    25
@@ -1505,7 +1505,7 @@
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    26
 #if !defined(MAGICKCORE_LTDL_DELEGATE)
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    27
   (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    28
 #else
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    29
-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    30
+  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    31
 #endif
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    32
 }
38548c092c06 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 168
diff changeset
    33