Author: fredkiefer
Date: Sat Oct 25 20:14:50 2014
New Revision: 38135
URL: http://svn.gna.org/viewcvs/gnustep?rev=38135&view=rev
Log:
* Source/cairo/CairoGState.m (-compositeGState:...fraction:):
Disable workaround for cairo > 1.8 for cairo > 1.13.
Patch by Edwin Ancaer <[email protected]>
Modified:
libs/back/trunk/ChangeLog
libs/back/trunk/Source/cairo/CairoGState.m
Modified: libs/back/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/ChangeLog?rev=38135&r1=38134&r2=38135&view=diff
==============================================================================
--- libs/back/trunk/ChangeLog (original)
+++ libs/back/trunk/ChangeLog Sat Oct 25 20:14:50 2014
@@ -1,3 +1,9 @@
+2014-10-25 Fred Kiefer <[email protected]>
+
+ * Source/cairo/CairoGState.m (-compositeGState:...fraction:):
+ Disable workaround for cairo > 1.8 for cairo > 1.13.
+ Patch by Edwin Ancaer <[email protected]>
+
2014-05-24 Fred Kiefer <[email protected]>
* configure.ac: Fix wrong assumption about Xft's .pc file that
Modified: libs/back/trunk/Source/cairo/CairoGState.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/cairo/CairoGState.m?rev=38135&r1=38134&r2=38135&view=diff
==============================================================================
--- libs/back/trunk/Source/cairo/CairoGState.m (original)
+++ libs/back/trunk/Source/cairo/CairoGState.m Sat Oct 25 20:14:50 2014
@@ -1309,9 +1309,10 @@
ssize = [source->_surface size];
}
- if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 8, 0))
+ if ((cairo_version() >= CAIRO_VERSION_ENCODE(1, 8, 0)) &&
+ (cairo_version() <= CAIRO_VERSION_ENCODE(1, 13, 0)))
{
- // For cairo > 1.8 we seem to need this adjustment
+ // For cairo > 1.8 and < 1.13 we seem to need this adjustment
srcRectInBase.origin.y -= 2 * (source->offset.y - ssize.height);
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
