Commit e31f9ed0 authored by Thomas Zander's avatar Thomas Zander

Rename KoColorSpaceFactoryRegistry to KoColorSpaceRegistry to keep it in

line with the other registries in koffice libs

svn path=/trunk/koffice/; revision=565484
parent a03c4dbc
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kis_debug_areas.h> #include <kis_debug_areas.h>
#include <KoColorSpaceFactoryRegistry.h> #include <KoColorSpaceRegistry.h>
#include <kis_basic_histogram_producers.h> #include <kis_basic_histogram_producers.h>
#include <kis_debug_areas.h> #include <kis_debug_areas.h>
#include "cmyk_u16_plugin.h" #include "cmyk_u16_plugin.h"
...@@ -39,9 +39,9 @@ CMYKU16Plugin::CMYKU16Plugin(QObject *parent, const QStringList &) ...@@ -39,9 +39,9 @@ CMYKU16Plugin::CMYKU16Plugin(QObject *parent, const QStringList &)
{ {
setInstance(CMYKU16PluginFactory::instance()); setInstance(CMYKU16PluginFactory::instance());
if ( parent->inherits("KoColorSpaceFactoryRegistry") ) if ( parent->inherits("KoColorSpaceRegistry") )
{ {
KoColorSpaceFactoryRegistry * f = dynamic_cast<KoColorSpaceFactoryRegistry*>( parent ); KoColorSpaceRegistry * f = dynamic_cast<KoColorSpaceRegistry*>( parent );
KoColorSpace * colorSpaceCMYKU16 = new KisCmykU16ColorSpace(f, 0); KoColorSpace * colorSpaceCMYKU16 = new KisCmykU16ColorSpace(f, 0);
KoColorSpaceFactory * csf = new KisCmykU16ColorSpaceFactory(); KoColorSpaceFactory * csf = new KisCmykU16ColorSpaceFactory();
......
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
#include "KoU16ColorSpaceTrait.h" #include "KoU16ColorSpaceTrait.h"
#include "kis_color_conversions.h" #include "kis_color_conversions.h"
#include "KoIntegerMaths.h" #include "KoIntegerMaths.h"
#include "KoColorSpaceFactoryRegistry.h" #include "KoColorSpaceRegistry.h"
namespace { namespace {
const qint32 MAX_CHANNEL_CMYK = 4; const qint32 MAX_CHANNEL_CMYK = 4;
const qint32 MAX_CHANNEL_CMYKA = 5; const qint32 MAX_CHANNEL_CMYKA = 5;
} }
KisCmykU16ColorSpace::KisCmykU16ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) : KisCmykU16ColorSpace::KisCmykU16ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) :
KoColorSpace(KoID("CMYKA16", i18n("CMYK (16-bit integer/channel)")), parent) KoColorSpace(KoID("CMYKA16", i18n("CMYK (16-bit integer/channel)")), parent)
, KoU16ColorSpaceTrait(PIXEL_ALPHA * sizeof(quint16)) , KoU16ColorSpaceTrait(PIXEL_ALPHA * sizeof(quint16))
, KoLcmsColorSpaceTrait(TYPE_CMYK5_16, icSigCmykData, p) , KoLcmsColorSpaceTrait(TYPE_CMYK5_16, icSigCmykData, p)
......
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
}; };
public: public:
KisCmykU16ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p); KisCmykU16ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p);
virtual ~KisCmykU16ColorSpace(); virtual ~KisCmykU16ColorSpace();
virtual bool willDegrade(ColorSpaceIndependence independence) virtual bool willDegrade(ColorSpaceIndependence independence)
...@@ -116,7 +116,7 @@ public: ...@@ -116,7 +116,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; }; virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; };
virtual KoColorSpace *createColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) { return new KisCmykU16ColorSpace(parent, p); }; virtual KoColorSpace *createColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) { return new KisCmykU16ColorSpace(parent, p); };
virtual QString defaultProfile() { return "Adobe CMYK"; }; virtual QString defaultProfile() { return "Adobe CMYK"; };
}; };
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kis_debug_areas.h> #include <kis_debug_areas.h>
#include <KoColorSpaceFactoryRegistry.h> #include <KoColorSpaceRegistry.h>
#include <kis_basic_histogram_producers.h> #include <kis_basic_histogram_producers.h>
#include "cmyk_plugin.h" #include "cmyk_plugin.h"
...@@ -43,9 +43,9 @@ CMYKPlugin::CMYKPlugin(QObject *parent, const QStringList &) ...@@ -43,9 +43,9 @@ CMYKPlugin::CMYKPlugin(QObject *parent, const QStringList &)
: KParts::Plugin(parent) : KParts::Plugin(parent)
{ {
setInstance(CMYKPluginFactory::instance()); setInstance(CMYKPluginFactory::instance());
if ( parent->inherits("KoColorSpaceFactoryRegistry") ) if ( parent->inherits("KoColorSpaceRegistry") )
{ {
KoColorSpaceFactoryRegistry * f = dynamic_cast<KoColorSpaceFactoryRegistry*>( parent ); KoColorSpaceRegistry * f = dynamic_cast<KoColorSpaceRegistry*>( parent );
KoColorSpace * colorSpaceCMYK = new KisCmykColorSpace(f, 0); KoColorSpace * colorSpaceCMYK = new KisCmykColorSpace(f, 0);
KoColorSpaceFactory * csf = new KisCmykColorSpaceFactory(); KoColorSpaceFactory * csf = new KisCmykColorSpaceFactory();
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "kis_cmyk_colorspace.h" #include "kis_cmyk_colorspace.h"
#include "KoU8ColorSpaceTrait.h" #include "KoU8ColorSpaceTrait.h"
#include "KoColorSpaceFactoryRegistry.h" #include "KoColorSpaceRegistry.h"
#include "KoColorProfile.h" #include "KoColorProfile.h"
#include "KoIntegerMaths.h" #include "KoIntegerMaths.h"
...@@ -37,7 +37,7 @@ namespace cmyk { ...@@ -37,7 +37,7 @@ namespace cmyk {
const qint32 MAX_CHANNEL_CMYKA = 5; const qint32 MAX_CHANNEL_CMYKA = 5;
} }
KisCmykColorSpace::KisCmykColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) : KisCmykColorSpace::KisCmykColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) :
KoColorSpace(KoID("CMYK", i18n("CMYK")), parent) KoColorSpace(KoID("CMYK", i18n("CMYK")), parent)
, KoU8ColorSpaceTrait(PIXEL_CMYK_ALPHA) , KoU8ColorSpaceTrait(PIXEL_CMYK_ALPHA)
, KoLcmsColorSpaceTrait(TYPE_CMYK5_8, icSigCmykData, p) , KoLcmsColorSpaceTrait(TYPE_CMYK5_8, icSigCmykData, p)
......
...@@ -38,7 +38,7 @@ public: ...@@ -38,7 +38,7 @@ public:
quint16 alpha; quint16 alpha;
}; };
public: public:
KisCmykColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p); KisCmykColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p);
virtual ~KisCmykColorSpace(); virtual ~KisCmykColorSpace();
...@@ -119,7 +119,7 @@ public: ...@@ -119,7 +119,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; }; virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; };
virtual KoColorSpace *createColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) { return new KisCmykColorSpace(parent, p); }; virtual KoColorSpace *createColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) { return new KisCmykColorSpace(parent, p); };
virtual QString defaultProfile() { return "Adobe CMYK"; }; // Do not i18n -- this is from a data file virtual QString defaultProfile() { return "Adobe CMYK"; }; // Do not i18n -- this is from a data file
}; };
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <kis_debug_areas.h> #include <kis_debug_areas.h>
#include <KoColorSpaceFactoryRegistry.h> #include <KoColorSpaceRegistry.h>
#include <kis_basic_histogram_producers.h> #include <kis_basic_histogram_producers.h>
#include "gray_u16_plugin.h" #include "gray_u16_plugin.h"
...@@ -40,9 +40,9 @@ GRAYU16Plugin::GRAYU16Plugin(QObject *parent, const QStringList &) ...@@ -40,9 +40,9 @@ GRAYU16Plugin::GRAYU16Plugin(QObject *parent, const QStringList &)
{ {
setInstance(GRAYU16PluginFactory::instance()); setInstance(GRAYU16PluginFactory::instance());
if ( parent->inherits("KoColorSpaceFactoryRegistry") ) if ( parent->inherits("KoColorSpaceRegistry") )
{ {
KoColorSpaceFactoryRegistry * f = dynamic_cast<KoColorSpaceFactoryRegistry*>( parent ); KoColorSpaceRegistry * f = dynamic_cast<KoColorSpaceRegistry*>( parent );
KoColorSpace * colorSpaceGRAYU16 = new KisGrayU16ColorSpace(f, 0); KoColorSpace * colorSpaceGRAYU16 = new KisGrayU16ColorSpace(f, 0);
KoColorSpaceFactory * csf = new KisGrayU16ColorSpaceFactory(); KoColorSpaceFactory * csf = new KisGrayU16ColorSpaceFactory();
......
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
#include "KoU16ColorSpaceTrait.h" #include "KoU16ColorSpaceTrait.h"
#include "kis_color_conversions.h" #include "kis_color_conversions.h"
#include "KoIntegerMaths.h" #include "KoIntegerMaths.h"
#include "KoColorSpaceFactoryRegistry.h" #include "KoColorSpaceRegistry.h"
namespace { namespace {
const qint32 MAX_CHANNEL_GRAY = 1; const qint32 MAX_CHANNEL_GRAY = 1;
const qint32 MAX_CHANNEL_GRAYA = 2; const qint32 MAX_CHANNEL_GRAYA = 2;
} }
KisGrayU16ColorSpace::KisGrayU16ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) : KisGrayU16ColorSpace::KisGrayU16ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) :
KoColorSpace(KoID("GRAYA16", i18n("Grayscale (16-bit integer/channel)")), parent) KoColorSpace(KoID("GRAYA16", i18n("Grayscale (16-bit integer/channel)")), parent)
, KoU16ColorSpaceTrait(PIXEL_ALPHA * sizeof(quint16)) , KoU16ColorSpaceTrait(PIXEL_ALPHA * sizeof(quint16))
, KoLcmsColorSpaceTrait(TYPE_GRAYA_16, icSigGrayData, p) , KoLcmsColorSpaceTrait(TYPE_GRAYA_16, icSigGrayData, p)
......
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
public: public:
KisGrayU16ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p); KisGrayU16ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p);
virtual ~KisGrayU16ColorSpace(); virtual ~KisGrayU16ColorSpace();
public: public:
...@@ -111,7 +111,7 @@ public: ...@@ -111,7 +111,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; }; virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; };
virtual KoColorSpace *createColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) { return new KisGrayU16ColorSpace(parent, p); }; virtual KoColorSpace *createColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) { return new KisGrayU16ColorSpace(parent, p); };
virtual QString defaultProfile() { return "gray built-in - (lcms internal)"; }; virtual QString defaultProfile() { return "gray built-in - (lcms internal)"; };
}; };
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kis_debug_areas.h> #include <kis_debug_areas.h>
#include <KoColorSpaceFactoryRegistry.h> #include <KoColorSpaceRegistry.h>
#include <kis_basic_histogram_producers.h> #include <kis_basic_histogram_producers.h>
#include "gray_plugin.h" #include "gray_plugin.h"
...@@ -43,10 +43,10 @@ GrayPlugin::GrayPlugin(QObject *parent, const QStringList &) ...@@ -43,10 +43,10 @@ GrayPlugin::GrayPlugin(QObject *parent, const QStringList &)
setInstance(GrayPluginFactory::instance()); setInstance(GrayPluginFactory::instance());
// This is not a gui plugin; only load it when the doc is created. // This is not a gui plugin; only load it when the doc is created.
if ( parent->inherits("KoColorSpaceFactoryRegistry") ) if ( parent->inherits("KoColorSpaceRegistry") )
{ {
KoColorSpaceFactoryRegistry * f = dynamic_cast<KoColorSpaceFactoryRegistry*>( parent ); KoColorSpaceRegistry * f = dynamic_cast<KoColorSpaceRegistry*>( parent );
// .22 gamma grayscale or something like that. Taken from the lcms tutorial... // .22 gamma grayscale or something like that. Taken from the lcms tutorial...
LPGAMMATABLE Gamma = cmsBuildGamma(256, 2.2); LPGAMMATABLE Gamma = cmsBuildGamma(256, 2.2);
......
...@@ -41,7 +41,7 @@ namespace { ...@@ -41,7 +41,7 @@ namespace {
const qint32 MAX_CHANNEL_GRAYSCALEA = 2; const qint32 MAX_CHANNEL_GRAYSCALEA = 2;
} }
KisGrayColorSpace::KisGrayColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) : KisGrayColorSpace::KisGrayColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) :
KoColorSpace(KoID("GRAYA", i18n("Grayscale")), parent) KoColorSpace(KoID("GRAYA", i18n("Grayscale")), parent)
, KoU8ColorSpaceTrait(PIXEL_GRAY_ALPHA) , KoU8ColorSpaceTrait(PIXEL_GRAY_ALPHA)
, KoLcmsColorSpaceTrait(TYPE_GRAYA_8, icSigGrayData, p) , KoLcmsColorSpaceTrait(TYPE_GRAYA_8, icSigGrayData, p)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
class KRITACOLOR_EXPORT KisGrayColorSpace : public KoU8ColorSpaceTrait, public KoLcmsColorSpaceTrait { class KRITACOLOR_EXPORT KisGrayColorSpace : public KoU8ColorSpaceTrait, public KoLcmsColorSpaceTrait {
public: public:
KisGrayColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p); KisGrayColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p);
virtual ~KisGrayColorSpace(); virtual ~KisGrayColorSpace();
virtual bool willDegrade(ColorSpaceIndependence /*independence*/) virtual bool willDegrade(ColorSpaceIndependence /*independence*/)
...@@ -104,7 +104,7 @@ public: ...@@ -104,7 +104,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; }; virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; };
virtual KoColorSpace *createColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) { return new KisGrayColorSpace(parent, p); }; virtual KoColorSpace *createColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) { return new KisGrayColorSpace(parent, p); };
virtual QString defaultProfile() { return "gray built-in - (lcms internal)"; }; virtual QString defaultProfile() { return "gray built-in - (lcms internal)"; };
}; };
......
...@@ -48,7 +48,7 @@ namespace { ...@@ -48,7 +48,7 @@ namespace {
#define F32_LCMS_TYPE TYPE_BGRA_16 #define F32_LCMS_TYPE TYPE_BGRA_16
// disable the lcms handling by setting profile=0 // disable the lcms handling by setting profile=0
KisLmsF32ColorSpace::KisLmsF32ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile */*p*/) : KisLmsF32ColorSpace::KisLmsF32ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile */*p*/) :
KoColorSpace(KoID("LMSAF32", i18n("LMS (32-bit float/channel)")), parent) KoColorSpace(KoID("LMSAF32", i18n("LMS (32-bit float/channel)")), parent)
, KoF32ColorSpaceTrait(PIXEL_ALPHA * sizeof(float)) , KoF32ColorSpaceTrait(PIXEL_ALPHA * sizeof(float))
, KoLcmsColorSpaceTrait(F32_LCMS_TYPE, icSig3colorData, 0) , KoLcmsColorSpaceTrait(F32_LCMS_TYPE, icSig3colorData, 0)
......
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
#include "KoF32HalfColorSpaceTrait.h" #include "KoF32HalfColorSpaceTrait.h"
#include "KoLcmsColorSpaceTrait.h" #include "KoLcmsColorSpaceTrait.h"
class KoColorSpaceFactoryRegistry; class KoColorSpaceRegistry;
class KRITACOLOR_EXPORT KisLmsF32ColorSpace : public KoF32ColorSpaceTrait, public KoLcmsColorSpaceTrait { class KRITACOLOR_EXPORT KisLmsF32ColorSpace : public KoF32ColorSpaceTrait, public KoLcmsColorSpaceTrait {
public: public:
KisLmsF32ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p); KisLmsF32ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p);
virtual ~KisLmsF32ColorSpace(); virtual ~KisLmsF32ColorSpace();
virtual bool willDegrade(ColorSpaceIndependence independence) virtual bool willDegrade(ColorSpaceIndependence independence)
...@@ -148,7 +148,7 @@ public: ...@@ -148,7 +148,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() { return icMaxEnumData; }; virtual icColorSpaceSignature colorSpaceSignature() { return icMaxEnumData; };
virtual KoColorSpace *createColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) { return new KisLmsF32ColorSpace(parent, p); }; virtual KoColorSpace *createColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) { return new KisLmsF32ColorSpace(parent, p); };
virtual QString defaultProfile() { return "sRGB built-in - (lcms internal)"; }; virtual QString defaultProfile() { return "sRGB built-in - (lcms internal)"; };
}; };
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kis_debug_areas.h> #include <kis_debug_areas.h>
#include <KoColorSpaceFactoryRegistry.h> #include <KoColorSpaceRegistry.h>
#include <kis_basic_histogram_producers.h> #include <kis_basic_histogram_producers.h>
#include "lms_f32_plugin.h" #include "lms_f32_plugin.h"
...@@ -41,9 +41,9 @@ LMSF32Plugin::LMSF32Plugin(QObject *parent, const QStringList &) ...@@ -41,9 +41,9 @@ LMSF32Plugin::LMSF32Plugin(QObject *parent, const QStringList &)
{ {
setInstance(LMSF32PluginFactory::instance()); setInstance(LMSF32PluginFactory::instance());
if ( parent->inherits("KoColorSpaceFactoryRegistry") ) if ( parent->inherits("KoColorSpaceRegistry") )
{ {
KoColorSpaceFactoryRegistry * f = dynamic_cast<KoColorSpaceFactoryRegistry*>(parent); KoColorSpaceRegistry * f = dynamic_cast<KoColorSpaceRegistry*>(parent);
KoColorSpace * colorSpaceLMSF32 = new KisLmsF32ColorSpace(f, 0); KoColorSpace * colorSpaceLMSF32 = new KisLmsF32ColorSpace(f, 0);
......
...@@ -50,7 +50,7 @@ namespace { ...@@ -50,7 +50,7 @@ namespace {
// FIXME: lcms doesn't support 16-bit float // FIXME: lcms doesn't support 16-bit float
#define RGBAF16HALF_LCMS_TYPE TYPE_BGRA_16 #define RGBAF16HALF_LCMS_TYPE TYPE_BGRA_16
KisRgbF16HalfColorSpace::KisRgbF16HalfColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) : KisRgbF16HalfColorSpace::KisRgbF16HalfColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) :
KoColorSpace(KoID("RGBAF16HALF", i18n("RGB (16-bit float/channel)")), parent) KoColorSpace(KoID("RGBAF16HALF", i18n("RGB (16-bit float/channel)")), parent)
, KoF16HalfColorSpaceTrait(PIXEL_ALPHA * sizeof(half)) , KoF16HalfColorSpaceTrait(PIXEL_ALPHA * sizeof(half))
, KoLcmsColorSpaceTrait(RGBAF16HALF_LCMS_TYPE, icSigRgbData, p) , KoLcmsColorSpaceTrait(RGBAF16HALF_LCMS_TYPE, icSigRgbData, p)
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
class KRITACOLOR_EXPORT KisRgbF16HalfColorSpace : public KoF16HalfColorSpaceTrait, public KoLcmsColorSpaceTrait { class KRITACOLOR_EXPORT KisRgbF16HalfColorSpace : public KoF16HalfColorSpaceTrait, public KoLcmsColorSpaceTrait {
public: public:
KisRgbF16HalfColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p); KisRgbF16HalfColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p);
virtual ~KisRgbF16HalfColorSpace(); virtual ~KisRgbF16HalfColorSpace();
virtual bool willDegrade(ColorSpaceIndependence independence) virtual bool willDegrade(ColorSpaceIndependence independence)
...@@ -137,7 +137,7 @@ public: ...@@ -137,7 +137,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; }; virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; };
virtual KoColorSpace *createColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) { return new KisRgbF16HalfColorSpace(parent, p); }; virtual KoColorSpace *createColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) { return new KisRgbF16HalfColorSpace(parent, p); };
virtual QString defaultProfile() { return "sRGB built-in - (lcms internal)"; }; virtual QString defaultProfile() { return "sRGB built-in - (lcms internal)"; };
}; };
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kis_debug_areas.h> #include <kis_debug_areas.h>
#include <KoColorSpaceFactoryRegistry.h> #include <KoColorSpaceRegistry.h>
#include <kis_basic_histogram_producers.h> #include <kis_basic_histogram_producers.h>
#include "rgb_f16half_plugin.h" #include "rgb_f16half_plugin.h"
...@@ -40,9 +40,9 @@ RGBF16HalfPlugin::RGBF16HalfPlugin(QObject *parent, const QStringList &) ...@@ -40,9 +40,9 @@ RGBF16HalfPlugin::RGBF16HalfPlugin(QObject *parent, const QStringList &)
{ {
setInstance(RGBF16HalfPluginFactory::instance()); setInstance(RGBF16HalfPluginFactory::instance());
if ( parent->inherits("KoColorSpaceFactoryRegistry") ) if ( parent->inherits("KoColorSpaceRegistry") )
{ {
KoColorSpaceFactoryRegistry * f = dynamic_cast<KoColorSpaceFactoryRegistry*>( parent ); KoColorSpaceRegistry * f = dynamic_cast<KoColorSpaceRegistry*>( parent );
KoColorSpace * colorSpaceRGBF16Half = new KisRgbF16HalfColorSpace(f, 0); KoColorSpace * colorSpaceRGBF16Half = new KisRgbF16HalfColorSpace(f, 0);
KoColorSpaceFactory *csf = new KisRgbF16HalfColorSpaceFactory(); KoColorSpaceFactory *csf = new KisRgbF16HalfColorSpaceFactory();
......
...@@ -52,7 +52,7 @@ namespace { ...@@ -52,7 +52,7 @@ namespace {
#define F32_LCMS_TYPE TYPE_BGRA_16 #define F32_LCMS_TYPE TYPE_BGRA_16
// disable the lcms handling by setting profile=0 // disable the lcms handling by setting profile=0
KisRgbF32ColorSpace::KisRgbF32ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile */*p*/) : KisRgbF32ColorSpace::KisRgbF32ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile */*p*/) :
KoColorSpace(KoID("RGBAF32", i18n("RGB (32-bit float/channel)")), parent) KoColorSpace(KoID("RGBAF32", i18n("RGB (32-bit float/channel)")), parent)
, KoF32ColorSpaceTrait(PIXEL_ALPHA * sizeof(float)) , KoF32ColorSpaceTrait(PIXEL_ALPHA * sizeof(float))
, KoLcmsColorSpaceTrait(F32_LCMS_TYPE, icSigRgbData, 0) , KoLcmsColorSpaceTrait(F32_LCMS_TYPE, icSigRgbData, 0)
......
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
#include "KoF32HalfColorSpaceTrait.h" #include "KoF32HalfColorSpaceTrait.h"
#include "KoLcmsColorSpaceTrait.h" #include "KoLcmsColorSpaceTrait.h"
class KoColorSpaceFactoryRegistry; class KoColorSpaceRegistry;
class KRITACOLOR_EXPORT KisRgbF32ColorSpace : public KoF32ColorSpaceTrait, public KoLcmsColorSpaceTrait { class KRITACOLOR_EXPORT KisRgbF32ColorSpace : public KoF32ColorSpaceTrait, public KoLcmsColorSpaceTrait {
public: public:
KisRgbF32ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p); KisRgbF32ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p);
virtual ~KisRgbF32ColorSpace(); virtual ~KisRgbF32ColorSpace();
virtual bool willDegrade(ColorSpaceIndependence independence) virtual bool willDegrade(ColorSpaceIndependence independence)
...@@ -141,7 +141,7 @@ public: ...@@ -141,7 +141,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; }; virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; };
virtual KoColorSpace *createColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) { return new KisRgbF32ColorSpace(parent, p); }; virtual KoColorSpace *createColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) { return new KisRgbF32ColorSpace(parent, p); };
virtual QString defaultProfile() { return "sRGB built-in - (lcms internal)"; }; virtual QString defaultProfile() { return "sRGB built-in - (lcms internal)"; };
}; };
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kis_debug_areas.h> #include <kis_debug_areas.h>
#include <KoColorSpaceFactoryRegistry.h> #include <KoColorSpaceRegistry.h>
#include <kis_basic_histogram_producers.h> #include <kis_basic_histogram_producers.h>
#include "rgb_f32_plugin.h" #include "rgb_f32_plugin.h"
...@@ -40,9 +40,9 @@ RGBF32Plugin::RGBF32Plugin(QObject *parent, const QStringList &) ...@@ -40,9 +40,9 @@ RGBF32Plugin::RGBF32Plugin(QObject *parent, const QStringList &)
{ {
setInstance(RGBF32PluginFactory::instance()); setInstance(RGBF32PluginFactory::instance());
if ( parent->inherits("KoColorSpaceFactoryRegistry") ) if ( parent->inherits("KoColorSpaceRegistry") )
{ {
KoColorSpaceFactoryRegistry * f = dynamic_cast<KoColorSpaceFactoryRegistry*>(parent); KoColorSpaceRegistry * f = dynamic_cast<KoColorSpaceRegistry*>(parent);
KoColorSpace * colorSpaceRGBF32 = new KisRgbF32ColorSpace(f, 0); KoColorSpace * colorSpaceRGBF32 = new KisRgbF32ColorSpace(f, 0);
......
...@@ -44,7 +44,7 @@ namespace { ...@@ -44,7 +44,7 @@ namespace {
//const quint16 KisRgbU16ColorSpace::U16_OPACITY_OPAQUE; //const quint16 KisRgbU16ColorSpace::U16_OPACITY_OPAQUE;
//const quint16 KisRgbU16ColorSpace::U16_OPACITY_TRANSPARENT; //const quint16 KisRgbU16ColorSpace::U16_OPACITY_TRANSPARENT;
KisRgbU16ColorSpace::KisRgbU16ColorSpace(KoColorSpaceFactoryRegistry * parent, KoColorProfile *p) : KisRgbU16ColorSpace::KisRgbU16ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile *p) :
KoColorSpace(KoID("RGBA16", i18n("RGB (16-bit integer/channel)")), parent) KoColorSpace(KoID("RGBA16", i18n("RGB (16-bit integer/channel)")), parent)
, KoU16ColorSpaceTrait(PIXEL_ALPHA * sizeof(quint16)) , KoU16ColorSpaceTrait(PIXEL_ALPHA * sizeof(quint16))
, KoLcmsColorSpaceTrait(TYPE_BGRA_16, icSigRgbData, p) , KoLcmsColorSpaceTrait(TYPE_BGRA_16, icSigRgbData, p)
......