From 44f183b72a5f96170dfb8f1d2ca77fa623ac8f84 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Thu, 11 Jul 2019 13:55:15 -0400
Subject: [PATCH] png2rle: handle 4-bit depth png files

should make a warning I suppose
---
 gr-utils/loadpng.c                 |  37 ++++++++++++++++++++++-------
 gr-utils/png2rle.c                 |   2 +-
 ootw/ootw_graphics/l2jail/dome.png | Bin 0 -> 328 bytes
 3 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 ootw/ootw_graphics/l2jail/dome.png

diff --git a/gr-utils/loadpng.c b/gr-utils/loadpng.c
index 12a20b7c..725664eb 100644
--- a/gr-utils/loadpng.c
+++ b/gr-utils/loadpng.c
@@ -166,20 +166,39 @@ int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize) {
 		for(y=0;y<height;y+=2) {
 			for(x=0;x<width/2;x++) {
 
-				/* top color */
-				a2_color=row_pointers[y][x*2];
+				if (bit_depth==8) {
+					/* top color */
+					a2_color=row_pointers[y][x*2];
 
-				/* bottom color */
-				color=row_pointers[y+1][x*2];
+					/* bottom color */
+					color=row_pointers[y+1][x*2];
 
-				a2_color|=(color<<4);
+					a2_color|=(color<<4);
 
-				if (debug) {
-					printf("%x ",a2_color);
+					if (debug) {
+						printf("%x ",a2_color);
+					}
+
+					*out_ptr=a2_color;
+					out_ptr++;
 				}
+				else if (bit_depth==4) {
+					/* top color */
+					a2_color=row_pointers[y][x];
 
-				*out_ptr=a2_color;
-				out_ptr++;
+					/* bottom color */
+					color=row_pointers[y+1][x];
+
+					a2_color|=(color<<4);
+
+					if (debug) {
+						printf("%x ",a2_color);
+					}
+
+					*out_ptr=a2_color;
+					out_ptr++;
+
+				}
 			}
 			if (debug) printf("\n");
 		}
diff --git a/gr-utils/png2rle.c b/gr-utils/png2rle.c
index af26a6af..85fdaf1f 100644
--- a/gr-utils/png2rle.c
+++ b/gr-utils/png2rle.c
@@ -154,7 +154,7 @@ int rle_smaller(int out_type, char *varname,
 		fprintf(stdout,"%c",xsize);
 	}
 
-	size+=2;
+	size+=1;
 
 	/* Get first top/bottom color pair */
 	last=image[x];
diff --git a/ootw/ootw_graphics/l2jail/dome.png b/ootw/ootw_graphics/l2jail/dome.png
new file mode 100644
index 0000000000000000000000000000000000000000..95460746501225ba42bd5c8d95abe052cc9f9b6f
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^0YGfP!VDx!PCqyT;sp4FxB}_NatR53d;h!qWmudr
zXU-gv^M5ZK{-039{6EWP?%cWm7hDkeYIEUkZ_)n?|Ns9_WS?0J)Wcce5n0T@AiN%g
z8Izy&9R>=rmw5WRvOi|$6ylSg&&m#zXOJv$jVN)>&&^HED`9XhN=+<DO;IS%EXh!C
z_w)@2Z{!mPDr)m|aSX9I{r1v9!3G5$mIJGwR&8R9+Q51`Y)XfMfDyC(r=&yY3i%%#
zns6k4-O@YCyNpt}y5B6kJ0U)zG;mRz!CFq$54|P_mkC?4YU!Qu6u7XY{Y_)Y!*^!s
z?Q7lhJNQlrWH#J7KXKAy1=g(#b})Q(sDITEpy=)_rD$@3NA4%bnd{to7V`7<ye<5+
UI{orGpo<thUHx3vIVCg!05~9jjQ{`u

literal 0
HcmV?d00001