[Emacs-diffs] trunk r117165: * image.c (imagemagick_load_image): Use MagickRealType for local

[Paul Eggert]

------------------------------------------------------------
revno: 117165
revision-id: address@hidden
parent: address@hidden
author: Paul Eggert  <address@hidden>
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2014-05-26 23:37:29 -0700
message:
  * image.c (imagemagick_load_image): Use MagickRealType for local
  
  'color_scale', instead of double, to avoid a GCC warning about
  double promotion.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-27 06:35:54 +0000
+++ b/src/ChangeLog     2014-05-27 06:37:29 +0000
@@ -1,5 +1,9 @@
 2014-05-27  Paul Eggert  <address@hidden>
 
+       * 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).

=== modified file 'src/image.c'
--- a/src/image.c       2014-05-21 19:51:58 +0000
+++ b/src/image.c       2014-05-27 06:37:29 +0000
@@ -8368,7 +8368,7 @@
 #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,