From 1edd79c74d9acb6ddd5a5aa326ca6268be433c08 Mon Sep 17 00:00:00 2001
From: morkt <morkt@users.noreply.github.com>
Date: Wed, 6 Jun 2018 00:47:14 +0400
Subject: [PATCH] (MG2): could contain JPEG images.

---
 ArcFormats/Valkyria/ImageMG2.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ArcFormats/Valkyria/ImageMG2.cs b/ArcFormats/Valkyria/ImageMG2.cs
index 1adfcd42..1cc03b78 100644
--- a/ArcFormats/Valkyria/ImageMG2.cs
+++ b/ArcFormats/Valkyria/ImageMG2.cs
@@ -36,6 +36,7 @@ namespace GameRes.Formats.Valkyria
         public int          ImageLength;
         public int          AlphaLength;
         public IMg2Scheme   Scheme;
+        public ImageFormat  Format;
     }
 
     internal interface IMg2Scheme
@@ -62,9 +63,16 @@ namespace GameRes.Formats.Valkyria
             foreach (var scheme in KnownSchemes)
             {
                 using (var input = scheme.CreateStream (file.AsStream, 0x10, length))
-                using (var png = new BinaryStream (input, file.Name))
+                using (var img = new BinaryStream (input, file.Name))
                 {
-                    var info = Png.ReadMetaData (png);
+                    ImageFormat format;
+                    if (Png.Signature == img.Signature)
+                        format = Png;
+                    else if (0xE0FFD8FF == img.Signature)
+                        format = Jpeg;
+                    else
+                        continue;
+                    var info = format.ReadMetaData (img);
                     if (null == info)
                         continue;
                     return new Mg2MetaData
@@ -77,6 +85,7 @@ namespace GameRes.Formats.Valkyria
                         ImageLength = length,
                         AlphaLength = header.ToInt32 (12),
                         Scheme = scheme,
+                        Format = format,
                     };
                 }
             }
@@ -94,9 +103,10 @@ namespace GameRes.Formats.Valkyria
         {
             BitmapSource frame;
             using (var input = meta.Scheme.CreateStream (file, 0x10, meta.ImageLength))
+            using (var img = new BinaryStream (input, meta.FileName))
             {
-                var decoder = new PngBitmapDecoder (input, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
-                frame = decoder.Frames[0];
+                var image = meta.Format.Read (img, meta);
+                frame = image.Bitmap;
                 if (0 == meta.AlphaLength)
                     return frame;
             }