r22360 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Thu Jan 25 22:57:26 UTC 2018 

Author: jghali
Date: Thu Jan 25 22:57:26 2018
New Revision: 22360

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22360
Log:
add new class for performing conversions of spectral values to CIEXYZ and CIELab 

Added:
    trunk/Scribus/scribus/colormgmt/scspectralvaluesconvertor.cpp
    trunk/Scribus/scribus/colormgmt/scspectralvaluesconvertor.h
Modified:
    trunk/Scribus/scribus/colormgmt/CMakeLists.txt
    trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h
    trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/scribus/colormgmt/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22360&path=/trunk/Scribus/scribus/colormgmt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/colormgmt/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/colormgmt/CMakeLists.txt	Thu Jan 25 22:57:26 2018
@@ -28,6 +28,7 @@
 	sccolorspacedata.cpp
 	sccolortransform.cpp
 	sccolortransformpool.cpp
+	scspectralvaluesconvertor.cpp
 	${SCRIBUS_LCMS_IMPL_SOURCES}
 )
 

Modified: trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22360&path=/trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h	Thu Jan 25 22:57:26 2018
@@ -144,6 +144,13 @@
 	double Z;
 };
 
+struct ScLab
+{
+	double L;
+	double a;
+	double b;
+};
+
 eColorType colorFormatType(eColorFormat format);
 uint       colorFormatNumChannels(eColorFormat format);
 uint       colorFormatBytesPerChannel(eColorFormat format);

Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22360&path=/trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj	Thu Jan 25 22:57:26 2018
@@ -242,6 +242,7 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieilluminants.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieobservers.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h" />
+    <ClInclude Include="..\..\..\scribus\colormgmt\scspectralvaluesconvertor.h" />
     <ClInclude Include="..\..\..\scribus\desaxe\actions.h" />
     <ClInclude Include="..\..\..\scribus\desaxe\automata.h" />
     <ClInclude Include="..\..\..\scribus\desaxe\base_actions.h" />
@@ -824,6 +825,7 @@
     <ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp" />
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieilluminants.cpp" />
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieobservers.cpp" />
+    <ClCompile Include="..\..\..\scribus\colormgmt\scspectralvaluesconvertor.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\digester_parse.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\saxfilter.cpp" />

Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22360&path=/trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters	Thu Jan 25 22:57:26 2018
@@ -734,6 +734,9 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieilluminants.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\scribus\colormgmt\scspectralvaluesconvertor.h">
+      <Filter>colorMgmt</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2348,6 +2351,9 @@
       <Filter>colorMgmt</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieilluminants.cpp">
+      <Filter>colorMgmt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\colormgmt\scspectralvaluesconvertor.cpp">
       <Filter>colorMgmt</Filter>
     </ClCompile>
   </ItemGroup>

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22360&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	Thu Jan 25 22:57:26 2018
@@ -242,6 +242,7 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieilluminants.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieobservers.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h" />
+    <ClInclude Include="..\..\..\scribus\colormgmt\scspectralvaluesconvertor.h" />
     <ClInclude Include="..\..\..\scribus\desaxe\actions.h" />
     <ClInclude Include="..\..\..\scribus\desaxe\automata.h" />
     <ClInclude Include="..\..\..\scribus\desaxe\base_actions.h" />
@@ -824,6 +825,7 @@
     <ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp" />
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieilluminants.cpp" />
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieobservers.cpp" />
+    <ClCompile Include="..\..\..\scribus\colormgmt\scspectralvaluesconvertor.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\digester_parse.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\saxfilter.cpp" />

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22360&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	Thu Jan 25 22:57:26 2018
@@ -734,6 +734,9 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieilluminants.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\scribus\colormgmt\scspectralvaluesconvertor.h">
+      <Filter>colorMgmt</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2348,6 +2351,9 @@
       <Filter>colorMgmt</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieilluminants.cpp">
+      <Filter>colorMgmt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\colormgmt\scspectralvaluesconvertor.cpp">
       <Filter>colorMgmt</Filter>
     </ClCompile>
   </ItemGroup>

More information about the scribus-commit mailing list