procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
'color_scale', instead of double, to avoid a GCC warning about
double promotion.
This commit is contained in:
Paul Eggert 2014-05-26 23:37:29 -07:00
parent 1ad913a1ae
commit c24163d444
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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).

2
src/image.c
View file

@ -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,