fix some warnings from -Wall
Mikael Magnusson mikachu@comhem.se
7 files changed,
10 insertions(+),
37 deletions(-)
M
openbox/action.c
→
openbox/action.c
@@ -29,6 +29,7 @@ #include "openbox.h"
#include "grab.h" #include "keyboard.h" #include "event.h" +#include "dock.h" #include "config.h" #include "mainloop.h"
M
openbox/stacking.c
→
openbox/stacking.c
@@ -56,11 +56,12 @@ }
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);
M
render/font.c
→
render/font.c
@@ -291,8 +291,9 @@ {
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
M
render/font.h
→
render/font.h
@@ -23,6 +23,7 @@ #include "render.h"
#include "geom.h" #ifdef USE_PANGO #include <pango/pango.h> +#include <pango/pangoxft.h> #endif /* USE_PANGO */ struct _RrFont {
M
render/image.c
→
render/image.c
@@ -26,37 +26,6 @@ #define FRACTION 12
#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)
M
render/render.c
→
render/render.c
@@ -375,9 +375,9 @@
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,