fix some warnings from -Wall

[chaz/openbox] / render / color.c

diff --git a/render/color.c b/render/color.c
index 491dc47ba1695d21a7cbe96a2be342bf7e789608..c53a366e9eb30cfb1de481ff64bf0db4b24f460e 100644 (file)
--- a/render/color.c
+++ b/render/color.c
@@ -49,7 +49,7 @@ RrColor *RrColorParse(const RrInstance *inst, gchar *colorname)
     xcol.pixel = 0;
     if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol)) {
         g_warning("unable to parse color '%s'", colorname);
-       return NULL;
+        return NULL;
     }
     return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8);
 }
@@ -154,7 +154,7 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
             data += im->width;
             p16 += im->bytes_per_line/2;
         }
-    break;
+        break;
     case 8:
         g_assert(RrVisual(inst)->class != TrueColor);
         for (y = 0; y < im->height; y++) {
@@ -163,12 +163,11 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
                                     data[x] >> RrDefaultRedOffset,
                                     data[x] >> RrDefaultGreenOffset,
                                     data[x] >> RrDefaultBlueOffset)->pixel;
+            }
+            data += im->width;
+            p8 += im->bytes_per_line;
         }
-        data += im->width;
-        p8 += im->bytes_per_line;
-  }
-
-    break;
+        break;
     default:
         g_warning("your bit depth is currently unhandled\n");
     }
@@ -204,9 +203,10 @@ static void swap_byte_order(XImage *im)
                 c[0] = c[1];
                 c[1] = t;
             case 8:
+            case 1:
                 break;
             default:
-                g_warning("your bit depth is currently unhandled");
+                g_warning("Your bit depth is currently unhandled");
             }
         }
         di += im->bytes_per_line;