mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
b=463872; fix qt backend cairo build; r=me
This commit is contained in:
parent
2bfaffb3eb
commit
ad77640a1e
@ -32,6 +32,8 @@ cairo-version-fixes.patch: fix up cairo-version.c/cairo-version.h for in-place b
|
||||
|
||||
win32-ddb-dib.patch: fix for bug 455513; not upstream yet pending feebdack
|
||||
|
||||
qpainter-type.patch: add SURFACE_TYPE_QPAINTER to cairo.h
|
||||
|
||||
==== pixman patches ====
|
||||
|
||||
endian.patch: include cairo-platform.h for endian macros
|
||||
|
@ -601,6 +601,8 @@ _cairo_qpainter_surface_clone_similar (void *abstract_surface,
|
||||
int src_y,
|
||||
int width,
|
||||
int height,
|
||||
int *clone_offset_x,
|
||||
int *clone_offset_y,
|
||||
cairo_surface_t **clone_out)
|
||||
{
|
||||
cairo_qpainter_surface_t *qs = (cairo_qpainter_surface_t *) abstract_surface;
|
||||
@ -643,6 +645,8 @@ _cairo_qpainter_surface_clone_similar (void *abstract_surface,
|
||||
new_surf = NULL;
|
||||
}
|
||||
|
||||
*clone_offset_x = 0;
|
||||
*clone_offset_y = 0;
|
||||
*clone_out = new_surf;
|
||||
return (cairo_status_t) status;
|
||||
}
|
||||
|
@ -1875,6 +1875,7 @@ cairo_surface_status (cairo_surface_t *surface);
|
||||
* @CAIRO_SURFACE_TYPE_OS2: The surface is of type os2
|
||||
* @CAIRO_SURFACE_TYPE_WIN32_PRINTING: The surface is a win32 printing surface
|
||||
* @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: The surface is of type quartz_image
|
||||
* @CAIRO_SURFACE_TYPE_QPAINTER: The surface is of type qpainter
|
||||
*
|
||||
* #cairo_surface_type_t is used to describe the type of a given
|
||||
* surface. The surface types are also known as "backends" or "surface
|
||||
@ -1913,7 +1914,8 @@ typedef enum _cairo_surface_type {
|
||||
CAIRO_SURFACE_TYPE_SVG,
|
||||
CAIRO_SURFACE_TYPE_OS2,
|
||||
CAIRO_SURFACE_TYPE_WIN32_PRINTING,
|
||||
CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
|
||||
CAIRO_SURFACE_TYPE_QUARTZ_IMAGE,
|
||||
CAIRO_SURFACE_TYPE_QPAINTER
|
||||
} cairo_surface_type_t;
|
||||
|
||||
cairo_public cairo_surface_type_t
|
||||
|
21
gfx/cairo/qpainter-type.patch
Normal file
21
gfx/cairo/qpainter-type.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff --git a/gfx/cairo/cairo/src/cairo.h b/gfx/cairo/cairo/src/cairo.h
|
||||
--- a/gfx/cairo/cairo/src/cairo.h
|
||||
+++ b/gfx/cairo/cairo/src/cairo.h
|
||||
@@ -1875,6 +1875,7 @@
|
||||
* @CAIRO_SURFACE_TYPE_OS2: The surface is of type os2
|
||||
* @CAIRO_SURFACE_TYPE_WIN32_PRINTING: The surface is a win32 printing surface
|
||||
* @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: The surface is of type quartz_image
|
||||
+ * @CAIRO_SURFACE_TYPE_QPAINTER: The surface is of type qpainter
|
||||
*
|
||||
* #cairo_surface_type_t is used to describe the type of a given
|
||||
* surface. The surface types are also known as "backends" or "surface
|
||||
@@ -1913,7 +1914,8 @@
|
||||
CAIRO_SURFACE_TYPE_SVG,
|
||||
CAIRO_SURFACE_TYPE_OS2,
|
||||
CAIRO_SURFACE_TYPE_WIN32_PRINTING,
|
||||
- CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
|
||||
+ CAIRO_SURFACE_TYPE_QUARTZ_IMAGE,
|
||||
+ CAIRO_SURFACE_TYPE_QPAINTER
|
||||
} cairo_surface_type_t;
|
||||
|
||||
cairo_public cairo_surface_type_t
|
Loading…
Reference in New Issue
Block a user