Revision 95:ef538bd687c0, committed 2015-07-07

Comitter:

WiredHome

Date:

Tue Jul 07 17:05:59 2015 +0000

Parent:

94:203729061e48

Child:

96:40b74dd3695b

Commit message:

Compiler cleanup - warning reductions.

Changed in this revision

--- a/GraphicsDisplay.cpp	Wed Mar 04 23:52:29 2015 +0000
+++ b/GraphicsDisplay.cpp	Tue Jul 07 17:05:59 2015 +0000
@@ -371,7 +371,7 @@
     uint8_t * lineBuffer = NULL;
     color_t * pixelBuffer = NULL;
     uint16_t BPP_t;
-    uint32_t PixelWidth, PixelHeight;
+    dim_t PixelWidth, PixelHeight;
     unsigned int    i, offset;
     int padd,j;
     #ifdef DEBUG

--- a/GraphicsDisplay.h	Wed Mar 04 23:52:29 2015 +0000
+++ b/GraphicsDisplay.h	Tue Jul 07 17:05:59 2015 +0000
@@ -203,7 +203,7 @@
     /// to the screen.
     ///
     /// @note the font data is in a special format as generate by
-    ///         the mikroe font creator. \\
+    ///         the mikroe font creator.
     ///         See http://www.mikroe.com/glcd-font-creator/
     ///
     /// @param[in] x is the horizontal pixel coordinate

--- a/RA8875.cpp	Wed Mar 04 23:52:29 2015 +0000
+++ b/RA8875.cpp	Tue Jul 07 17:05:59 2015 +0000
@@ -1675,21 +1675,21 @@
 
         // Be optimistic - don't check for errors.
         HexDump("BMP_Header", (uint8_t *)&BMP_Header, sizeof(BMP_Header));
-        size_t r = fwrite(&BMP_Header, sizeof(char), sizeof(BMP_Header), Image);
+        fwrite(&BMP_Header, sizeof(char), sizeof(BMP_Header), Image);
 
         HexDump("BMP_Info", (uint8_t *)&BMP_Info, sizeof(BMP_Info));
-        r = fwrite(&BMP_Info, sizeof(char), sizeof(BMP_Info), Image);
+        fwrite(&BMP_Info, sizeof(char), sizeof(BMP_Info), Image);
 
-        color_t transparency = GetBackgroundTransparencyColor();
-        unsigned char ltpr0 = ReadCommand(0x52) & 0x7;
+        //color_t transparency = GetBackgroundTransparencyColor();
+        LayerMode_T ltpr0 = GetLayerMode();
 
         uint16_t prevLayer = GetDrawingLayer();
         // If only one of the layers is visible, select that layer
         switch(ltpr0) {
-            case 0:
+            case ShowLayer0:
                 SelectDrawingLayer(0);
                 break;
-            case 1:
+            case ShowLayer1:
                 SelectDrawingLayer(1);
                 break;
             default:
@@ -1741,8 +1741,9 @@
                         break;
                 }
             }
-            if (j == h - 1)
+            if (j == h - 1) {
                 HexDump("Line", lineBuffer, lineBufSize);
+            }
             // Write to disk
             fwrite(lineBuffer, sizeof(char), lb, Image);
         }