Author: tom
Date: Mon Dec 22 21:03:39 2008
New Revision: 3615
URL: http://svn.slimdevices.com?rev=3615&root=Jive&view=rev
Log:
removed printfs
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/files/layoutcontext.patch
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/files/layoutcontext.patch
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/files/layoutcontext.patch?rev=3615&root=Jive&r1=3614&r2=3615&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/files/layoutcontext.patch
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/files/layoutcontext.patch
Mon Dec 22 21:03:39 2008
@@ -1,5 +1,5 @@
---- SDL_Pango-0.1.2/src/SDL_Pango.c 2008-12-22 23:36:04.000000000 -0500
-+++ SDL_Pango_0.2.1/src/SDL_Pango.c 2008-12-22 18:40:27.000000000 -0500
+--- SDL_Pango-0.1.2/src/SDL_Pango.c 2008-12-23 00:00:57.000000000 -0500
++++ SDL_Pango-0.1.2/src/SDL_Pango.c 2008-12-22 23:56:02.000000000 -0500
@@ -372,8 +372,9 @@
return IS_INITIALIZED;
}
@@ -115,15 +115,7 @@
GSList *tmp_list = line->runs;
PangoColor fg_color, bg_color;
PangoRectangle logical_rect;
-@@ -507,6 +553,7 @@
-
- risen_y = y + baseline - PANGO_PIXELS (rise);
-
-+ fprintf(stderr, "risen_y:%d, rise\n", risen_y, rise);
- if(fg_set) {
- color_matrix.m[0][1] = (Uint8)(fg_color.red >> 8);
- color_matrix.m[1][1] = (Uint8)(fg_color.green >> 8);
-@@ -527,6 +574,13 @@
+@@ -527,6 +573,13 @@
}
if(! shape_set) {
@@ -137,7 +129,7 @@
if (uline == PANGO_UNDERLINE_NONE)
pango_glyph_string_extents (run->glyphs,
run->item->analysis.font,
NULL, &logical_rect);
-@@ -539,16 +593,21 @@
+@@ -539,16 +592,21 @@
d_rect.x = (Uint16)(x + PANGO_PIXELS (x_off));
d_rect.y = (Uint16)(risen_y - baseline);
@@ -163,7 +155,7 @@
}
switch (uline) {
case PANGO_UNDERLINE_NONE:
-@@ -607,6 +666,30 @@
+@@ -607,6 +665,30 @@
}
/*!
@@ -194,7 +186,7 @@
Innter function of Pango. Stolen from GDK.
@param *item [in] The item to get property
-@@ -890,15 +973,22 @@
+@@ -890,15 +972,22 @@
@param *context [in] Context
@return A newly created surface
*/
@@ -220,7 +212,7 @@
width = PANGO_PIXELS (logical_rect.width);
height = PANGO_PIXELS (logical_rect.height);
if(width < context->min_width)
-@@ -918,12 +1008,25 @@
+@@ -918,12 +1007,25 @@
}
@@ -247,7 +239,7 @@
Draw text on a existing surface.
@param *context [in] Context
-@@ -937,6 +1040,34 @@
+@@ -937,6 +1039,34 @@
SDL_Surface *surface,
int x, int y)
{
@@ -282,11 +274,9 @@
PangoLayoutIter *iter;
PangoRectangle logical_rect;
int width, height;
-@@ -945,22 +1076,28 @@
- SDL_SetError("surface is NULL");
+@@ -946,9 +1076,9 @@
return;
}
-+// fprintf(stderr, "layout lines:%d\n",
pango_layout_get_line_count(layout));
- iter = pango_layout_get_iter (context->layout);
+ iter = pango_layout_get_iter (layout);
@@ -296,8 +286,7 @@
width = PANGO_PIXELS (logical_rect.width);
height = PANGO_PIXELS (logical_rect.height);
-+// fprintf(stderr, "SDLPango_Draw w:%d h:%d\n", width, height);
- if (width && height) {
+@@ -956,11 +1086,15 @@
SDL_FillRect(surface, NULL, SDL_MapRGBA(surface->format, 0, 0, 0, 0));
}
@@ -317,7 +306,7 @@
}
do {
-@@ -972,14 +1109,15 @@
+@@ -972,14 +1106,15 @@
pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
baseline = pango_layout_iter_get_baseline (iter);
@@ -335,7 +324,7 @@
} while (pango_layout_iter_next_line (iter));
pango_layout_iter_free (iter);
-@@ -1264,3 +1402,15 @@
+@@ -1264,3 +1399,15 @@
{
return context->layout;
}
@@ -351,8 +340,8 @@
+{
+ return pango_layout_new(context->context);
+}
---- SDL_Pango-0.1.2/src/SDL_Pango.h 2008-12-22 23:36:04.000000000 -0500
-+++ SDL_Pango-0.1.3/src/SDL_Pango.h 2008-12-22 18:19:35.000000000 -0500
+--- SDL_Pango-0.1.2/src/SDL_Pango.h 2008-12-23 00:00:56.000000000 -0500
++++ SDL_Pango-0.1.2/src/SDL_Pango.h 2008-12-22 18:19:35.000000000 -0500
@@ -47,6 +47,12 @@
Uint8 m[4][4]; /*! Matrix variables */
} SDLPango_Matrix;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
