From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 27 May 2014 06:37:29 +0000 (-0700)
Subject: * image.c (imagemagick_load_image): Use MagickRealType for local
X-Git-Tag: emacs-25.0.90~2640^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c24163d444ba9256b9efee8e7d8f1c65386b1e2a;p=emacs.git

* 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 7e270789094..4378cfce5d3 100644
--- 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 f7c3ef52563..07cf9f9af49 100644
--- 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,