* image.c (imagemagick_load_image): Use MagickRealType for local

'color_scale', instead of double, to avoid a GCC warning about
double promotion.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7e270789094d1ea7143d064847446a37a2a32094..4378cfce5d3341f65523b856bd9f03b4bf0399c8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * image.c (imagemagick_load_image): Use MagickRealType for local
+       'color_scale', instead of double, to avoid a GCC warning about
+       double promotion.
+
        * xfns.c (Fx_window_property): Remove unused local.
 
        Don't kill already-reaped process (Bug#17561).

diff --git a/src/image.c b/src/image.c
index f7c3ef52563e31c40f1dcb77826e9b3fa643f48e..07cf9f9af4964602e4b2099b1ecbb7419d84de49 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -8368,7 +8368,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
 #endif /* HAVE_MAGICKEXPORTIMAGEPIXELS */
     {
       size_t image_height;
-      double color_scale = 65535.0 / QuantumRange;
+      MagickRealType color_scale = 65535.0 / QuantumRange;
 
       /* Try to create a x pixmap to hold the imagemagick pixmap.  */
       if (!image_create_x_image_and_pixmap (f, img, width, height, 0,