Mercurial > hg > dmlib

diff tools/lib64fmts.c @ 2121:f12ac487954b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename the "shift" variable/function argument used for bitshift of c64 bitmap/char pixels.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 27 May 2019 00:04:02 +0300
parents 88d37ec1b4d6
children 56d4dc81774b
line wrap: on
line diff
--- a/tools/lib64fmts.c	Sun May 26 18:40:45 2019 +0300
+++ b/tools/lib64fmts.c	Mon May 27 00:04:02 2019 +0300
@@ -476,10 +476,10 @@
 
 static Uint8 fmtGetPixelFLIDesigner(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     (void) rasterX;
-    return dmC64GetGenericMCPixel(img, bmoffs, scroffs, shift, rasterY & 7, bitmap, 0, img->bgcolor);
+    return dmC64GetGenericMCPixel(img, bmoffs, scroffs, shiftX, rasterY & 7, bitmap, 0, img->bgcolor);
 }
 
 
@@ -567,13 +567,13 @@
 
 static Uint8 fmtGetPixelBlackMailFLI(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     const int vbank = rasterY & 7;
     (void) rasterX;
 
     return dmC64GetGenericMCPixel(
-        img, bmoffs, scroffs, shift,
+        img, bmoffs, scroffs, shiftX,
         vbank, bitmap, 0,
         img->extraData[0].data[rasterY] & 15);
 }
@@ -592,11 +592,11 @@
 
 static Uint8 fmtGetPixelTruePaint(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     (void) rasterX;
     (void) rasterY;
-    return dmC64GetGenericMCPixel(img, bmoffs, scroffs, shift, 0, bitmap, 0, img->bgcolor);
+    return dmC64GetGenericMCPixel(img, bmoffs, scroffs, shiftX, 0, bitmap, 0, img->bgcolor);
 }
 
 
@@ -893,13 +893,13 @@
 
 static Uint8 fmtGetPixelFunPaint2(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     const int vbank = (rasterY & 7) + (bitmap * 8);
     (void) rasterX;
 
     return dmC64GetGenericMCPixel(
-        img, bmoffs, scroffs, shift,
+        img, bmoffs, scroffs, shiftX,
         vbank, bitmap, 0,
         img->extraData[0].data[rasterY] & 15);
 }
@@ -907,7 +907,7 @@
 
 static Uint8 fmtGetPixelBFLI(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     const int vbb = rasterY < 200 ? 0 : 1;
     const int vbank = (rasterY & 7) + (vbb * 8);
@@ -916,13 +916,13 @@
 
     return dmC64GetGenericMCPixel(
         img, bmoffs & 0x1fff, scroffs & 0x3ff,
-        shift, vbank, vbb, 0, img->bgcolor);
+        shiftX, vbank, vbb, 0, img->bgcolor);
 }
 
 
 static Uint8 fmtGetPixelPentelPaint(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     const int ry = rasterY / C64_SPR_HEIGHT_PX;
     const int yd = rasterY % C64_SPR_HEIGHT_PX;
@@ -931,7 +931,7 @@
     const int offs = (ry * 8 + rx) * C64_SPR_SIZE + (yd * C64_SPR_WIDTH_UT) + (xd / 8);
     const int mask = 1 << (7 - (rasterX & 7));
 
-    Uint8 color1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shift, 0, bitmap, 0);
+    Uint8 color1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, 0, bitmap, 0);
     Uint8 color2 = img->extraData[0].data[offs] & mask ? 0x0f : 0;
     Uint8 color3 = img->extraData[0].data[offs + C64_SPR_SIZE * 155] & mask ? img->d022 : 0;
 
@@ -941,7 +941,7 @@
 
 static Uint8 fmtGetPixelHCB(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     const int vbank = (rasterY / 4) & 1;
     (void) bitmap;
@@ -949,17 +949,17 @@
 
     return dmC64GetGenericMCPixel(
         img, bmoffs, scroffs,
-        shift, vbank, 0, vbank,
+        shiftX, vbank, 0, vbank,
         img->extraData[0].data[rasterY / 5] & 15);
 }
 
 
 static Uint8 fmtGetPixelCrestHIFLIorCDHM(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     (void) rasterX;
-    return dmC64GetGenericSCPixel(img, bmoffs, scroffs, shift, rasterY & 7, bitmap, 0);
+    return dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, rasterY & 7, bitmap, 0);
 }
 
 
@@ -976,12 +976,12 @@
 
 static Uint8 fmtGetPixelECI(
     const DMC64Image *img, const int bmoffs, const int scroffs,
-    const int shift, const int bitmap, const int rasterX, const int rasterY)
+    const int shiftX, const int bitmap, const int rasterX, const int rasterY)
 {
     const int vbank = rasterY & 7;
     Uint8
-        c1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shift, vbank    , 0, 0),
-        c2 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shift, vbank + 8, 1, 0);
+        c1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, vbank    , 0, 0),
+        c2 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, vbank + 8, 1, 0);
 
     (void) bitmap;
     (void) rasterX;