From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 23 Mar 2015 00:42:27 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7243780e395bd4e966c539c4afabef83d54191fc;p=imagemagick

---

diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c
index 009ecd69c..b5fc8eabe 100644
--- 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 f482c7769..cafb54206 100644
--- 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 cdd142311..4f3eb8ff6 100644
--- 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);