r19103 by fschmid - Fixed Bug #12257: Can not load EPS file
scribus-commit
scribus-commit at lists.scribus.net
Sat May 10 07:47:20 UTC 2014
Author: fschmid
Date: Sat May 10 07:47:19 2014
New Revision: 19103
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19103
Log:
Fixed Bug #12257: Can not load EPS file
Modified:
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
trunk/Scribus/scribus/pslib.cpp
trunk/Scribus/scribus/scpainter.cpp
trunk/Scribus/scribus/ui/colorpalette.ui
trunk/Scribus/scribus/ui/cpalette.cpp
trunk/Scribus/scribus/ui/cpalette.h
trunk/Scribus/scribus/vgradient.cpp
trunk/Scribus/scribus/vgradient.h
trunk/Scribus/scribus/vgradientex.cpp
trunk/Scribus/scribus/vgradientex.h
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sat May 10 07:47:19 2014
@@ -7896,6 +7896,27 @@
GrColorP4QColor = val;
}
+void PageItem::setGradientExtend(VGradient::VGradientRepeatMethod val)
+{
+ fill_gradient.setRepeatMethod(val);
+}
+
+void PageItem::setStrokeGradientExtend(VGradient::VGradientRepeatMethod val)
+{
+ stroke_gradient.setRepeatMethod(val);
+}
+
+VGradient::VGradientRepeatMethod PageItem::getGradientExtend()
+{
+ return fill_gradient.repeatMethod();
+}
+
+VGradient::VGradientRepeatMethod PageItem::getStrokeGradientExtend()
+{
+ return stroke_gradient.repeatMethod();
+}
+
+
void PageItem::setSnapToPatchGrid(bool val)
{
if(snapToPatchGrid ==val)
Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Sat May 10 07:47:19 2014
@@ -600,6 +600,10 @@
void setGradientColor3(QColor val);
QColor gradientColor4() const { return GrColorP4QColor; }
void setGradientColor4(QColor val);
+ void setGradientExtend(VGradient::VGradientRepeatMethod val);
+ void setStrokeGradientExtend(VGradient::VGradientRepeatMethod val);
+ VGradient::VGradientRepeatMethod getGradientExtend();
+ VGradient::VGradientRepeatMethod getStrokeGradientExtend();
//>> ********* Attributes of the item *********
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Sat May 10 07:47:19 2014
@@ -6233,7 +6233,10 @@
else
PutDoc("/ShadingType 3\n");
PutDoc("/ColorSpace /DeviceGray\n");
- PutDoc("/Extend [true true]\n");
+ if (gradient.repeatMethod() == VGradient::none)
+ PutDoc("/Extend [false false]\n");
+ else
+ PutDoc("/Extend [true true]\n");
if ((GType == 1) || (GType == 4))
PutDoc("/Coords ["+FToStr(StartX)+" "+FToStr(-StartY)+" "+FToStr(EndX)+" "+FToStr(-EndY)+"]\n");
else
@@ -8305,7 +8308,10 @@
else
PutDoc("/ShadingType 3\n");
PutDoc("/ColorSpace /DeviceGray\n");
- PutDoc("/Extend [true true]\n");
+ if (gradient.repeatMethod() == VGradient::none)
+ PutDoc("/Extend [false false]\n");
+ else
+ PutDoc("/Extend [true true]\n");
if (GType == 6)
PutDoc("/Coords ["+FToStr(StartX)+" "+FToStr(-StartY)+" "+FToStr(EndX)+" "+FToStr(-EndY)+"]\n");
else
@@ -8426,7 +8432,10 @@
else
PutDoc("/ColorSpace /DeviceCMYK\n");
}
- PutDoc("/Extend [true true]\n");
+ if (gradient.repeatMethod() == VGradient::none)
+ PutDoc("/Extend [false false]\n");
+ else
+ PutDoc("/Extend [true true]\n");
if (GType == 6)
PutDoc("/Coords ["+FToStr(StartX)+" "+FToStr(-StartY)+" "+FToStr(EndX)+" "+FToStr(-EndY)+"]\n");
else
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Sat May 10 07:47:19 2014
@@ -266,7 +266,9 @@
VGradient gra;
QString grName = attrs.valueAsString("Name");
success = readGradient(m_Doc, gra, reader);
- if (!success) break;
+ if (!success)
+ break;
+ gra.setRepeatMethod((VGradient::VGradientRepeatMethod)(attrs.valueAsInt("Ext", VGradient::pad)));
if (!grName.isEmpty())
{
m_Doc->docGradients.insert(grName, gra);
@@ -785,7 +787,9 @@
VGradient gra;
QString grName = attrs.valueAsString("Name");
success = readGradient(m_Doc, gra, reader);
- if (!success) break;
+ if (!success)
+ break;
+ gra.setRepeatMethod((VGradient::VGradientRepeatMethod)(attrs.valueAsInt("Ext", VGradient::pad)));
if (!grName.isEmpty())
{
m_Doc->docGradients.insert(grName, gra);
@@ -1359,7 +1363,9 @@
VGradient gra;
QString grName = attrs.valueAsString("Name");
success = readGradient(m_Doc, gra, reader);
- if (!success) break;
+ if (!success)
+ break;
+ gra.setRepeatMethod((VGradient::VGradientRepeatMethod)(attrs.valueAsInt("Ext", VGradient::pad)));
if (!grName.isEmpty())
{
m_Doc->docGradients.insert(grName, gra);
@@ -5465,6 +5471,9 @@
currItem->inlineCharID = attrs.valueAsInt("InID", -1);
else
currItem->inlineCharID = -1;
+ currItem->fill_gradient.setRepeatMethod((VGradient::VGradientRepeatMethod)(attrs.valueAsInt("GRExt", VGradient::pad)));
+ currItem->stroke_gradient.setRepeatMethod((VGradient::VGradientRepeatMethod)(attrs.valueAsInt("GRExtS", VGradient::pad)));
+ currItem->mask_gradient.setRepeatMethod((VGradient::VGradientRepeatMethod)(attrs.valueAsInt("GRExtM", VGradient::pad)));
currItem->setHasSoftShadow(attrs.valueAsBool("HASSOFTSHADOW", false));
currItem->setSoftShadowXOffset(attrs.valueAsDouble("SOFTSHADOWXOFFSET", 5.0));
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Sat May 10 07:47:19 2014
@@ -590,6 +590,7 @@
docu.writeStartElement("Gradient");
docu.writeAttribute("Name",itGrad.key());
VGradient gra = itGrad.value();
+ docu.writeAttribute("Ext", gra.repeatMethod());
QList<VColorStop*> cstops = gra.colorStops();
for (uint cst = 0; cst < gra.Stops(); ++cst)
{
@@ -1812,6 +1813,7 @@
docu.writeAttribute("GRFOCALY", item->GrFocalY);
docu.writeAttribute("GRSCALE" , item->GrScale);
docu.writeAttribute("GRSKEW" , item->GrSkew);
+ docu.writeAttribute("GRExt", item->fill_gradient.repeatMethod());
if ((item->GrType == 9) || (item->GrType == 10))
{
docu.writeAttribute("GRC1X" , item->GrControl1.x());
@@ -1848,6 +1850,7 @@
docu.writeAttribute("GRNAMEM", item->gradientMask());
if (item->GrTypeStroke > 0)
{
+ docu.writeAttribute("GRExtS", item->stroke_gradient.repeatMethod());
docu.writeAttribute("GRSTARTXS", item->GrStrokeStartX);
docu.writeAttribute("GRSTARTYS", item->GrStrokeStartY);
docu.writeAttribute("GRENDXS", item->GrStrokeEndX);
@@ -1879,6 +1882,7 @@
}
if (item->GrMask > 0)
{
+ docu.writeAttribute("GRExtM", item->mask_gradient.repeatMethod());
docu.writeAttribute("GRTYPM", item->GrMask);
docu.writeAttribute("GRSTARTXM", item->GrMaskStartX);
docu.writeAttribute("GRSTARTYM", item->GrMaskStartY);
Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Sat May 10 07:47:19 2014
@@ -1815,6 +1815,10 @@
QString stopColor2 = getColor(color_space, &stop2, &shade);
FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor2], m_doc, shade), 1.0, 0.5, 1.0, stopColor2, shade );
}
+ if (!shading->getExtend0() || !shading->getExtend1())
+ FillGradient.setRepeatMethod(VGradient::none);
+ else
+ FillGradient.setRepeatMethod(VGradient::pad);
((GfxAxialShading*)shading)->getCoords(&GrStartX, &GrStartY, &GrEndX, &GrEndY);
double xmin, ymin, xmax, ymax;
// get the clip region bbox
@@ -1909,6 +1913,10 @@
QString stopColor2 = getColor(color_space, &stop2, &shade);
FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor2], m_doc, shade), 1.0, 0.5, 1.0, stopColor2, shade );
}
+ if (!shading->getExtend0() || !shading->getExtend1())
+ FillGradient.setRepeatMethod(VGradient::none);
+ else
+ FillGradient.setRepeatMethod(VGradient::pad);
double r0, x1, y1, r1;
((GfxRadialShading*)shading)->getCoords(&GrStartX, &GrStartY, &r0, &x1, &y1, &r1);
double xmin, ymin, xmax, ymax;
Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Sat May 10 07:47:19 2014
@@ -4645,7 +4645,10 @@
}
else
PutStream("/ColorSpace /DeviceCMYK\n");
- PutStream("/Extend [true true]\n");
+ if (gradient.repeatMethod() == VGradient::none)
+ PutStream("/Extend [false false]\n");
+ else
+ PutStream("/Extend [true true]\n");
if (GType == 6)
PutStream("/Coords ["+ToStr(StartX)+" "+ToStr(-StartY)+" "+ToStr(EndX)+" "+ToStr(-EndY)+"]\n");
else
Modified: trunk/Scribus/scribus/scpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp (original)
+++ trunk/Scribus/scribus/scpainter.cpp Sat May 10 07:47:19 2014
@@ -1365,7 +1365,10 @@
pat = cairo_pattern_create_linear (x1, y1, x2, y2);
else
pat = cairo_pattern_create_radial (fx, fy, 0, x1, y1, sqrt(pow(x2 - x1, 2) + pow(y2 - y1,2)));
- cairo_pattern_set_extend(pat, CAIRO_EXTEND_PAD);
+ if (fill_gradient.repeatMethod() == VGradient::none)
+ cairo_pattern_set_extend(pat, CAIRO_EXTEND_NONE);
+ else
+ cairo_pattern_set_extend(pat, CAIRO_EXTEND_PAD);
cairo_pattern_set_filter(pat, CAIRO_FILTER_GOOD);
QList<VColorStop*> colorStops = fill_gradient.colorStops();
for( int offset = 0 ; offset < colorStops.count() ; offset++ )
@@ -1642,7 +1645,10 @@
pat = cairo_pattern_create_linear (x1, y1, x2, y2);
else
pat = cairo_pattern_create_radial (fx, fy, 0, x1, y1, sqrt(pow(x2 - x1, 2) + pow(y2 - y1,2)));
- cairo_pattern_set_extend(pat, CAIRO_EXTEND_PAD);
+ if (stroke_gradient.repeatMethod() == VGradient::none)
+ cairo_pattern_set_extend(pat, CAIRO_EXTEND_NONE);
+ else
+ cairo_pattern_set_extend(pat, CAIRO_EXTEND_PAD);
cairo_pattern_set_filter(pat, CAIRO_FILTER_GOOD);
QList<VColorStop*> colorStops = stroke_gradient.colorStops();
for( int offset = 0 ; offset < colorStops.count() ; offset++ )
Modified: trunk/Scribus/scribus/ui/colorpalette.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/ui/colorpalette.ui
==============================================================================
--- trunk/Scribus/scribus/ui/colorpalette.ui (original)
+++ trunk/Scribus/scribus/ui/colorpalette.ui Sat May 10 07:47:19 2014
@@ -200,23 +200,17 @@
</property>
<widget class="QWidget" name="page_3">
<layout class="QVBoxLayout" name="verticalLayout_4">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
<item>
<widget class="ScComboBox" name="namedGradient"/>
</item>
<item>
<widget class="GradientEditor" name="gradEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
@@ -224,6 +218,31 @@
<enum>QFrame::Raised</enum>
</property>
</widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_10">
+ <item>
+ <widget class="QLabel" name="label_14">
+ <property name="text">
+ <string>Extend:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="gradientExtend">
+ <item>
+ <property name="text">
+ <string>None</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Pad</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -841,21 +860,6 @@
</widget>
<widget class="QWidget" name="gradientStrokePage">
<layout class="QVBoxLayout" name="verticalLayout_10">
- <property name="spacing">
- <number>2</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
@@ -902,6 +906,31 @@
<enum>QFrame::Raised</enum>
</property>
</widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_12">
+ <item>
+ <widget class="QLabel" name="label_15">
+ <property name="text">
+ <string>Extend:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="GradientExtendS">
+ <item>
+ <property name="text">
+ <string>None</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Pad</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Sat May 10 07:47:19 2014
@@ -173,6 +173,8 @@
connect(hatchType, SIGNAL(activated(int)), this, SLOT(changeHatchProps()));
connect(hatchBackground, SIGNAL(activated(int)), this, SLOT(changeHatchProps()));
connect(hatchLineColor, SIGNAL(activated(int)), this, SLOT(changeHatchProps()));
+ connect(gradientExtend , SIGNAL(activated(int)), this, SLOT(handleGradientExtend(int)));
+ connect(GradientExtendS , SIGNAL(activated(int)), this, SLOT(handleStrokeGradientExtend(int)));
}
void Cpalette::disconnectSignals()
@@ -231,6 +233,8 @@
disconnect(hatchType, SIGNAL(activated(int)), this, SLOT(changeHatchProps()));
disconnect(hatchBackground, SIGNAL(activated(int)), this, SLOT(changeHatchProps()));
disconnect(hatchLineColor, SIGNAL(activated(int)), this, SLOT(changeHatchProps()));
+ disconnect(gradientExtend , SIGNAL(activated(int)), this, SLOT(handleGradientExtend(int)));
+ disconnect(GradientExtendS , SIGNAL(activated(int)), this, SLOT(handleStrokeGradientExtend(int)));
}
void Cpalette::setCurrentItem(PageItem* item)
@@ -554,6 +558,32 @@
currentDoc->itemSelection_SetLineGradient(gradient);
currentDoc->updateManager()->setUpdatesEnabled();
blockUpdates(false);
+ }
+}
+
+void Cpalette::handleStrokeGradientExtend(int val)
+{
+ if (currentDoc)
+ {
+ if (val == 0)
+ currentItem->setStrokeGradientExtend(VGradient::none);
+ else
+ currentItem->setStrokeGradientExtend(VGradient::pad);
+ currentItem->update();
+ currentDoc->regionsChanged()->update(QRect());
+ }
+}
+
+void Cpalette::handleGradientExtend(int val)
+{
+ if (currentDoc)
+ {
+ if (val == 0)
+ currentItem->setGradientExtend(VGradient::none);
+ else
+ currentItem->setGradientExtend(VGradient::pad);
+ currentItem->update();
+ currentDoc->regionsChanged()->update(QRect());
}
}
@@ -1002,6 +1032,10 @@
gradientType->setCurrentIndex(0);
}
fillModeCombo->setCurrentIndex(1);
+ if (currentItem->getGradientExtend() == VGradient::none)
+ gradientExtend->setCurrentIndex(0);
+ else
+ gradientExtend->setCurrentIndex(1);
}
else if (number == 14)
{
@@ -1045,6 +1079,10 @@
else
gradientTypeStroke->setCurrentIndex(0);
strokeModeCombo->setCurrentIndex(1);
+ if (currentItem->getStrokeGradientExtend() == VGradient::none)
+ GradientExtendS->setCurrentIndex(0);
+ else
+ GradientExtendS->setCurrentIndex(1);
}
else
{
Modified: trunk/Scribus/scribus/ui/cpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/ui/cpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.h (original)
+++ trunk/Scribus/scribus/ui/cpalette.h Sat May 10 07:47:19 2014
@@ -84,6 +84,8 @@
void handleOverprint(int);
void handleFillGradient();
void handleStrokeGradient();
+ void handleStrokeGradientExtend(int val);
+ void handleGradientExtend(int val);
void showColorValues(QString stroke, QString fille, int sShade, int fShade);
void showGradient(int nr);
void showGradientStroke(int nr);
Modified: trunk/Scribus/scribus/vgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/vgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/vgradient.cpp (original)
+++ trunk/Scribus/scribus/vgradient.cpp Sat May 10 07:47:19 2014
@@ -70,7 +70,7 @@
setOrigin( FPoint( 0, 0 ) );
setVector( FPoint( 0, 50 ) );
- setRepeatMethod( VGradient::reflect );
+ setRepeatMethod( VGradient::pad );
}
VGradient::VGradient( const VGradient& gradient )
Modified: trunk/Scribus/scribus/vgradient.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/vgradient.h
==============================================================================
--- trunk/Scribus/scribus/vgradient.h (original)
+++ trunk/Scribus/scribus/vgradient.h Sat May 10 07:47:19 2014
@@ -94,7 +94,8 @@
{
none = 0,
reflect = 1,
- repeat = 2
+ repeat = 2,
+ pad = 3
};
VGradient( VGradientType type = linear );
@@ -142,7 +143,7 @@
private:
VGradientType m_type;
- VGradientRepeatMethod m_repeatMethod : 2;
+ VGradientRepeatMethod m_repeatMethod : 3;
// coordinates:
FPoint m_origin;
Modified: trunk/Scribus/scribus/vgradientex.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/vgradientex.cpp
==============================================================================
--- trunk/Scribus/scribus/vgradientex.cpp (original)
+++ trunk/Scribus/scribus/vgradientex.cpp Sat May 10 07:47:19 2014
@@ -66,7 +66,7 @@
setOrigin( FPoint( 0, 0 ) );
setVector( FPoint( 0, 50 ) );
setFocalPoint( FPoint( 0, 0 ) );
- setRepeatMethod( VGradientEx::reflect );
+ setRepeatMethod( VGradientEx::pad );
}
VGradientEx::VGradientEx( const VGradientEx& gradient )
Modified: trunk/Scribus/scribus/vgradientex.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19103&path=/trunk/Scribus/scribus/vgradientex.h
==============================================================================
--- trunk/Scribus/scribus/vgradientex.h (original)
+++ trunk/Scribus/scribus/vgradientex.h Sat May 10 07:47:19 2014
@@ -96,7 +96,8 @@
{
none = 0,
reflect = 1,
- repeat = 2
+ repeat = 2,
+ pad = 3
};
VGradientEx( VGradientEx::Type type = linear );
@@ -139,7 +140,7 @@
private:
VGradientEx::Type m_type;
- VGradientEx::RepeatMethod m_repeatMethod : 2;
+ VGradientEx::RepeatMethod m_repeatMethod : 3;
// coordinates:
FPoint m_origin;
More information about the scribus-commit
mailing list