Mercurial > hg > dmlib

changeset 2133:898c1edadbc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 28 May 2019 10:35:26 +0300
parents 6528a1398e8e
children 5daed72fd211
files tools/lib64fmts.c
diffstat 1 files changed, 28 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/tools/lib64fmts.c	Tue May 28 10:32:12 2019 +0300
+++ b/tools/lib64fmts.c	Tue May 28 10:35:26 2019 +0300
@@ -302,8 +302,9 @@
         vshift = 6 - (rasterX & 6);
 
     return dmC64GetGenericMCPixel(col, img,
-        bmoffs, scroffs, vshift,
-        0, rasterX & 1, 0, img->bgcolor);
+        bmoffs, scroffs,
+        vshift, 0,
+        rasterX & 1, 0, img->bgcolor);
 }
 
 
@@ -521,8 +522,10 @@
 {
     DM_C64_GENERIC_MC_PIXEL_DEFS(img)
 
-    //return dmC64GetGenericMCPixel(   img, bmoffs, scroffs, vshift, rasterY & 7, bitmap, 0, img->bgcolor);
-    return dmC64GetGenericMCPixel(col, img, bmoffs, scroffs, vshift, rasterY & 7, 0, 0, img->bgcolor);
+    return dmC64GetGenericMCPixel(col, img,
+        bmoffs, scroffs,
+        vshift, rasterY & 7,
+        0, 0, img->bgcolor);
 }
 
 
@@ -617,8 +620,9 @@
         img->extraData[0].data[rasterY] : img->bgcolor;
 
     return dmC64GetGenericMCPixel(col, img,
-        bmoffs, scroffs, vshift, rasterY & 7, 0, 0,
-        bgcol & 15);
+        bmoffs, scroffs,
+        vshift, rasterY & 7,
+        0, 0, bgcol & 15);
 }
 
 
@@ -645,7 +649,9 @@
         vshift = 6 - (rasterX & 6);
 
     return dmC64GetGenericMCPixel(col, img,
-        bmoffs, scroffs, vshift, 0, rasterX & 1, 0, img->bgcolor);
+        bmoffs, scroffs,
+        vshift, 0,
+        rasterX & 1, 0, img->bgcolor);
 }
 
 
@@ -950,16 +956,17 @@
         yoffs = y * img->fmt->chWidth,
         bmoffs = yoffs * 8 + yb + (x * 8),
         scroffs = yoffs + x,
-        vshift = 6 - (rasterX & 6),
         bitmap = rasterX & 1,
-        vbank = yb + (bitmap * 8);
+        vbank = yb + (bitmap * 8),
+        vshift = 6 - (rasterX & 6);
 
     Uint8 bgcol = (unsigned) rasterY < img->extraData[0].size ?
         img->extraData[0].data[rasterY] : img->bgcolor;
 
     return dmC64GetGenericMCPixel(col, img,
-        bmoffs, scroffs, vshift,
-        vbank, bitmap, 0, bgcol & 15);
+        bmoffs, scroffs,
+        vshift, vbank,
+        bitmap, 0, bgcol & 15);
 }
 
 
@@ -970,9 +977,10 @@
     const int vbb = rasterY < 200 ? 0 : 1;
     const int vbank = (rasterY & 7) + (vbb * 8);
 
-    return dmC64GetGenericMCPixel(col,
-        img, bmoffs & 0x1fff, scroffs & 0x3ff,
-        vshift, vbank, vbb, 0, img->bgcolor);
+    return dmC64GetGenericMCPixel(col, img,
+        bmoffs & 0x1fff, scroffs & 0x3ff,
+        vshift, vbank,
+        vbb, 0, img->bgcolor);
 }
 
 
@@ -1013,7 +1021,8 @@
 
     return dmC64GetGenericMCPixel(col, img,
         bmoffs, scroffs,
-        vshift, vbank, 0, vbank, bgcol & 15);
+        vshift, vbank,
+        0, vbank, bgcol & 15);
 }
 
 
@@ -1021,7 +1030,10 @@
     const DMC64Image *img, const int rasterX, const int rasterY)
 {
     DM_C64_GENERIC_SC_PIXEL_DEFS(img)
-    return dmC64GetGenericSCPixel(col, img, bmoffs, scroffs, vshift, rasterY & 7, 0);
+
+    return dmC64GetGenericSCPixel(col, img,
+        bmoffs, scroffs,
+        vshift, rasterY & 7, 0);
 }