From 343bca53fcdb2fc365ff61d25cb8b863bd6927b6 Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Wed, 2 Oct 2002 05:44:12 +0000
Subject: [PATCH] kode54's patch to kill 16->32bpp LUT Related change causing
 Linux to not init that table anymore

---
 zsnes/src/linux/sw_draw.c |  8 --------
 zsnes/src/zip/zpng.c      | 11 +++--------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/zsnes/src/linux/sw_draw.c b/zsnes/src/linux/sw_draw.c
index 1d84c99c..53df1395 100644
--- a/zsnes/src/linux/sw_draw.c
+++ b/zsnes/src/linux/sw_draw.c
@@ -33,7 +33,6 @@ extern void LinuxExit();
 
 extern unsigned int vidbuffer;
 extern DWORD converta;
-extern unsigned int BitConv32Ptr;
 extern unsigned char curblank;
 void UpdateVFrame(void);
 
@@ -44,13 +43,6 @@ BOOL sw_start(int width, int height, int req_depth, int FullScreen)
     Uint32 flags = SDL_DOUBLEBUF | SDL_HWSURFACE | SDL_HWPALETTE;
     DWORD GBitMask;
     
-    p = BitConv32Ptr;
-    for(i=0; i<65536; i++) {
-        color32 = ((i&0xF800)<<8) + ((i&0x07E0)<<5) + ((i&0x001F)<<3)+0xFF000000;
-	    (*(unsigned int *)(p)) = color32;
-	    p += 4;
-    }
-    
     flags |= (FullScreen ? SDL_FULLSCREEN : 0);
     
     SurfaceX = width; SurfaceY = height;
diff --git a/zsnes/src/zip/zpng.c b/zsnes/src/zip/zpng.c
index 71239df9..ecdb15b3 100644
--- a/zsnes/src/zip/zpng.c
+++ b/zsnes/src/zip/zpng.c
@@ -198,7 +198,6 @@ void Grab_PNG_Data(void)
 	/*Set scanline width for 32-bit color data: 4*256 = 1024*/
 	int scanline=1024;
 	unsigned char *DIBits;
-	unsigned int * lookup32=(unsigned int *)BitConv32Ptr;
 	unsigned int * DBits;
 
 	filename = generate_filename();
@@ -217,13 +216,9 @@ void Grab_PNG_Data(void)
 		{
 
 			conv_pixel=pixel[(i*288)+j+16];
-#ifndef __MSDOS__
-			DBits[i*256+j]=lookup32[conv_pixel];
-#else
-			DBits[i*256+j]=((conv_pixel&0xF800)<<8)+
-              ((conv_pixel&0x07E0)<<5)+
-              ((conv_pixel&0x001F)<<3)+0xFF000000;
-#endif
+			DBits[i*256+j]=((conv_pixel&0xF800)<<8)|
+				       ((conv_pixel&0x07E0)<<5)|
+				       ((conv_pixel&0x001F)<<3)|0xFF000000;
 		}
 	}