r22340 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Mon Jan 8 23:25:57 UTC 2018


Author: jghali
Date: Mon Jan  8 23:25:57 2018
New Revision: 22340

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22340
Log:
#15096: VIVA import filter doesn't recognize Lab values

Modified:
    trunk/Scribus/scribus/plugins/import/viva/importviva.cpp

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22340&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	Mon Jan  8 23:25:57 2018
@@ -521,7 +521,7 @@
 				bool seenSpot = false;
 				bool seenRegC = false;
 				ScColor tmp;
-				for(QDomNode gr = e.firstChild(); !gr.isNull(); gr = gr.nextSibling() )
+				for (QDomNode gr = e.firstChild(); !gr.isNull(); gr = gr.nextSibling() )
 				{
 					QDomElement grs = gr.toElement();
 					if (grs.tagName() == "vc:rgb")
@@ -539,6 +539,14 @@
 						int y = grs.attribute("vc:yellow", "0").toInt();
 						int k = grs.attribute("vc:key", "0").toInt();
 						tmp.setColor(c, m, y, k);
+						break;
+					}
+					else if (grs.tagName() == "vc:lab")
+					{
+						double L = grs.attribute("vc:l", "100").toDouble();
+						double a = grs.attribute("vc:a", "0").toDouble();
+						double b = grs.attribute("vc:b", "0").toDouble();
+						tmp.setLabColor(L, a, b);
 						break;
 					}
 					else if (grs.tagName() == "vc:hsv")




More information about the scribus-commit mailing list