File dx-4.4.4-imagemagick.patch of Package dx

Overview Repositories Revisions Requests Users Attributes Meta

File dx-4.4.4-imagemagick.patch of Package dx

Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -801,8 +801,8 @@ then
 
     failed=0;
     passed=0;
-    AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
 if test "$ARCH" = "intelnt" ; then
+    AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
     AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_MSG_CHECKING(if ImageMagick package is complete)
     if test $passed -gt 0
@@ -835,8 +835,13 @@ dnl routine. This allows us to simplify
 dnl format configuration libraries.
 
  if test "$HAVE_MC" = "yes" ; then
+    INC_MAGICK="`Magick-config --cflags`"
+    SAVECPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS"
+    AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+    CPPFLAGS="$SAVECPPFLAGS"
     LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`"
-    AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
+    AC_CHECK_LIB( c,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
     AC_MSG_CHECKING(if ImageMagick package is complete)
     if test $passed -gt 0
     then
Index: src/exec/dxmods/_im_image.c
===================================================================
--- src/exec/dxmods/_im_image.c.orig
+++ src/exec/dxmods/_im_image.c
@@ -329,7 +329,7 @@ static Error write_im(RWImageArgs *iargs
             DestroyImageInfo(new_frame_info);
             DestroyImageInfo(image_info);
 #if MagickLibVersion > 0x0537
-            DestroyConstitute();
+            ConstituteComponentTerminus();
 #endif
              DXSetError(ERROR_INTERNAL, "reason = %s, description = %s",
                         image->exception.reason,
@@ -346,7 +346,7 @@ static Error write_im(RWImageArgs *iargs
             DestroyImageInfo(new_frame_info);
             DestroyImageInfo(image_info);
 #if MagickLibVersion > 0x0537
-            DestroyConstitute();
+            ConstituteComponentTerminus();
 #endif
             DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c");
         }
@@ -375,7 +375,7 @@ static Error write_im(RWImageArgs *iargs
         DestroyImageInfo(image_info);
         DestroyImageInfo(new_frame_info);
 #if MagickLibVersion > 0x0537
-        DestroyConstitute();
+        ConstituteComponentTerminus();
 #endif
         
         DEBUGMESSAGE("back from DestroyImage");
@@ -491,7 +491,7 @@ static Error write_im(RWImageArgs *iargs
         DestroyImage(image);
         DestroyImageInfo(image_info);
 #if MagickLibVersion > 0x0537
-        DestroyConstitute();
+        ConstituteComponentTerminus();
 #endif
     }
     return (OK);

Places

File dx-4.4.4-imagemagick.patch of Package dx

Places