AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid overflow when converting coordinates to Pango units. (#332266, Jody

Browse Source 
2007-01-05  Behdad Esfahbod  <behdad@gnome.org>

        * gdk/gdkprivate.h:
        * gdk/gdkpango.c (gdk_draw_layout_line_with_colors),
        (gdk_draw_layout_with_colors):
        * gdk/gdkwindow.c (gdk_window_draw_glyphs_transformed):
        Avoid overflow when converting coordinates to Pango units. (#332266,
        Jody Goldberg)


svn path=/trunk/; revision=17075
This commit is contained in:
Behdad Esfahbod 2007-01-05 06:16:32 +00:00 committed by Behdad Esfahbod
parent d6e4485f9f
commit b4328913d8
4 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-01-05 Behdad Esfahbod <behdad@gnome.org>
* gdk/gdkprivate.h:
* gdk/gdkpango.c (gdk_draw_layout_line_with_colors),
(gdk_draw_layout_with_colors):
* gdk/gdkwindow.c (gdk_window_draw_glyphs_transformed):
Avoid overflow when converting coordinates to Pango units. (#332266,
Jody Goldberg)
2007-01-04 Matthias Clasen <mclasen@redhat.com> 2007-01-04 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c (gtk_combo_box_popup): move set_cursor * gtk/gtkcombobox.c (gtk_combo_box_popup): move set_cursor

28
gdk/gdkpango.c
View File

@ -844,8 +844,22 @@ gdk_draw_layout_line_with_colors (GdkDrawable *drawable,
PangoMatrix tmp_matrix; PangoMatrix tmp_matrix;
tmp_matrix = *matrix; tmp_matrix = *matrix;
tmp_matrix.x0 = x; tmp_matrix.x0 += x;
tmp_matrix.y0 = y; tmp_matrix.y0 += y;
pango_renderer_set_matrix (renderer, &tmp_matrix);
x = 0;
y = 0;
}
/* Fall back to introduce a matrix if the coords would scale out of range.
* The x and y here will be added to in-layout coordinates. So we cannot
* support the entire range here safely. So, we just accept the middle half
* and use fallback for the rest. */
else if (GDK_PANGO_UNITS_OVERFLOWS (x, y))
{
PangoMatrix tmp_matrix = PANGO_MATRIX_INIT;
tmp_matrix.x0 += x;
tmp_matrix.y0 += y;
pango_renderer_set_matrix (renderer, &tmp_matrix); pango_renderer_set_matrix (renderer, &tmp_matrix);
x = 0; x = 0;
@ -965,6 +979,16 @@ gdk_draw_layout_with_colors (GdkDrawable *drawable,
tmp_matrix.y0 += y - rect.y; tmp_matrix.y0 += y - rect.y;
pango_renderer_set_matrix (renderer, &tmp_matrix); pango_renderer_set_matrix (renderer, &tmp_matrix);
x = 0;
y = 0;
}
else if (GDK_PANGO_UNITS_OVERFLOWS (x, y))
{
PangoMatrix tmp_matrix = PANGO_MATRIX_INIT;
tmp_matrix.x0 = x;
tmp_matrix.y0 = y;
pango_renderer_set_matrix (renderer, &tmp_matrix);
x = 0; x = 0;
y = 0; y = 0;
} }

10
gdk/gdkprivate.h
View File

@ -50,6 +50,16 @@ void gdk_synthesize_window_state (GdkWindow *window,
GdkWindowState unset_flags, GdkWindowState unset_flags,
GdkWindowState set_flags); GdkWindowState set_flags);
/* Tests whether a pair of x,y may cause overflows when converted to Pango
* units (multiplied by PANGO_SCALE). We don't allow the entire range, leave
* some space for additions afterwards, to be safe...
*/
#define GDK_PANGO_UNITS_OVERFLOWS(x,y) (G_UNLIKELY ( \
(y) >= PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
(x) >= PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
(y) <=-PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
(x) <=-PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2))
G_END_DECLS G_END_DECLS
#endif /* __GDK_PRIVATE_H__ */ #endif /* __GDK_PRIVATE_H__ */

9
gdk/gdkwindow.c
View File

@ -1737,6 +1737,15 @@ gdk_window_draw_glyphs_transformed (GdkDrawable *drawable,
tmp_matrix.y0 -= y_offset; tmp_matrix.y0 -= y_offset;
matrix = &tmp_matrix; matrix = &tmp_matrix;
} }
else if (GDK_PANGO_UNITS_OVERFLOWS (x_offset, y_offset))
{
PangoMatrix identity = PANGO_MATRIX_INIT;
tmp_matrix = identity;
tmp_matrix.x0 -= x_offset;
tmp_matrix.y0 -= y_offset;
matrix = &tmp_matrix;
}
else else
{ {
x -= x_offset * PANGO_SCALE; x -= x_offset * PANGO_SCALE;