Fixed a bug related to palette conversion

ZILtoid1991 · Aug 28, 2020 · 106a846 · 106a846
1 parent e1c3724
commit 106a846
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/source/dimage/base.d b/source/dimage/base.d
@@ -115,7 +115,7 @@ public class Palette(T) : IPalette {
 				array[i] = OutputType(data[i]);
 			result = new Palette!OutputType(array, format, getBitDepth(format));
 		}
-		switch (format & !(PixelFormat.BigEndian | PixelFormat.ValidAlpha)) {
+		switch (format & ~(PixelFormat.BigEndian | PixelFormat.ValidAlpha)) {
 			case PixelFormat.RGB888:
 				if(format & PixelFormat.BigEndian)
 					converter!(RGB888BE);

diff --git a/source/dimage/tga.d b/source/dimage/tga.d
@@ -1144,8 +1144,11 @@ unittest{
 		mappedRLE = TGA.load!VFile(virtualFile);
 		std.stdio.writeln("Load from virtual file was successful");
 		compareImages(mappedUnc, mappedRLE);
+
 		{
 			Palette!RGBA5551 p = cast(Palette!RGBA5551)mappedUnc.palette;
+			p.convTo(PixelFormat.ARGB8888);
+			p.convTo(PixelFormat.RGBA8888);
 			//std.stdio.writeln(mappedUnc.getHeader);
 			foreach_reverse (c ; p) {
 			}