Mercurial > hg > dmlib

changeset 1919:f0225a52afce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 27 Jun 2018 19:09:25 +0300
parents ba88ff5e85ea
children be7492a121f0
files tools/lib64gfx.c
diffstat 1 files changed, 13 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/tools/lib64gfx.c	Wed Jun 27 19:09:07 2018 +0300
+++ b/tools/lib64gfx.c	Wed Jun 27 19:09:25 2018 +0300
@@ -1246,10 +1246,9 @@
         rwidth /= 2;
 
     // Perform conversion
-    Uint8 *dp = dst->data;
     for (int yc = 0; yc < src->height; yc++)
     {
-        Uint8 *d = dp;
+        Uint8 *dp = dst->data + (yc * dst->pitch);
         const int y = yc / 8, yb = yc & 7;
         const int scroffsy = y * src->chWidth;
 
@@ -1266,9 +1265,9 @@
                 const int v = 7 - (xc & 7);
 
                 if ((src->charData[0].data[chr * C64_CHR_SIZE + yb] >> v) & 1)
-                    *d++ = src->color[0].data[scroffs];
+                    *dp++ = src->color[0].data[scroffs];
                 else
-                    *d++ = src->bgcolor;
+                    *dp++ = src->bgcolor;
             }
             else
             // Multicolor variants
@@ -1284,19 +1283,19 @@
                     const int v = 6 - ((xc * 2) & 6);
                     switch ((src->charData[0].data[chr * C64_CHR_SIZE + yb] >> v) & 3)
                     {
-                        case 0: *d++ = src->bgcolor; break;
-                        case 1: *d++ = src->d022; break;
-                        case 2: *d++ = src->d023; break;
-                        case 3: *d++ = col;
+                        case 0: *dp++ = src->bgcolor; break;
+                        case 1: *dp++ = src->d022; break;
+                        case 2: *dp++ = src->d023; break;
+                        case 3: *dp++ = col;
                     }
                 }
                 else
                 {
                     const int v = 7 - (xc & 7);
                     if ((src->charData[0].data[chr * C64_CHR_SIZE + yb] >> v) & 1)
-                        *d++ = src->color[0].data[scroffs];
+                        *dp++ = src->color[0].data[scroffs];
                     else
-                        *d++ = src->bgcolor;
+                        *dp++ = src->bgcolor;
                 }
             }
         }
@@ -1314,7 +1313,7 @@
                 const int bmoffs = bmoffsy + (x * 8);
                 const int vshift = 7 - (xc & 7);
 
-                *d++ = getPixel(src, bmoffs, scroffs, vshift, 0, xc, yc);
+                *dp++ = getPixel(src, bmoffs, scroffs, vshift, 0, xc, yc);
             }
             else
             // Multicolor bitmap and variants
@@ -1330,8 +1329,8 @@
                     switch (src->laceType)
                     {
                         case D64_ILACE_RES:
-                            *d++ = getPixel(src, bmoffs, scroffs, vshift, 0, xc, yc);
-                            *d++ = getPixel(src, bmoffs, scroffs, vshift, 1, xc, yc);
+                            *dp++ = getPixel(src, bmoffs, scroffs, vshift, 0, xc, yc);
+                            *dp++ = getPixel(src, bmoffs, scroffs, vshift, 1, xc, yc);
                             break;
 
                         default:
@@ -1340,11 +1339,10 @@
                 }
                 else
                 {
-                    *d++ = getPixel(src, bmoffs, scroffs, vshift, 0, xc, yc);
+                    *dp++ = getPixel(src, bmoffs, scroffs, vshift, 0, xc, yc);
                 }
             }
         }
-        dp += dst->pitch;
     }
 
     return DMERR_OK;