Added two pixel format decoders

Verified a previously disabled pixel format decoder (L4) and enabled it, along with another (A4) that's assumed to work now as well; thanks Ehm2k
xdanieldzd · Mar 2, 2016 · 44119f9 · 44119f9
1 parent 7834fbe
commit 44119f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/Tharsis/Images/TileCodecs.cs b/Tharsis/Images/TileCodecs.cs
@@ -39,9 +39,9 @@ internal static class TileCodecs
             /* ETC1     */ new Codec(Pica.DataTypes.UnsignedByte,       Pica.PixelFormats.ETC1RGB8NativeDMP,        DecodeETC1,     null),
             /* ETC1_A4  */ new Codec(Pica.DataTypes.UnsignedByte,       Pica.PixelFormats.ETC1AlphaRGB8A4NativeDMP, DecodeETC1_A4,  null),
             /* A8       */ new Codec(Pica.DataTypes.UnsignedByte,       Pica.PixelFormats.AlphaNativeDMP,           DecodeA8,       EncodeA8),
-            /* A4       */ new Codec(Pica.DataTypes.Unsigned4BitsDMP,   Pica.PixelFormats.AlphaNativeDMP,           null /*DecodeA4*/, null),
+            /* A4       */ new Codec(Pica.DataTypes.Unsigned4BitsDMP,   Pica.PixelFormats.AlphaNativeDMP,           DecodeA4,       null),
             /* L8       */ new Codec(Pica.DataTypes.UnsignedByte,       Pica.PixelFormats.LuminanceNativeDMP,       DecodeL8,       EncodeL8),
-            /* L4       */ new Codec(Pica.DataTypes.Unsigned4BitsDMP,   Pica.PixelFormats.LuminanceNativeDMP,       null /*DecodeL4*/, null),
+            /* L4       */ new Codec(Pica.DataTypes.Unsigned4BitsDMP,   Pica.PixelFormats.LuminanceNativeDMP,       DecodeL4,       null),
             /* LA88     */ new Codec(Pica.DataTypes.UnsignedByte,       Pica.PixelFormats.LuminanceAlphaNativeDMP,  DecodeLA88,     EncodeLA88),
             /* LA44     */ new Codec(Pica.DataTypes.UnsignedByte44DMP,  Pica.PixelFormats.LuminanceAlphaNativeDMP,  DecodeLA44,     EncodeLA44)
         };
@@ -221,7 +221,6 @@ private static void DecodeA8(BinaryReader reader, byte[] targetData, int x, int
 
         private static void DecodeA4(BinaryReader reader, byte[] targetData, int x, int y, int width, int height)
         {
-            // TODO: fixme?
             for (int t = 0; t < tileOrder.Length; t += 2)
             {
                 byte a4 = reader.ReadByte();
@@ -251,7 +250,6 @@ private static void DecodeL8(BinaryReader reader, byte[] targetData, int x, int
 
         private static void DecodeL4(BinaryReader reader, byte[] targetData, int x, int y, int width, int height)
         {
-            // TODO: fixme?
             for (int t = 0; t < tileOrder.Length; t += 2)
             {
                 byte l4 = reader.ReadByte();

diff --git a/Tharsis/Program.cs b/Tharsis/Program.cs
@@ -37,7 +37,7 @@ static void Main(string[] args)
             Console.Title = Path.GetFileName(ApplicationPath);
 
             StringBuilder headerString = new StringBuilder();
-            headerString.AppendFormat("Tharsis {0}.{1} - Generic Game File Converter\n", ApplicationVersion.Major, ApplicationVersion.Minor);
+            headerString.AppendFormat("Tharsis v{0}.{1}.{2} - Generic Game File Converter\n", ApplicationVersion.Major, ApplicationVersion.Minor, ApplicationVersion.Build);
             headerString.Append("Written 2014-2016 by xdaniel - http://magicstone.de/dzd/");
 
             Console.WriteLine(headerString.ToString().Center(2).StyleLine(LineType.Overline | LineType.Underline));

diff --git a/Tharsis/Properties/AssemblyInfo.cs b/Tharsis/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: AssemblyVersion("0.9.1.0")]
+[assembly: AssemblyFileVersion("0.9.1.0")]