wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

b=419715, upgrade cairo to 1.6 or as-close-as-possible -- add patch to fix cairo bustage ; r=me

Browse Source
This commit is contained in:
vladimir@pobox.com 2008-04-06 22:09:53 -07:00
parent 7439270a65
commit b768ba704e
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/cairo/README
View File

@ -27,6 +27,8 @@ nonfatal-assertions.patch: Make assertions non-fatal
buggy-repeat.patch: Unconditionally turn on buggy-repeat handling to bandaid bug 413583.
rollback-731e121.patch: roll back 731e121; causes bugs
==== pixman patches ====
endian.patch: include cairo-platform.h for endian macros

22
gfx/cairo/cairo/src/cairo-pattern.c
View File

@ -1994,28 +1994,6 @@ _cairo_pattern_get_extents (cairo_pattern_t *pattern,
x2 = x1 + surface_extents.width;
y2 = y1 + surface_extents.height;
/* The filter can effectively enlarge the extents of the
* pattern, so extend as necessary. Note: We aren't doing any
* backend-specific querying of filter box sizes at this time,
* (since currently no specific backends that could do custom
* filters are calling _cairo_pattern_get_extents). */
switch (pattern->filter) {
case CAIRO_FILTER_GOOD:
case CAIRO_FILTER_BEST:
case CAIRO_FILTER_BILINEAR:
x1 -= 0.5;
y1 -= 0.5;
x2 += 0.5;
y2 += 0.5;
break;
case CAIRO_FILTER_FAST:
case CAIRO_FILTER_NEAREST:
case CAIRO_FILTER_GAUSSIAN:
default:
/* Nothing to do */
break;
}
imatrix = pattern->matrix;
status = cairo_matrix_invert (&imatrix);
/* cairo_pattern_set_matrix ensures the matrix is invertible */

32
gfx/cairo/rollback-731e121.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/gfx/cairo/cairo/src/cairo-pattern.c b/gfx/cairo/cairo/src/cairo-pattern.c
--- a/gfx/cairo/cairo/src/cairo-pattern.c
+++ b/gfx/cairo/cairo/src/cairo-pattern.c
@@ -1994,28 +1994,6 @@
x2 = x1 + surface_extents.width;
y2 = y1 + surface_extents.height;
- /* The filter can effectively enlarge the extents of the
- * pattern, so extend as necessary. Note: We aren't doing any
- * backend-specific querying of filter box sizes at this time,
- * (since currently no specific backends that could do custom
- * filters are calling _cairo_pattern_get_extents). */
- switch (pattern->filter) {
- case CAIRO_FILTER_GOOD:
- case CAIRO_FILTER_BEST:
- case CAIRO_FILTER_BILINEAR:
- x1 -= 0.5;
- y1 -= 0.5;
- x2 += 0.5;
- y2 += 0.5;
- break;
- case CAIRO_FILTER_FAST:
- case CAIRO_FILTER_NEAREST:
- case CAIRO_FILTER_GAUSSIAN:
- default:
- /* Nothing to do */
- break;
- }
-
imatrix = pattern->matrix;
status = cairo_matrix_invert (&imatrix);
/* cairo_pattern_set_matrix ensures the matrix is invertible */