View | Details | Raw Unified | Return to bug 196135
Collapse All | Expand All

(-)graphics/ImageMagick/files/patch-magic__magick-type.h (+58 lines)
Line 0 Link Here
1 
--- magick/magick-type.h.orig	2014-08-08 16:27:39.000000000 +0200
2 
+++ magick/magick-type.h	2014-12-19 17:31:35.000000000 +0100
3 
@@ -45,12 +45,16 @@ extern "C" {
4 
 */
5 
 #if MAGICKCORE_SIZEOF_FLOAT_T == 0
6 
 typedef float MagickRealType;
7 
+#define fabs fabsf
8 
 #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_FLOAT)
9 
 typedef float MagickRealType;
10 
+#define fabs fabsf
11 
 #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_DOUBLE)
12 
 typedef double MagickRealType;
13 
+#define fabs fabs
14 
 #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
15 
 typedef long double MagickRealType;
16 
+#define fabs fabsl
17 
 #else
18 
 # error Your float_t type is neither a float, nor a double, nor a long double
19 
 #endif
20 
@@ -74,12 +78,16 @@ typedef unsigned char Quantum;
21 
 */
22 
 #if MAGICKCORE_SIZEOF_FLOAT_T == 0
23 
 typedef float MagickRealType;
24 
+#define fabs fabsf
25 
 #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_FLOAT)
26 
 typedef float MagickRealType;
27 
+#define fabs fabsf
28 
 #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_DOUBLE)
29 
 typedef double MagickRealType;
30 
+#define fabs fabs
31 
 #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
32 
 typedef long double MagickRealType;
33 
+#define fabs fabsl
34 
 #else
35 
 # error Your float_t type is neither a float, nor a double, nor a long double
36 
 #endif
37 
@@ -103,10 +111,13 @@ typedef unsigned short Quantum;
38 
 */
39 
 #if MAGICKCORE_SIZEOF_DOUBLE_T == 0
40 
 typedef double MagickRealType;
41 
+#define fabs fabs
42 
 #elif (MAGICKCORE_SIZEOF_DOUBLE_T == MAGICKCORE_SIZEOF_DOUBLE)
43 
 typedef double MagickRealType;
44 
+#define fabs fabs
45 
 #elif (MAGICKCORE_SIZEOF_DOUBLE_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
46 
 typedef long double MagickRealType;
47 
+#define fabs fabsl
48 
 #else
49 
 # error Your double_t type is neither a float, nor a double, nor a long double
50 
 #endif
51 
@@ -131,6 +142,7 @@ typedef long double SignedQuantum;
52 
 typedef long double Quantum;
53 
 #define QuantumRange  18446744073709551615.0
54 
 #define QuantumFormat  "%g"
55 
+#define fabs fabsl
56 
 #else
57 
 #if !defined(_CH_)
58 
 # error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64"
(-)graphics/ImageMagick/files/patch-magic__method-attribute.h (+24 lines)
Line 0 Link Here
1 
--- magick/method-attribute.h.orig	2014-03-21 19:28:48.000000000 +0100
2 
+++ magick/method-attribute.h	2014-12-19 17:09:11.000000000 +0100
3 
@@ -123,14 +123,18 @@ extern "C" {
4 
 #  define magick_unreferenced(x)  /* nothing */
5 
 #endif
6
7 
-#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__)
8 
+#if !defined(__clang__) && (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
9 
 #  define magick_alloc_size(x)  __attribute__((__alloc_size__(x)))
10 
 #  define magick_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
11 
-#  define magick_cold_spot  __attribute__((__cold__))
12 
-#  define magick_hot_spot  __attribute__((__hot__))
13 
 #else
14 
 #  define magick_alloc_size(x)  /* nothing */
15 
 #  define magick_alloc_sizes(x,y)  /* nothing */
16 
+#endif
17 
+
18 
+#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
19 
+#  define magick_cold_spot  __attribute__((__cold__))
20 
+#  define magick_hot_spot  __attribute__((__hot__))
21 
+#else
22 
 #  define magick_cold_spot
23 
 #  define magick_hot_spot
24 
 #endif
(-)graphics/ImageMagick/files/patch-wand__method-attribute.h (+24 lines)
Line 0 Link Here
1 
--- wand/method-attribute.h.orig	2014-06-18 15:21:47.000000000 +0200
2 
+++ wand/method-attribute.h	2014-12-19 17:09:14.000000000 +0100
3 
@@ -116,14 +116,18 @@ extern "C" {
4 
 #  define wand_unreferenced(x)  /* nothing */
5 
 #endif
6
7 
-#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__)
8 
+#if !defined(__clang__) && (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
9 
 #  define wand_alloc_size(x)  __attribute__((__alloc_size__(x)))
10 
 #  define wand_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
11 
-#  define wand_cold_spot  __attribute__((__cold__))
12 
-#  define wand_hot_spot  __attribute__((__hot__))
13 
 #else
14 
 #  define wand_alloc_size(x)  /* nothing */
15 
 #  define wand_alloc_sizes(x,y)  /* nothing */
16 
+#endif
17 
+
18 
+#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
19 
+#  define wand_cold_spot  __attribute__((__cold__))
20 
+#  define wand_hot_spot  __attribute__((__hot__))
21 
+#else
22 
 #  define wand_cold_spot
23 
 #  define wand_hot_spot
24 
 #endif

Return to bug 196135