diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj
index 095fc216..629dcb14 100644
--- a/ArcFormats/ArcFormats.csproj
+++ b/ArcFormats/ArcFormats.csproj
@@ -246,6 +246,7 @@
+
diff --git a/ArcFormats/Nonono/ArcNPF.cs b/ArcFormats/Nonono/ArcNPF.cs
index b7e690c9..745a545c 100644
--- a/ArcFormats/Nonono/ArcNPF.cs
+++ b/ArcFormats/Nonono/ArcNPF.cs
@@ -23,7 +23,6 @@
// IN THE SOFTWARE.
//
-using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
@@ -99,6 +98,14 @@ namespace GameRes.Formats.Nonono
return new BinMemoryStream (data, entry.Name);
}
+ public override IImageDecoder OpenImage (ArcFile arc, Entry entry)
+ {
+ var input = arc.OpenBinaryEntry (entry);
+ if (input.Length <= 8 || input.Signature != 0x58474D49) // 'IMGX'
+ return ImageFormatDecoder.Create (input);
+ return new ImgXDecoder (input);
+ }
+
internal void Decrypt (byte[] data, int pos, int count, RandomGenerator rnd)
{
for (int i = 0; i < count; ++i)
diff --git a/ArcFormats/Nonono/ImageIMGX.cs b/ArcFormats/Nonono/ImageIMGX.cs
new file mode 100644
index 00000000..33a24db5
--- /dev/null
+++ b/ArcFormats/Nonono/ImageIMGX.cs
@@ -0,0 +1,161 @@
+//! \file ImageIMGX.cs
+//! \date 2019 Mar 12
+//! \brief NGS engine compressed bitmap decoder.
+//
+// Copyright (C) 2019 by morkt
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+
+using System.IO;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace GameRes.Formats.Nonono
+{
+ internal class ImgXDecoder : IImageDecoder
+ {
+ LsbBitStream m_input;
+ uint m_unpacked_size;
+ ImageMetaData m_info;
+ ImageData m_image;
+
+ public Stream Source { get { return m_input.Input; } }
+ public ImageFormat SourceFormat { get { return null; } }
+ public ImageMetaData Info { get { return m_info ?? GetImageInfo(); } }
+ public ImageData Image { get { return m_image ?? (m_image = GetImage()); } }
+
+ public ImgXDecoder (IBinaryStream input)
+ {
+ input.Position = 4;
+ uint unpacked_size = ~input.ReadUInt32();
+ m_unpacked_size = unpacked_size >> 16 | unpacked_size << 16;
+ m_input = new LsbBitStream (input.AsStream);
+ }
+
+ ImageData GetImage ()
+ {
+ var bitmap = Unpack();
+ m_info = new ImageMetaData {
+ Width = bitmap.ToUInt32 (4),
+ Height = bitmap.ToUInt32 (8),
+ BPP = bitmap.ToUInt16 (0xE),
+ };
+ int header_size = bitmap.ToInt32 (0);
+ BitmapPalette palette = null;
+ int stride = m_info.iWidth * m_info.BPP / 8;
+ var pixels = new byte[stride * m_info.iHeight];
+ using (var input = new MemoryStream (bitmap, header_size, bitmap.Length - header_size))
+ {
+ if (8 == m_info.BPP)
+ palette = ImageFormat.ReadPalette (input);
+ input.Read (pixels, 0, pixels.Length);
+ }
+ PixelFormat format = 8 == m_info.BPP ? PixelFormats.Indexed8
+ : 24 == m_info.BPP ? PixelFormats.Bgr24
+ : PixelFormats.Bgr32;
+ return ImageData.Create (m_info, format, palette, pixels, stride);
+ }
+
+ ImageMetaData GetImageInfo ()
+ {
+ GetImage();
+ return m_info;
+ }
+
+ struct Node
+ {
+ public int Child;
+ public byte Value;
+ }
+
+ public byte[] Unpack ()
+ {
+ var output = new byte[m_unpacked_size];
+ m_input.Input.Position = 8;
+ var tree = new Node[0x88CF];
+ var buffer = new byte[0x88CF];
+ int out_pos = 0;
+
+ int root_node = 259;
+ int code_length = 9;
+ int last_code = m_input.GetBits (code_length);
+ if (-1 == last_code || 256 == last_code)
+ return output;
+ byte last_symbol = output[out_pos++] = (byte)last_code;
+ while (out_pos < output.Length)
+ {
+ int code;
+ for (;;)
+ {
+ code = m_input.GetBits (code_length);
+ if (-1 == code)
+ return output;
+ if (code != 257)
+ break;
+ ++code_length;
+ }
+ if (code == 256)
+ break;
+ if (code == 258)
+ {
+ root_node = 259;
+ code_length = 9;
+ last_code = m_input.GetBits (code_length);
+ if (-1 == last_code || 256 == last_code)
+ return output;
+ last_symbol = output[out_pos++] = (byte)last_code;
+ continue;
+ }
+ int symbol = code;
+ int ptr = 0;
+ if (code >= root_node)
+ {
+ symbol = last_code;
+ buffer[ptr++] = last_symbol;
+ }
+ while (symbol > 255)
+ {
+ buffer[ptr++] = tree[symbol].Value;
+ symbol = tree[symbol].Child;
+ }
+ last_symbol = buffer[ptr] = (byte)symbol;
+ while (ptr >= 0)
+ {
+ output[out_pos++] = buffer[ptr--];
+ }
+ tree[root_node].Child = last_code;
+ tree[root_node].Value = last_symbol;
+ ++root_node;
+ last_code = code;
+ }
+ return output;
+ }
+
+ bool m_disposed = false;
+ public void Dispose ()
+ {
+ if (!m_disposed)
+ {
+ m_input.Dispose();
+ m_disposed = true;
+ }
+ }
+ }
+}