[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/krita-gsoc-filters-sahil] krita/plugins/colorspaces/extensions: Removing The .cc Extension
From: Sahil Nagpal <nagpal.sahil01 () gmail ! com>
Date: 2013-06-30 21:32:10
Message-ID: E1UtPEA-0001Fv-VV () scm ! kde ! org
[Download RAW message or body]
Git commit 4730adc8c95ba2aaaf51e4ae834f61d347851dc6 by Sahil Nagpal.
Committed on 30/06/2013 at 21:31.
Pushed by sahilnagpal into branch 'krita-gsoc-filters-sahil'.
Removing The .cc Extension Files
D +0 -128 krita/plugins/colorspaces/extensions/kis_burnhighlights_adjustment.cc
D +0 -128 krita/plugins/colorspaces/extensions/kis_burnmidtones_adjustment.cc
D +0 -127 krita/plugins/colorspaces/extensions/kis_burnshadows_adjustment.cc
D +0 -129 krita/plugins/colorspaces/extensions/kis_dodgemidtones_adjustment.cc
D +0 -127 krita/plugins/colorspaces/extensions/kis_dodgeshadows_adjustment.cc
D +0 -271 krita/plugins/colorspaces/extensions/kis_hsv_adjustment.cc
http://commits.kde.org/calligra/4730adc8c95ba2aaaf51e4ae834f61d347851dc6
diff --git a/krita/plugins/colorspaces/extensions/kis_burnhighlights_adjustment.cc \
b/krita/plugins/colorspaces/extensions/kis_burnhighlights_adjustment.cc deleted file \
mode 100644 index 0521466..0000000
--- a/krita/plugins/colorspaces/extensions/kis_burnhighlights_adjustment.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2013 Sahil Nagpal <nagpal.sahil01@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
-*/
-
-#include "kis_burnhighlights_adjustment.h"
-#include <KoConfig.h>
-
-#include <kis_debug.h>
-#include <klocale.h>
-
-#include <KoColorConversions.h>
-#include <KoColorModelStandardIds.h>
-#include <KoColorSpace.h>
-#include <KoColorSpaceTraits.h>
-#include <KoColorTransformation.h>
-#include <KoID.h>
-
-template<typename _channel_type_>
-class KisBurnHighlightsAdjustment : public KoColorTransformation
-{
- typedef KoBgrTraits<_channel_type_> RGBTrait;
- typedef typename RGBTrait::Pixel RGBPixel;
-
-public:
- KisBurnHighlightsAdjustment(){};
-
- void transform(const quint8 *srcU8, quint8 *dstU8, qint32 nPixels) const
- {
- const RGBPixel* src = reinterpret_cast<const RGBPixel*>(srcU8);
- RGBPixel* dst = reinterpret_cast<RGBPixel*>(dstU8);
- float r, g, b;
- while(nPixels > 0)
- {
- r = exposure * KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->red);
- g = exposure * KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->green);
- b = exposure * KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->blue);
-
- dst->red = KoColorSpaceMaths< float, _channel_type_>::scaleToA(r);
- dst->green = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(g);
- dst->blue = KoColorSpaceMaths< float, _channel_type_>::scaleToA(b);
- dst->alpha = src->alpha;
-
- --nPixels;
- ++src;
- ++dst;
- }
- }
-
- virtual QList<QString> parameters() const
- {
- QList<QString> list;
- list << "exposure";
- return list;
- }
-
- virtual int parameterId(const QString& name) const
- {
- if (name == "exposure")
- return 0;
- return -1;
- }
-
- virtual void setParameter(int id, const QVariant& parameter)
- {
- switch(id)
- {
- case 0:
- exposure = parameter.toDouble();
- break;
- default:
- ;
- }
- }
-private:
-
- float exposure;
- };
-
- KisBurnHighlightsAdjustmentFactory::KisBurnHighlightsAdjustmentFactory()
- : KoColorTransformationFactory("BurnHighlights", i18n("BurnHighlights \
Adjustment"))
-{
-}
-
-QList< QPair< KoID, KoID > > KisBurnHighlightsAdjustmentFactory::supportedModels() \
const
-{
- QList< QPair< KoID, KoID > > l;
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer8BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer16BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Float32BitsColorDepthID));
- return l;
-}
-
-KoColorTransformation* \
KisBurnHighlightsAdjustmentFactory::createTransformation(const KoColorSpace* \
colorSpace, QHash<QString, QVariant> parameters) const
-{
- KoColorTransformation * adj;
- if (colorSpace->colorModelId() != RGBAColorModelID) {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisBurnHighlightsAdjustment::createTransformation";
- return 0;
- }
- if (colorSpace->colorDepthId() == Integer8BitsColorDepthID) {
- adj = new KisBurnHighlightsAdjustment< quint8 >();
- } else if (colorSpace->colorDepthId() == Integer16BitsColorDepthID) {
- adj = new KisBurnHighlightsAdjustment< quint16 >();
- } else if (colorSpace->colorDepthId() == Float32BitsColorDepthID) {
- adj = new KisBurnHighlightsAdjustment< float >();
- } else {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisBurnHighlightsAdjustment::createTransformation";
- return 0;
- }
- adj->setParameters(parameters);
- return adj;
-
-}
diff --git a/krita/plugins/colorspaces/extensions/kis_burnmidtones_adjustment.cc \
b/krita/plugins/colorspaces/extensions/kis_burnmidtones_adjustment.cc deleted file \
mode 100644 index 8861756..0000000
--- a/krita/plugins/colorspaces/extensions/kis_burnmidtones_adjustment.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2013 Sahil Nagpal <nagpal.sahil01@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
-*/
-
-#include "kis_burnmidtones_adjustment.h"
-#include <KoConfig.h>
-
-#include <kis_debug.h>
-#include <klocale.h>
-
-#include <KoColorConversions.h>
-#include <KoColorModelStandardIds.h>
-#include <KoColorSpace.h>
-#include <KoColorSpaceTraits.h>
-#include <KoColorTransformation.h>
-#include <KoID.h>
-
-template<typename _channel_type_>
-class KisBurnMidtonesAdjustment : public KoColorTransformation
-{
- typedef KoBgrTraits<_channel_type_> RGBTrait;
- typedef typename RGBTrait::Pixel RGBPixel;
-
-public:
- KisBurnMidtonesAdjustment(){};
-
- void transform(const quint8 *srcU8, quint8 *dstU8, qint32 nPixels) const
- {
- const RGBPixel* src = reinterpret_cast<const RGBPixel*>(srcU8);
- RGBPixel* dst = reinterpret_cast<RGBPixel*>(dstU8);
- float r, g, b;
- while(nPixels > 0)
- {
- r = pow(KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->red), \
exposure);
- g = pow(KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->green), \
exposure);
- b = pow(KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->blue), \
exposure);
-
- dst->red = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(r);
- dst->green = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(g);
- dst->blue = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(b);
- dst->alpha = src->alpha;
-
- --nPixels;
- ++src;
- ++dst;
- }
- }
-
- virtual QList<QString> parameters() const
- {
- QList<QString> list;
- list << "exposure";
- return list;
- }
-
- virtual int parameterId(const QString& name) const
- {
- if (name == "exposure")
- return 0;
- return -1;
- }
-
- virtual void setParameter(int id, const QVariant& parameter)
- {
- switch(id)
- {
- case 0:
- exposure = parameter.toDouble();
- break;
- default:
- ;
- }
- }
-private:
-
- float exposure;
- };
-
- KisBurnMidtonesAdjustmentFactory::KisBurnMidtonesAdjustmentFactory()
- : KoColorTransformationFactory("BurnMidtones", i18n("BurnMidtones Adjustment"))
-{
-}
-
-QList< QPair< KoID, KoID > > KisBurnMidtonesAdjustmentFactory::supportedModels() \
const
-{
- QList< QPair< KoID, KoID > > l;
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer8BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer16BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Float32BitsColorDepthID));
- return l;
-}
-
-KoColorTransformation* KisBurnMidtonesAdjustmentFactory::createTransformation(const \
KoColorSpace* colorSpace, QHash<QString, QVariant> parameters) const
-{
- KoColorTransformation * adj;
- if (colorSpace->colorModelId() != RGBAColorModelID) {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisBurnMidtonesAdjustment::createTransformation";
- return 0;
- }
- if (colorSpace->colorDepthId() == Float32BitsColorDepthID) {
- adj = new KisBurnMidtonesAdjustment< float >();
- } else if (colorSpace->colorDepthId() == Integer16BitsColorDepthID) {
- adj = new KisBurnMidtonesAdjustment< quint16 >();
- } else if (colorSpace->colorDepthId() == Integer8BitsColorDepthID) {
- adj = new KisBurnMidtonesAdjustment< quint8 >();
- } else {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisBurnMidtonesAdjustment::createTransformation";
- return 0;
- }
- adj->setParameters(parameters);
- return adj;
-
-}
diff --git a/krita/plugins/colorspaces/extensions/kis_burnshadows_adjustment.cc \
b/krita/plugins/colorspaces/extensions/kis_burnshadows_adjustment.cc deleted file \
mode 100644 index 5131ccf..0000000
--- a/krita/plugins/colorspaces/extensions/kis_burnshadows_adjustment.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2013 Sahil Nagpal <nagpal.sahil01@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
-*/
-
-#include "kis_burnshadows_adjustment.h"
-#include <KoConfig.h>
-
-#include <kis_debug.h>
-#include <klocale.h>
-
-#include <KoColorConversions.h>
-#include <KoColorModelStandardIds.h>
-#include <KoColorSpace.h>
-#include <KoColorSpaceTraits.h>
-#include <KoColorTransformation.h>
-#include <KoID.h>
-
-template<typename _channel_type_>
-class KisBurnShadowsAdjustment : public KoColorTransformation
- {
- typedef KoBgrTraits<_channel_type_> RGBTrait;
- typedef typename RGBTrait::Pixel RGBPixel;
-
-public:
- KisBurnShadowsAdjustment(){};
-
- void transform(const quint8 *srcU8, quint8 *dstU8, qint32 nPixels) const
- {
- const RGBPixel* src = reinterpret_cast<const RGBPixel*>(srcU8);
- RGBPixel* dst = reinterpret_cast<RGBPixel*>(dstU8);
- float r, g, b;
- while (nPixels > 0) {
- r = (KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->red) - \
exposure) / (1.0 - exposure);
- g = (KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->green) - \
exposure) / (1.0 - exposure);
- b = (KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->blue) - \
exposure) / (1.0 - exposure);
-
- dst->red = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(r);
- dst->green = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(g);
- dst->blue = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(b);
- dst->alpha = src->alpha;
-
- --nPixels;
- ++src;
- ++dst;
- }
- }
-
- virtual QList<QString> parameters() const
- {
- QList<QString> list;
- list << "exposure";
- return list;
- }
-
- virtual int parameterId(const QString& name) const
- {
- if (name == "exposure")
- return 0;
- return -1;
- }
-
- virtual void setParameter(int id, const QVariant& parameter)
- {
- switch(id)
- {
- case 0:
- exposure = parameter.toDouble();
- break;
- default:
- ;
- }
- }
-private:
-
- float exposure;
- };
-
- KisBurnShadowsAdjustmentFactory::KisBurnShadowsAdjustmentFactory()
- : KoColorTransformationFactory("BurnShadows", i18n("BurnShadows Adjustment"))
-{
-}
-
-QList< QPair< KoID, KoID > > KisBurnShadowsAdjustmentFactory::supportedModels() \
const
-{
- QList< QPair< KoID, KoID > > l;
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer8BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer16BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Float32BitsColorDepthID));
- return l;
-}
-
-KoColorTransformation* KisBurnShadowsAdjustmentFactory::createTransformation(const \
KoColorSpace* colorSpace, QHash<QString, QVariant> parameters) const
-{
- KoColorTransformation * adj;
- if (colorSpace->colorModelId() != RGBAColorModelID) {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisBurnShadowsAdjustment::createTransformation";
- return 0;
- }
- if (colorSpace->colorDepthId() == Integer8BitsColorDepthID) {
- adj = new KisBurnShadowsAdjustment< quint8 >();
- } else if (colorSpace->colorDepthId() == Integer16BitsColorDepthID) {
- adj = new KisBurnShadowsAdjustment< quint16 >();
- } else if (colorSpace->colorDepthId() == Float32BitsColorDepthID) {
- adj = new KisBurnShadowsAdjustment< float >();
- } else {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisBurnShadowsAdjustment::createTransformation";
- return 0;
- }
- adj->setParameters(parameters);
- return adj;
-
-}
diff --git a/krita/plugins/colorspaces/extensions/kis_dodgemidtones_adjustment.cc \
b/krita/plugins/colorspaces/extensions/kis_dodgemidtones_adjustment.cc deleted file \
mode 100644 index 260c108..0000000
--- a/krita/plugins/colorspaces/extensions/kis_dodgemidtones_adjustment.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2013 Sahil Nagpal <nagpal.sahil01@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
-*/
-
-#include "kis_dodgemidtones_adjustment.h"
-#include <KoConfig.h>
-
-#include <kis_debug.h>
-#include <klocale.h>
-
- #include <KoColorConversions.h>
- #include <KoColorModelStandardIds.h>
- #include <KoColorSpace.h>
- #include <KoColorSpaceTraits.h>
- #include <KoColorTransformation.h>
- #include <KoID.h>
-
-template<typename _channel_type_>
-class KisDodgeMidtonesAdjustment : public KoColorTransformation
- {
- typedef KoBgrTraits<_channel_type_> RGBTrait;
- typedef typename RGBTrait::Pixel RGBPixel;
-
-public:
- KisDodgeMidtonesAdjustment(){};
-
-public:
-
- void transform(const quint8 *srcU8, quint8 *dstU8, qint32 nPixels) const
- {
- const RGBPixel* src = reinterpret_cast<const RGBPixel*>(srcU8);
- RGBPixel* dst = reinterpret_cast<RGBPixel*>(dstU8);
- float r, g, b;
- while(nPixels > 0)
- {
- r = pow(KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->red), \
exposure);
- g = pow(KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->green), \
exposure);
- b = pow(KoColorSpaceMaths<_channel_type_, float>::scaleToA(src->blue), \
exposure);
-
- dst->red = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(r);
- dst->green = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(g);
- dst->blue = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(b);
- dst->alpha = src->alpha;
-
- --nPixels;
- ++src;
- ++dst;
- }
- }
-
- virtual QList<QString> parameters() const
- {
- QList<QString> list;
- list << "exposure";
- return list;
- }
-
- virtual int parameterId(const QString& name) const
- {
- if (name == "exposure")
- return 0;
- return -1;
- }
-
- virtual void setParameter(int id, const QVariant& parameter)
- {
- switch(id)
- {
- case 0:
- exposure = parameter.toDouble();
- break;
- default:
- ;
- }
- }
-private:
-
- float exposure;
-};
-
- KisDodgeMidtonesAdjustmentFactory::KisDodgeMidtonesAdjustmentFactory()
- : KoColorTransformationFactory("DodgeMidtones", i18n("DodgeMidtones \
Adjustment"))
-{
-}
-
-QList< QPair< KoID, KoID > > KisDodgeMidtonesAdjustmentFactory::supportedModels() \
const
-{
- QList< QPair< KoID, KoID > > l;
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer8BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer16BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Float32BitsColorDepthID));
- return l;
-}
-
-KoColorTransformation* KisDodgeMidtonesAdjustmentFactory::createTransformation(const \
KoColorSpace* colorSpace, QHash<QString, QVariant> parameters) const
-{
- KoColorTransformation * adj;
- if (colorSpace->colorModelId() != RGBAColorModelID) {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisDodgeMidtonesAdjustmentFactory::createTransformation";
- return 0;
- }
- if (colorSpace->colorDepthId() == Float32BitsColorDepthID) {
- adj = new KisDodgeMidtonesAdjustment< float >();
- } else if(colorSpace->colorDepthId() == Integer16BitsColorDepthID) {
- adj = new KisDodgeMidtonesAdjustment< quint16 >();
- } else if(colorSpace->colorDepthId() == Integer8BitsColorDepthID) {
- adj = new KisDodgeMidtonesAdjustment< quint8 >();
- } else {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisDodgeMidtonesAdjustmentFactory::createTransformation";
- return 0;
- }
- adj->setParameters(parameters);
- return adj;
-}
diff --git a/krita/plugins/colorspaces/extensions/kis_dodgeshadows_adjustment.cc \
b/krita/plugins/colorspaces/extensions/kis_dodgeshadows_adjustment.cc deleted file \
mode 100644 index dd2fa1b..0000000
--- a/krita/plugins/colorspaces/extensions/kis_dodgeshadows_adjustment.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2013 Sahil Nagpal <nagpal.sahil01@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
-*/
-
-#include "kis_dodgeshadows_adjustment.h"
-#include <KoConfig.h>
-
-#include <kis_debug.h>
-#include <klocale.h>
-
-#include <KoColorConversions.h>
-#include <KoColorModelStandardIds.h>
-#include <KoColorSpace.h>
-#include <KoColorSpaceTraits.h>
-#include <KoColorTransformation.h>
-#include <KoID.h>
-
-template<typename _channel_type_>
-class KisDodgeShadowsAdjustment : public KoColorTransformation
-{
- typedef KoBgrTraits<_channel_type_> RGBTrait;
- typedef typename RGBTrait::Pixel RGBPixel;
-
-public:
- KisDodgeShadowsAdjustment(){};
-
- void transform(const quint8 *srcU8, quint8 *dstU8, qint32 nPixels) const
- {
- const RGBPixel* src = reinterpret_cast<const RGBPixel*>(srcU8);
- RGBPixel* dst = reinterpret_cast<RGBPixel*>(dstU8);
- float r, g, b;
- while (nPixels > 0) {
- r = (exposure + KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->red)) - exposure * KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->red);
- g = (exposure + KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->green)) - exposure * KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->green);
- b = (exposure + KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->blue)) - exposure * KoColorSpaceMaths<_channel_type_, \
float>::scaleToA(src->blue);
-
- dst->red = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(r);
- dst->green = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(g);
- dst->blue = KoColorSpaceMaths< float, _channel_type_ >::scaleToA(b);
- dst->alpha = src->alpha;
-
- --nPixels;
- ++src;
- ++dst;
- }
- }
-
- virtual QList<QString> parameters() const
- {
- QList<QString> list;
- list << "exposure";
- return list;
- }
-
- virtual int parameterId(const QString& name) const
- {
- if (name == "exposure")
- return 0;
- return -1;
- }
-
- virtual void setParameter(int id, const QVariant& parameter)
- {
- switch(id)
- {
- case 0:
- exposure = parameter.toDouble();
- break;
- default:
- ;
- }
- }
-private:
-
- float exposure;
- };
-
- KisDodgeShadowsAdjustmentFactory::KisDodgeShadowsAdjustmentFactory()
- : KoColorTransformationFactory("DodgeShadows", i18n("DodgeShadows Adjustment"))
-{
-}
-
-QList< QPair< KoID, KoID > > KisDodgeShadowsAdjustmentFactory::supportedModels() \
const
-{
- QList< QPair< KoID, KoID > > l;
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer8BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer16BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Float32BitsColorDepthID));
- return l;
-}
-
-KoColorTransformation* KisDodgeShadowsAdjustmentFactory::createTransformation(const \
KoColorSpace* colorSpace, QHash<QString, QVariant> parameters) const
-{
- KoColorTransformation * adj;
- if (colorSpace->colorModelId() != RGBAColorModelID) {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisDodgeShadowsAdjustmentFactory::createTransformation";
- return 0;
- }
- if (colorSpace->colorDepthId() == Float32BitsColorDepthID) {
- adj = new KisDodgeShadowsAdjustment < float >();
- } else if (colorSpace->colorDepthId() == Integer16BitsColorDepthID) {
- adj = new KisDodgeShadowsAdjustment< quint16 >();
- } else if (colorSpace->colorDepthId() == Integer8BitsColorDepthID) {
- adj = new KisDodgeShadowsAdjustment< quint8 >();
- } else {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisDodgeShadowsAdjustmentFactory::createTransformation";
- return 0;
- }
- adj->setParameters(parameters);
- return adj;
-
-}
diff --git a/krita/plugins/colorspaces/extensions/kis_hsv_adjustment.cc \
b/krita/plugins/colorspaces/extensions/kis_hsv_adjustment.cc deleted file mode 100644
index d79de72..0000000
--- a/krita/plugins/colorspaces/extensions/kis_hsv_adjustment.cc
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2007 Cyrille Berger <cberger@cberger.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
-*/
-
-#include "kis_hsv_adjustment.h"
-#include <KoConfig.h>
-#ifdef HAVE_OPENEXR
-#include <half.h>
-#endif
-
-#include <kis_debug.h>
-#include <klocale.h>
-
-#include <KoColorConversions.h>
-#include <KoColorModelStandardIds.h>
-#include <KoColorSpace.h>
-#include <KoColorSpaceTraits.h>
-#include <KoColorTransformation.h>
-#include <KoID.h>
-
-#define SCALE_TO_FLOAT( v ) KoColorSpaceMaths< _channel_type_, float>::scaleToA( v )
-#define SCALE_FROM_FLOAT( v ) KoColorSpaceMaths< float, _channel_type_>::scaleToA( \
v )
-
-template<typename _channel_type_>
-void clamp(float* r, float* g, float* b);
-
-#define FLOAT_CLAMP( v ) * v = (*v < 0.0) ? 0.0 : ( (*v>1.0) ? 1.0 : *v )
-
-template<>
-void clamp<quint8>(float* r, float* g, float* b)
-{
- FLOAT_CLAMP(r);
- FLOAT_CLAMP(g);
- FLOAT_CLAMP(b);
-}
-
-template<>
-void clamp<quint16>(float* r, float* g, float* b)
-{
- FLOAT_CLAMP(r);
- FLOAT_CLAMP(g);
- FLOAT_CLAMP(b);
-}
-
-#ifdef HAVE_OPENEXR
-template<>
-void clamp<half>(float* r, float* g, float* b)
-{
- Q_UNUSED(r);
- Q_UNUSED(g);
- Q_UNUSED(b);
-}
-#endif
-
-template<>
-void clamp<float>(float* r, float* g, float* b)
-{
- Q_UNUSED(r);
- Q_UNUSED(g);
- Q_UNUSED(b);
-}
-
-
-template<typename _channel_type_>
-class KisHSVAdjustment : public KoColorTransformation
-{
- typedef KoBgrTraits<_channel_type_> RGBTrait;
- typedef typename RGBTrait::Pixel RGBPixel;
-
-public:
- KisHSVAdjustment()
- {
- }
-
-public:
-
- void transform(const quint8 *srcU8, quint8 *dstU8, qint32 nPixels) const
- {
-
- const RGBPixel* src = reinterpret_cast<const RGBPixel*>(srcU8);
- RGBPixel* dst = reinterpret_cast<RGBPixel*>(dstU8);
- float h, s, v, r, g, b;
- while (nPixels > 0) {
-
- if (m_colorize) {
- h = m_adj_h * 360;
- if (h >= 360.0) h = 0;
-
- s = m_adj_s;
-
- r = SCALE_TO_FLOAT(src->red);
- g = SCALE_TO_FLOAT(src->green);
- b = SCALE_TO_FLOAT(src->blue);
-
- float luminance = r * 0.2126 + g * 0.7152 + b * 0.0722;
-
- if (m_adj_v > 0) {
- luminance *= (1.0 - m_adj_v);
- luminance += 1.0 - (1.0 - m_adj_v);
- }
- else if (m_adj_v < 0 ){
- luminance *= (m_adj_v + 1.0);
- }
- v = luminance;
- HSLToRGB(h, s, v, &r, &g, &b);
-
- }
- else {
-
- if (m_type == 0) {
- RGBToHSV(SCALE_TO_FLOAT(src->red), SCALE_TO_FLOAT(src->green), \
SCALE_TO_FLOAT(src->blue), &h, &s, &v);
- h += m_adj_h * 180;
- if (h > 360) h -= 360;
- if (h < 0) h += 360;
- s += m_adj_s;
- v += m_adj_v;
- HSVToRGB(h, s, v, &r, &g, &b);
- }
- else {
-
- RGBToHSL(SCALE_TO_FLOAT(src->red), SCALE_TO_FLOAT(src->green), \
SCALE_TO_FLOAT(src->blue), &h, &s, &v);
-
- h += m_adj_h * 180;
- if (h > 360) h -= 360;
- if (h < 0) h += 360;
-
- s *= (m_adj_s + 1.0);
- if (s < 0.0) s = 0.0;
- if (s > 1.0) s = 1.0;
-
- if (m_adj_v < 0)
- v *= (m_adj_v + 1.0);
- else
- v += (m_adj_v * (1.0 - v));
-
-
- HSLToRGB(h, s, v, &r, &g, &b);
- }
-
- }
-
- clamp< _channel_type_ >(&r, &g, &b);
- dst->red = SCALE_FROM_FLOAT(r);
- dst->green = SCALE_FROM_FLOAT(g);
- dst->blue = SCALE_FROM_FLOAT(b);
- dst->alpha = src->alpha;
-
- --nPixels;
- ++src;
- ++dst;
- }
- }
-
- virtual QList<QString> parameters() const
- {
- QList<QString> list;
- list << "h" << "s" << "v" << "type" << "colorize";
- return list;
- }
-
- virtual int parameterId(const QString& name) const
- {
- if (name == "h") {
- return 0;
- } else if (name == "s") {
- return 1;
- } else if (name == "v") {
- return 2;
- } else if (name == "type") {
- return 3;
- } else if (name == "colorize") {
- return 4;
- }
- return -1;
- }
-
- /**
- * name - "h", "s" or "v"
- * (h)ue in range <-1.0, 1.0> ( for user, show as -180, 180 or 0, 360 for \
colorize)
- * (s)aturation in range <-1.0, 1.0> ( for user, show -100, 100, or 0, 100 for \
colorize)
- * (v)alue in range <-1.0, 1.0> (for user, show -100, 100)
- */
- virtual void setParameter(int id, const QVariant& parameter)
- {
- switch(id)
- {
- case 0:
- m_adj_h = parameter.toDouble();
- break;
- case 1:
- m_adj_s = parameter.toDouble();
- break;
- case 2:
- m_adj_v = parameter.toDouble();
- break;
- case 3:
- m_type = parameter.toDouble();
- break;
- case 4:
- m_colorize = parameter.toBool();
- break;
- default:
- ;
- }
- }
-
-private:
-
- double m_adj_h, m_adj_s, m_adj_v;
- int m_type;
- bool m_colorize;
-};
-
-
-KisHSVAdjustmentFactory::KisHSVAdjustmentFactory()
- : KoColorTransformationFactory("hsv_adjustment", i18n("HSV/HSL Adjustment"))
-{
-}
-
-QList< QPair< KoID, KoID > > KisHSVAdjustmentFactory::supportedModels() const
-{
- QList< QPair< KoID, KoID > > l;
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer8BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Integer16BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Float16BitsColorDepthID));
- l.append(QPair< KoID, KoID >(RGBAColorModelID , Float32BitsColorDepthID));
- return l;
-}
-
-KoColorTransformation* KisHSVAdjustmentFactory::createTransformation(const \
KoColorSpace* colorSpace, QHash<QString, QVariant> parameters) const
-{
- KoColorTransformation * adj;
- if (colorSpace->colorModelId() != RGBAColorModelID) {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisHSVAdjustmentFactory::createTransformation";
- return 0;
- }
- if (colorSpace->colorDepthId() == Integer8BitsColorDepthID) {
- adj = new KisHSVAdjustment< quint8 >();
- } else if (colorSpace->colorDepthId() == Integer16BitsColorDepthID) {
- adj = new KisHSVAdjustment< quint16 >();
- }
-#ifdef HAVE_OPENEXR
- else if (colorSpace->colorDepthId() == Float16BitsColorDepthID) {
- adj = new KisHSVAdjustment< half >();
- }
-#endif
- else if (colorSpace->colorDepthId() == Float32BitsColorDepthID) {
- adj = new KisHSVAdjustment< float >();
- } else {
- kError() << "Unsupported color space " << colorSpace->id() << " in \
KisHSVAdjustmentFactory::createTransformation";
- return 0;
- }
- adj->setParameters(parameters);
- return adj;
-
-}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic