Author: jghali
Date: Mon Jan 15 22:38:44 2018
New Revision: 22349
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22349
Log:
add data for CIE D50 and D65 illuminants
Added:
trunk/Scribus/scribus/colormgmt/sccieilluminants.cpp
trunk/Scribus/scribus/colormgmt/sccieilluminants.h
Modified:
trunk/Scribus/scribus/colormgmt/CMakeLists.txt
trunk/Scribus/scribus/colormgmt/scciedata.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=22349&path=/trunk/Scribus/scribus/colormgmt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/colormgmt/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/colormgmt/CMakeLists.txt Mon Jan 15 22:38:44 2018
@@ -14,6 +14,7 @@
set(SCRIBUS_COLORMGMT_LIB_SOURCES
scciedata.cpp
+ sccieilluminants.cpp
sccieobservers.cpp
sccolormgmtengine.cpp
sccolormgmtenginedata.cpp
Modified: trunk/Scribus/scribus/colormgmt/scciedata.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22349&path=/trunk/Scribus/scribus/colormgmt/scciedata.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/scciedata.h (original)
+++ trunk/Scribus/scribus/colormgmt/scciedata.h Mon Jan 15 22:38:44 2018
@@ -7,6 +7,7 @@
#ifndef SCCIEDATA_H
#define SCCIEDATA_H
+#include "sccieilluminants.h"
#include "sccieobservers.h"
class ScCIEData
@@ -33,6 +34,16 @@
* @brief Retrieve data for CIE 1964 10° observer.
*/
const ScCIE1964Observer& cie1964Observer() const { return
m_cie1964Observer; }
+
+ /**
+ * @brief Retrieve data for CIE D50 illuminant.
+ */
+ const ScD50Illuminant& d50Illuminant() const { return m_d50Illuminant; }
+
+ /**
+ * @brief Retrieve data for CIE D65 illuminant.
+ */
+ const ScD65Illuminant& d65Illuminant() const { return m_d65Illuminant; }
protected:
/** @brief Constructor. Use ScCIEData::instance() instead. */
@@ -46,6 +57,12 @@
/** @brief CIE 1964 10° observer. */
ScCIE1964Observer m_cie1964Observer;
+
+ /** @brief CIE D50 illuminant. */
+ ScD50Illuminant m_d50Illuminant;
+
+ /** @brief CIE D65 illuminant. */
+ ScD65Illuminant m_d65Illuminant;
};
#endif
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22349&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 Mon Jan 15
22:38:44 2018
@@ -239,6 +239,7 @@
<ClInclude Include="..\..\..\scribus\appmodes.h" />
<ClInclude Include="..\..\..\scribus\collapsedtablepainterex.h" />
<ClInclude Include="..\..\..\scribus\colormgmt\scciedata.h" />
+ <ClInclude Include="..\..\..\scribus\colormgmt\sccieilluminants.h" />
<ClInclude Include="..\..\..\scribus\colormgmt\sccieobservers.h" />
<ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h"
/>
<ClInclude Include="..\..\..\scribus\desaxe\actions.h" />
@@ -821,6 +822,7 @@
<ClCompile Include="..\..\..\scribus\appmodehelper.cpp" />
<ClCompile Include="..\..\..\scribus\collapsedtablepainterex.cpp" />
<ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp" />
+ <ClCompile Include="..\..\..\scribus\colormgmt\sccieilluminants.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=22349&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 Mon Jan
15 22:38:44 2018
@@ -731,6 +731,9 @@
<ClInclude Include="..\..\..\scribus\colormgmt\scciedata.h">
<Filter>colorMgmt</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\colormgmt\sccieilluminants.h">
+ <Filter>colorMgmt</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2342,6 +2345,9 @@
<Filter>colorMgmt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp">
+ <Filter>colorMgmt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\colormgmt\sccieilluminants.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=22349&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 Mon Jan 15
22:38:44 2018
@@ -239,6 +239,7 @@
<ClInclude Include="..\..\..\scribus\appmodes.h" />
<ClInclude Include="..\..\..\scribus\collapsedtablepainterex.h" />
<ClInclude Include="..\..\..\scribus\colormgmt\scciedata.h" />
+ <ClInclude Include="..\..\..\scribus\colormgmt\sccieilluminants.h" />
<ClInclude Include="..\..\..\scribus\colormgmt\sccieobservers.h" />
<ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h"
/>
<ClInclude Include="..\..\..\scribus\desaxe\actions.h" />
@@ -821,6 +822,7 @@
<ClCompile Include="..\..\..\scribus\appmodehelper.cpp" />
<ClCompile Include="..\..\..\scribus\collapsedtablepainterex.cpp" />
<ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp" />
+ <ClCompile Include="..\..\..\scribus\colormgmt\sccieilluminants.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=22349&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 Mon Jan
15 22:38:44 2018
@@ -731,6 +731,9 @@
<ClInclude Include="..\..\..\scribus\colormgmt\scciedata.h">
<Filter>colorMgmt</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\colormgmt\sccieilluminants.h">
+ <Filter>colorMgmt</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2342,6 +2345,9 @@
<Filter>colorMgmt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\colormgmt\scciedata.cpp">
+ <Filter>colorMgmt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\colormgmt\sccieilluminants.cpp">
<Filter>colorMgmt</Filter>
</ClCompile>
</ItemGroup>
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
