lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(FormatCatalog.FindFormats): new generic method.

Browse Source
This commit is contained in:
morkt
2016-12-17 18:51:33 +04:00
parent 7c989a0150
commit f3e3446c9a
4 changed files with 69 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
GameRes/Image.cs
View File

@@ -131,37 +131,23 @@ namespace GameRes
public static System.Tuple<ImageFormat, ImageMetaData> FindFormat (IBinaryStream file)
{
uint signature = file.Signature;
Lazy<string> ext = null;
if (!string.IsNullOrEmpty (file.Name))
ext = new Lazy<string> (() => Path.GetExtension (file.Name).TrimStart ('.').ToLowerInvariant(), false);
for (;;)
foreach (var impl in FormatCatalog.Instance.FindFormats<ImageFormat> (file.Name, file.Signature))
{
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
{
try
file.Position = 0;
ImageMetaData metadata = impl.ReadMetaData (file);
if (null != metadata)
{
file.Position = 0;
ImageMetaData metadata = impl.ReadMetaData (file);
if (null != metadata)
{
metadata.FileName = file.Name;
return Tuple.Create (impl, metadata);
}
metadata.FileName = file.Name;
return Tuple.Create (impl, metadata);
}
catch (OperationCanceledException)
{
throw;
}
catch { }
}
if (0 == signature)
break;
signature = 0;
catch (OperationCanceledException)
{
throw;
}
catch { }
}
return null;
}