-diff -x xine-config -x 'configure.h*' -x config.guess -x config.sub -x configure -x SlackBuild -x '*.m4' -x ltmain.sh -x libtool -x Makefile -x Makefile.in -ru xine-lib-1-2-767ccb7795a2/include/xine/buffer.h ../xine-lib-1-2-767ccb7795a2/include/xine/buffer.h
+diff -x xine-config -x configure.ac -x 'configure.h*' -x config.guess -x config.sub -x configure -x SlackBuild -x '*.m4' -x ltmain.sh -x libtool -x Makefile -x Makefile.in -ru xine-lib-1-2-767ccb7795a2/include/xine/buffer.h ../xine-lib-1-2-767ccb7795a2/include/xine/buffer.h
 --- xine-lib-1-2-767ccb7795a2/include/xine/buffer.h	2008-07-17 16:50:59.000000000 +0100
 +++ ../xine-lib-1-2-767ccb7795a2/include/xine/buffer.h	2008-07-22 21:56:36.000000000 +0100
 @@ -284,6 +284,7 @@

+  if (palette>=0) {
+    this->osd_renderer->render_text(this->osd,x,y,glyph,palette);
+  }
+  this->osd_renderer->get_text_size(this->osd,glyph,w,h);
+}
+
+static void xinekate_render_l2r(xinekate_decoder_item_t *this,int x,int y,const char *text,int palette,size_t len0,int *w,int *h)

+        if (bitmap->palette>=0) pal=this->decoder->ki.palettes[bitmap->palette];
+      }
+      if (pal) {
+        kate_bitmap *scaled_bitmap;
+        const kate_bitmap *drawn_bitmap;
+        int x=this->x0, y=this->y0;
+        int frame_width = this->decoder->master->cached_width;
+        int frame_height = this->decoder->master->cached_height;
+        xinekate_setup_bitmap(this, bitmap, pal);
+        scaled_bitmap = xinekate_apply_scaling(this, bitmap);
+        drawn_bitmap = scaled_bitmap ? scaled_bitmap : bitmap;
+        if (x+drawn_bitmap->width>=frame_width) x=frame_width-drawn_bitmap->width-1;
+        if (y+drawn_bitmap->height>=frame_height) y=frame_height-drawn_bitmap->height-1;
+        if (x<0) x=0;
+        if (y<0) y=0;
+        this->osd_renderer->draw_bitmap (this->osd, drawn_bitmap->pixels,
+            x, y, drawn_bitmap->width, drawn_bitmap->height,
+            temp_bitmap_mapping);
+        if (scaled_bitmap) {
+          free(scaled_bitmap->pixels);
+          free(scaled_bitmap);
+        }
+      }
+      else {
+        lprintf("No palette to display bitmap, not drawing bitmap\n");
