Changeset 551 for trunk/dll/loadbmp.c

Timestamp:

Feb 28, 2007, 2:33:51 AM (19 years ago)

Author:

Gregg Young

Message:

Indentation cleanup

File:

• trunk/dll/loadbmp.c (modified) (19 diffs)

trunk/dll/loadbmp.c

@@ -49 +49 @@
   USHORT usType;
   PBITMAPARRAYFILEHEADER2 pbmafh2 = NULL;       // Must init for xfree
-  PBITMAPFILEHEADER2 pbmfh2;            // No color table
-  PBITMAPINFOHEADER2 pbmih2;            // No color table
-  PBITMAPINFO2 pbmi2;                   // Includes color table
-  BOOL is2x;                            // Format 1.x or 2.x
+  PBITMAPFILEHEADER2 pbmfh2;    // No color table
+  PBITMAPINFOHEADER2 pbmih2;    // No color table
+  PBITMAPINFO2 pbmi2;           // Includes color table
+  BOOL is2x;                    // Format 1.x or 2.x
   ULONG ulColors;
   ULONG ulRGBOffset;
-  PBYTE pData = NULL;                   // Must init for xfree
+  PBYTE pData = NULL;           // Must init for xfree
   ULONG ulDataSize;
   SIZEL sizel;
@@ -61 +61 @@
 
   if (!hPS) {
-    Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "WinGetPS");
+    Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, "WinGetPS");
     goto ExitLoadBMP;
   }
@@ -84 +83 @@
      Allocate enough to hold a complete 2.x bitmap array file header
      fixme to support > 256 colors?
-  */
+   */
   pbmafh2 =
     xmalloc(sizeof(*pbmafh2) + 256 * sizeof(RGB2), pszSrcFile, __LINE__);
@@ -92 +91 @@
      Both the 1.x and 2.x structures are assigned to simplify code
      fixme to clean this up - aliased pointers are evil
-  */
+   */
   pbmfh2 = &pbmafh2->bfh2;
   pbmih2 = &pbmfh2->bmp2;
-  pbmi2 = (PBITMAPINFO2)pbmih2;
+  pbmi2 = (PBITMAPINFO2) pbmih2;
 
   switch (usType) {
@@ -105 +104 @@
     {
       /* Assume image is a 2.0 image and read as a 2.x header
-         OK for 1.x file - read will not fail unless file is corrupted
-      */
+         OK for 1.x file - read will not fail unless file is corrupted
+       */
       rc = fseek(pf, 0, SEEK_SET);
       if (rc) {
@@ -121 +120 @@
       is2x = pbmih2->cbFix > sizeof(BITMAPINFOHEADER);  // 1.x or 2.x bitmap
       /* We will read the color table later
-         Color table follows header but
-         location depends on the type of the bitmap (old vs new)
-         1.x header is fixed size
-         2.x header is variable sized, so offset must be calculated
-         cbFix contains actual size of BITMAPINFOHEADER2 in file
-      */
+         Color table follows header but
+         location depends on the type of the bitmap (old vs new)
+         1.x header is fixed size
+         2.x header is variable sized, so offset must be calculated
+         cbFix contains actual size of BITMAPINFOHEADER2 in file
+       */
       ulRGBOffset = is2x ? sizeof(*pbmfh2) - sizeof(*pbmih2) + pbmih2->cbFix :
-                           sizeof(BITMAPFILEHEADER);
+        sizeof(BITMAPFILEHEADER);
     }
     break;
@@ -135 +134 @@
     {
       /* Now we are dealing with a bitmap array which is a collection of bitmaps
-         Each bitmap has its own file header
-      */
+         Each bitmap has its own file header
+       */
 
       ULONG ulCurOffset;
@@ -149 +148 @@
 
       /* Scan the array and chose the bitmap best suited
-         for the current display size and color capacities
-      */
+         for the current display size and color capacities
+       */
       hdc = GpiQueryDevice(hPS);
       if (!hdc) {
@@ -157 +156 @@
         goto ExitLoadBMP;
       }
-      DevQueryCaps(hdc, CAPS_COLORS, 1, (PLONG)&ulDeviceColors);
-      DevQueryCaps(hdc, CAPS_WIDTH, 1, (PLONG)&clScreenWidth);
-      DevQueryCaps(hdc, CAPS_HEIGHT, 1, (PLONG)&clScreenHeight);
+      DevQueryCaps(hdc, CAPS_COLORS, 1, (PLONG) & ulDeviceColors);
+      DevQueryCaps(hdc, CAPS_WIDTH, 1, (PLONG) & clScreenWidth);
+      DevQueryCaps(hdc, CAPS_HEIGHT, 1, (PLONG) & clScreenHeight);
       pbmafh2->offNext = 0;
       do {
@@ -179 +178 @@
         }
         else {
-          ulColors = 1 << (((PBITMAPARRAYFILEHEADER)pbmafh2)->bfh.bmp.cBitCount *
-                           ((PBITMAPARRAYFILEHEADER)pbmafh2)->bfh.bmp.cPlanes);
+          ulColors =
+            1 << (((PBITMAPARRAYFILEHEADER) pbmafh2)->bfh.bmp.cBitCount *
+                  ((PBITMAPARRAYFILEHEADER) pbmafh2)->bfh.bmp.cPlanes);
         }
         if (pbmafh2->cxDisplay == 0 && pbmafh2->cyDisplay == 0) {
@@ -188 +188 @@
         }
         ulSizeDiff = abs(pbmafh2->cxDisplay - clScreenWidth) +
-                     abs(pbmafh2->cyDisplay - clScreenHeight);
+          abs(pbmafh2->cyDisplay - clScreenHeight);
         if (ulDeviceColors == ulColors && ulSizeDiff == 0) {
           // We found the perfect match
@@ -197 +197 @@
             ulSizeDiff < ulSizeDiffPicked ||    // Better fit than any previous
             (ulColors > ulColorsPicked && ulColors < ulDeviceColors) || // More colors than prev & less than device
-            (ulColors < ulColorsPicked && ulColors > ulDeviceColors))
-        {
+            (ulColors < ulColorsPicked && ulColors > ulDeviceColors)) {
           ulOffsetPicked = ulCurOffset; // Make this our current pick
           ulColorsPicked = ulColors;
@@ -219 +218 @@
       is2x = pbmih2->cbFix > sizeof(BITMAPINFOHEADER);
       /* As before, we calculate offset in file stream to color table
-         This code must match single bitmap logic
-      */
+         This code must match single bitmap logic
+       */
       ulRGBOffset = ulOffsetPicked;
-      ulRGBOffset += is2x ? sizeof(*pbmafh2) - sizeof(*pbmih2) + pbmih2->cbFix :
-                            sizeof(BITMAPARRAYFILEHEADER);
+      ulRGBOffset +=
+        is2x ? sizeof(*pbmafh2) - sizeof(*pbmih2) +
+        pbmih2->cbFix : sizeof(BITMAPARRAYFILEHEADER);
     }
     break;
@@ -246 +246 @@
        pbmih2->cclrUsed or pbmih2->cclrImportant are non zero
        fixme to test this
-    */
+     */
     if (pbmih2->cBitCount < 24) {
       ULONG ulRGBBytes;
+
       ulColors = 1L << pbmih2->cBitCount;
 
       if (ulColors > 256) {
-        Runtime_Error(pszSrcFile, __LINE__, "RGB exceeds 256 colors: %lu", ulColors);
+        Runtime_Error(pszSrcFile, __LINE__, "RGB exceeds 256 colors: %lu",
+                      ulColors);
         goto ExitLoadBMP;
       }
@@ -263 +265 @@
     }                                   // endif
     // Get pointer to bitmap info (header and color table)
-    pbmi2 = (PBITMAPINFO2)pbmih2;
+    pbmi2 = (PBITMAPINFO2) pbmih2;
   }
   else {
@@ -269 +271 @@
        Since the current standard format is the 2.0
        convert the header and color table to 2.x format
-    */
+     */
     ULONG ul;
     RGB rgb;
-    PBITMAPINFOHEADER pbmih = &((PBITMAPARRAYFILEHEADER)pbmafh2)->bfh.bmp;
+    PBITMAPINFOHEADER pbmih = &((PBITMAPARRAYFILEHEADER) pbmafh2)->bfh.bmp;
 
     if (pbmih->cBitCount < 24) {
       ulColors = 1 << pbmih->cBitCount;
       if (ulColors > 256) {
-        Runtime_Error(pszSrcFile, __LINE__, "RGB exceeds 256 colors: %lu", ulColors);
+        Runtime_Error(pszSrcFile, __LINE__, "RGB exceeds 256 colors: %lu",
+                      ulColors);
         goto ExitLoadBMP;
       }
@@ -287 +290 @@
         pbmi2->argbColor[ul].bBlue = rgb.bBlue;
         pbmi2->argbColor[ul].fcOptions = 0;     // initialize 2.x extra byte to 0
-      } // for
+      }                                 // for
     }
 
@@ -297 +300 @@
     pbmi2->cx = pbmih->cx;
     // set rest to zero
-    memset((PCHAR)pbmi2 + 16, 0, sizeof(BITMAPINFOHEADER2) - 16);
-  } // if 1.x
+    memset((PCHAR) pbmi2 + 16, 0, sizeof(BITMAPINFOHEADER2) - 16);
+  }                                     // if 1.x
 
   /* The 2.0 bitmap info structure set up
      Position to start of the bitmap data
-  */
+   */
   rc = fseek(pf, pbmfh2->offBits, SEEK_SET);
   if (rc) {
@@ -315 +318 @@
      After aligning it, we divide by 4 to get the number of bytes, and
      multiply by the number of scan lines and the number of pel planes
-  */
+   */
   if (pbmi2->ulCompression)
     ulDataSize = pbmi2->cbImage;