Usermode - Slight changes, debug/commenting only

[tpg/acess2.git] / Usermode / Libraries / libimage_sif.so_src / main.c

diff --git a/Usermode/Libraries/libimage_sif.so_src/main.c b/Usermode/Libraries/libimage_sif.so_src/main.c
index 455d3bc..c15652e 100644 (file)
--- a/Usermode/Libraries/libimage_sif.so_src/main.c
+++ b/Usermode/Libraries/libimage_sif.so_src/main.c
@@ -7,6 +7,17 @@
 #include <image.h>
 //#include <image_sif.h>
 
+// === STRUCTURES ===
+struct sHeader
+{
+       uint16_t        Magic;
+       uint16_t        Flags;
+       uint16_t        Width;
+       uint16_t        Height;
+};
+
+// === CONSTANTS ===
+
 // === CODE ===
 int SoMain(void)
 {
@@ -17,57 +28,64 @@ int SoMain(void)
  */
 tImage *Image_SIF_Parse(void *Buffer, size_t Size)
 {
-       uint16_t        magic;
-       uint16_t        flags;
        uint16_t        w, h;
         int    ofs, i;
-       tImage_SIF      *ret;
+       tImage  *ret;
         int    bRevOrder;
         int    fileOfs = 0;
         int    comp, fmt;
         int    sampleSize = 4;
+       struct sHeader  *hdr = Buffer;
+        
+       _SysDebug("Image_SIF_Parse: (Buffer=%p, Size=0x%x)", Buffer, Size);
        
        // Get magic word and determine byte ordering
-       magic = *(uint16_t*)Buffer+fileOfs;     fileOfs += 2;
-       if(magic == 0x51F0)
+       if(hdr->Magic == 0x51F0)        // Little Endian
                bRevOrder = 0;
-       else if(magic == 0xF051)
+       else if(hdr->Magic == 0xF051)   // Big Endian
                bRevOrder = 1;
        else {
+               _SysDebug(" Image_SIF_Parse: Magic invalid (0x%x)", hdr->Magic);
                return NULL;
        }
        
+       _SysDebug(" Image_SIF_Parse: bRevOrder = %i", bRevOrder);
+       
        // Read flags
-       flags = *(uint16_t*)Buffer+fileOfs;     fileOfs += 2;
-       comp = flags & 7;
-       fmt = (flags >> 3) & 7;
+       comp = hdr->Flags & 7;
+       fmt = (hdr->Flags >> 3) & 7;
        
        // Read dimensions
-       w = *(uint16_t*)Buffer+fileOfs; fileOfs += 2;
-       h = *(uint16_t*)Buffer+fileOfs; fileOfs += 2;
+       w = hdr->Width;
+       h = hdr->Height;
        
-       
-       // Allocate space
-       ret = calloc(1, sizeof(tImage) + w * h * sampleSize);
-       ret->Width = w;
-       ret->Height = h;
+       _SysDebug(" Image_SIF_Parse: Dimensions %ix%i", w, h);
        
        // Get image format
        switch(fmt)
        {
-       case 0: // ARGB
-               ret->Format = IMGFMT_ARGB;
+       case 0: // ARGB 32-bit Little Endian
+               fmt = IMGFMT_BGRA;
                sampleSize = 4;
                break;
-       case 1: // RGB
-               ret->Format = IMGFMT_RGB;
+       case 1: // RGB 24-bit big endian
+               fmt = IMGFMT_RGB;
                sampleSize = 3;
                break;
        default:
-               free(ret);
                return NULL;
        }
        
+       _SysDebug(" Image_SIF_Parse: sampleSize = %i, fmt = %i", sampleSize, fmt);
+       
+       fileOfs = sizeof(struct sHeader);
+       
+       // Allocate space
+       ret = calloc(1, sizeof(tImage) + w * h * sampleSize);
+       ret->Width = w;
+       ret->Height = h;
+       ret->Format = fmt;
+       
        switch(comp)
        {
        // Uncompressed 32-bpp data
@@ -89,6 +107,7 @@ tImage *Image_SIF_Parse(void *Buffer, size_t Size)
                        uint8_t len;
                        if( fileOfs + 1 > Size )        return ret;
                        len = *(uint8_t*)Buffer+fileOfs;        fileOfs += 1;
+                       // Verbatim
                        if(len & 0x80) {
                                len &= 0x7F;
                                if( fileOfs + len*sampleSize > Size ) {
@@ -100,6 +119,7 @@ tImage *Image_SIF_Parse(void *Buffer, size_t Size)
                                }
                                ofs += len;
                        }
+                       // RLE
                        else {
                                uint8_t tmp[sampleSize];
                                
@@ -118,6 +138,7 @@ tImage *Image_SIF_Parse(void *Buffer, size_t Size)
                return ret;
        
        // Channel 1.7.8 RLE
+       // - Each channel is separately 1.7 RLE compressed
        case 3:
                // Alpha, Red, Green, Blue
                for( i = 0; i < sampleSize; i++ )