Author: jghali
Date: Tue Jul 10 11:15:08 2018
New Revision: 22596
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22596
Log:
Indentation fixes: replace spaces introduced by error in slaoutput.cpp by spaces
Modified:
trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22596&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Tue Jul 10
11:15:08 2018
@@ -222,51 +222,51 @@
}
else if (color_space->getMode() == csSeparation)
{
- GfxSeparationColorSpace* sepColorSpace =
(GfxSeparationColorSpace*)color_space;
- GfxColorSpace* altColorSpace = sepColorSpace->getAlt();
- QString name = QString(sepColorSpace->getName()->getCString());
- bool isRegistrationColor = (name == "All");
- if (isRegistrationColor)
- {
- tmp.setCmykColorF(1.0, 1.0, 1.0, 1.0);
- tmp.setRegistrationColor(true);
- name = "Registration";
- }
- else if ((altColorSpace->getMode() == csDeviceRGB) ||
(altColorSpace->getMode() == csCalRGB))
- {
- double x = 1.0;
- double comps[gfxColorMaxComps];
- sepColorSpace->getFunc()->transform(&x, comps);
- tmp.setRgbColorF(comps[0], comps[1], comps[2]);
- }
- else if ((altColorSpace->getMode() == csCalGray) ||
(altColorSpace->getMode() == csDeviceGray))
- {
- double x = 1.0;
- double comps[gfxColorMaxComps];
- sepColorSpace->getFunc()->transform(&x, comps);
- tmp.setCmykColorF(0.0, 0.0, 0.0, 1.0 - comps[0]);
- }
- else if (altColorSpace->getMode() == csLab)
- {
- double x = 1.0;
- double comps[gfxColorMaxComps];
- sepColorSpace->getFunc()->transform(&x, comps);
- tmp.setLabColor(comps[0], comps[1], comps[2]);
- }
- else
- {
- GfxCMYK cmyk;
- color_space->getCMYK(color, &cmyk);
- double Cc = colToDbl(cmyk.c);
- double Mc = colToDbl(cmyk.m);
- double Yc = colToDbl(cmyk.y);
- double Kc = colToDbl(cmyk.k);
- tmp.setCmykColorF(Cc, Mc, Yc, Kc);
- }
- tmp.setSpotColor(true);
-
- fNam = m_doc->PageColors.tryAddColor(name, tmp);
- *shade = qRound(colToDbl(color->c[0]) * 100);
+ GfxSeparationColorSpace* sepColorSpace =
(GfxSeparationColorSpace*)color_space;
+ GfxColorSpace* altColorSpace = sepColorSpace->getAlt();
+ QString name = QString(sepColorSpace->getName()->getCString());
+ bool isRegistrationColor = (name == "All");
+ if (isRegistrationColor)
+ {
+ tmp.setCmykColorF(1.0, 1.0, 1.0, 1.0);
+ tmp.setRegistrationColor(true);
+ name = "Registration";
+ }
+ else if ((altColorSpace->getMode() == csDeviceRGB) ||
(altColorSpace->getMode() == csCalRGB))
+ {
+ double x = 1.0;
+ double comps[gfxColorMaxComps];
+ sepColorSpace->getFunc()->transform(&x, comps);
+ tmp.setRgbColorF(comps[0], comps[1], comps[2]);
+ }
+ else if ((altColorSpace->getMode() == csCalGray) ||
(altColorSpace->getMode() == csDeviceGray))
+ {
+ double x = 1.0;
+ double comps[gfxColorMaxComps];
+ sepColorSpace->getFunc()->transform(&x, comps);
+ tmp.setCmykColorF(0.0, 0.0, 0.0, 1.0 - comps[0]);
+ }
+ else if (altColorSpace->getMode() == csLab)
+ {
+ double x = 1.0;
+ double comps[gfxColorMaxComps];
+ sepColorSpace->getFunc()->transform(&x, comps);
+ tmp.setLabColor(comps[0], comps[1], comps[2]);
+ }
+ else
+ {
+ GfxCMYK cmyk;
+ color_space->getCMYK(color, &cmyk);
+ double Cc = colToDbl(cmyk.c);
+ double Mc = colToDbl(cmyk.m);
+ double Yc = colToDbl(cmyk.y);
+ double Kc = colToDbl(cmyk.k);
+ tmp.setCmykColorF(Cc, Mc, Yc, Kc);
+ }
+ tmp.setSpotColor(true);
+
+ fNam = m_doc->PageColors.tryAddColor(name, tmp);
+ *shade = qRound(colToDbl(color->c[0]) * 100);
}
else
{
@@ -4017,46 +4017,46 @@
}
else if (color_space->getMode() == csSeparation)
{
- GfxSeparationColorSpace* sepColorSpace = (GfxSeparationColorSpace*)
color_space;
- GfxColorSpace* altColorSpace = sepColorSpace->getAlt();
+ GfxSeparationColorSpace* sepColorSpace =
(GfxSeparationColorSpace*) color_space;
+ GfxColorSpace* altColorSpace = sepColorSpace->getAlt();
QString name = QString(sepColorSpace->getName()->getCString());
bool isRegistrationColor = (name == "All");
- if (isRegistrationColor)
- {
- tmp.setCmykColorF(1.0, 1.0, 1.0, 1.0);
- tmp.setRegistrationColor(true);
- name = "Registration";
- }
- else if ((altColorSpace->getMode() == csDeviceRGB) ||
(altColorSpace->getMode() == csCalRGB))
- {
- double x = 1.0;
- double comps[gfxColorMaxComps];
- sepColorSpace->getFunc()->transform(&x, comps);
- tmp.setRgbColorF(comps[0], comps[1], comps[2]);
- }
- else if ((altColorSpace->getMode() == csCalGray) ||
(altColorSpace->getMode() == csDeviceGray))
- {
- double x = 1.0;
- double comps[gfxColorMaxComps];
- sepColorSpace->getFunc()->transform(&x, comps);
- tmp.setCmykColorF(0.0, 0.0, 0.0, 1.0 - comps[0]);
- }
- else if (altColorSpace->getMode() == csLab)
- {
- double x = 1.0;
- double comps[gfxColorMaxComps];
- sepColorSpace->getFunc()->transform(&x, comps);
- tmp.setLabColor(comps[0], comps[1], comps[2]);
- }
- else
- {
- GfxCMYK cmyk;
+ if (isRegistrationColor)
+ {
+ tmp.setCmykColorF(1.0, 1.0, 1.0, 1.0);
+ tmp.setRegistrationColor(true);
+ name = "Registration";
+ }
+ else if ((altColorSpace->getMode() == csDeviceRGB) ||
(altColorSpace->getMode() == csCalRGB))
+ {
+ double x = 1.0;
+ double comps[gfxColorMaxComps];
+ sepColorSpace->getFunc()->transform(&x, comps);
+ tmp.setRgbColorF(comps[0], comps[1], comps[2]);
+ }
+ else if ((altColorSpace->getMode() == csCalGray) ||
(altColorSpace->getMode() == csDeviceGray))
+ {
+ double x = 1.0;
+ double comps[gfxColorMaxComps];
+ sepColorSpace->getFunc()->transform(&x, comps);
+ tmp.setCmykColorF(0.0, 0.0, 0.0, 1.0 - comps[0]);
+ }
+ else if (altColorSpace->getMode() == csLab)
+ {
+ double x = 1.0;
+ double comps[gfxColorMaxComps];
+ sepColorSpace->getFunc()->transform(&x, comps);
+ tmp.setLabColor(comps[0], comps[1], comps[2]);
+ }
+ else
+ {
+ GfxCMYK cmyk;
color_space->getCMYK(color, &cmyk);
double Cc = colToDbl(cmyk.c);
- double Mc = colToDbl(cmyk.m);
- double Yc = colToDbl(cmyk.y);
- double Kc = colToDbl(cmyk.k);
- tmp.setCmykColorF(Cc, Mc, Yc, Kc);
+ double Mc = colToDbl(cmyk.m);
+ double Yc = colToDbl(cmyk.y);
+ double Kc = colToDbl(cmyk.k);
+ tmp.setCmykColorF(Cc, Mc, Yc, Kc);
}
tmp.setSpotColor(true);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
