From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 29 Jul 2018 22:48:44 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.8-9~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00c2ed75a2966a82e8cd6678d1d6b0eab3394d46;p=imagemagick

...
---

diff --git a/coders/psd.c b/coders/psd.c
index 4f9cf7180..afe1d1aef 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1162,7 +1162,7 @@ static MagickBooleanType ReadPSDChannelRLE(Image *image,const PSDInfo *psd_info,
     if ((MagickOffsetType) length < sizes[y])
       length=(size_t) sizes[y];
 
-  if (length > (row_size+512)) // arbitrary number
+  if (length > (row_size+512)) /* arbitrary number */
     {
       pixels=(unsigned char *) RelinquishMagickMemory(pixels);
       ThrowBinaryException(ResourceLimitError,"InvalidLength",image->filename);
@@ -1304,10 +1304,12 @@ static MagickBooleanType ReadPSDChannelZip(Image *image,const size_t channels,
               p[2]+=p[0]+((p[1]+p[3]) >> 8);
               p[3]+=p[1];
             }
-          // else if (packet_size == 4)
-          //   {
-          //     TODO: Figure out what to do there.
-          //   }
+          /*
+          else if (packet_size == 4)
+             {
+               TODO: Figure out what to do there.
+             }
+          */
           else
             *(p+1)+=*p;
           p+=packet_size;
diff --git a/coders/svg.c b/coders/svg.c
index 67ec9ba78..2332f59d1 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -869,6 +869,16 @@ static void SVGProcessStyleElement(void *context,const xmlChar *name,
           }
         break;
       }
+      case 'M':
+      case 'm':
+      {
+        if (LocaleCompare(keyword,"mask") == 0)
+          {
+            (void) FormatLocaleFile(svg_info->file,"mask \"%s\"\n",value);
+            break;
+          }
+        break;
+      }
       case 'O':
       case 'o':
       {