Changeset 104 for trunk/common_functions/img_funcs.c

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• common_functions/img_funcs.c (modified) (11 diffs)

trunk/common_functions/img_funcs.c

@@ -1 +1 @@
 /*
-  This file conatins functions for loading image files. 
+  This file conatins functions for loading image files.
  */
 
@@ -64 +64 @@
     SIZEL         ImageSize;
     ULONG         dwHeight, dwWidth;
-    SHORT          wBitCount;
     FOURCC        fccStorageSystem;
     ULONG         dwPadBytes;
     ULONG         dwRowBits;
     ULONG         ulReturnCode;
-    ULONG         dwReturnCode;
-    HBITMAP       hbReturnCode;
-    LONG          lReturnCode;
     FOURCC        fccIOProc;
     HDC           hdc;
@@ -129 +125 @@
 
 
-    dwReturnCode = mmioQueryHeaderLength ( hmmio,
+    ulReturnCode = mmioQueryHeaderLength ( hmmio,
                                          (PLONG)&ulImageHeaderLength,
                                            0L,
@@ -163 +159 @@
     dwHeight = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cy;
     dwWidth = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cx;
-    wBitCount = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cBitCount;
     dwRowBits = dwWidth * mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cBitCount;
     dwNumRowBytes = dwRowBits >> 3;
@@ -203 +198 @@
         return(0L);
       }
-    
+
     /*
     // ***************************************************
@@ -226 +221 @@
                        (ULONG) MB_OK | MB_MOVEABLE |
                        MB_ERROR );
-#endif   
+#endif
         DevCloseDC(hdc);
         DosFreeMem(pRowBuffer);
@@ -265 +260 @@
       Select the bitmap into the memory device context.
       ***************************************************/
-    hbReturnCode = GpiSetBitmap ( hps,
+    ulReturnCode = GpiSetBitmap ( hps,
                                   hbm );
     /***************************************************************
@@ -285 +280 @@
           *  it to work. Perhaps will get to it when time is available...
           */
-         lReturnCode = GpiSetBitmapBits ( hps,
+         ulReturnCode = GpiSetBitmapBits ( hps,
                                           (LONG) dwRowCount,
                                           (LONG) 1,
@@ -293 +288 @@
 
     /* Clean up */
-    hbReturnCode = GpiSetBitmap ( hps,
+    ulReturnCode = GpiSetBitmap ( hps,
                                   NULLHANDLE );
     ulReturnCode = mmioClose (hmmio, 0L);
@@ -368 +363 @@
     ULONG         ulReturnCode;
     ULONG ulBytesRead;
-    
+
     /* Check file size */
     if(SysQueryFileSize(pszFileName)==0)
       return FALSE; /* File is empty at the moment, so return without reading. */
-    
+
     ulReturnCode = mmioIdentifyFile ( pszFileName,
                                       0L,
@@ -436 +431 @@
                        &mmioinfo,
                        MMIO_READ | MMIO_DENYWRITE | MMIO_NOIDENTIFY );
-   
+
     if ( ! hmmio )
     {