host-tools/rendering/patches/0015-Introduce-the-pitch-set-it-and-set-the-width.patch

   1 From c21dca6ce3fcdb0f721efe75e5ab8c3be9e449c8 Mon Sep 17 00:00:00 2001
   2 From: Holger Hans Peter Freyther <zecke@selfish.org>
   3 Date: Thu, 5 Mar 2009 19:09:25 +0800
   4 Subject: [PATCH] Introduce the pitch, set it, and set the width...
   5
   6 ---
   7  WebCore/platform/graphics/gtk/FontGtk.cpp |    3 ++-
   8  WebKit/gtk/webkit/webkitwebview.h         |    1 +
   9  WebKitTools/GtkLauncher/main.c            |    2 ++
  10  3 files changed, 5 insertions(+), 1 deletions(-)
  11
  12 diff --git a/WebCore/platform/graphics/gtk/FontGtk.cpp b/WebCore/platform/graphics/gtk/FontGtk.cpp
  13 index 5ee6f88..fe210e5 100644
  14 --- a/WebCore/platform/graphics/gtk/FontGtk.cpp
  15 +++ b/WebCore/platform/graphics/gtk/FontGtk.cpp
  16 @@ -333,8 +333,9 @@ webkit_ft2_renderer_draw_glyph (PangoRenderer *renderer,
  17      glyph->face_and_config = pango_font_description_to_string(description);
  18      glyph->advance_x = rendered_glyph->advance_x;
  19      glyph->advance_y = rendered_glyph->advance_y;
  20 -    glyph->glyph_width  = rendered_glyph->bitmap.pitch;
  21 +    glyph->glyph_width  = rendered_glyph->bitmap.width;
  22      glyph->glyph_height = rendered_glyph->bitmap.rows;
  23 +    glyph->glyph_pitch = rendered_glyph->bitmap.pitch;
  24      glyph->bitmap_left_bearing = rendered_glyph->bitmap_left;
  25      glyph->bitmap_top_bearing = rendered_glyph->bitmap_top;
  26      glyph->bitmap = rendered_glyph->bitmap.buffer;
  27 diff --git a/WebKit/gtk/webkit/webkitwebview.h b/WebKit/gtk/webkit/webkitwebview.h
  28 index 1044db4..58f9ee1 100644
  29 --- a/WebKit/gtk/webkit/webkitwebview.h
  30 +++ b/WebKit/gtk/webkit/webkitwebview.h
  31 @@ -318,6 +318,7 @@ typedef struct _WebKitGlyph {
  32      int bitmap_top_bearing;
  33      int glyph_width;
  34      int glyph_height;
  35 +    int glyph_pitch;
  36      guchar* bitmap;
  37
  38      /* The actual occurence of the above glyph */
  39 diff --git a/WebKitTools/GtkLauncher/main.c b/WebKitTools/GtkLauncher/main.c
  40 index 8b74e3a..fe25f33 100644
  41 --- a/WebKitTools/GtkLauncher/main.c
  42 +++ b/WebKitTools/GtkLauncher/main.c
  43 @@ -27,6 +27,8 @@
  44  #include <gtk/gtk.h>
  45  #include <webkit/webkit.h>
  46
  47 +#include <string.h>
  48 +
  49  static GtkWidget* main_window;
  50  static GtkWidget* uri_entry;
  51  static GtkStatusbar* main_statusbar;
  52 --
  53 1.5.6.3
  54