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

24
ArcFormats/CatSystem/ImageHG3.cs
View File

@@ -94,11 +94,11 @@ namespace GameRes.Formats.CatSystem
protected int m_pixel_size;
protected ImageData m_image;
public Stream Input { get { return m_input.AsStream; } }
public int Stride { get; protected set; }
public ImageFormat Format { get { return null; } }
public ImageMetaData Info { get { return m_info; } }
public virtual ImageData Image { get { throw new NotImplementedException(); } }
public Stream Source { get { return m_input.AsStream; } }
public ImageFormat SourceFormat { get { return null; } }
public ImageMetaData Info { get { return m_info; } }
public virtual ImageData Image { get { throw new NotImplementedException(); } }
public int Stride { get; protected set; }
protected HgReader (IBinaryStream input, HgMetaData info)
{
@@ -112,12 +112,12 @@ namespace GameRes.Formats.CatSystem
{
var ctl_offset = data_offset + data_packed;
var data = new byte[data_unpacked];
using (var z = new StreamRegion (Input, data_offset, data_packed, true))
using (var z = new StreamRegion (Source, data_offset, data_packed, true))
using (var data_in = new ZLibStream (z, CompressionMode.Decompress))
if (data.Length != data_in.Read (data, 0, data.Length))
throw new EndOfStreamException();
using (var z = new StreamRegion (Input, ctl_offset, ctl_packed, true))
using (var z = new StreamRegion (Source, ctl_offset, ctl_packed, true))
using (var ctl_in = new ZLibStream (z, CompressionMode.Decompress))
using (var bits = new LsbBitStream (ctl_in))
{
@@ -258,7 +258,7 @@ namespace GameRes.Formats.CatSystem
public byte[] Unpack ()
{
Input.Position = m_info.HeaderSize;
Source.Position = m_info.HeaderSize;
var img_type = m_input.ReadBytes (8);
if (Binary.AsciiEqual (img_type, "img0000\0"))
return UnpackImg0000();
@@ -271,7 +271,7 @@ namespace GameRes.Formats.CatSystem
byte[] UnpackImg0000 ()
{
Flipped = true;
Input.Position = m_info.HeaderSize+0x18;
Source.Position = m_info.HeaderSize+0x18;
int packed_data_size = m_input.ReadInt32();
int data_size = m_input.ReadInt32();
int packed_ctl_size = m_input.ReadInt32();
@@ -284,8 +284,8 @@ namespace GameRes.Formats.CatSystem
Flipped = false;
m_input.ReadInt32();
var jpeg_size = m_input.ReadInt32();
long next_section = Input.Position + jpeg_size;
var decoder = new JpegBitmapDecoder (Input,
long next_section = Source.Position + jpeg_size;
var decoder = new JpegBitmapDecoder (Source,
BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
var frame = decoder.Frames[0];
if (frame.Format.BitsPerPixel < 24)
@@ -313,7 +313,7 @@ namespace GameRes.Formats.CatSystem
return output;
m_input.Seek (8, SeekOrigin.Current);
int alpha_size = m_input.ReadInt32();
using (var alpha_in = new StreamRegion (Input, Input.Position+4, alpha_size, true))
using (var alpha_in = new StreamRegion (Source, Source.Position+4, alpha_size, true))
using (var alpha = new ZLibStream (alpha_in, CompressionMode.Decompress))
{
for (int i = 3; i < output.Length; i += 4)

4
ArcFormats/Cyberworks/ArcDAT.cs
View File

@@ -240,7 +240,7 @@ namespace GameRes.Formats.Cyberworks
}
}
input.Position = 0;
return new ImageStreamDecoder (input);
return new ImageFormatDecoder (input);
}
uint DecodeDecimal (ArcView file, long offset)
@@ -409,7 +409,7 @@ namespace GameRes.Formats.Cyberworks
if (id == scheme.Value2)
return new AImageReader (input, scheme);
input.Position = 0;
return new ImageStreamDecoder (input);
return new ImageFormatDecoder (input);
}
byte[] ReadToc (string toc_name)

6
ArcFormats/Cyberworks/ImageTINK.cs
View File

@@ -52,9 +52,9 @@ namespace GameRes.Formats.Cyberworks
AImageScheme m_scheme;
ImageData m_image;
public Stream Input { get { m_input.Position = 0; return m_input.AsStream; } }
public ImageMetaData Info { get { return m_info; } }
public ImageFormat Format { get { return null; } }
public Stream Source { get { m_input.Position = 0; return m_input.AsStream; } }
public ImageFormat SourceFormat { get { return null; } }
public ImageMetaData Info { get { return m_info; } }
public ImageData Image
{

4
ArcFormats/Kaguya/ArcANM.cs
View File

@@ -212,8 +212,8 @@ namespace GameRes.Formats.Kaguya
protected override ImageData GetImageData ()
{
m_input.Position = 0x14;
int stride = info.BPP/8*(int)Info.Width;
var pixels = m_input.ReadBytes (stride*(int)info.Height);
int stride = Info.BPP/8*(int)Info.Width;
var pixels = m_input.ReadBytes (stride*(int)Info.Height);
return ImageData.CreateFlipped (Info, GetFormat(), null, pixels, stride);
}

9
ArcFormats/Musica/ArcSQZ.cs
View File

@@ -26,6 +26,7 @@
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Windows.Media;
using GameRes.Compression;
namespace GameRes.Formats.Musica
@@ -96,10 +97,10 @@ namespace GameRes.Formats.Musica
ImageMetaData m_info;
ImageData m_image;
public Stream Input { get { return m_input; } }
public ImageFormat Format { get { return null; } }
public ImageMetaData Info { get { return m_info; } }
public ImageData Image
public Stream Source { get { return m_input; } }
public ImageFormat SourceFormat { get { return null; } }
public ImageMetaData Info { get { return m_info; } }
public ImageData Image
{
get
{

6
ArcFormats/ShiinaRio/ImageS25.cs
View File

@@ -95,9 +95,9 @@ namespace GameRes.Formats.ShiinaRio
ImageMetaData m_info;
ImageData m_image;
public Stream Input { get { m_input.Position = 0; return m_input.AsStream; } }
public ImageMetaData Info { get { return m_info; } }
public ImageFormat Format { get { return null; } }
public Stream Source { get { m_input.Position = 0; return m_input.AsStream; } }
public ImageFormat SourceFormat { get { return null; } }
public ImageMetaData Info { get { return m_info; } }
public ImageData Image
{