r19628 by jghali - #12803: wrong condition in Mac Pict importer plugin

scribus-commit scribus-commit at lists.scribus.net
Mon Nov 17 07:59:44 UTC 2014


Author: jghali
Date: Mon Nov 17 07:59:44 2014
New Revision: 19628

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

Modified:
    trunk/Scribus/scribus/plugins/import/pct/importpct.cpp

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19628&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp Mon Nov 17 07:59:44 2014
@@ -1318,7 +1318,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);
 }
 
@@ -1403,7 +1403,7 @@
 		ite->PoLine.translate(offsetX, offsetY);
 		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