| author | John Beck <John.Beck@Oracle.COM> |
| Wed, 18 May 2016 14:06:45 -0700 | |
| branch | s11u3-sru |
| changeset 6072 | a1b208a8235a |
| parent 2721 | 3c9bd15584c4 |
| child 6233 | bbdba2b0d364 |
| permissions | -rw-r--r-- |
|
2721
3c9bd15584c4
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 |
|
3c9bd15584c4
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" |
|
3c9bd15584c4
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 |
----------------------------------------------------------------- |
|
3c9bd15584c4
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 |
|
|
6072
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
2721
diff
changeset
|
5 |
--- ImageMagick-6.9.4/magick/module.c.~1~ 2016-05-09 10:28:58.000000000 -0700 |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
2721
diff
changeset
|
6 |
+++ ImageMagick-6.9.4/magick/module.c 2016-05-10 08:56:44.350751083 -0700 |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
2721
diff
changeset
|
7 |
@@ -74,7 +74,7 @@ |
|
2721
3c9bd15584c4
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. |
|
3c9bd15584c4
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 |
*/ |
|
3c9bd15584c4
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) |
|
3c9bd15584c4
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" |
|
3c9bd15584c4
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" |
|
3c9bd15584c4
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 |
|
3c9bd15584c4
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) |
|
3c9bd15584c4
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" |
|
6072
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
2721
diff
changeset
|
16 |
@@ -1480,7 +1480,7 @@ |
|
2721
3c9bd15584c4
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); |
|
3c9bd15584c4
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); |
|
3c9bd15584c4
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) |
|
3c9bd15584c4
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); |
|
3c9bd15584c4
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); |
|
3c9bd15584c4
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); |
|
3c9bd15584c4
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 |
|
3c9bd15584c4
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) |
|
6072
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
2721
diff
changeset
|
25 |
@@ -1531,7 +1531,7 @@ |
|
2721
3c9bd15584c4
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) |
|
3c9bd15584c4
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); |
|
3c9bd15584c4
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 |
|
3c9bd15584c4
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); |
|
3c9bd15584c4
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); |
|
3c9bd15584c4
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 |
|
3c9bd15584c4
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 |
} |
|
3c9bd15584c4
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 |