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

ImageFormat.Read method made static.

Browse Source
This commit is contained in:
morkt
2014-07-25 08:56:32 +04:00
parent 2e75b3e183
commit 46c05b25de
3 changed files with 40 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Image.Convert/Program.cs
View File

@@ -42,47 +42,11 @@ namespace GARbro
return range.FirstOrDefault();
}
Tuple<ImageFormat, ImageMetaData> FindImageFormat (ArcView arc)
{
uint signature = arc.View.ReadUInt32 (0);
using (var stream = arc.CreateStream())
{
for (;;)
{
var range = FormatCatalog.Instance.LookupSignature<ImageFormat> (signature);
foreach (var impl in range)
{
try
{
ImageMetaData metadata = impl.ReadMetaData (stream);
if (null != metadata)
return new Tuple<ImageFormat, ImageMetaData> (impl, metadata);
stream.Position = 0;
}
catch { }
}
if (0 == signature)
break;
signature = 0;
}
}
return null;
}
ImageData ReadImage (ArcView file)
{
var format = FindImageFormat (file);
if (null == format)
return null;
using (var stream = file.CreateStream())
return format.Item1.Read (stream, format.Item2);
}
void PrintMetaData (string filename)
{
using (ArcView file = new ArcView (filename))
using (var file = File.Open (filename, FileMode.Open, FileAccess.Read))
{
var format = FindImageFormat (file);
var format = ImageFormat.FindFormat (file);
if (null == format)
{
Console.Error.WriteLine ("{0}: file format not recognized", filename);
@@ -96,9 +60,9 @@ namespace GARbro
void ConvertFile (string filename, ImageFormat format)
{
ImageData image;
using (var file = new ArcView (filename))
using (var file = File.Open (filename, FileMode.Open, FileAccess.Read))
{
image = ReadImage (file);
image = ImageFormat.Read (file);
if (null == image)
{
Console.Error.WriteLine ("{0}: Unknown image format", filename);