SOURCES: dx-ImageMagic.patch - fix building ImageMagick with HDRI enabled

[baggins]

Author: baggins                      Date: Sun Nov 16 15:37:09 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix building ImageMagick with HDRI enabled

---- Files affected:
SOURCES:
   dx-ImageMagic.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/dx-ImageMagic.patch
diff -u SOURCES/dx-ImageMagic.patch:1.1 SOURCES/dx-ImageMagic.patch:1.2
--- SOURCES/dx-ImageMagic.patch:1.1	Thu Nov 13 12:59:39 2008
+++ SOURCES/dx-ImageMagic.patch	Sun Nov 16 16:37:03 2008
@@ -29,3 +29,19 @@
  	AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries])
  	AC_MSG_RESULT(yes)
          have_magick='yes'
+diff -urN dx-4.4.4/src/exec/dxmods/_im_image.c dx-4.4.4-new/src/exec/dxmods/_im_image.c
+--- dx-4.4.4/src/exec/dxmods/_im_image.c	2006-01-05 17:55:43.000000000 -0500
++++ dx-4.4.4-new/src/exec/dxmods/_im_image.c	2008-05-11 01:09:15.000000000 -0400
+@@ -999,8 +999,11 @@
+                     /* Opacities in colormap is wrong; use direct color map */
+                     if ( image->matte )
+                         for ( x = 0; x < width; x++ )
+-                            omap[*(indexes2++)] = ( 1.0 -
++			  {
++			    int omap_index = *(indexes2++); // if Magick has HDRI, Quantum is a float
++                            omap[(omap_index < 0 ? 0 : omap_index)] = ( 1.0 - // clamp if negative
+                                                     ((float) (pixies++)->opacity) / MaxRGB );
++			  }
+                 }
+             } else
+                 DXErrorGoto( ERROR_INTERNAL,  "unexpected image field format" );
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dx-ImageMagic.patch?r1=1.1&r2=1.2&f=u