Attachment 150782 Details for Bug 196135 – Fix several clang 3.5.0 warnings in graphics/ImageMagick

[patch] Fix several clang 3.5.0 warnings in graphics/ImageMagick

graphics__ImageMagick-fix-clang350-warnings-1.diff (text/plain), 6.17 KB, created by Dimitry Andric on 2014-12-19 16:55:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2014-12-19 16:55:06 UTC

Size: 6.17 KB

patch

obsolete

>Index: graphics/ImageMagick/files/patch-magic__magick-type.h
>===================================================================
>--- graphics/ImageMagick/files/patch-magic__magick-type.h	(revision 0)
>+++ graphics/ImageMagick/files/patch-magic__magick-type.h	(working copy)
>@@ -0,0 +1,58 @@
>+--- magick/magick-type.h.orig	2014-08-08 16:27:39.000000000 +0200
>++++ magick/magick-type.h	2014-12-19 17:31:35.000000000 +0100
>+@@ -45,12 +45,16 @@ extern "C" {
>+ */
>+ #if MAGICKCORE_SIZEOF_FLOAT_T == 0
>+ typedef float MagickRealType;
>++#define fabs fabsf
>+ #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_FLOAT)
>+ typedef float MagickRealType;
>++#define fabs fabsf
>+ #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_DOUBLE)
>+ typedef double MagickRealType;
>++#define fabs fabs
>+ #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
>+ typedef long double MagickRealType;
>++#define fabs fabsl
>+ #else
>+ # error Your float_t type is neither a float, nor a double, nor a long double
>+ #endif
>+@@ -74,12 +78,16 @@ typedef unsigned char Quantum;
>+ */
>+ #if MAGICKCORE_SIZEOF_FLOAT_T == 0
>+ typedef float MagickRealType;
>++#define fabs fabsf
>+ #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_FLOAT)
>+ typedef float MagickRealType;
>++#define fabs fabsf
>+ #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_DOUBLE)
>+ typedef double MagickRealType;
>++#define fabs fabs
>+ #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
>+ typedef long double MagickRealType;
>++#define fabs fabsl
>+ #else
>+ # error Your float_t type is neither a float, nor a double, nor a long double
>+ #endif
>+@@ -103,10 +111,13 @@ typedef unsigned short Quantum;
>+ */
>+ #if MAGICKCORE_SIZEOF_DOUBLE_T == 0
>+ typedef double MagickRealType;
>++#define fabs fabs
>+ #elif (MAGICKCORE_SIZEOF_DOUBLE_T == MAGICKCORE_SIZEOF_DOUBLE)
>+ typedef double MagickRealType;
>++#define fabs fabs
>+ #elif (MAGICKCORE_SIZEOF_DOUBLE_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
>+ typedef long double MagickRealType;
>++#define fabs fabsl
>+ #else
>+ # error Your double_t type is neither a float, nor a double, nor a long double
>+ #endif
>+@@ -131,6 +142,7 @@ typedef long double SignedQuantum;
>+ typedef long double Quantum;
>+ #define QuantumRange  18446744073709551615.0
>+ #define QuantumFormat  "%g"
>++#define fabs fabsl
>+ #else
>+ #if !defined(_CH_)
>+ # error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64"
>
>Property changes on: graphics/ImageMagick/files/patch-magic__magick-type.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/ImageMagick/files/patch-magic__method-attribute.h
>===================================================================
>--- graphics/ImageMagick/files/patch-magic__method-attribute.h	(revision 0)
>+++ graphics/ImageMagick/files/patch-magic__method-attribute.h	(working copy)
>@@ -0,0 +1,24 @@
>+--- magick/method-attribute.h.orig	2014-03-21 19:28:48.000000000 +0100
>++++ magick/method-attribute.h	2014-12-19 17:09:11.000000000 +0100
>+@@ -123,14 +123,18 @@ extern "C" {
>+ #  define magick_unreferenced(x)  /* nothing */
>+ #endif
>+ 
>+-#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__)
>++#if !defined(__clang__) && (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
>+ #  define magick_alloc_size(x)  __attribute__((__alloc_size__(x)))
>+ #  define magick_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
>+-#  define magick_cold_spot  __attribute__((__cold__))
>+-#  define magick_hot_spot  __attribute__((__hot__))
>+ #else
>+ #  define magick_alloc_size(x)  /* nothing */
>+ #  define magick_alloc_sizes(x,y)  /* nothing */
>++#endif
>++
>++#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
>++#  define magick_cold_spot  __attribute__((__cold__))
>++#  define magick_hot_spot  __attribute__((__hot__))
>++#else
>+ #  define magick_cold_spot
>+ #  define magick_hot_spot
>+ #endif
>
>Property changes on: graphics/ImageMagick/files/patch-magic__method-attribute.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/ImageMagick/files/patch-wand__method-attribute.h
>===================================================================
>--- graphics/ImageMagick/files/patch-wand__method-attribute.h	(revision 0)
>+++ graphics/ImageMagick/files/patch-wand__method-attribute.h	(working copy)
>@@ -0,0 +1,24 @@
>+--- wand/method-attribute.h.orig	2014-06-18 15:21:47.000000000 +0200
>++++ wand/method-attribute.h	2014-12-19 17:09:14.000000000 +0100
>+@@ -116,14 +116,18 @@ extern "C" {
>+ #  define wand_unreferenced(x)  /* nothing */
>+ #endif
>+ 
>+-#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__)
>++#if !defined(__clang__) && (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
>+ #  define wand_alloc_size(x)  __attribute__((__alloc_size__(x)))
>+ #  define wand_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
>+-#  define wand_cold_spot  __attribute__((__cold__))
>+-#  define wand_hot_spot  __attribute__((__hot__))
>+ #else
>+ #  define wand_alloc_size(x)  /* nothing */
>+ #  define wand_alloc_sizes(x,y)  /* nothing */
>++#endif
>++
>++#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
>++#  define wand_cold_spot  __attribute__((__cold__))
>++#  define wand_hot_spot  __attribute__((__hot__))
>++#else
>+ #  define wand_cold_spot
>+ #  define wand_hot_spot
>+ #endif
>
>Property changes on: graphics/ImageMagick/files/patch-wand__method-attribute.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 196135: 150782