r22346 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sun Jan 14 00:46:33 UTC 2018


Author: jghali
Date: Sun Jan 14 00:46:33 2018
New Revision: 22346

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22346
Log:
add singleton class for retrieving CIE data involved in conversion of spectral values to CIE XYZ

Added:
    trunk/Scribus/scribus/colormgmt/scciedata.cpp
    trunk/Scribus/scribus/colormgmt/scciedata.h
Modified:
    trunk/Scribus/scribus/colormgmt/CMakeLists.txt
    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=22346&path=/trunk/Scribus/scribus/colormgmt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/colormgmt/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/colormgmt/CMakeLists.txt	Sun Jan 14 00:46:33 2018
@@ -13,6 +13,8 @@
 )
 
 set(SCRIBUS_COLORMGMT_LIB_SOURCES
+	scciedata.cpp
+	sccieobservers.cpp
 	sccolormgmtengine.cpp
 	sccolormgmtenginedata.cpp
 	sccolormgmtenginefactory.cpp

Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22346&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	Sun Jan 14 00:46:33 2018
@@ -238,6 +238,7 @@
     <moc Include="..\..\..\scribus\appmodehelper.h" />
     <ClInclude Include="..\..\..\scribus\appmodes.h" />
     <ClInclude Include="..\..\..\scribus\collapsedtablepainterex.h" />
+    <ClInclude Include="..\..\..\scribus\colormgmt\scciedata.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieobservers.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h" />
     <ClInclude Include="..\..\..\scribus\desaxe\actions.h" />
@@ -819,6 +820,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\appmodehelper.cpp" />
     <ClCompile Include="..\..\..\scribus\collapsedtablepainterex.cpp" />
+    <ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp" />
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieobservers.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\digester_parse.cpp" />

Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22346&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	Sun Jan 14 00:46:33 2018
@@ -728,6 +728,9 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieobservers.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\scribus\colormgmt\scciedata.h">
+      <Filter>colorMgmt</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2336,6 +2339,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieobservers.cpp">
+      <Filter>colorMgmt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\colormgmt\scciedata.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=22346&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	Sun Jan 14 00:46:33 2018
@@ -238,6 +238,7 @@
     <moc Include="..\..\..\scribus\appmodehelper.h" />
     <ClInclude Include="..\..\..\scribus\appmodes.h" />
     <ClInclude Include="..\..\..\scribus\collapsedtablepainterex.h" />
+    <ClInclude Include="..\..\..\scribus\colormgmt\scciedata.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieobservers.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h" />
     <ClInclude Include="..\..\..\scribus\desaxe\actions.h" />
@@ -819,6 +820,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\appmodehelper.cpp" />
     <ClCompile Include="..\..\..\scribus\collapsedtablepainterex.cpp" />
+    <ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp" />
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieobservers.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\digester_parse.cpp" />

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22346&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	Sun Jan 14 00:46:33 2018
@@ -728,6 +728,9 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccieobservers.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\scribus\colormgmt\scciedata.h">
+      <Filter>colorMgmt</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2336,6 +2339,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\colormgmt\sccieobservers.cpp">
+      <Filter>colorMgmt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp">
       <Filter>colorMgmt</Filter>
     </ClCompile>
   </ItemGroup>




More information about the scribus-commit mailing list