diff --git a/src/cairo-win32.h b/src/cairo-win32.h index 99e2f5c63..4f257d7ed 100644 --- a/src/cairo-win32.h +++ b/src/cairo-win32.h @@ -69,15 +69,9 @@ cairo_win32_surface_create_with_dib (cairo_format_t format, cairo_public HDC cairo_win32_surface_get_dc (cairo_surface_t *surface); -cairo_public HDC -cairo_win32_get_dc_with_clip (cairo_t *cr); - cairo_public cairo_surface_t * cairo_win32_surface_get_image (cairo_surface_t *surface); -cairo_public cairo_status_t -cairo_win32_surface_get_size (const cairo_surface_t *surface, int *width, int *height); - #if CAIRO_HAS_WIN32_FONT /* @@ -111,9 +105,6 @@ cairo_public void cairo_win32_scaled_font_get_device_to_logical (cairo_scaled_font_t *scaled_font, cairo_matrix_t *device_to_logical); -cairo_public BYTE -cairo_win32_get_system_text_quality (void); - #endif /* CAIRO_HAS_WIN32_FONT */ #if CAIRO_HAS_DWRITE_FONT @@ -124,18 +115,6 @@ cairo_win32_get_system_text_quality (void); cairo_public cairo_font_face_t * cairo_dwrite_font_face_create_for_dwrite_fontface (void *dwrite_font_face); -cairo_public void -cairo_dwrite_scaled_font_set_force_GDI_classic (cairo_scaled_font_t *dwrite_scaled_font, cairo_bool_t allowed); - -cairo_public cairo_bool_t -cairo_dwrite_scaled_font_get_force_GDI_classic (cairo_scaled_font_t *dwrite_scaled_font); - -cairo_public void -cairo_dwrite_set_cleartype_params (FLOAT gamma, FLOAT contrast, FLOAT level, int geometry, int mode); - -cairo_public int -cairo_dwrite_get_cleartype_rendering_mode (); - #endif /* CAIRO_HAS_DWRITE_FONT */ CAIRO_END_DECLS diff --git a/src/win32/cairo-win32-private.h b/src/win32/cairo-win32-private.h index 4538309fc..486b12811 100644 --- a/src/win32/cairo-win32-private.h +++ b/src/win32/cairo-win32-private.h @@ -253,6 +253,9 @@ _cairo_win32_scaled_font_is_type1 (cairo_scaled_font_t *scaled_font); cairo_bool_t _cairo_win32_scaled_font_is_bitmap (cairo_scaled_font_t *scaled_font); +cairo_public BYTE +cairo_win32_get_system_text_quality (void); + #if CAIRO_HAS_DWRITE_FONT cairo_int_status_t diff --git a/src/win32/cairo-win32-surface.c b/src/win32/cairo-win32-surface.c index 39391650f..e53c16540 100644 --- a/src/win32/cairo-win32-surface.c +++ b/src/win32/cairo-win32-surface.c @@ -171,46 +171,6 @@ cairo_win32_surface_get_dc (cairo_surface_t *surface) return NULL; } -HDC -cairo_win32_get_dc_with_clip (cairo_t *cr) -{ - cairo_surface_t *surface = cairo_get_target (cr); - if (cr->backend->type == CAIRO_TYPE_DEFAULT) { - cairo_default_context_t *c = (cairo_default_context_t *) cr; - cairo_clip_t *clip = _cairo_clip_copy (_cairo_gstate_get_clip (c->gstate)); - if (_cairo_surface_is_win32 (surface)) { - cairo_win32_display_surface_t *winsurf = (cairo_win32_display_surface_t *) surface; - - _cairo_win32_display_surface_set_clip (winsurf, clip); - - _cairo_clip_destroy (clip); - return winsurf->win32.dc; - } - - if (_cairo_surface_is_paginated (surface)) { - cairo_surface_t *target; - - target = _cairo_paginated_surface_get_target (surface); - - if (_cairo_surface_is_win32_printing (target)) { - cairo_status_t status; - cairo_win32_printing_surface_t *psurf = (cairo_win32_printing_surface_t *) target; - - status = _cairo_surface_clipper_set_clip (&psurf->clipper, clip); - - _cairo_clip_destroy (clip); - - if (status) - return NULL; - - return psurf->win32.dc; - } - } - _cairo_clip_destroy (clip); - } - return NULL; -} - /** * _cairo_surface_is_win32: * @surface: a #cairo_surface_t @@ -386,17 +346,3 @@ _cairo_win32_surface_emit_glyphs (cairo_win32_surface_t *dst, #endif } #undef STACK_GLYPH_SIZE - -cairo_status_t -cairo_win32_surface_get_size (const cairo_surface_t *surface, int *width, int *height) -{ - if (surface->type != CAIRO_SURFACE_TYPE_WIN32) - return CAIRO_STATUS_SURFACE_TYPE_MISMATCH; - - const cairo_win32_surface_t *winsurface = (const cairo_win32_surface_t *) surface; - - *width = winsurface->extents.width; - *height = winsurface->extents.height; - - return CAIRO_STATUS_SUCCESS; -}