(no commit message)

diff --git a/Makefile.in b/Makefile.in
index d5612f95ac8a373d052cafeff331f25fa811cf9a..9940bb1ebed4c3941d1025f29e6f4030112c9264 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1390,14 +1390,14 @@ am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \
        magick/image.h magick/image-private.h magick/image-view.c \
        magick/image-view.h magick/layer.c magick/layer.h \
        magick/list.c magick/list.h magick/locale.c magick/locale_.h \
-       magick/log.c magick/log.h magick/mac.h magick/magic.c \
-       magick/magic.h magick/magick.c magick/magick-config.h \
-       magick/magick-type.h magick/magick.h magick/matrix.c \
-       magick/matrix.h magick/memory.c magick/memory_.h \
-       magick/methods.h magick/mime.c magick/mime.h magick/module.c \
-       magick/module.h magick/monitor.c magick/monitor.h \
-       magick/monitor-private.h magick/montage.c magick/montage.h \
-       magick/morphology.c magick/morphology.h \
+       magick/locale-private.h magick/log.c magick/log.h magick/mac.h \
+       magick/magic.c magick/magic.h magick/magick.c \
+       magick/magick-config.h magick/magick-type.h magick/magick.h \
+       magick/matrix.c magick/matrix.h magick/memory.c \
+       magick/memory_.h magick/methods.h magick/mime.c magick/mime.h \
+       magick/module.c magick/module.h magick/monitor.c \
+       magick/monitor.h magick/monitor-private.h magick/montage.c \
+       magick/montage.h magick/morphology.c magick/morphology.h \
        magick/morphology-private.h magick/nt-base.h \
        magick/nt-feature.h magick/option.c magick/option.h \
        magick/paint.c magick/paint.h magick/pixel.c magick/pixel.h \
@@ -3933,6 +3933,7 @@ MAGICK_BASE_SRCS = \
        magick/list.h \
        magick/locale.c \
        magick/locale_.h \
+       magick/locale-private.h \
        magick/log.c \
        magick/log.h \
        magick/mac.h \
@@ -4164,6 +4165,7 @@ MAGICK_NOINST_HDRS = \
        magick/exception-private.h \
        magick/fx-private.h \
        magick/image-private.h \
+       magick/locale-private.h \
        magick/mac.h \
        magick/mime-private.h \
        magick/monitor-private.h \

diff --git a/config/delegates.xml b/config/delegates.xml
index 1abcbb84f08e166cbdcb3df9c64a957eb7b09116..c9e321dd9025bf368671e44063c9baf1538e84f3 100644 (file)
--- a/config/delegates.xml
+++ b/config/delegates.xml
@@ -87,7 +87,7 @@
   <delegate decode="pcl:mono" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=epswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="pdf" encode="ps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
-  <delegate decode="miff" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
+  <delegate decode="png" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
   <delegate decode="pnm" encode="ilbm" mode="encode" command="&quot;ppmtoilbm&quot; -24if &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="pov" command="&quot;povray&quot; &quot;+i%i&quot; -D0 +o&quot;%o&quot; +fn%q +w%w +h%h +a -q9 -kfi&quot;%s&quot; -kff&quot;%n&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
   <delegate decode="ps" encode="eps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=epswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
@@ -100,11 +100,11 @@
   <delegate decode="rgba" encode="rle" mode="encode" command="&quot;rawtorle&quot; -o &quot;%o&quot; -v &quot;%i&quot;"/>
   <delegate decode="scan" command="&quot;scanimage&quot; -d &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="scanx" command="&quot;scanimage&quot; &gt; &quot;%o&quot;"/>
-  <delegate decode="miff" encode="show" spawn="True" command="&quot;/usr/local/bin/display&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+  <delegate decode="png" encode="show" spawn="True" command="&quot;/usr/local/bin/display&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="shtml" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="svg" command="&quot;rsvg&quot; &quot;%i&quot; &quot;%o&quot;"/>
   <delegate decode="txt" encode="ps" mode="bi" command="&quot;enscript&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
-  <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;/usr/local/bin/display&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+  <delegate decode="png" encode="win" stealth="True" spawn="True" command="&quot;/usr/local/bin/display&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="wmf" command="&quot;wmf2eps&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="xps:color" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="xps:cmyk" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=bmpsep8&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>

diff --git a/magick/Makefile.am b/magick/Makefile.am
index 6abc3cc8f4d752a952b82e4961400670d1c950ac..ca09f4b51259fa13e8a40148449cf8d15f306293 100644 (file)
--- a/magick/Makefile.am
+++ b/magick/Makefile.am
@@ -150,6 +150,7 @@ MAGICK_BASE_SRCS = \
        magick/list.h \
        magick/locale.c \
        magick/locale_.h \
+       magick/locale-private.h \
        magick/log.c \
        magick/log.h \
        magick/mac.h \
@@ -386,6 +387,7 @@ MAGICK_NOINST_HDRS = \
        magick/exception-private.h \
        magick/fx-private.h \
        magick/image-private.h \
+       magick/locale-private.h \
        magick/mac.h \
        magick/mime-private.h \
        magick/monitor-private.h \

diff --git a/magick/locale-private.h b/magick/locale-private.h
new file mode 100644 (file)
index 0000000..790014a
--- /dev/null
+++ b/magick/locale-private.h
@@ -0,0 +1,29 @@
+/*
+  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  dedicated to making software imaging solutions freely available.
+  
+  You may not use this file except in compliance with the License.
+  obtain a copy of the License at
+  
+    http://www.imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore localre private methods.
+*/
+#ifndef _MAGICKCORE_LOCALE_PRIVATE_H
+#define _MAGICKCORE_LOCALE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif