Diff: GraphicsDisplay.cpp

Revision:

55:dfbabef7003e

Parent:

42:7cbdfd2bbfc5

Child:

59:fb40aad4efd4

diff -r e117ad10fba6 -r dfbabef7003e GraphicsDisplay.cpp
--- a/GraphicsDisplay.cpp	Sun Mar 23 17:35:14 2014 +0000
+++ b/GraphicsDisplay.cpp	Sun Mar 30 23:37:41 2014 +0000
@@ -233,7 +233,7 @@
     window(0,0, width(),height());
 }
 
-RetCode_t GraphicsDisplay::putp(color_t color)
+RetCode_t GraphicsDisplay::_putp(color_t color)
 {
     pixel(_x, _y, color);
     // update pixel location based on window settings
@@ -264,7 +264,7 @@
     window(x, y, w, h);
     _StartGraphicsStream();
     for (int i=0; i<w*h; i++) {
-        putp(color[i]);
+        _putp(color[i]);
     }
     _EndGraphicsStream();
     WindowMax();
@@ -287,7 +287,7 @@
         if (offset == 0)
             INFO(" %2d = %02X", i>>3, byte);
         int c = ((byte << offset) & 0x80) ? _foreground : _background;
-        putp(c);
+        _putp(c);
     }
     _EndGraphicsStream();
     WindowMax();
@@ -320,7 +320,7 @@
             color_t c = (byte & bitmask) ? _foreground : _background;
             //INFO("(%2d,%2d) %02X & %02X => %04X [%04X,%04X]", px, py, byte, bitmask, c, _foreground, _background);
             //pixel(x+px, y+py, c);
-            putp(c);
+            _putp(c);
         }
     }
     _EndGraphicsStream();
@@ -542,13 +542,13 @@
                     dPix >>= 4;
                 dPix &= 0x0F;
                 pixelBuffer[i] = RGBQuadToRGB16(colorPalette, dPix);
-                //putp(RGBQuadToRGB16(colorPalette, dPix));
+                //_putp(RGBQuadToRGB16(colorPalette, dPix));
             } else if (BPP_t == 8) {
                 pixelBuffer[i] = RGBQuadToRGB16(colorPalette, lineBuffer[i]);
-                //putp(RGBQuadToRGB16(colorPalette, lineBuffer[i]));
+                //_putp(RGBQuadToRGB16(colorPalette, lineBuffer[i]));
             } else if (BPP_t == 16) {
                 pixelBuffer[i] = lineBuffer[i];
-                //putp(lineBuffer[i]);
+                //_putp(lineBuffer[i]);
             } else if (BPP_t == 24) {
                 color_t color;
                 color = RGB(lineBuffer[i*3+2], lineBuffer[i*3+1], lineBuffer[i*3+0]);