From 005eb35ee810fbc1edc31a83f298866067be6ef9 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 19 Aug 2006 05:05:36 +0000
Subject: [PATCH] fix some warnings from -Wall

---
 openbox/action.c    |  1 +
 openbox/menuframe.c |  2 +-
 openbox/stacking.c  |  3 ++-
 render/font.c       |  3 ++-
 render/font.h       |  1 +
 render/image.c      | 31 -------------------------------
 render/render.c     |  6 +++---
 7 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/openbox/action.c b/openbox/action.c
index 05a9e640..c0195dd8 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -29,6 +29,7 @@
 #include "grab.h"
 #include "keyboard.h"
 #include "event.h"
+#include "dock.h"
 #include "config.h"
 #include "mainloop.h"
 
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 120f4c38..62a68ae9 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -23,6 +23,7 @@
 #include "screen.h"
 #include "grab.h"
 #include "openbox.h"
+#include "mainloop.h"
 #include "config.h"
 #include "render/theme.h"
 
@@ -189,7 +190,6 @@ void menu_frame_move(ObMenuFrame *self, gint x, gint y)
 void menu_frame_move_on_screen(ObMenuFrame *self)
 {
     Rect *a = NULL;
-    guint i;
     gint dx = 0, dy = 0;
     gint pos, half;
 
diff --git a/openbox/stacking.c b/openbox/stacking.c
index 714d2a1c..bedc10c8 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -56,11 +56,12 @@ void stacking_set_list()
 
 static void do_restack(GList *wins, GList *before)
 {
-    GList *it, *next;
+    GList *it;
     Window *win;
     gint i;
 
 #ifdef DEBUG
+    GList *next;
     /* pls only restack stuff in the same layer at a time */
     for (it = wins; it; it = next) {
         next = g_list_next(it);
diff --git a/render/font.c b/render/font.c
index 4d9e0adf..79a5b40d 100644
--- a/render/font.c
+++ b/render/font.c
@@ -291,8 +291,9 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     gint x,y,w,h;
     XftColor c;
     GString *text;
-    gint mw, mh;
+    gint mw;
 #ifndef USE_PANGO
+    gint mh;
     size_t l;
     gboolean shortened = FALSE;
 #else
diff --git a/render/font.h b/render/font.h
index f2997639..19417db2 100644
--- a/render/font.h
+++ b/render/font.h
@@ -23,6 +23,7 @@
 #include "geom.h"
 #ifdef USE_PANGO
 #include <pango/pango.h>
+#include <pango/pangoxft.h>
 #endif /* USE_PANGO */
 
 struct _RrFont {
diff --git a/render/image.c b/render/image.c
index 2c32cd12..8903ad38 100644
--- a/render/image.c
+++ b/render/image.c
@@ -26,37 +26,6 @@
 #define FLOOR(i)        ((i) & (~0UL << FRACTION))
 #define AVERAGE(a, b)   (((((a) ^ (b)) & 0xfefefefeL) >> 1) + ((a) & (b)))
 
-static RrPixel32* scale_half(RrPixel32 *source, gint w, gint h)
-{
-    RrPixel32 *out, *dest, *sourceline, *sourceline2;
-    gint dw, dh, x, y;
-
-    sourceline = source;
-    sourceline2 = source + w;
-
-    dw = w >> 1;
-    dh = h >> 1;
-
-    out = dest = g_new(RrPixel32, dw * dh);
-
-    for (y = 0; y < dh; ++y) {
-        RrPixel32 *s, *s2;
-
-        s = sourceline;
-        s2 = sourceline2;
-
-        for (x = 0; x < dw; ++x) {
-            *dest++ = AVERAGE(AVERAGE(*s, *(s+1)),
-                              AVERAGE(*s2, *(s2+1)));
-            s += 2;
-            s2 += 2;
-        }
-        sourceline += w << 1;
-        sourceline2 += w << 1;
-    }
-    return out;
-}
-
 static void ImageCopyResampled(RrPixel32 *dst, RrPixel32 *src,
                                gulong dstW, gulong dstH,
                                gulong srcW, gulong srcH)
diff --git a/render/render.c b/render/render.c
index e97f7855..5b6cb95f 100644
--- a/render/render.c
+++ b/render/render.c
@@ -375,9 +375,9 @@ void RrMinsize(RrAppearance *a, gint *w, gint *h)
 static void reverse_bits(gchar *c, gint n)
 {
     gint i;
-    for (i = 0; i < n; i++)
-        *c++ = (((*c * 0x0802UL & 0x22110UL) |
-                 (*c * 0x8020UL & 0x88440UL)) * 0x10101UL) >> 16;
+    for (i = 0; i < n; i++, *c++)
+        *c = (((*c * 0x0802UL & 0x22110UL) |
+               (*c * 0x8020UL & 0x88440UL)) * 0x10101UL) >> 16;
 }
 
 gboolean RrPixmapToRGBA(const RrInstance *inst,
-- 
2.39.2