r20026 by avox - get rid of several clang warnings

scribus-commit scribus-commit at lists.scribus.net
Sun Apr 26 13:34:48 UTC 2015


Author: avox
Date: Sun Apr 26 13:34:48 2015
New Revision: 20026

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20026
Log:
get rid of several clang warnings

Modified:
    trunk/Scribus/scribus/canvas.cpp
    trunk/Scribus/scribus/canvasmode_nodeedit.cpp
    trunk/Scribus/scribus/fonts/scface_ttf.cpp
    trunk/Scribus/scribus/fonts/scfontmetrics.cpp
    trunk/Scribus/scribus/nodeeditcontext.cpp
    trunk/Scribus/scribus/nodeeditcontext.h
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/serializer.cpp
    trunk/Scribus/scribus/third_party/fparser/fparser.cc
    trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc
    trunk/Scribus/scribus/third_party/lib2geom/choose.h
    trunk/Scribus/scribus/third_party/lib2geom/path.h
    trunk/Scribus/scribus/third_party/lib2geom/poly.h
    trunk/Scribus/scribus/util_color.cpp

Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp (original)
+++ trunk/Scribus/scribus/canvas.cpp Sun Apr 26 13:34:48 2015
@@ -2243,7 +2243,7 @@
 	if (!newRect.isNull())
 	{
 		if (!oldRect.isNull())
-			newRect.united(oldRect);
+			newRect = newRect.united(oldRect);
 		repaint(newRect.adjusted(-10, -10, 20, 20));
 	}
 	oldRect = newRect;
@@ -2258,7 +2258,7 @@
 	if (!newR.isNull())
 	{
 		if (!oldRect.isNull())
-			newRect.united(oldRect);
+			newRect = newRect.united(oldRect);
 //		newR.moveBy(qRound(-m_doc->minCanvasCoordinate.x() * m_viewMode.scale), qRound(-m_doc->minCanvasCoordinate.y() * m_viewMode.scale));
 		m_viewMode.redrawPolygon = newRect;
 //		m_viewMode.redrawPolygon.translate(qRound(-m_doc->minCanvasCoordinate.x() * m_viewMode.scale), qRound(-m_doc->minCanvasCoordinate.y() * m_viewMode.scale));

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Sun Apr 26 13:34:48 2015
@@ -1156,9 +1156,9 @@
 					int prev = (curr+cli.size()-4)%cli.size();
 					int next = (curr+4)%cli.size();
 
-					if(abs(cli.point(prev).x()-cli.point(curr).x())<abs(cli.point(next).x()-cli.point(curr).x()))
+					if(std::abs(cli.point(prev).x()-cli.point(curr).x())<std::abs(cli.point(next).x()-cli.point(curr).x()))
 						tmpNode=next;
-					else if(abs(cli.point(prev).x()-cli.point(curr).x())==abs(cli.point(next).x()-cli.point(curr).x())){
+					else if(std::abs(cli.point(prev).x()-cli.point(curr).x())==std::abs(cli.point(next).x()-cli.point(curr).x())){
 						if(cli.point(prev).y()!=cli.point(curr).y())
 							tmpNode=next;
 						else

Modified: trunk/Scribus/scribus/fonts/scface_ttf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/fonts/scface_ttf.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/scface_ttf.cpp (original)
+++ trunk/Scribus/scribus/fonts/scface_ttf.cpp Sun Apr 26 13:34:48 2015
@@ -472,15 +472,15 @@
 	const unsigned char * pp = reinterpret_cast<const unsigned char*>(bb.data()) + pos;
 	return pp[0] << 8 | pp[1];
 }
-QString tag(QByteArray const & bb, uint pos)
-{
-	char buf[5] = "1234";
-	buf[0] = bb.data()[pos];
-	buf[1] = bb.data()[pos+1];
-	buf[2] = bb.data()[pos+2];
-	buf[3] = bb.data()[pos+3];
-	return buf;
-}
+//QString tag(QByteArray const & bb, uint pos)
+//{
+//	char buf[5] = "1234";
+//	buf[0] = bb.data()[pos];
+//	buf[1] = bb.data()[pos+1];
+//	buf[2] = bb.data()[pos+2];
+//	buf[3] = bb.data()[pos+3];
+//	return buf;
+//}
 bool copy(QByteArray & dst, uint to, QByteArray & src, uint from, uint len) 
 {
 	if (!dst.data())

Modified: trunk/Scribus/scribus/fonts/scfontmetrics.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/fonts/scfontmetrics.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/scfontmetrics.cpp (original)
+++ trunk/Scribus/scribus/fonts/scfontmetrics.cpp Sun Apr 26 13:34:48 2015
@@ -30,13 +30,15 @@
 static FPoint firstP;
 static bool FirstM;
 static QMap<FT_ULong, QString> adobeGlyphNames;
+#if 0
 static const char* table[] = {
 //#include "glyphnames.txt.q"
 					NULL};
+#endif
 
 // private functions
-static void readAdobeGlyphNames();
-static QString adobeGlyphName(FT_ULong charcode);
+//static void readAdobeGlyphNames();
+//static QString adobeGlyphName(FT_ULong charcode);
 static int traceMoveto( FT_Vector *to, FPointArray *composite );
 static int traceLineto( FT_Vector *to, FPointArray *composite );
 static int traceQuadraticBezier( FT_Vector *control, FT_Vector *to, FPointArray *composite );
@@ -440,6 +442,7 @@
 	return 0;
 }
 
+#if 0
 /// init the Adobe Glyph List
 void readAdobeGlyphNames() 
 {
@@ -477,6 +480,7 @@
 	}
 	return result;
 }
+#endif
 
 /*
 qreal Cwidth(ScribusDoc *, ScFace* scFace, QString ch, int Size, QString ch2)

Modified: trunk/Scribus/scribus/nodeeditcontext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/nodeeditcontext.cpp
==============================================================================
--- trunk/Scribus/scribus/nodeeditcontext.cpp (original)
+++ trunk/Scribus/scribus/nodeeditcontext.cpp Sun Apr 26 13:34:48 2015
@@ -5,10 +5,10 @@
 #include "util_math.h"
 
 NodeEditContext::NodeEditContext() :
+	oldClip(NULL),
+	nodeTransaction(NULL),
 	m_submode(MOVE_POINT),
 	m_isContourLine(false),
-	oldClip(NULL),
-	nodeTransaction(NULL),
 	m_ClRe(-1),
 	m_ClRe2(-1),
 	m_SegP1(-1),

Modified: trunk/Scribus/scribus/nodeeditcontext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/nodeeditcontext.h
==============================================================================
--- trunk/Scribus/scribus/nodeeditcontext.h (original)
+++ trunk/Scribus/scribus/nodeeditcontext.h Sun Apr 26 13:34:48 2015
@@ -74,17 +74,17 @@
 		enum SubMode { MOVE_POINT = 0, ADD_POINT = 1, DEL_POINT = 2, SPLIT_PATH = 3 };
 
 	protected:
+		int m_submode;
 		bool m_isContourLine;
 
 		int m_ClRe;
 		int m_ClRe2;
+		int m_SegP1;
+		int m_SegP2;
 		bool m_EdPoints;
 		bool m_MoveSym;
 		QList<int> m_SelNode;
-		int m_SegP1;
-		int m_SegP2;
 		double m_oldItemX;
 		double m_oldItemY;
-		int m_submode;
 };
 #endif

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Sun Apr 26 13:34:48 2015
@@ -777,61 +777,61 @@
 	{
 		if (! cstyle.font().usable())
 			cstyle.resetFont();
-		if (cstyle.fontSize() <= -16000 / 10)
+		if (cstyle.fontSize() <= NOVALUE / 10)
 			cstyle.resetFontSize();
 //		if (cstyle.effects() == 65535)
 //			cstyle.resetEffects();
 		if (cstyle.fillColor().isEmpty())
 			cstyle.resetFillColor();
-		if (cstyle.fillShade() <= -16000)
+		if (cstyle.fillShade() <= NOVALUE)
 			cstyle.resetFillShade();
 		if (cstyle.strokeColor().isEmpty())
 			cstyle.resetStrokeColor();
-		if (cstyle.strokeShade() <= -16000)
+		if (cstyle.strokeShade() <= NOVALUE)
 			cstyle.resetStrokeShade();
-		if (cstyle.shadowXOffset() <= -16000 / 10)
+		if (cstyle.shadowXOffset() <= NOVALUE / 10)
 			cstyle.resetShadowXOffset();
-		if (cstyle.shadowYOffset() <= -16000 / 10)
+		if (cstyle.shadowYOffset() <= NOVALUE / 10)
 			cstyle.resetShadowYOffset();
-		if (cstyle.outlineWidth() <= -16000 / 10)
+		if (cstyle.outlineWidth() <= NOVALUE / 10)
 			cstyle.resetOutlineWidth();
-		if (cstyle.underlineOffset() <= -16000 / 10)
+		if (cstyle.underlineOffset() <= NOVALUE / 10)
 			cstyle.resetUnderlineOffset();
-		if (cstyle.underlineWidth() <= -16000 / 10)
+		if (cstyle.underlineWidth() <= NOVALUE / 10)
 			cstyle.resetUnderlineWidth();
-		if (cstyle.strikethruOffset() <= -16000 / 10)
+		if (cstyle.strikethruOffset() <= NOVALUE / 10)
 			cstyle.resetStrikethruOffset();
-		if (cstyle.strikethruWidth() <= -16000 / 10)
+		if (cstyle.strikethruWidth() <= NOVALUE / 10)
 			cstyle.resetStrikethruWidth();
-		if (cstyle.scaleH() <= -16000 / 10)
+		if (cstyle.scaleH() <= NOVALUE / 10)
 			cstyle.resetScaleH();
-		if (cstyle.scaleV() <= -16000 / 10)
+		if (cstyle.scaleV() <= NOVALUE / 10)
 			cstyle.resetScaleV();
-		if (cstyle.baselineOffset() <= -16000 / 10)
+		if (cstyle.baselineOffset() <= NOVALUE / 10)
 			cstyle.resetBaselineOffset();
-		if (cstyle.tracking() <= -16000 / 10)
+		if (cstyle.tracking() <= NOVALUE / 10)
 			cstyle.resetTracking();
 	}
 	
 	void fixLegacyParStyle(ParagraphStyle& pstyle) 
 	{
-		if (pstyle.lineSpacing() <= -16000)
+		if (pstyle.lineSpacing() <= NOVALUE)
 			pstyle.resetLineSpacing();
-		if (pstyle.leftMargin() <= -16000)
+		if (pstyle.leftMargin() <= NOVALUE)
 			pstyle.resetLeftMargin();
-		if (pstyle.rightMargin() <= -16000)
+		if (pstyle.rightMargin() <= NOVALUE)
 			pstyle.resetRightMargin();
-		if (pstyle.firstIndent() <= -16000)
+		if (pstyle.firstIndent() <= NOVALUE)
 			pstyle.resetFirstIndent();
 		if (pstyle.alignment() < 0)
 			pstyle.resetAlignment();
-		if (pstyle.gapBefore() <= -16000)
+		if (pstyle.gapBefore() <= NOVALUE)
 			pstyle.resetGapBefore();
-		if (pstyle.gapAfter() <= -16000)
+		if (pstyle.gapAfter() <= NOVALUE)
 			pstyle.resetGapAfter();
 		if (pstyle.dropCapLines() < 0)
 			pstyle.resetDropCapLines();
-		if (pstyle.parEffectOffset() <= -16000)
+		if (pstyle.parEffectOffset() <= NOVALUE)
 			pstyle.resetParEffectOffset();
 		fixLegacyCharStyle(pstyle.charStyle());
 	}

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&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 Sun Apr 26 13:34:48 2015
@@ -1953,61 +1953,61 @@
 	{
 		if (! cstyle.font().usable())
 			cstyle.resetFont();
-		if (cstyle.fontSize() <= -16000 / 10)
+		if (cstyle.fontSize() <= NOVALUE / 10)
 			cstyle.resetFontSize();
 //		if (cstyle.effects() == 65535)
 //			cstyle.resetEffects();
 		if (cstyle.fillColor().isEmpty())
 			cstyle.resetFillColor();
-		if (cstyle.fillShade() <= -16000)
+		if (cstyle.fillShade() <= NOVALUE)
 			cstyle.resetFillShade();
 		if (cstyle.strokeColor().isEmpty())
 			cstyle.resetStrokeColor();
-		if (cstyle.strokeShade() <= -16000)
+		if (cstyle.strokeShade() <= NOVALUE)
 			cstyle.resetStrokeShade();
-		if (cstyle.shadowXOffset() <= -16000 / 10)
+		if (cstyle.shadowXOffset() <= NOVALUE / 10)
 			cstyle.resetShadowXOffset();
-		if (cstyle.shadowYOffset() <= -16000 / 10)
+		if (cstyle.shadowYOffset() <= NOVALUE / 10)
 			cstyle.resetShadowYOffset();
-		if (cstyle.outlineWidth() <= -16000 / 10)
+		if (cstyle.outlineWidth() <= NOVALUE / 10)
 			cstyle.resetOutlineWidth();
-		if (cstyle.underlineOffset() <= -16000 / 10)
+		if (cstyle.underlineOffset() <= NOVALUE / 10)
 			cstyle.resetUnderlineOffset();
-		if (cstyle.underlineWidth() <= -16000 / 10)
+		if (cstyle.underlineWidth() <= NOVALUE / 10)
 			cstyle.resetUnderlineWidth();
-		if (cstyle.strikethruOffset() <= -16000 / 10)
+		if (cstyle.strikethruOffset() <= NOVALUE / 10)
 			cstyle.resetStrikethruOffset();
-		if (cstyle.strikethruWidth() <= -16000 / 10)
+		if (cstyle.strikethruWidth() <= NOVALUE / 10)
 			cstyle.resetStrikethruWidth();
-		if (cstyle.scaleH() <= -16000 / 10)
+		if (cstyle.scaleH() <= NOVALUE / 10)
 			cstyle.resetScaleH();
-		if (cstyle.scaleV() <= -16000 / 10)
+		if (cstyle.scaleV() <= NOVALUE / 10)
 			cstyle.resetScaleV();
-		if (cstyle.baselineOffset() <= -16000 / 10)
+		if (cstyle.baselineOffset() <= NOVALUE / 10)
 			cstyle.resetBaselineOffset();
-		if (cstyle.tracking() <= -16000 / 10)
+		if (cstyle.tracking() <= NOVALUE / 10)
 			cstyle.resetTracking();
 	}
 
 	void fixLegacyParStyle(ParagraphStyle& pstyle) 
 	{
-		if (pstyle.lineSpacing() <= -16000)
+		if (pstyle.lineSpacing() <= NOVALUE)
 			pstyle.resetLineSpacing();
-		if (pstyle.leftMargin() <= -16000)
+		if (pstyle.leftMargin() <= NOVALUE)
 			pstyle.resetLeftMargin();
-		if (pstyle.rightMargin() <= -16000)
+		if (pstyle.rightMargin() <= NOVALUE)
 			pstyle.resetRightMargin();
-		if (pstyle.firstIndent() <= -16000)
+		if (pstyle.firstIndent() <= NOVALUE)
 			pstyle.resetFirstIndent();
 		if (pstyle.alignment() < 0)
 			pstyle.resetAlignment();
-		if (pstyle.gapBefore() <= -16000)
+		if (pstyle.gapBefore() <= NOVALUE)
 			pstyle.resetGapBefore();
-		if (pstyle.gapAfter() <= -16000)
+		if (pstyle.gapAfter() <= NOVALUE)
 			pstyle.resetGapAfter();
 		if (pstyle.dropCapLines() < 0)
 			pstyle.resetDropCapLines();
-		if (pstyle.parEffectOffset() <= -16000)
+		if (pstyle.parEffectOffset() <= NOVALUE)
 			pstyle.resetParEffectOffset();
 		fixLegacyCharStyle(pstyle.charStyle());
 	}

Modified: trunk/Scribus/scribus/serializer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/serializer.cpp
==============================================================================
--- trunk/Scribus/scribus/serializer.cpp (original)
+++ trunk/Scribus/scribus/serializer.cpp Sun Apr 26 13:34:48 2015
@@ -140,6 +140,7 @@
 
 Serializer::Serializer(ScribusDoc& doc) : Digester(), m_Doc(doc)
 {
+Q_UNUSED(m_Doc)
 	// register desaxe rules for styles, colors and elems
 	addRule("/SCRIBUSFRAGMENT", Factory<Collection>());
 	addRule("/SCRIBUSFRAGMENT", Store<Collection>("<collection>"));

Modified: trunk/Scribus/scribus/third_party/fparser/fparser.cc
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/third_party/fparser/fparser.cc
==============================================================================
--- trunk/Scribus/scribus/third_party/fparser/fparser.cc (original)
+++ trunk/Scribus/scribus/third_party/fparser/fparser.cc Sun Apr 26 13:34:48 2015
@@ -1415,7 +1415,7 @@
         if(op == '-')
         {
             // if we are negating a negation, we can remove both:
-            if((data->ByteCode.back() == cNeg))
+            if(data->ByteCode.back() == cNeg)
                 data->ByteCode.pop_back();
 
             // if we are negating a constant, negate the constant itself:

Modified: trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc
==============================================================================
--- trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc (original)
+++ trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc Sun Apr 26 13:34:48 2015
@@ -75,6 +75,7 @@
 
     inline Ref& operator* () const { return *p; }
     inline Ref* operator->() const { return p; }
+    inline bool operator! () const { return p; }
 
     FPOPT_autoptr& operator= (Ref*        b) { Set(b); return *this; }
     FPOPT_autoptr& operator= (const FPOPT_autoptr& b) { Set(b.p); return *this; }
@@ -238,7 +239,7 @@
         inline double GetImmed() const;
         inline unsigned GetVar() const;
         inline unsigned GetFuncNo() const;
-        inline bool IsDefined() const { return (&*data) != 0; }
+	inline bool IsDefined() const { return !data == false; }
 
         inline bool    IsImmed() const { return GetOpcode() == FUNCTIONPARSERTYPES::cImmed; }
         inline bool      IsVar() const { return GetOpcode() == FUNCTIONPARSERTYPES::cVar; }
@@ -1993,7 +1994,7 @@
 
     bool CodeTree::IsIdenticalTo(const CodeTree& b) const
     {
-        if((!&*data) != (!&*b.data)) return false;
+        if((!data) != (!b.data)) return false;
         if(&*data == &*b.data) return true;
         return data->IsIdenticalTo(*b.data);
     }
@@ -3289,6 +3290,8 @@
                         return true; // Failure
                     case AnyParams:
                         return false; // Not a failure
+		    case GroupFunction:
+			break;
                 }
             }
             return false;
@@ -3311,7 +3314,7 @@
         {
             found = TestParams(rule.match_tree, tree, found.specs, info, true);
             if(found.found) break;
-            if(!&*found.specs)
+            if(!found.specs)
             {
                 // Did not match
         #ifdef DEBUG_SUBSTITUTIONS
@@ -3691,7 +3694,7 @@
                 }
                 else /* A subtree conforming these specs */
                 {
-                    if(!&*start_at)
+                    if(!start_at)
                     {
                         if(!TestImmedConstraints(param.constraints, tree)) return false;
                         if(tree.GetOpcode() != param.data.subfunc_opcode) return false;
@@ -3751,7 +3754,7 @@
     {
         FPOPT_autoptr<MatchPositionSpec_AnyWhere> position;
         unsigned a;
-        if(&*start_at)
+        if(!start_at == false)
         {
             position = (MatchPositionSpec_AnyWhere*) &*start_at;
             a = position->trypos;
@@ -3783,7 +3786,7 @@
                 return MatchResultType(true, &*position);
             } }
         retry_anywhere_2:
-            if(&*(*position)[a].start_at) // is there another try?
+            if(!((*position)[a].start_at) == false) // is there another try?
             {
                 goto retry_anywhere;
             }
@@ -3844,7 +3847,7 @@
                 /* Simple: Test all given parameters in succession. */
                 FPOPT_autoptr<MatchPositionSpec_PositionalParams> position;
                 unsigned a;
-                if(&*start_at)
+                if(!start_at == false)
                 {
                     position = (MatchPositionSpec_PositionalParams*) &*start_at;
                     a = model_tree.param_count - 1;
@@ -3873,7 +3876,7 @@
                   } }
                 retry_positionalparams_2:
                     // doesn't match
-                    if(&*(*position)[a].start_at) // is there another try?
+                    if(!((*position)[a].start_at) == false) // is there another try?
                     {
                         info = (*position)[a].info;
                         goto retry_positionalparams;
@@ -3919,7 +3922,7 @@
                 }
 
                 unsigned a;
-                if(&*start_at)
+                if(!start_at == false)
                 {
                     position = (MatchPositionSpec_AnyParams*) &*start_at;
                     a = model_tree.param_count - 1;
@@ -3959,7 +3962,7 @@
                   } }
                 retry_anyparams_2:
                     // doesn't match
-                    if(&*(*position)[a].start_at) // is there another try?
+                    if(!((*position)[a].start_at) == false) // is there another try?
                     {
                         info = (*position)[a].info;
                         used = (*position)[a].used;

Modified: trunk/Scribus/scribus/third_party/lib2geom/choose.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/third_party/lib2geom/choose.h
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/choose.h (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/choose.h Sun Apr 26 13:34:48 2015
@@ -42,7 +42,7 @@
     static unsigned rows_done = 0;
     // indexing is (0,0,), (1,0), (1,1), (2, 0)...
     // to get (i, j) i*(i+1)/2 + j
-    if(k < 0 || k > n) return 0;
+    if(/*k < 0 ||*/ k > n) return 0;
     if(rows_done <= n) {// we haven't got there yet
         if(rows_done == 0) {
             pascals_triangle.push_back(1);

Modified: trunk/Scribus/scribus/third_party/lib2geom/path.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/third_party/lib2geom/path.h
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/path.h (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/path.h Sun Apr 26 13:34:48 2015
@@ -316,7 +316,7 @@
   }
 
 // TODO: incomplete/buggy
-  Curve *reverse(double /*f*/, double /*t*/) const {
+  Curve *reverse(/*double f, double t*/) const {
     SVGEllipticalArc *ret = new SVGEllipticalArc (*this);
     ret->initial_ = final_;
     ret->final_ = initial_;
@@ -447,7 +447,7 @@
 
   template <typename Impl>
   Path(BaseIterator<Impl> first, BaseIterator<Impl> last, bool closed=false)
-  : closed_(closed), final_(new LineSegment())
+  : final_(new LineSegment()), closed_(closed) 
   {
     curves_.push_back(final_);
     insert(begin(), first, last);

Modified: trunk/Scribus/scribus/third_party/lib2geom/poly.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/third_party/lib2geom/poly.h
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/poly.h (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/poly.h Sun Apr 26 13:34:48 2015
@@ -101,11 +101,12 @@
         const size_type out_size = size() + terms;
         result.reserve(out_size);
         
-        if(terms < 0) {
+        /*if(terms < 0) {
             for(unsigned i = 0; i < out_size; i++) {
                 result.push_back((*this)[i-terms]);
             }
-        } else {
+        } else*/
+	{
             for(unsigned i = 0; i < terms; i++) {
                 result.push_back(0.0);
             }

Modified: trunk/Scribus/scribus/util_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20026&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp (original)
+++ trunk/Scribus/scribus/util_color.cpp Sun Apr 26 13:34:48 2015
@@ -344,7 +344,7 @@
 	{
 		hue        = value;
 		saturation = value;
-		value      = value;
+		/* value   = value;*/
 	}
 	else
 	{




More information about the scribus-commit mailing list