1 --- dx-4.4.4/configure.ac.orig 2006-08-21 23:56:08.000000000 +0200
2 +++ dx-4.4.4/configure.ac 2008-11-13 12:31:28.000000000 +0100
7 + old_CPPFLAGS="$CPPFLAGS"
8 + CPPFLAGS="$CPPFLAGS -I/usr/include/ImageMagick"
9 AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
10 + CPPFLAGS="$old_CPPFLAGS"
11 if test "$ARCH" = "intelnt" ; then
12 AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
13 AC_MSG_CHECKING(if ImageMagick package is complete)
16 if test "$HAVE_MC" = "yes" ; then
17 LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`"
18 - AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
19 + AC_CHECK_LIB( MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
20 AC_MSG_CHECKING(if ImageMagick package is complete)
24 LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-config --libs`"
25 dnl UNIQUIFY will remove duplicate library tokens leaving the last instance.
26 AC_UTILS_UNIQUIFY($LIB_MAGICK, LIBS)
27 - FMT_LIBS="$FMT_LIBS libMagick.a"
28 + FMT_LIBS="$FMT_LIBS libMagickCore.a"
29 AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries])
32 diff -urN dx-4.4.4/src/exec/dxmods/_im_image.c dx-4.4.4-new/src/exec/dxmods/_im_image.c
33 --- dx-4.4.4/src/exec/dxmods/_im_image.c 2006-01-05 17:55:43.000000000 -0500
34 +++ dx-4.4.4-new/src/exec/dxmods/_im_image.c 2008-05-11 01:09:15.000000000 -0400
36 /* Opacities in colormap is wrong; use direct color map */
38 for ( x = 0; x < width; x++ )
39 - omap[*(indexes2++)] = ( 1.0 -
41 + int omap_index = *(indexes2++); // if Magick has HDRI, Quantum is a float
42 + omap[(omap_index < 0 ? 0 : omap_index)] = ( 1.0 - // clamp if negative
43 ((float) (pixies++)->opacity) / MaxRGB );
47 DXErrorGoto( ERROR_INTERNAL, "unexpected image field format" );
48 --- dx-4.4.4/src/exec/dxmods/_im_image.c.orig 2010-01-19 11:42:23.000000000 +0100
49 +++ dx-4.4.4/src/exec/dxmods/_im_image.c 2010-01-19 11:42:48.000000000 +0100
51 DestroyImageInfo(new_frame_info);
52 DestroyImageInfo(image_info);
53 #if MagickLibVersion > 0x0537
54 - DestroyConstitute();
55 + ConstituteComponentTerminus();
57 DXSetError(ERROR_INTERNAL, "reason = %s, description = %s",
58 image->exception.reason,
60 DestroyImageInfo(new_frame_info);
61 DestroyImageInfo(image_info);
62 #if MagickLibVersion > 0x0537
63 - DestroyConstitute();
64 + ConstituteComponentTerminus();
66 DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c");
69 DestroyImageInfo(image_info);
70 DestroyImageInfo(new_frame_info);
71 #if MagickLibVersion > 0x0537
72 - DestroyConstitute();
73 + ConstituteComponentTerminus();
76 DEBUGMESSAGE("back from DestroyImage");
79 DestroyImageInfo(image_info);
80 #if MagickLibVersion > 0x0537
81 - DestroyConstitute();
82 + ConstituteComponentTerminus();