author | Sonam Gupta <sonam.x.gupta@oracle.com> |
Tue, 09 Apr 2013 22:03:20 -0700 | |
changeset 1255 | b7b09f9348b7 |
parent 168 | 5884bc1edfdf |
child 3798 | c0f7a9f723ca |
child 6072 | a1b208a8235a |
permissions | -rw-r--r-- |
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
1 |
To avoid dependency on libtool/libltdl, change "*.la" extension |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
2 |
to "*.so" |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
3 |
----------------------------------------------------------------- |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
4 |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
5 |
--- ImageMagick-6.7.8/magick/module.c Sun Dec 18 17:54:26 2011 |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
6 |
+++ ImageMagick-6.7.8/magick/module.c Thu Oct 4 00:00:46 2012 |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
7 |
@@ -72,7 +72,7 @@ |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
8 |
Define declarations. |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
9 |
*/ |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
10 |
#if defined(MAGICKCORE_LTDL_DELEGATE) |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
11 |
-# define ModuleGlobExpression "*.la" |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
12 |
+# define ModuleGlobExpression "*.so" |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
13 |
#else |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
14 |
# if defined(_DEBUG) |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
15 |
# define ModuleGlobExpression "IM_MOD_DB_*.dll" |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
16 |
@@ -1454,7 +1454,7 @@ |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
17 |
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
18 |
assert(name != (char *) NULL); |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
19 |
#if defined(MAGICKCORE_LTDL_DELEGATE) |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
20 |
- (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag); |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
21 |
+ (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag); |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
22 |
(void) LocaleLower(name); |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
23 |
#else |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
24 |
#if defined(MAGICKCORE_WINDOWS_SUPPORT) |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
25 |
@@ -1505,7 +1505,7 @@ |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
26 |
#if !defined(MAGICKCORE_LTDL_DELEGATE) |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
27 |
(void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag); |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
28 |
#else |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
29 |
- (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag); |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
30 |
+ (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag); |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
31 |
#endif |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
32 |
} |
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
168
diff
changeset
|
33 |