fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-23 14:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

From: J. Ali Harlow" <ali@avrc.city.ac.uk> Reviewed by: Vladimir Vukicevic <vladimirv@gmail.com>

Browse source 
Update win32 backend to match current API, so it actually builds once again.
This commit is contained in:
Carl Worth 2005-06-25 02:00:17 +00:00
parent 64d5b34a98
commit 13a27d19d4
3 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ChangeLog
View file

@ -1,3 +1,25 @@
2005-06-25 Carl Worth <cworth@cworth.org>
From: J. Ali Harlow" <ali@avrc.city.ac.uk>
Reviewed by: Vladimir Vukicevic <vladimirv@gmail.com>
* test/Makefile.am:
* src/cairo-win32-surface.c: (_cairo_win32_surface_create_for_dc),
(_cairo_win32_surface_create_similar),
(_cairo_win32_surface_create_dib),
(_cairo_win32_surface_composite), (categorize_solid_dest_operator),
(_cairo_win32_surface_set_clip_region): Update win32 backend to
match current API, so it actually builds once again.
2005-06-25 Carl Worth <cworth@cworth.org>
* src/cairo-win32-surface.c: (_cairo_win32_surface_create_for_dc),
(_cairo_win32_surface_create_similar),
(_cairo_win32_surface_create_dib),
(_cairo_win32_surface_composite), (categorize_solid_dest_operator),
(_cairo_win32_surface_set_clip_region):
* test/Makefile.am:
2005-06-24 Carl Worth <cworth@cworth.org> 2005-06-24 Carl Worth <cworth@cworth.org>
* src/cairo-ft-font.c: (_cairo_ft_unscaled_font_create_glyph): * src/cairo-ft-font.c: (_cairo_ft_unscaled_font_create_glyph):

19
src/cairo-win32-surface.c
View file

@ -240,7 +240,6 @@ _create_dc_and_bitmap (cairo_win32_surface_t *surface,
static cairo_surface_t * static cairo_surface_t *
_cairo_win32_surface_create_for_dc (HDC original_dc, _cairo_win32_surface_create_for_dc (HDC original_dc,
cairo_format_t format, cairo_format_t format,
int drawable,
int width, int width,
int height) int height)
{ {
@ -297,8 +296,7 @@ _cairo_win32_surface_create_similar (void *abstract_src,
{ {
cairo_win32_surface_t *src = abstract_src; cairo_win32_surface_t *src = abstract_src;
return _cairo_win32_surface_create_for_dc (src->dc, format, drawable, return _cairo_win32_surface_create_for_dc (src->dc, format, width, height);
width, height);
} }
/** /**
@ -319,8 +317,7 @@ _cairo_win32_surface_create_dib (cairo_format_t format,
int width, int width,
int height) int height)
{ {
return _cairo_win32_surface_create_for_dc (NULL, format, TRUE, return _cairo_win32_surface_create_for_dc (NULL, format, width, height);
width, height);
} }
static cairo_status_t static cairo_status_t
@ -577,7 +574,6 @@ _cairo_win32_surface_composite (cairo_operator_t operator,
} else if (integer_transform && } else if (integer_transform &&
(src->format == CAIRO_FORMAT_RGB24 || src->format == CAIRO_FORMAT_ARGB32) && (src->format == CAIRO_FORMAT_RGB24 || src->format == CAIRO_FORMAT_ARGB32) &&
dst->format == CAIRO_FORMAT_RGB24 && dst->format == CAIRO_FORMAT_RGB24 &&
!src->base.repeat &&
operator == CAIRO_OPERATOR_OVER) { operator == CAIRO_OPERATOR_OVER) {
BLENDFUNCTION blend_function; BLENDFUNCTION blend_function;
@ -675,6 +671,9 @@ categorize_solid_dest_operator (cairo_operator_t operator,
return DO_UNSUPPORTED; return DO_UNSUPPORTED;
break; break;
} }
ASSERT_NOT_REACHED;
return DO_UNSUPPORTED;
} }
static cairo_int_status_t static cairo_int_status_t
@ -751,8 +750,12 @@ _cairo_win32_surface_set_clip_region (void *abstract_surface,
/* If we are in-memory, then we set the clip on the image surface /* If we are in-memory, then we set the clip on the image surface
* as well as on the underlying GDI surface. * as well as on the underlying GDI surface.
*/ */
if (surface->image) if (surface->image) {
_cairo_surface_set_clip_region (surface->image, region); unsigned int serial;
serial = _cairo_surface_allocate_clip_serial (surface->image);
_cairo_surface_set_clip_region (surface->image, region, serial);
}
/* The semantics we want is that any clip set by cairo combines /* The semantics we want is that any clip set by cairo combines
* is intersected with the clip on device context that the * is intersected with the clip on device context that the

4
test/Makefile.am
View file

@ -109,8 +109,8 @@ INCLUDES = \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
$(CAIRO_CFLAGS) \ $(CAIRO_CFLAGS) \
-I$(srcdir) \ -I$(srcdir) \
-I$(top_srcdir)/src \ -I$(top_builddir)/src \
-I$(top_builddir)/src -I$(top_srcdir)/src
noinst_LTLIBRARIES = libcairotest.la noinst_LTLIBRARIES = libcairotest.la