Changeset 10459

Timestamp:

03/31/08 17:05:25 (5 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• Install-windows.txt (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)
• QuickStart.txt (modified) (3 diffs)
• coders/pdf.c (modified) (1 diff)
• coders/ps.c (modified) (1 diff)
• config/configure.xml (modified) (1 diff)
• magick/Makefile.am (modified) (2 diffs)
• magick/delegate-private.h (added)
• magick/delegate.h (modified) (1 diff)
• magick/nt-base.h (modified) (1 diff)
• magick/version.h (modified) (1 diff)

ImageMagick/trunk/Install-windows.txt

@@ -58 +58 @@
   Key user tunables in magick_config.h include:
 
-    QuantumDepth (default 8)
+    MAGICKCORE_QUANTUM_DEPTH (default 16)
 
       Specify the size of PixelPacket color Quantums (8, 16, or 32).
@@ -67 +67 @@
       whereas a quantum-depth of 32 uses 16-times as much memory.
 
-    UseInstalledMagick (default undefined)
+    MAGICKCORE_INSTALLED_SUPPORT (default undefined)
 
       Define to build an ImageMagick which uses registry settings or embedded

ImageMagick/trunk/Makefile.in

@@ -1249 +1249 @@
         magick/configure.c magick/configure.h magick/constitute.c \
         magick/constitute.h magick/decorate.c magick/decorate.h \
-        magick/delegate.c magick/delegate.h magick/deprecate.c \
-        magick/deprecate.h magick/display.c magick/display.h \
-        magick/display-private.h magick/distort.c magick/distort.h \
-        magick/draw.c magick/draw.h magick/draw-private.h \
-        magick/effect.c magick/effect.h magick/enhance.c \
-        magick/enhance.h magick/exception.c magick/exception.h \
-        magick/exception-private.h magick/fx.c magick/fx.h \
-        magick/fx-private.h magick/gem.c magick/gem.h \
+        magick/delegate.c magick/delegate.h magick/delegate-private.h \
+        magick/deprecate.c magick/deprecate.h magick/display.c \
+        magick/display.h magick/display-private.h magick/distort.c \
+        magick/distort.h magick/draw.c magick/draw.h \
+        magick/draw-private.h magick/effect.c magick/effect.h \
+        magick/enhance.c magick/enhance.h magick/exception.c \
+        magick/exception.h magick/exception-private.h magick/fx.c \
+        magick/fx.h magick/fx-private.h magick/gem.c magick/gem.h \
         magick/geometry.c magick/geometry.h magick/hashmap.c \
         magick/hashmap.h magick/identify.c magick/identify.h \
@@ -3549 +3549 @@
         magick/delegate.c \
         magick/delegate.h \
+        magick/delegate-private.h \
         magick/deprecate.c \
         magick/deprecate.h \
@@ -3785 +3786 @@
         magick/colorspace-private.h \
         magick/composite-private.h \
+        magick/delegate-private.h \
         magick/display-private.h \
         magick/draw-private.h \

ImageMagick/trunk/QuickStart.txt

@@ -62 +62 @@
       loads them if found:
 
-          $MAGICK_CONFIGURE_PATH
+          $MAGICKCORE_CONFIGURE_PATH
           $MAGICK_HOME/lib/ImageMagick-6.4.0/config
           $MAGICK_HOME/share/ImageMagick-6.4.0/config
@@ -75 +75 @@
       order, and loads them if found:
 
-          $MAGICK_CONFIGURE_PATH
+          $MAGICKCORE_CONFIGURE_PATH
           $MAGICK_HOME/lib/ImageMagick-6.4.0/config
           $MAGICK_HOME/share/ImageMagick-6.4.0/config
@@ -93 +93 @@
           $HOME/.magick/
           <client path>/../lib/ImageMagick-6.4.0/modules-Q16/coders/
-
           $MAGICK_HOME/lib/ImageMagick-6.4.0/modules-Q16/coders
           $MAGICK_HOME/share/ImageMagick-6.4.0/modules-Q16/coders

ImageMagick/trunk/coders/pdf.c

@@ -49 +49 @@
 #include "magick/constitute.h"
 #include "magick/delegate.h"
+#include "magick/delegate-private.h"
 #include "magick/draw.h"
 #include "magick/exception.h"

ImageMagick/trunk/coders/ps.c

@@ -48 +48 @@
 #include "magick/constitute.h"
 #include "magick/delegate.h"
+#include "magick/delegate-private.h"
 #include "magick/draw.h"
 #include "magick/exception.h"

ImageMagick/trunk/config/configure.xml

@@ -10 +10 @@
   <configure name="LIB_VERSION" value="0x640"/>
   <configure name="LIB_VERSION_NUMBER" value="6,4,0,3"/>
-  <configure name="RELEASE_DATE" value="03/29/08"/>
-  <configure name="CONFIGURE" value="./configure --no-create --no-recursion"/>
+  <configure name="RELEASE_DATE" value="03/31/08"/>
+  <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

ImageMagick/trunk/magick/Makefile.am

@@ -96 +96 @@
         magick/delegate.c \
         magick/delegate.h \
+        magick/delegate-private.h \
         magick/deprecate.c \
         magick/deprecate.h \
@@ -337 +338 @@
         magick/colorspace-private.h \
         magick/composite-private.h \
+        magick/delegate-private.h \
         magick/display-private.h \
         magick/draw-private.h \

ImageMagick/trunk/magick/delegate.h

@@ -22 +22 @@
 extern "C" {
 #endif
-
-#if defined(MAGICKCORE_GS_DELEGATE)
-#include "ghostscript/iapi.h"
-#include "ghostscript/ierrors.h"
-#endif
-
-#ifndef gs_main_instance_DEFINED
-# define gs_main_instance_DEFINED
-typedef struct gs_main_instance_s gs_main_instance;
-#endif
-
-#if !defined(MagickDLLCall)
-#  if defined(__WINDOWS__)
-#    define MagickDLLCall __stdcall
-#  else
-#    define MagickDLLCall
-#  endif
-#endif
-
-typedef struct _GhostscriptVectors
-{
-  int
-    (MagickDLLCall *exit)(gs_main_instance *);
-
-  int
-    (MagickDLLCall *init_with_args)(gs_main_instance *,int,char **);
-
-  int
-    (MagickDLLCall *new_instance)(gs_main_instance **,void *);
-
-  int
-    (MagickDLLCall *run_string)(gs_main_instance *,const char *,int,int *);
-
-  void
-    (MagickDLLCall *delete_instance)(gs_main_instance *);
-} GhostscriptVectors;
 
 typedef struct _DelegateInfo

ImageMagick/trunk/magick/nt-base.h

@@ -24 +24 @@
 
 #include "magick/delegate.h"
+#include "magick/delegate-private.h"
 #include "magick/exception.h"
 

ImageMagick/trunk/magick/version.h

@@ -47 +47 @@
 #define MagickQuantumRange  "?"
 #endif
-#define MagickReleaseDate  "03/29/08"
+#define MagickReleaseDate  "03/31/08"
 #if !defined(UseHDRI)
 #define MagickVersion MagickPackageName " " MagickLibVersionText " " \