(no commit message)

diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c
index 009ecd69c632dafef938f8262e69eeca348dabed..b5fc8eabe728661b94394ddc3c8029f819fea327 100644 (file)
--- a/MagickWand/pixel-wand.c
+++ b/MagickWand/pixel-wand.c
@@ -1262,6 +1262,7 @@ WandExport void PixelGetQuantumPacket(const PixelWand *wand,PixelInfo *packet)
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   assert(packet != (PixelInfo *) NULL);
+  packet->depth=wand->pixel.depth;
   packet->fuzz=wand->pixel.fuzz;
   packet->alpha=(double) ClampToQuantum(wand->pixel.alpha);
   packet->alpha_trait=wand->pixel.alpha_trait;

diff --git a/coders/pdb.c b/coders/pdb.c
index f482c7769e12cd909a108c6e86685371bf63aef0..cafb542061b593931bcdbf46e9ceaf8af9e92d51 100644 (file)
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -771,7 +771,7 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image,
   } else {
     bits_per_pixel=4;
   }
-  (void) ResetMagickMemory(&pdb_info.name,0,sizeof(pdb_info));
+  (void) ResetMagickMemory(&pdb_info,0,sizeof(pdb_info));
   (void) CopyMagickString(pdb_info.name,image_info->filename,
     sizeof(pdb_info.name));
   pdb_info.attributes=0;

diff --git a/coders/pdf.c b/coders/pdf.c
index cdd14231126fd635f432665eef24cd0bba788f82..4f3eb8ff6654f4547bab5dbf0d2f41098bcc8b0b 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -417,8 +417,9 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
     cmyk,
     cropbox,
     fitPage,
-    trimbox,
-    status;
+    status,
+    stop_on_error,
+    trimbox;
 
   MagickStatusType
     flags;
@@ -505,6 +506,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
   */
   cmyk=image_info->colorspace == CMYKColorspace ? MagickTrue : MagickFalse;
   cropbox=IsStringTrue(GetImageOption(image_info,"pdf:use-cropbox"));
+  stop_on_error=IsStringTrue(GetImageOption(image_info,"pdf:stop-on-error"));
   trimbox=IsStringTrue(GetImageOption(image_info,"pdf:use-trimbox"));
   count=0;
   spotcolor=0;
@@ -715,6 +717,8 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
     (void) ConcatenateMagickString(options,"-dUseCIEColor ",MaxTextExtent);
   if (cropbox != MagickFalse)
     (void) ConcatenateMagickString(options,"-dUseCropBox ",MaxTextExtent);
+  if (stop_on_error != MagickFalse)
+    (void) ConcatenateMagickString(options,"-dPDFSTOPONERROR ",MaxTextExtent);
   if (trimbox != MagickFalse)
     (void) ConcatenateMagickString(options,"-dUseTrimBox ",MaxTextExtent);
   read_info=CloneImageInfo(image_info);