Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-23 13:45:34 +08:00
Code Issues Projects Releases Wiki Activity

(Image.Read): sort matched formats according to filename extension.

Browse Source
This commit is contained in:
morkt 2015-07-25 10:13:56 +04:00
parent 60479757ac
commit 097672845d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
GameRes/Image.cs
View File

@ -23,7 +23,9 @@
// IN THE SOFTWARE.
//
using System;
using System.IO;
using System.Linq;
using System.Windows.Media;
using System.Windows.Media.Imaging;
@ -108,6 +110,11 @@ namespace GameRes
public abstract void Write (Stream file, ImageData bitmap);
public static ImageData Read (Stream file)
{
return Read (null, file);
}
public static ImageData Read (string filename, Stream file)
{
bool need_dispose = false;
try
@ -119,7 +126,7 @@ namespace GameRes
file = stream;
need_dispose = true;
}
var format = FindFormat (file);
var format = FindFormat (file, filename);
if (null == format)
return null;
file.Position = 0;
@ -132,12 +139,18 @@ namespace GameRes
}
}
public static System.Tuple<ImageFormat, ImageMetaData> FindFormat (Stream file)
public static System.Tuple<ImageFormat, ImageMetaData> FindFormat (Stream file, string filename = null)
{
uint signature = FormatCatalog.ReadSignature (file);
Lazy<string> ext = null;
if (!string.IsNullOrEmpty (filename))
ext = new Lazy<string> (() => Path.GetExtension (filename).TrimStart ('.').ToLowerInvariant());
for (;;)
{
var range = FormatCatalog.Instance.LookupSignature<ImageFormat> (signature);
// check formats that match filename extension first
if (ext != null && range.Skip(1).Any())
range = range.OrderByDescending (f => f.Extensions.Any (e => e == ext.Value));
foreach (var impl in range)
{
try