r14401 by jghali - svg importer: fix inverted magenta and yellow channels when parsing icc colors

scribus-commit scribus-commit at lists.scribus.net
Sat Dec 12 03:00:21 CET 2009


Revision: 14401
Author: jghali
Date: 2009-12-11T14:59:47.882648Z
Commit message: svg importer: fix inverted magenta and yellow channels when parsing icc colors

Changeset: 
M  /branches/Version135/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp

Diffs:
Index: scribus/plugins/svgimplugin/svgplugin.cpp
===================================================================
--- scribus/plugins/svgimplugin/svgplugin.cpp	(revision 14400)
+++ scribus/plugins/svgimplugin/svgplugin.cpp	(revision 14401)
@@ -2009,22 +2009,22 @@
 		QStringList colors = iccColor.split(',', QString::SkipEmptyParts);
 		if (colors.count() == 5) // then we assume this is a cmyk color
 		{
-			QString cs = colors[1], ys = colors[2], ms = colors[3], ks = colors[4];
+			QString cs = colors[1], ms = colors[2], ys = colors[3], ks = colors[4];
 			if (cs.contains( "%" ))
 			{
 				cs = cs.left( cs.length() - 1 );
 				cs = QString::number(ScCLocale::toDoubleC(cs) / 100);
 			}
+			if (ms.contains( "%" ))
+			{
+				ms = ms.left( ms.length() - 1 );
+				ms = QString::number(ScCLocale::toDoubleC(ms) / 100);
+			}
 			if (ys.contains( "%" ))
 			{
 				ys = ys.left( ys.length() - 1 );
 				ys = QString::number(ScCLocale::toDoubleC(ys) / 100);
 			}
-			if (ms.contains( "%" ))
-			{
-				ms = ms.left( ms.length() - 1 );
-				ms = QString::number(ScCLocale::toDoubleC(ms) / 100);
-			}
 			if (ks.contains( "%" ))
 			{
 				ks = ks.left( ks.length() - 1 );




More information about the scribus-commit mailing list