r23516 by jghali - C++11 updates for color management classes

scribus-commit scribus-commit at lists.scribus.net
Thu Mar 19 11:45:50 UTC 2020


Author: jghali
Date: Thu Mar 19 11:45:50 2020
New Revision: 23516

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23516
Log:
C++11 updates for color management classes

Modified:
    trunk/Scribus/scribus/colormgmt/sccolorprofile.h
    trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyk.h
    trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyka.h
    trunk/Scribus/scribus/colormgmt/sccolorspacedata_gray.h
    trunk/Scribus/scribus/colormgmt/sccolorspacedata_laba.h
    trunk/Scribus/scribus/colormgmt/sccolorspacedata_labdbl.h
    trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgb.h
    trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgba.h
    trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.h
    trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h
    trunk/Scribus/scribus/colormgmt/sclcms2colortransformimpl.h

Modified: trunk/Scribus/scribus/colormgmt/sccolorprofile.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sccolorprofile.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorprofile.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorprofile.h	Thu Mar 19 11:45:50 2020
@@ -8,6 +8,7 @@
 #ifndef SCCOLORPROFILE_H
 #define SCCOLORPROFILE_H
 
+#include <QByteArray>
 #include <QSharedPointer>
 #include <QWeakPointer>
 

Modified: trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyk.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyk.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyk.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyk.h	Thu Mar 19 11:45:50 2020
@@ -19,8 +19,8 @@
 public:
 	ScColorSpaceDataTempl_CMYK(ScColorProfile& profile);
 
-	virtual uint alphaIndex(void) const { return 0; }
-	virtual void flattenAlpha(void* dataIn, uint numElems) const {};
+	uint alphaIndex(void) const override { return 0; }
+	void flattenAlpha(void* dataIn, uint numElems) const override {};
 };
 
 template<typename T, eColorFormat COLORFORMAT>

Modified: trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyka.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyka.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyka.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyka.h	Thu Mar 19 11:45:50 2020
@@ -20,8 +20,8 @@
 public:
 	ScColorSpaceDataTempl_CMYKA(ScColorProfile& profile);
 
-	virtual uint alphaIndex(void) const { return m_aIndex; }
-	virtual void flattenAlpha(void* dataIn, uint numElems) const;
+	uint alphaIndex(void) const override { return m_aIndex; }
+	void flattenAlpha(void* dataIn, uint numElems) const override;
 };
 
 template<typename T, eColorFormat COLORFORMAT>

Modified: trunk/Scribus/scribus/colormgmt/sccolorspacedata_gray.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sccolorspacedata_gray.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorspacedata_gray.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorspacedata_gray.h	Thu Mar 19 11:45:50 2020
@@ -13,8 +13,8 @@
 public:
 	ScColorSpaceDataTempl_Gray(ScColorProfile& profile);
 
-	virtual uint alphaIndex(void) const { return 0; }
-	virtual void flattenAlpha(void* dataIn, uint numElems) const {};
+	uint alphaIndex(void) const override { return 0; }
+	void flattenAlpha(void* dataIn, uint numElems) const override {};
 };
 
 template<typename T, eColorFormat COLORFORMAT>

Modified: trunk/Scribus/scribus/colormgmt/sccolorspacedata_laba.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sccolorspacedata_laba.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorspacedata_laba.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorspacedata_laba.h	Thu Mar 19 11:45:50 2020
@@ -19,8 +19,8 @@
 public:
 	ScColorSpaceDataTempl_LabA(ScColorProfile& profile);
 
-	virtual uint alphaIndex(void) const { return m_AIndex; }
-	virtual void flattenAlpha(void* dataIn, uint numElems) const;
+	uint alphaIndex(void) const override { return m_AIndex; }
+	void flattenAlpha(void* dataIn, uint numElems) const override;
 };
 
 template<typename T, eColorFormat COLORFORMAT>

Modified: trunk/Scribus/scribus/colormgmt/sccolorspacedata_labdbl.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sccolorspacedata_labdbl.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorspacedata_labdbl.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorspacedata_labdbl.h	Thu Mar 19 11:45:50 2020
@@ -18,8 +18,8 @@
 public:
 	ScColorSpaceDataTempl_LabDbl(ScColorProfile& profile);
 
-	virtual uint alphaIndex(void) const { return 0; }
-	virtual void flattenAlpha(void* dataIn, uint numElems) const {};
+	uint alphaIndex(void) const override { return 0; }
+	void flattenAlpha(void* dataIn, uint numElems) const override {};
 };
 
 template<typename T, eColorFormat COLORFORMAT>

Modified: trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgb.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgb.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgb.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgb.h	Thu Mar 19 11:45:50 2020
@@ -18,8 +18,8 @@
 public:
 	ScColorSpaceDataTempl_RGB(ScColorProfile& profile);
 
-	virtual uint alphaIndex(void) const { return 0; }
-	virtual void flattenAlpha(void* dataIn, uint numElems) const {};
+	uint alphaIndex(void) const override { return 0; }
+	void flattenAlpha(void* dataIn, uint numElems) const override {};
 };
 
 template<typename T, eColorFormat COLORFORMAT>

Modified: trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgba.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgba.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgba.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgba.h	Thu Mar 19 11:45:50 2020
@@ -19,8 +19,8 @@
 public:
 	ScColorSpaceDataTempl_RGBA(ScColorProfile& profile);
 
-	virtual uint alphaIndex(void) const { return m_aIndex; }
-	virtual void flattenAlpha(void* dataIn, uint numElems) const;
+	uint alphaIndex(void) const override { return m_aIndex; }
+	void flattenAlpha(void* dataIn, uint numElems) const override;
 };
 
 template<typename T, eColorFormat COLORFORMAT>

Modified: trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.h	Thu Mar 19 11:45:50 2020
@@ -23,29 +23,29 @@
 	ScLcms2ColorMgmtEngineImpl();
 
 	// Setter, only for  color management strategy
-	virtual void setStrategy(const ScColorMgmtStrategy& strategy);
+	void setStrategy(const ScColorMgmtStrategy& strategy) override;
 
 	// function for getting available profile in a directory
-	virtual QList<ScColorProfileInfo> getAvailableProfileInfo(const QString& directory, bool recursive);
+	QList<ScColorProfileInfo> getAvailableProfileInfo(const QString& directory, bool recursive) override;
 	
 	// functions for opening icc profiles
-	virtual ScColorProfile openProfileFromFile(ScColorMgmtEngine& engine, const QString& filePath);
-	virtual ScColorProfile openProfileFromMem (ScColorMgmtEngine& engine, const QByteArray& array);
+	ScColorProfile openProfileFromFile(ScColorMgmtEngine& engine, const QString& filePath) override;
+	ScColorProfile openProfileFromMem (ScColorMgmtEngine& engine, const QByteArray& array) override;
 	
 	// functions for creating profiles
-	virtual ScColorProfile createProfile_sRGB(ScColorMgmtEngine& engine);
-	virtual ScColorProfile createProfile_Lab (ScColorMgmtEngine& engine);
+	ScColorProfile createProfile_sRGB(ScColorMgmtEngine& engine) override;
+	ScColorProfile createProfile_Lab (ScColorMgmtEngine& engine) override;
 	
 	// functions for creating transforms
-	virtual ScColorTransform createTransform(ScColorMgmtEngine& colorManagementEngine,
-		                                     const ScColorProfile& inputProfile , eColorFormat inputFormat,
-	                                         const ScColorProfile& outputProfile, eColorFormat outputFormat,
-											 eRenderIntent renderIntent, long transformFlags);
-	virtual ScColorTransform createProofingTransform(ScColorMgmtEngine& colorManagementEngine,
-		                                     const ScColorProfile& inputProfile , eColorFormat inputFormat,
-	                                         const ScColorProfile& outputProfile, eColorFormat outputFormat,
-											 const ScColorProfile& proofing, eRenderIntent renderIntent, 
-	                                         eRenderIntent proofingIntent, long transformFlags);
+	ScColorTransform createTransform(ScColorMgmtEngine& colorManagementEngine,
+	                                 const ScColorProfile& inputProfile , eColorFormat inputFormat,
+	                                 const ScColorProfile& outputProfile, eColorFormat outputFormat,
+	                                 eRenderIntent renderIntent, long transformFlags) override;
+	ScColorTransform createProofingTransform(ScColorMgmtEngine& colorManagementEngine,
+	                                  const ScColorProfile& inputProfile , eColorFormat inputFormat,
+	                                  const ScColorProfile& outputProfile, eColorFormat outputFormat,
+	                                  const ScColorProfile& proofing, eRenderIntent renderIntent, 
+	                                  eRenderIntent proofingIntent, long transformFlags) override;
 
 protected:
 

Modified: trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sclcms2colorprofileimpl.h	Thu Mar 19 11:45:50 2020
@@ -22,13 +22,13 @@
 	ScLcms2ColorProfileImpl(ScColorMgmtEngine& engine, cmsHPROFILE lcmsProfile);
 	virtual ~ScLcms2ColorProfileImpl();
 
-	virtual bool isNull() const;
+	bool isNull() const override;
 
-	virtual eColorSpaceType colorSpace()  const;
-	virtual eProfileClass   deviceClass() const;
-	virtual bool            isSuitableForOutput() const;
-	virtual QString         productDescription() const;
-	virtual bool            save(QByteArray& profileData) const;
+	eColorSpaceType colorSpace()  const override;
+	eProfileClass   deviceClass() const override;
+	bool            isSuitableForOutput() const override;
+	QString         productDescription() const override;
+	bool            save(QByteArray& profileData) const override;
 
 protected:
 	cmsHPROFILE     m_profileHandle;

Modified: trunk/Scribus/scribus/colormgmt/sclcms2colortransformimpl.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23516&path=/trunk/Scribus/scribus/colormgmt/sclcms2colortransformimpl.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sclcms2colortransformimpl.h	(original)
+++ trunk/Scribus/scribus/colormgmt/sclcms2colortransformimpl.h	Thu Mar 19 11:45:50 2020
@@ -20,10 +20,10 @@
 	ScLcms2ColorTransformImpl(ScColorMgmtEngine& engine, cmsHTRANSFORM lcmsTransform);
 	virtual ~ScLcms2ColorTransformImpl();
 
-	virtual bool isNull() const;
+	bool isNull() const override;
 
-	virtual bool apply(void* input, void* output, uint numElem);
-	virtual bool apply(QByteArray& input, QByteArray& output, uint numElem);
+	bool apply(void* input, void* output, uint numElem) override;
+	bool apply(QByteArray& input, QByteArray& output, uint numElem) override;
 
 protected:
 	cmsHTRANSFORM m_transformHandle;




More information about the scribus-commit mailing list