r20619 by fschmid -
scribus-commit
scribus-commit at lists.scribus.net
Sun Dec 13 08:33:56 UTC 2015
Author: fschmid
Date: Sun Dec 13 08:33:56 2015
New Revision: 20619
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20619
Log:
Fix some build warnings.
Modified:
trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20619&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp Sun Dec 13 08:33:56 2015
@@ -2332,9 +2332,6 @@
}
if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
{
- double angle = 0;
- if (propList["draw:angle"])
- angle = propList["draw:angle"]->getDouble();
if (gradient.count() > 1)
{
double opacity = 1.0;
@@ -2845,7 +2842,7 @@
WPXString base64 = binaryData.getBase64Data();
if (propList["svg:x"] && propList["svg:y"] && propList["svg:width"] && propList["svg:height"])
{
- PageItem *ite;
+ PageItem *ite = NULL;
double x = valueAsPoint(propList["svg:x"]);
double y = valueAsPoint(propList["svg:y"]);
double w = valueAsPoint(propList["svg:width"]);
@@ -2948,9 +2945,12 @@
delete tempFile;
}
}
- applyFlip(ite);
- if (CurrColorFill != CommonStrings::None)
- applyShadow(ite);
+ if (ite)
+ {
+ applyFlip(ite);
+ if (CurrColorFill != CommonStrings::None)
+ applyShadow(ite);
+ }
}
// qDebug() << "drawGraphicObject";
// printf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
More information about the scribus-commit
mailing list