| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Mon, 09 Mar 2015 23:00:55 -0700 | |
| changeset 3928 | a2a4b4365139 |
| parent 3798 | c0f7a9f723ca |
| 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:
diff
changeset
|
1 |
ImageMagick uses many unsupported attributes by Oracle Solaris Studio. |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
2 |
Supported attributes are here: |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
3 |
http://docs.oracle.com/cd/E24457_01/html/E21991/gljol.html |
|
3798
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
4 |
This patch comes from in-house; as it is Solaris-specific, it will not |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
5 |
be contributed upstream. |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
6 |
|
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
7 |
--- ImageMagick-6.8.3/magick/method-attribute.h.~1~ 2013-01-16 14:17:00.000000000 -0800 |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
8 |
+++ ImageMagick-6.8.3/magick/method-attribute.h 2015-02-10 20:34:01.057456551 -0800 |
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
9 |
@@ -110,7 +110,7 @@ |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
10 |
|
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
11 |
#if defined(MAGICKCORE_HAVE___ATTRIBUTE__) |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
12 |
# define magick_aligned(x) __attribute__((aligned(x))) |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
13 |
-# define magick_attribute __attribute__ |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
14 |
+# define magick_attribute(x) |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
15 |
# define magick_unused(x) magick_unused_ ## x __attribute__((unused)) |
|
3798
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
16 |
#elif defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
17 |
# define magick_aligned(x) __declspec(align(x)) |