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

renamed some ImageDecoder properties and classes.

Browse Source
This commit is contained in:
morkt
2016-10-26 15:42:27 +04:00
parent 2c06c1cbcd
commit c771b13d4e
11 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GameRes/FileSystem.cs
View File

@@ -730,7 +730,7 @@ namespace GameRes
return arc_fs.Source.OpenImage (entry);
var input = fs.OpenBinaryStream (entry);
return new ImageStreamDecoder (input);
return new ImageFormatDecoder (input);
}
public static Stream OpenStream (string filename)

2
GameRes/GameRes.cs
View File

@@ -203,7 +203,7 @@ namespace GameRes
public virtual IImageDecoder OpenImage (ArcFile arc, Entry entry)
{
var input = arc.OpenBinaryEntry (entry);
return new ImageStreamDecoder (input);
return new ImageFormatDecoder (input);
}
/// <summary>

27
GameRes/ImageDecoder.cs
View File

@@ -30,12 +30,12 @@ namespace GameRes
{
public interface IImageDecoder : IDisposable
{
Stream Input { get; }
Stream Source { get; }
/// <summary>
/// Underlying image format or null if image is not represented by any format.
/// </summary>
ImageFormat Format { get; }
ImageFormat SourceFormat { get; }
/// <summary>
/// Image parameters.
@@ -48,15 +48,14 @@ namespace GameRes
ImageData Image { get; }
}
public sealed class ImageStreamDecoder : IImageDecoder
public sealed class ImageFormatDecoder : IImageDecoder
{
IBinaryStream m_file;
ImageData m_image;
public Stream Input { get { m_file.Position = 0; return m_file.AsStream; } }
public ImageFormat Format { get; private set; }
public ImageMetaData Info { get; private set; }
public Stream Source { get { m_file.Position = 0; return m_file.AsStream; } }
public ImageFormat SourceFormat { get; private set; }
public ImageMetaData Info { get; private set; }
public ImageData Image
{
@@ -65,19 +64,19 @@ namespace GameRes
if (null == m_image)
{
m_file.Position = 0;
m_image = Format.Read (m_file, Info);
m_image = SourceFormat.Read (m_file, Info);
}
return m_image;
}
}
public ImageStreamDecoder (IBinaryStream file)
public ImageFormatDecoder (IBinaryStream file)
{
m_file = file;
var format = ImageFormat.FindFormat (file);
if (null == format)
throw new InvalidFormatException();
Format = format.Item1;
SourceFormat = format.Item1;
Info = format.Item2;
}
@@ -97,10 +96,10 @@ namespace GameRes
protected IBinaryStream m_input;
protected ImageData m_image;
public Stream Input { get { m_input.Position = 0; return m_input.AsStream; } }
public ImageFormat Format { get { return null; } }
public ImageMetaData Info { get; protected set; }
public ImageData Image
public Stream Source { get { m_input.Position = 0; return m_input.AsStream; } }
public ImageFormat SourceFormat { get { return null; } }
public ImageMetaData Info { get; protected set; }
public ImageData Image
{
get
{