diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/font.c | 3 | ||||
| -rw-r--r-- | render/font.h | 1 | ||||
| -rw-r--r-- | render/image.c | 31 | ||||
| -rw-r--r-- | render/render.c | 6 |
4 files changed, 6 insertions, 35 deletions
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, |