From 52531057972cf575c064ee86c28bec1192aa181f Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Sun, 7 Mar 2010 21:40:36 +0000 Subject: [PATCH] * Source/cairo/CairoGState.m: Only use calls for cairo_pattern_set_extend() on cairo > 1.6.0. Patch suggested by Eric Wasylishen . git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@29868 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 16 +++++++++++----- Source/cairo/CairoGState.m | 10 ++++++++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a738a67..1eef462 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-07 Fred Kiefer + + * Source/cairo/CairoGState.m: Only use calls for + cairo_pattern_set_extend() on cairo > 1.6.0. + Patch suggested by Eric Wasylishen . + 2010-03-05 Richard Frith-Macdonald * Source/cairo/CairoGState.m: @@ -6,12 +12,12 @@ 2010-02-24 16:45-EST Gregory John Casamento - * Source/win32/WIN32Server.m: Added a boolean to control if - callbacks are honored so that we can ignore the - SetActiveWindow(...) call when windows are resigned. Otherwise + * Source/win32/WIN32Server.m: Added a boolean to control if + callbacks are honored so that we can ignore the + SetActiveWindow(...) call when windows are resigned. Otherwise this causes some issues and could result in an inconsistent state. - * Source/winlib/WIN32GState.m: Moved AlphaBlend to seperate - function so that it can be called elsewhere. + * Source/winlib/WIN32GState.m: Moved AlphaBlend to seperate + function so that it can be called elsewhere. 2010-02-20 Fred Kiefer diff --git a/Source/cairo/CairoGState.m b/Source/cairo/CairoGState.m index 00b47ed..c6856a1 100644 --- a/Source/cairo/CairoGState.m +++ b/Source/cairo/CairoGState.m @@ -1207,7 +1207,10 @@ _set_op(cairo_t *ct, NSCompositingOperation op) cairo_matrix_init_scale(&local_matrix, 1, -1); cairo_matrix_translate(&local_matrix, 0, -2*pixelsHigh); cairo_pattern_set_matrix(cpattern, &local_matrix); - cairo_pattern_set_extend(cpattern, CAIRO_EXTEND_PAD); + if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 6, 0)) + { + cairo_pattern_set_extend(cpattern, CAIRO_EXTEND_PAD); + } cairo_set_source(_ct, cpattern); cairo_pattern_destroy(cpattern); @@ -1222,7 +1225,10 @@ _set_op(cairo_t *ct, NSCompositingOperation op) cairo_matrix_init_scale(&local_matrix, 1, -1); cairo_matrix_translate(&local_matrix, 0, -pixelsHigh); cairo_pattern_set_matrix(cpattern, &local_matrix); - cairo_pattern_set_extend(cpattern, CAIRO_EXTEND_PAD); + if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 6, 0)) + { + cairo_pattern_set_extend(cpattern, CAIRO_EXTEND_PAD); + } cairo_set_source(_ct, cpattern); cairo_pattern_destroy(cpattern);