From 084e5ade90fbe2717cecaa03e9de663b20e83cae Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Tue, 14 Jun 2011 22:27:58 +0000 Subject: [PATCH] Revert last change as gui is fixed now. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@33305 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ Headers/cairo/CairoGState.h | 1 - Source/cairo/CairoContext.m | 2 +- Source/cairo/CairoGState.m | 17 ----------------- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a1fd2e..8219441 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-06-15 Fred Kiefer + + * Source/cairo/CairoContext.m (-supportsDrawGState), + * Headers/cairo/CairoGState.h (-supportsDrawGState) + * Source/cairo/CairoGState.m (-supportsDrawGState): Revert last + change as gui is fixed now. + 2011-06-13 Fred Kiefer * Source/cairo/CairoContext.m (-supportsDrawGState): Delegate to gstate. diff --git a/Headers/cairo/CairoGState.h b/Headers/cairo/CairoGState.h index ad077ba..b8b322b 100644 --- a/Headers/cairo/CairoGState.h +++ b/Headers/cairo/CairoGState.h @@ -44,7 +44,6 @@ - (void) GSSetSurface: (CairoSurface *)surface : (int)x : (int)y; - (void) showPage; -- (BOOL) supportsDrawGState; @end #endif diff --git a/Source/cairo/CairoContext.m b/Source/cairo/CairoContext.m index 884c2e7..3853db1 100644 --- a/Source/cairo/CairoContext.m +++ b/Source/cairo/CairoContext.m @@ -98,7 +98,7 @@ - (BOOL) supportsDrawGState { - return [CGSTATE supportsDrawGState]; + return YES; } - (void) flushGraphics diff --git a/Source/cairo/CairoGState.m b/Source/cairo/CairoGState.m index fc0f8a5..b65df22 100644 --- a/Source/cairo/CairoGState.m +++ b/Source/cairo/CairoGState.m @@ -1400,23 +1400,6 @@ _set_op(cairo_t *ct, NSCompositingOperation op) cairo_restore(_ct); } -- (BOOL) supportsDrawGState -{ -#if CAIRO_VERSION > CAIRO_VERSION_ENCODE(1, 4, 0) - cairo_rectangle_list_t *clip_rects; - cairo_status_t status; - - clip_rects = cairo_copy_clip_rectangle_list(_ct); - status = clip_rects->status; - cairo_rectangle_list_destroy(clip_rects); - if (status == CAIRO_STATUS_SUCCESS) - { - return YES; - } -#endif - return NO; -} - /** Unlike -compositeGState, -drawGSstate fully respects the AppKit CTM but doesn't support to use the receiver cairo target as the source. */ - (void) drawGState: (CairoGState *)source