r19629 by jghali - ##12812: wrong condition in Mac Pict importer plugin

scribus-commit scribus-commit at lists.scribus.net
Mon Nov 17 08:00:20 UTC 2014


Author: jghali
Date: Mon Nov 17 08:00:20 2014
New Revision: 19629

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19629
Log:
##12812: wrong condition in Mac Pict importer plugin

Modified:
    branches/Version14x/Scribus/scribus/plugins/import/pct/importpct.cpp

Modified: branches/Version14x/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19629&path=/branches/Version14x/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/import/pct/importpct.cpp Mon Nov 17 08:00:20 2014
@@ -1250,7 +1250,7 @@
 	if (opCode > 0x0044)
 		currRectType = 1;
 	finishItem(ite);
-	if ((patternMode) && ((opCode != 0x0030) || (opCode != 0x0040) || (opCode != 0x0050)))
+	if ((patternMode) && (opCode != 0x0030) && (opCode != 0x0040) && (opCode != 0x0050))
 		setFillPattern(ite);
 }
 
@@ -1335,7 +1335,7 @@
 		ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
 		finishItem(ite);
 	}
-	if ((patternMode) && ((opCode != 0x0038) || (opCode != 0x0048) || (opCode != 0x0058)))
+	if ((patternMode) && (opCode != 0x0038) && (opCode != 0x0048) && (opCode != 0x0058))
 		setFillPattern(ite);
 }
 




More information about the scribus-commit mailing list