X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibimage_sif.so_src%2Fmain.c;h=a51585625224c076c9c2bd2aaf7b8117c432798e;hb=40eb5cfbfd8baaa6f398e9bbc4960632525acd39;hp=c4c59d4d52840a8ae6a64377590bed0a6b97efe4;hpb=f8168f419a5b83f6875fc0a3044ce8a8b1572b65;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libimage_sif.so_src/main.c b/Usermode/Libraries/libimage_sif.so_src/main.c
index c4c59d4d..a5158562 100644
--- a/Usermode/Libraries/libimage_sif.so_src/main.c
+++ b/Usermode/Libraries/libimage_sif.so_src/main.c
@@ -8,6 +8,8 @@
 //#include <image_sif.h>
 #include <acess/sys.h>	// _SysDebug
 
+#define	_SysDebug(...)	do{}while(0)
+
 // === STRUCTURES ===
 struct sHeader
 {
@@ -35,7 +37,7 @@ tImage *Image_SIF_Parse(void *Buffer, size_t Size)
 	 int	bRevOrder;
 	 int	fileOfs = 0;
 	 int	comp, fmt;
-	 int	sampleSize = 4;
+	 int	sampleSize;
 	struct sHeader	*hdr = Buffer;
 	 
 	_SysDebug("Image_SIF_Parse: (Buffer=%p, Size=0x%x)", Buffer, Size);
@@ -86,6 +88,8 @@ tImage *Image_SIF_Parse(void *Buffer, size_t Size)
 	ret->Width = w;
 	ret->Height = h;
 	ret->Format = fmt;
+	for( ofs = 0; ofs < w*h*sampleSize; ofs ++ )
+		ret->Data[ofs] = 255;
 	
 	switch(comp)
 	{
@@ -103,39 +107,38 @@ tImage *Image_SIF_Parse(void *Buffer, size_t Size)
 	// (1 Flag, 7-bit size, 32-bit value)
 	case 1:
 		ofs = 0;
-		while( ofs < w*h )
+		while( ofs < w*h*sampleSize )
 		{
 			uint8_t	len;
-			if( fileOfs + 1 > Size )	return ret;
-			len = *(uint8_t*)Buffer+fileOfs;	fileOfs += 1;
+			if( fileOfs + 1 > Size )
+				return ret;
+			len = ((uint8_t*)Buffer)[fileOfs++];
 			// Verbatim
 			if(len & 0x80) {
 				len &= 0x7F;
-				if( fileOfs + len*sampleSize > Size ) {
-					memcpy(ret->Data + ofs*sampleSize, Buffer+fileOfs, Size-fileOfs);
-					return ret;
+				while( len -- )
+				{
+					if( fileOfs + sampleSize > Size )
+						return ret;
+					memcpy(ret->Data+ofs, Buffer+fileOfs, sampleSize);
+					ofs += sampleSize;
+					fileOfs += sampleSize;
 				}
-				else {
-					memcpy(ret->Data + ofs*sampleSize, Buffer+fileOfs, len*sampleSize);
-				}
-				ofs += len;
 			}
 			// RLE
 			else {
-				uint8_t	tmp[sampleSize];
-				
-				if( fileOfs + sampleSize > Size )	return ret;
-				
-				for(i=0;i<sampleSize;i++)
-					tmp[i] = *(uint8_t*)Buffer+fileOfs;	fileOfs += 1;
+				if( fileOfs + sampleSize > Size )
+					return ret;
 				
-				i = 0;
-				while(len--) {
-					for(i=0;i<sampleSize;i++)
-						ret->Data[ofs++] = tmp[i];
+				while( len -- )
+				{
+					memcpy(ret->Data+ofs, Buffer+fileOfs, sampleSize);
+					ofs += sampleSize;
 				}
+				fileOfs += sampleSize;
 			}
 		}
+		_SysDebug("Image_SIF_Parse: Complete at %i bytes", fileOfs);
 		return ret;
 	
 	// Channel 1.7.8 RLE
@@ -149,31 +152,22 @@ tImage *Image_SIF_Parse(void *Buffer, size_t Size)
 			{
 				uint8_t	len, val;
 				if( fileOfs + 1 > Size )	return ret;
-				len = *(uint8_t*)Buffer+fileOfs;	fileOfs += 1;
+				len = ((uint8_t*)Buffer)[fileOfs++];
 				if(len & 0x80) {
 					len &= 0x7F;
 					while(len--) {
 						if( fileOfs + 1 > Size )	return ret;
-						val = *(uint8_t*)Buffer+fileOfs;	fileOfs += 1;
-						if(i == 0)
-							ret->Data[ofs] = val;
-						else
-							ret->Data[ofs] |= val;
+						val = ((uint8_t*)Buffer)[fileOfs++];
+						ret->Data[ofs] = val;
 						ofs += sampleSize;
 					}
 				}
 				else {
 					if( fileOfs + 1 > Size )	return ret;
-					val = *(uint8_t*)Buffer+fileOfs;	fileOfs += 1;
-					if(i == 0) {
-						while(len--) {
-							ret->Data[ofs] = val;		ofs += sampleSize;
-						}
-					}
-					else {
-						while(len--) {
-							ret->Data[ofs] |= val;	ofs += sampleSize;
-						}
+					val = ((uint8_t*)Buffer)[fileOfs++];
+					while(len--) {
+						ret->Data[ofs] = val;
+						ofs += sampleSize;
 					}
 				}
 			}