(no commit message)

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 9f57ffc5444ff214f2a2d4a8500e44e70e800ee5..93772aa1a4dc3648db1bba4e3213be52a6821f69 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -121,7 +121,6 @@ static const MagicMapInfo
     { "FIG", 0, MagickString("#FIG") },
     { "FITS", 0, MagickString("IT0") },
     { "FITS", 0, MagickString("SIMPLE") },
-    { "FPX", 0, MagickString("\320\317\021\340") },
     { "GIF", 0, MagickString("GIF8") },
     { "GPLT", 0, MagickString("#!/usr/local/bin/gnuplot") },
     { "HDF", 1, MagickString("HDF") },

diff --git a/coders/fpx.c b/coders/fpx.c
index 65ab06431d1e789867cb2c9c5f0a0bbfc934cb9d..e3b25507c5a897f2c2c1d75fee6a062d6bc75b99 100644 (file)
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -84,40 +84,6 @@ static MagickBooleanType
   WriteFPXImage(const ImageInfo *,Image *,ExceptionInfo *);
 #endif
 \f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%   I s F P X                                                                 %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  IsFPX() returns MagickTrue if the image format type, identified by the
-%  magick string, is FPX.
-%
-%  The format of the IsFPX method is:
-%
-%      MagickBooleanType IsFPX(const unsigned char *magick,const size_t length)
-%
-%  A description of each parameter follows:
-%
-%    o magick: compare image format pattern against these bytes.
-%
-%    o length: Specifies the length of the magick string.
-%
-*/
-static MagickBooleanType IsFPX(const unsigned char *magick,const size_t length)
-{
-  if (length < 4)
-    return(MagickFalse);
-  if (memcmp(magick,"\320\317\021\340",4) == 0)
-    return(MagickTrue);
-  return(MagickFalse);
-}
-\f
 #if defined(MAGICKCORE_FPX_DELEGATE)
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -531,7 +497,6 @@ ModuleExport size_t RegisterFPXImage(void)
   entry->adjoin=MagickFalse;
   entry->seekable_stream=MagickTrue;
   entry->blob_support=MagickFalse;
-  entry->magick=(IsImageFormatHandler *) IsFPX;
   entry->description=ConstantString("FlashPix Format");
   entry->module=ConstantString("FPX");
   (void) RegisterMagickInfo(entry);

diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index 08807db4d36584dce970d3fba60e2057d85093e2..e2d6ed39666bd56ae06caa2c31551e6cf55ca187 100644 (file)
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -73,8 +73,8 @@
   <delegate decode="browse" stealth="True" spawn="True" command="&quot;@BrowseDelegate@&quot; http://www.imagemagick.org/; rm &quot;%i&quot;"/>
   <delegate decode="cdr" command="&quot;@UniconvertorDelegate@&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>
   <delegate decode="cgm" command="&quot;@UniconvertorDelegate@&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>
-  <delegate decode="doc" command="&quot;@DOCDecodeDelegate@&quot; --headless --invisible --convert-to pdf &quot;%i&quot; ; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
-  <delegate decode="docx" command="&quot;@DOCDecodeDelegate@&quot; --headless --invisible --convert-to pdf &quot;%i&quot; ; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="doc" command="&quot;@DOCDecodeDelegate@&quot; --headless --invisible --convert-to pdf --outdir `dirname &quot;%i&quot;` &quot;%i&quot; ; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="docx" command="&quot;@DOCDecodeDelegate@&quot; --headless --invisible --convert-to pdf --outdir `dirname &quot;%i&quot;` &quot;%i&quot; ; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
   <delegate decode="dng:decode" command="&quot;@DNGDecodeDelegate@&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
   <delegate decode="dot" command='&quot;@GVCDecodeDelegate@&quot; -Tsvg &quot;%i&quot; -o &quot;%o&quot;' />
   <delegate decode="dvi" command="&quot;@DVIDecodeDelegate@&quot; -q -o &quot;%o&quot; &quot;%i&quot;"/>
@@ -94,7 +94,7 @@
   <delegate decode="miff" encode="show" spawn="True" command="&quot;@DisplayDelegate@&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;@DisplayDelegate@&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="mpeg:decode" command="&quot;@MPEGDecodeDelegate@&quot; -v -1 -i &quot;%i&quot; -vframes %S -vcodec pam -an -f rawvideo -y &quot;%u.pam&quot; 2&gt; &quot;%Z&quot;"/>
-  <delegate decode="odt" command="&quot;@DOCDecodeDelegate@&quot; --headless --invisible --convert-to pdf &quot;%i&quot; ; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="odt" command="&quot;@DOCDecodeDelegate@&quot; --headless --invisible --convert-to pdf --outdir `dirname &quot;%i&quot;` &quot;%i&quot; ; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
   <delegate decode="pcl:cmyk" stealth="True" command="&quot;@PCLDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@PCLCMYKDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pcl:color" stealth="True" command="&quot;@PCLDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@PCLColorDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pcl:mono" stealth="True" command="&quot;@PCLDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@PCLMonoDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>