[lcd4linux @ 2004-06-19 08:20:19 by reinelt]

compiler warning in image driver fixed
bar bug in USBLCD driver fixed

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@475 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/drv_Image.c b/drv_Image.c
index c17e6ef102248c7b6581387b756f5292ffaa1507..3d5b08634df0f379e1c64313d4a8edf608824f89 100644 (file)
--- a/drv_Image.c
+++ b/drv_Image.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Image.c,v 1.5 2004/06/06 06:51:59 reinelt Exp $
+/* $Id: drv_Image.c,v 1.6 2004/06/19 08:20:19 reinelt Exp $
  *
  * new style Image (PPM/PNG) Driver for LCD4Linux 
  *
@@ -23,6 +23,11 @@
  *
  *
  * $Log: drv_Image.c,v $
+ * Revision 1.6  2004/06/19 08:20:19  reinelt
+ *
+ * compiler warning in image driver fixed
+ * bar bug in USBLCD driver fixed
+ *
  * Revision 1.5  2004/06/06 06:51:59  reinelt
  *
  * do not display end splash screen if quiet=1
@@ -301,16 +306,16 @@ static int drv_IMG_flush_PNG (void)
 static void drv_IMG_flush (void)
 {
   switch (Format) {
-#ifdef WITH_PPM
   case PPM:
+#ifdef WITH_PPM
     drv_IMG_flush_PPM();
-    break;
 #endif
-#ifdef WITH_PNG
+    break;
   case PNG:
+#ifdef WITH_PNG
     drv_IMG_flush_PNG();
-    break;
 #endif
+    break;
   }
 }
 

diff --git a/drv_USBLCD.c b/drv_USBLCD.c
index ec4d39d356483c716c5fb4ff9055859bd7a0d5ee..52355b60a01fdf4b3f8102d026d67bd3c9449e62 100644 (file)
--- a/drv_USBLCD.c
+++ b/drv_USBLCD.c
@@ -1,4 +1,4 @@
-/* $Id: drv_USBLCD.c,v 1.10 2004/06/06 06:51:59 reinelt Exp $
+/* $Id: drv_USBLCD.c,v 1.11 2004/06/19 08:20:19 reinelt Exp $
  *
  * new style driver for USBLCD displays
  *
@@ -26,6 +26,11 @@
  *
  *
  * $Log: drv_USBLCD.c,v $
+ * Revision 1.11  2004/06/19 08:20:19  reinelt
+ *
+ * compiler warning in image driver fixed
+ * bar bug in USBLCD driver fixed
+ *
  * Revision 1.10  2004/06/06 06:51:59  reinelt
  *
  * do not display end splash screen if quiet=1
@@ -178,7 +183,7 @@ static void drv_UL_defchar (int ascii, unsigned char *matrix)
   drv_UL_command (0x40|8*ascii);
 
   for (i = 0; i < 8; i++) {
-    if(*matrix == 0) *BufPtr++ = 0;
+    if ((*matrix & 0x1f) == 0) *BufPtr++ = 0;
     *BufPtr++ = *matrix++ & 0x1f;
   }