Diff: abstractarduboy.cpp

Revision:

4:63cfe7ff1c02

Parent:

3:df305b314063

Child:

7:fb7e549d1cf6

--- a/abstractarduboy.cpp	Sat Jan 07 12:43:36 2017 +0000
+++ b/abstractarduboy.cpp	Sat Jan 07 20:37:11 2017 +0000
@@ -445,12 +445,12 @@
         if (iCol + x > (WIDTH - 1)) break;
         if (iCol + x >= 0) {
           if (bRow >= 0) {
-            if (color) this->sBuffer[ (bRow * WIDTH) + x + iCol  ]  |= pgm_read_byte(bitmap + (a * w) + iCol) << yOffset;
-            else this->sBuffer[ (bRow * WIDTH) + x + iCol  ]  &= ~(pgm_read_byte(bitmap + (a * w) + iCol) << yOffset);
+            if (color) this->sBuffer[ (bRow * WIDTH) + x + iCol  ]  |= bitmap[ (a * w) + iCol] << yOffset;
+            else this->sBuffer[ (bRow * WIDTH) + x + iCol  ]  &= ~(bitmap[(a * w) + iCol] << yOffset);
           }
           if (yOffset && bRow < (HEIGHT / 8) - 1 && bRow > -2) {
-            if (color) this->sBuffer[ ((bRow + 1)*WIDTH) + x + iCol  ] |= pgm_read_byte(bitmap + (a * w) + iCol) >> (8 - yOffset);
-            else this->sBuffer[ ((bRow + 1)*WIDTH) + x + iCol  ] &= ~(pgm_read_byte(bitmap + (a * w) + iCol) >> (8 - yOffset));
+            if (color) this->sBuffer[ ((bRow + 1)*WIDTH) + x + iCol  ] |= bitmap[(a * w) + iCol] >> (8 - yOffset);
+            else this->sBuffer[ ((bRow + 1)*WIDTH) + x + iCol  ] &= (~bitmap[(a * w) + iCol] >> (8 - yOffset));
           }
         }
       }