]> granicus.if.org Git - imagemagick/commitdiff
Less secure coders require explicit reference (e.g. mvg:my-graph.mvg)
authorCristy <urban-warrior@imagemagick.org>
Sat, 7 May 2016 20:43:55 +0000 (16:43 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sat, 7 May 2016 20:43:55 +0000 (16:43 -0400)
MagickCore/magic.c
coders/msl.c
coders/mvg.c
coders/txt.c

index e87fab792cb8f6fe808597c8663a86d6d572f4ed..a9767220af0d447b43721518bbb25fb9dd59ffbd 100644 (file)
@@ -146,7 +146,6 @@ static const MagicMapInfo
     { "MPC", 0, MagicPattern("id=MagickCache") },
     { "MPEG", 0, MagicPattern("\000\000\001\263") },
     { "MRW", 0, MagicPattern("\x00MRM") },
-    { "MVG", 0, MagicPattern("push graphic-context") },
     { "ORF", 0, MagicPattern("IIRO\x08\x00\x00\x00") },
     { "PCD", 2048, MagicPattern("PCD_") },
     { "PCL", 0, MagicPattern("\033E\033") },
index 6cad0ef2d7f5678fcb70bf1d1ddc724d05da5078..7c7570913f33d43845c363fd49fb37fc17b3a9e2 100644 (file)
@@ -7878,6 +7878,7 @@ ModuleExport size_t RegisterMSLImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMSLImage;
   entry->encoder=(EncodeImageHandler *) WriteMSLImage;
 #endif
+  entry->format_type=ImplicitFormatType;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }
index cd6b7ad1c59589bf92804cbe9086926292e8bba8..7b09d084bec928097c4e5b4cba02c2fce33d77c0 100644 (file)
@@ -250,6 +250,7 @@ ModuleExport size_t RegisterMVGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMVGImage;
   entry->encoder=(EncodeImageHandler *) WriteMVGImage;
   entry->magick=(IsImageFormatHandler *) IsMVG;
+  entry->format_type=ImplicitFormatType;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
index 74f7b76472a6edcee1edc2b482c83497b8e5a051..1245eafcaf6bec5a9a3a95f4c0bf06f3de5d0d71 100644 (file)
@@ -609,8 +609,8 @@ ModuleExport size_t RegisterTXTImage(void)
   entry->flags|=CoderEndianSupportFlag;
   (void) RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("TXT","TEXT","Text");
-  entry->decoder=(DecodeImageHandler *) ReadTXTImage;
-  entry->encoder=(EncodeImageHandler *) WriteTXTImage;
+  entry->decoder=(DecodeImageHandler *) ReadTEXTImage;
+  entry->format_type=ImplicitFormatType;
   entry->flags|=CoderRawSupportFlag;
   entry->flags|=CoderEndianSupportFlag;
   (void) RegisterMagickInfo(entry);