Author: jghali
Date: Fri Dec 29 21:57:01 2017
New Revision: 22298
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22298
Log:
fix msvc build errors
Modified:
trunk/Scribus/scribus/scpainterex_cairo.cpp
trunk/Scribus/scribus/scpainterex_cairo.h
trunk/Scribus/scribus/text/boxes.cpp
Modified: trunk/Scribus/scribus/scpainterex_cairo.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22298&path=/trunk/Scribus/scribus/scpainterex_cairo.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_cairo.cpp (original)
+++ trunk/Scribus/scribus/scpainterex_cairo.cpp Fri Dec 29 21:57:01 2017
@@ -287,7 +287,7 @@
m_gradControlP5 = c5;
}
-void ScPainterEx_Cairo::setMeshGradient(FPoint p1, FPoint p2, FPoint p3,
FPoint p4, QList<QList<meshPoint> > meshArray)
+void ScPainterEx_Cairo::setMeshGradient(FPoint p1, FPoint p2, FPoint p3,
FPoint p4, QList<QList<MeshPoint> > meshArray)
{
m_fillGradient.setType(VGradientEx::mesh);
m_meshGradientArray = meshArray;
@@ -1077,10 +1077,10 @@
{
for (int gcol = 0; gcol < m_meshGradientArray[grow].count()-1;
gcol++)
{
- meshPoint mp1 = m_meshGradientArray[grow][gcol];
- meshPoint mp2 = m_meshGradientArray[grow][gcol+1];
- meshPoint mp3 = m_meshGradientArray[grow+1][gcol+1];
- meshPoint mp4 = m_meshGradientArray[grow+1][gcol];
+ MeshPoint mp1 = m_meshGradientArray[grow][gcol];
+ MeshPoint mp2 = m_meshGradientArray[grow][gcol+1];
+ MeshPoint mp3 = m_meshGradientArray[grow+1][gcol+1];
+ MeshPoint mp4 = m_meshGradientArray[grow+1][gcol];
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());
@@ -1154,10 +1154,10 @@
for (int col = 0; col < m_meshGradientPatches.count(); col++)
{
meshGradientPatch patch = m_meshGradientPatches[col];
- meshPoint mp1 = patch.TL;
- meshPoint mp2 = patch.TR;
- meshPoint mp3 = patch.BR;
- meshPoint mp4 = patch.BL;
+ MeshPoint mp1 = patch.TL;
+ MeshPoint mp2 = patch.TR;
+ MeshPoint mp3 = patch.BR;
+ MeshPoint mp4 = patch.BL;
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());
Modified: trunk/Scribus/scribus/scpainterex_cairo.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22298&path=/trunk/Scribus/scribus/scpainterex_cairo.h
==============================================================================
--- trunk/Scribus/scribus/scpainterex_cairo.h (original)
+++ trunk/Scribus/scribus/scpainterex_cairo.h Fri Dec 29 21:57:01 2017
@@ -62,7 +62,7 @@
virtual void set4ColorGeometry(FPoint p1, FPoint p2, FPoint p3, FPoint
p4, FPoint c1, FPoint c2, FPoint c3, FPoint c4);
virtual void set4ColorColors(const ScColorShade& col1, const
ScColorShade& col2, const ScColorShade& col3, const ScColorShade& col4);
virtual void setDiamondGeometry(FPoint p1, FPoint p2, FPoint p3, FPoint
p4, FPoint c1, FPoint c2, FPoint c3, FPoint c4, FPoint c5);
- virtual void setMeshGradient(FPoint p1, FPoint p2, FPoint p3, FPoint
p4, QList<QList<meshPoint> > meshArray);
+ virtual void setMeshGradient(FPoint p1, FPoint p2, FPoint p3, FPoint
p4, QList<QList<MeshPoint> > meshArray);
virtual void setMeshGradient(FPoint p1, FPoint p2, FPoint p3, FPoint
p4, QList<meshGradientPatch> meshPatches);
virtual void setClipPath();
@@ -155,7 +155,7 @@
ScColorShade m_gradPatchColor2;
ScColorShade m_gradPatchColor3;
ScColorShade m_gradPatchColor4;
- QList<QList<meshPoint> > m_meshGradientArray;
+ QList<QList<MeshPoint> > m_meshGradientArray;
QList<meshGradientPatch> m_meshGradientPatches;
double m_gradientScale;
Modified: trunk/Scribus/scribus/text/boxes.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22298&path=/trunk/Scribus/scribus/text/boxes.cpp
==============================================================================
--- trunk/Scribus/scribus/text/boxes.cpp (original)
+++ trunk/Scribus/scribus/text/boxes.cpp Fri Dec 29 21:57:01 2017
@@ -755,7 +755,7 @@
{
BreakIterator *it = StoryText::getGraphemeIterator();
QString text(story.text(firstChar(), lastChar() - firstChar() +
1));
- it->setText(const_cast<UChar*>(text.utf16()));
+ it->setText((const UChar*) text.utf16());
int count = 0;
while (it->next() != BreakIterator::DONE)
count++;
@@ -802,7 +802,7 @@
int index = 0;
BreakIterator *it = StoryText::getGraphemeIterator();
QString text(story.text(firstChar(), lastChar() - firstChar() +
1));
- it->setText(const_cast<UChar*>(text.utf16()));
+ it->setText((const UChar*) text.utf16());
int count = 0;
while (it->next() != BreakIterator::DONE)
{
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
