r17379 by jghali - msvc project update : cairo 1.11.4 is now out, use it instead of cairo private copy
scribus-commit
scribus-commit at lists.scribus.net
Wed Mar 14 22:00:10 UTC 2012
Author: jghali
Date: Wed Mar 14 22:00:10 2012
New Revision: 17379
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17379
Log:
msvc project update : cairo 1.11.4 is now out, use it instead of cairo private copy
Modified:
trunk/Scribus/BUILDING_win32_msvc.txt
trunk/Scribus/scribus/scpainterex_cairo.cpp
trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj
trunk/Scribus/win32/vc9/win-config.h
Modified: trunk/Scribus/BUILDING_win32_msvc.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17379&path=/trunk/Scribus/BUILDING_win32_msvc.txt
==============================================================================
--- trunk/Scribus/BUILDING_win32_msvc.txt (original)
+++ trunk/Scribus/BUILDING_win32_msvc.txt Wed Mar 14 22:00:10 2012
@@ -12,8 +12,8 @@
- Microsoft Windows XP, Vista or 7
- Microsoft Visual Studio 2008 or Visual C++ Express Edition 2008
- A recent Qt (version >= 4.6) release built with Visual Studio 2008
- - Cairo sources from cairographics.org (version >= 1.8.0)
- - Pixman sources from cairographics.org (version >= 0.18.0)
+ - Cairo sources from cairographics.org (version >= 1.11.4)
+ - Pixman sources from cairographics.org (version >= 0.24.4)
- Boost from www.boost.org (version >= 1.35.0)
- Libxml2 win32 binaries from the Libxml project
- Libjpeg win32 libs and binaries from the GnuWin32 project
@@ -138,10 +138,10 @@
Download the both scribus-pixman-* and scribus-cairo-* zip files. Unpack them.
-Build pixman first : open the PixManWin32 solution located in pixman-whatever\win32
+Build pixman first : open the pixman-win32 solution located in pixman-whatever\win32
directory and build Debug and Release configurations.
-Build cairo afterwards : open the CairoWin32 solution located in cairo-whatever\win32
+Build cairo afterwards : open the cairo-win32 solution located in cairo-whatever\win32
directory and build Debug and Release configurations.
----
Modified: trunk/Scribus/scribus/scpainterex_cairo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17379&path=/trunk/Scribus/scribus/scpainterex_cairo.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_cairo.cpp (original)
+++ trunk/Scribus/scribus/scpainterex_cairo.cpp Wed Mar 14 22:00:10 2012
@@ -762,29 +762,29 @@
cairo_set_tolerance(cr, 0.5 );
double r, g, b, a;
mpat = cairo_pattern_create_mesh();
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, p1x, p1y);
- cairo_pattern_mesh_line_to(mpat, p2x, p2y);
- cairo_pattern_mesh_line_to(mpat, p3x, p3y);
- cairo_pattern_mesh_line_to(mpat, p4x, p4y);
- cairo_pattern_mesh_line_to(mpat, p1x, p1y);
- cairo_pattern_mesh_set_control_point(mpat, 0, m_gradControlP1.x(), m_gradControlP1.y());
- cairo_pattern_mesh_set_control_point(mpat, 1, m_gradControlP2.x(), m_gradControlP2.y());
- cairo_pattern_mesh_set_control_point(mpat, 2, m_gradControlP3.x(), m_gradControlP3.y());
- cairo_pattern_mesh_set_control_point(mpat, 3, m_gradControlP4.x(), m_gradControlP4.y());
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, p1x, p1y);
+ cairo_mesh_pattern_line_to(mpat, p2x, p2y);
+ cairo_mesh_pattern_line_to(mpat, p3x, p3y);
+ cairo_mesh_pattern_line_to(mpat, p4x, p4y);
+ cairo_mesh_pattern_line_to(mpat, p1x, p1y);
+ cairo_mesh_pattern_set_control_point(mpat, 0, m_gradControlP1.x(), m_gradControlP1.y());
+ cairo_mesh_pattern_set_control_point(mpat, 1, m_gradControlP2.x(), m_gradControlP2.y());
+ cairo_mesh_pattern_set_control_point(mpat, 2, m_gradControlP3.x(), m_gradControlP3.y());
+ cairo_mesh_pattern_set_control_point(mpat, 3, m_gradControlP4.x(), m_gradControlP4.y());
color = transformColor(m_gradPatchColor1, 1.0);
color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
color = transformColor(m_gradPatchColor2, 1.0);
color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
color = transformColor(m_gradPatchColor3, 1.0);
color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
color = transformColor(m_gradPatchColor4, 1.0);
color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
cairo_pattern_set_filter(mpat, CAIRO_FILTER_GOOD);
cairo_set_source(cr, mpat);
cairo_paint_with_alpha(cr, 1.0);
@@ -898,105 +898,105 @@
e4s.setLength(edge4.length() * colorStops[ offset - 1 ]->rampPoint);
if (offset == 1)
{
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, centerP.x(), centerP.y());
- cairo_pattern_mesh_line_to(mpat, e1.x2(), e1.y2());
- cairo_pattern_mesh_line_to(mpat, e2.x2(), e2.y2());
- cairo_pattern_mesh_line_to(mpat, centerP.x(), centerP.y());
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, centerP.x(), centerP.y());
+ cairo_mesh_pattern_line_to(mpat, e1.x2(), e1.y2());
+ cairo_mesh_pattern_line_to(mpat, e2.x2(), e2.y2());
+ cairo_mesh_pattern_line_to(mpat, centerP.x(), centerP.y());
qStopColors[0].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, centerP.x(), centerP.y());
- cairo_pattern_mesh_line_to(mpat, e2.x2(), e2.y2());
- cairo_pattern_mesh_line_to(mpat, e3.x2(), e3.y2());
- cairo_pattern_mesh_line_to(mpat, centerP.x(), centerP.y());
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, centerP.x(), centerP.y());
+ cairo_mesh_pattern_line_to(mpat, e2.x2(), e2.y2());
+ cairo_mesh_pattern_line_to(mpat, e3.x2(), e3.y2());
+ cairo_mesh_pattern_line_to(mpat, centerP.x(), centerP.y());
qStopColors[0].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, centerP.x(), centerP.y());
- cairo_pattern_mesh_line_to(mpat, e3.x2(), e3.y2());
- cairo_pattern_mesh_line_to(mpat, e4.x2(), e4.y2());
- cairo_pattern_mesh_line_to(mpat, centerP.x(), centerP.y());
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, centerP.x(), centerP.y());
+ cairo_mesh_pattern_line_to(mpat, e3.x2(), e3.y2());
+ cairo_mesh_pattern_line_to(mpat, e4.x2(), e4.y2());
+ cairo_mesh_pattern_line_to(mpat, centerP.x(), centerP.y());
qStopColors[0].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, centerP.x(), centerP.y());
- cairo_pattern_mesh_line_to(mpat, e4.x2(), e4.y2());
- cairo_pattern_mesh_line_to(mpat, e1.x2(), e1.y2());
- cairo_pattern_mesh_line_to(mpat, centerP.x(), centerP.y());
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, centerP.x(), centerP.y());
+ cairo_mesh_pattern_line_to(mpat, e4.x2(), e4.y2());
+ cairo_mesh_pattern_line_to(mpat, e1.x2(), e1.y2());
+ cairo_mesh_pattern_line_to(mpat, centerP.x(), centerP.y());
qStopColors[0].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
}
else
{
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, e1s.x2(), e1s.y2());
- cairo_pattern_mesh_line_to(mpat, e1.x2(), e1.y2());
- cairo_pattern_mesh_line_to(mpat, e2.x2(), e2.y2());
- cairo_pattern_mesh_line_to(mpat, e2s.x2(), e2s.y2());
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, e1s.x2(), e1s.y2());
+ cairo_mesh_pattern_line_to(mpat, e1.x2(), e1.y2());
+ cairo_mesh_pattern_line_to(mpat, e2.x2(), e2.y2());
+ cairo_mesh_pattern_line_to(mpat, e2s.x2(), e2s.y2());
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[offset].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, e2s.x2(), e2s.y2());
- cairo_pattern_mesh_line_to(mpat, e2.x2(), e2.y2());
- cairo_pattern_mesh_line_to(mpat, e3.x2(), e3.y2());
- cairo_pattern_mesh_line_to(mpat, e3s.x2(), e3s.y2());
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, e2s.x2(), e2s.y2());
+ cairo_mesh_pattern_line_to(mpat, e2.x2(), e2.y2());
+ cairo_mesh_pattern_line_to(mpat, e3.x2(), e3.y2());
+ cairo_mesh_pattern_line_to(mpat, e3s.x2(), e3s.y2());
qStopColors[offset - 1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[offset].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, e3s.x2(), e3s.y2());
- cairo_pattern_mesh_line_to(mpat, e3.x2(), e3.y2());
- cairo_pattern_mesh_line_to(mpat, e4.x2(), e4.y2());
- cairo_pattern_mesh_line_to(mpat, e4s.x2(), e4s.y2());
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, e3s.x2(), e3s.y2());
+ cairo_mesh_pattern_line_to(mpat, e3.x2(), e3.y2());
+ cairo_mesh_pattern_line_to(mpat, e4.x2(), e4.y2());
+ cairo_mesh_pattern_line_to(mpat, e4s.x2(), e4s.y2());
qStopColors[offset - 1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[offset].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, e4s.x2(), e4s.y2());
- cairo_pattern_mesh_line_to(mpat, e4.x2(), e4.y2());
- cairo_pattern_mesh_line_to(mpat, e1.x2(), e1.y2());
- cairo_pattern_mesh_line_to(mpat, e1s.x2(), e1s.y2());
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, e4s.x2(), e4s.y2());
+ cairo_mesh_pattern_line_to(mpat, e4.x2(), e4.y2());
+ cairo_mesh_pattern_line_to(mpat, e1.x2(), e1.y2());
+ cairo_mesh_pattern_line_to(mpat, e1s.x2(), e1s.y2());
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[offset].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
}
}
cairo_pattern_set_filter(mpat, CAIRO_FILTER_GOOD);
@@ -1056,25 +1056,25 @@
meshPoint mp2 = m_meshGradientArray[grow][gcol+1];
meshPoint mp3 = m_meshGradientArray[grow+1][gcol+1];
meshPoint mp4 = m_meshGradientArray[grow+1][gcol];
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, mp1.gridPoint.x(), mp1.gridPoint.y());
- cairo_pattern_mesh_curve_to(mpat, mp1.controlRight.x(), mp1.controlRight.y(), mp2.controlLeft.x(), mp2.controlLeft.y(), mp2.gridPoint.x(), mp2.gridPoint.y());
- cairo_pattern_mesh_curve_to(mpat, mp2.controlBottom.x(), mp2.controlBottom.y(), mp3.controlTop.x(), mp3.controlTop.y(), mp3.gridPoint.x(), mp3.gridPoint.y());
- cairo_pattern_mesh_curve_to(mpat, mp3.controlLeft.x(), mp3.controlLeft.y(), mp4.controlRight.x(), mp4.controlRight.y(), mp4.gridPoint.x(), mp4.gridPoint.y());
- cairo_pattern_mesh_curve_to(mpat, mp4.controlTop.x(), mp4.controlTop.y(), mp1.controlBottom.x(), mp1.controlBottom.y(), mp1.gridPoint.x(), mp1.gridPoint.y());
- cairo_pattern_mesh_set_control_point(mpat, 0, mp1.controlColor.x(), mp1.controlColor.y());
- cairo_pattern_mesh_set_control_point(mpat, 1, mp2.controlColor.x(), mp2.controlColor.y());
- cairo_pattern_mesh_set_control_point(mpat, 2, mp3.controlColor.x(), mp3.controlColor.y());
- cairo_pattern_mesh_set_control_point(mpat, 3, mp4.controlColor.x(), mp4.controlColor.y());
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, mp1.gridPoint.x(), mp1.gridPoint.y());
+ cairo_mesh_pattern_curve_to(mpat, mp1.controlRight.x(), mp1.controlRight.y(), mp2.controlLeft.x(), mp2.controlLeft.y(), mp2.gridPoint.x(), mp2.gridPoint.y());
+ cairo_mesh_pattern_curve_to(mpat, mp2.controlBottom.x(), mp2.controlBottom.y(), mp3.controlTop.x(), mp3.controlTop.y(), mp3.gridPoint.x(), mp3.gridPoint.y());
+ cairo_mesh_pattern_curve_to(mpat, mp3.controlLeft.x(), mp3.controlLeft.y(), mp4.controlRight.x(), mp4.controlRight.y(), mp4.gridPoint.x(), mp4.gridPoint.y());
+ cairo_mesh_pattern_curve_to(mpat, mp4.controlTop.x(), mp4.controlTop.y(), mp1.controlBottom.x(), mp1.controlBottom.y(), mp1.gridPoint.x(), mp1.gridPoint.y());
+ cairo_mesh_pattern_set_control_point(mpat, 0, mp1.controlColor.x(), mp1.controlColor.y());
+ cairo_mesh_pattern_set_control_point(mpat, 1, mp2.controlColor.x(), mp2.controlColor.y());
+ cairo_mesh_pattern_set_control_point(mpat, 2, mp3.controlColor.x(), mp3.controlColor.y());
+ cairo_mesh_pattern_set_control_point(mpat, 3, mp4.controlColor.x(), mp4.controlColor.y());
mp1.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
mp2.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
mp3.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
mp4.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
}
}
cairo_pattern_set_filter(mpat, CAIRO_FILTER_BEST);
@@ -1133,25 +1133,25 @@
meshPoint mp2 = patch.TR;
meshPoint mp3 = patch.BR;
meshPoint mp4 = patch.BL;
- cairo_pattern_mesh_begin_patch(mpat);
- cairo_pattern_mesh_move_to(mpat, mp1.gridPoint.x(), mp1.gridPoint.y());
- cairo_pattern_mesh_curve_to(mpat, mp1.controlRight.x(), mp1.controlRight.y(), mp2.controlLeft.x(), mp2.controlLeft.y(), mp2.gridPoint.x(), mp2.gridPoint.y());
- cairo_pattern_mesh_curve_to(mpat, mp2.controlBottom.x(), mp2.controlBottom.y(), mp3.controlTop.x(), mp3.controlTop.y(), mp3.gridPoint.x(), mp3.gridPoint.y());
- cairo_pattern_mesh_curve_to(mpat, mp3.controlLeft.x(), mp3.controlLeft.y(), mp4.controlRight.x(), mp4.controlRight.y(), mp4.gridPoint.x(), mp4.gridPoint.y());
- cairo_pattern_mesh_curve_to(mpat, mp4.controlTop.x(), mp4.controlTop.y(), mp1.controlBottom.x(), mp1.controlBottom.y(), mp1.gridPoint.x(), mp1.gridPoint.y());
- cairo_pattern_mesh_set_control_point(mpat, 0, mp1.controlColor.x(), mp1.controlColor.y());
- cairo_pattern_mesh_set_control_point(mpat, 1, mp2.controlColor.x(), mp2.controlColor.y());
- cairo_pattern_mesh_set_control_point(mpat, 2, mp3.controlColor.x(), mp3.controlColor.y());
- cairo_pattern_mesh_set_control_point(mpat, 3, mp4.controlColor.x(), mp4.controlColor.y());
+ cairo_mesh_pattern_begin_patch(mpat);
+ cairo_mesh_pattern_move_to(mpat, mp1.gridPoint.x(), mp1.gridPoint.y());
+ cairo_mesh_pattern_curve_to(mpat, mp1.controlRight.x(), mp1.controlRight.y(), mp2.controlLeft.x(), mp2.controlLeft.y(), mp2.gridPoint.x(), mp2.gridPoint.y());
+ cairo_mesh_pattern_curve_to(mpat, mp2.controlBottom.x(), mp2.controlBottom.y(), mp3.controlTop.x(), mp3.controlTop.y(), mp3.gridPoint.x(), mp3.gridPoint.y());
+ cairo_mesh_pattern_curve_to(mpat, mp3.controlLeft.x(), mp3.controlLeft.y(), mp4.controlRight.x(), mp4.controlRight.y(), mp4.gridPoint.x(), mp4.gridPoint.y());
+ cairo_mesh_pattern_curve_to(mpat, mp4.controlTop.x(), mp4.controlTop.y(), mp1.controlBottom.x(), mp1.controlBottom.y(), mp1.gridPoint.x(), mp1.gridPoint.y());
+ cairo_mesh_pattern_set_control_point(mpat, 0, mp1.controlColor.x(), mp1.controlColor.y());
+ cairo_mesh_pattern_set_control_point(mpat, 1, mp2.controlColor.x(), mp2.controlColor.y());
+ cairo_mesh_pattern_set_control_point(mpat, 2, mp3.controlColor.x(), mp3.controlColor.y());
+ cairo_mesh_pattern_set_control_point(mpat, 3, mp4.controlColor.x(), mp4.controlColor.y());
mp1.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
mp2.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
mp3.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
mp4.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_mesh_end_patch(mpat);
+ cairo_mesh_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_mesh_pattern_end_patch(mpat);
}
cairo_pattern_set_filter(mpat, CAIRO_FILTER_BEST);
cairo_set_source(cr, mpat);
Modified: trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17379&path=/trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj Wed Mar 14 22:00:10 2012
@@ -60,8 +60,8 @@
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories="..\..\vc9;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;..\..\..\scribus\third_party\cairo;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CAIRO;HAVE_PRIVATE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
+ AdditionalIncludeDirectories="..\..\vc9;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(CAIRO_DIR)\include";"$(LCMS_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
IgnoreStandardIncludePath="false"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -88,7 +88,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) $(PODOFO_DEBUG_LIB) mscms.lib WSock32.Lib scribus-cairo.lib scribus-pgf.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib $(CAIRO_DEBUG_LIB) $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) $(PODOFO_DEBUG_LIB) mscms.lib WSock32.Lib scribus-pgf.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -166,8 +166,8 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\vc9;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;..\..\..\scribus\third_party\cairo;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CAIRO;HAVE_PRIVATE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
+ AdditionalIncludeDirectories="..\..\vc9;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(CAIRO_DIR)\include";"$(LCMS_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="true"
@@ -193,7 +193,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(PODOFO_RELEASE_LIB) mscms.lib WSock32.Lib scribus-cairo.lib scribus-pgf.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib $(CAIRO_RELEASE_LIB) $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(PODOFO_RELEASE_LIB) mscms.lib WSock32.Lib scribus-pgf.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
Modified: trunk/Scribus/win32/vc9/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17379&path=/trunk/Scribus/win32/vc9/win-config.h
==============================================================================
--- trunk/Scribus/win32/vc9/win-config.h (original)
+++ trunk/Scribus/win32/vc9/win-config.h Wed Mar 14 22:00:10 2012
@@ -47,7 +47,7 @@
#undef HAVE_INTTYPES_H
/* Defines if your system has the cairo library */
-/*#define HAVE_CAIRO 1*/
+#define HAVE_CAIRO 1
/* Define if you have libjpeg */
#define HAVE_LIBJPEG 1
More information about the scribus-commit
mailing list