[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/libs/pigment
From:       Lukáš Tvrdý <lukast.dev () gmail ! com>
Date:       2010-09-14 17:19:30
Message-ID: 20100914171930.A5F7EAC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1175304 by lukast:

Fixing the mixing of the transparent pixels in COPY mode.

Use new KoCompositeOpCopy2 in the colorspaces.
Remove the KoCompositeOpCopy from the abstract colorspace which is the base class
for the colorspaces.

Leave the old composite copy around, it is still used in KoCtlColorSpace.

CCBUG:245130
CCBUG:217124

 M  +1 -2      KoColorSpaceAbstract.h  
 M  +2 -0      compositeops/KoCompositeOps.h  


--- trunk/koffice/libs/pigment/KoColorSpaceAbstract.h #1175303:1175304
@@ -35,7 +35,6 @@
 #include "KoLabDarkenColorTransformation.h"
 #include "KoMixColorsOpImpl.h"
 
-#include "compositeops/KoCompositeOpCopy.h"
 #include "KoConvolutionOpImpl.h"
 #include "KoInvertColorTransformation.h"
 
@@ -58,7 +57,7 @@
     KoColorSpaceAbstract(const QString &id, const QString &name) :
             KoColorSpace(id, name, new KoMixColorsOpImpl< _CSTrait>(), new \
KoConvolutionOpImpl< _CSTrait>()) {  
-        this->addCompositeOp(new KoCompositeOpCopy(this));
+        
     }
 
     virtual quint32 colorChannelCount() const {
--- trunk/koffice/libs/pigment/compositeops/KoCompositeOps.h #1175303:1175304
@@ -36,6 +36,7 @@
 #include "compositeops/KoCompositeOpInversedSubtract.h"
 #include "compositeops/KoCompositeOpSoftlight.h"
 #include "compositeops/KoCompositeOpHardlight.h"
+#include "compositeops/KoCompositeOpCopy2.h"
 
 /**
  * This function add to the colorspace all the composite ops defined by
@@ -47,6 +48,7 @@
     cs->addCompositeOp(new KoCompositeOpAdd<_Traits_>(cs));
     cs->addCompositeOp(new KoCompositeOpAlphaDarken<_Traits_>(cs));
     cs->addCompositeOp(new KoCompositeOpBurn<_Traits_>(cs));
+    cs->addCompositeOp(new KoCompositeOpCopy2<_Traits_>(cs));
     cs->addCompositeOp(new KoCompositeOpDivide<_Traits_>(cs));
     cs->addCompositeOp(new KoCompositeOpDodge<_Traits_>(cs));
     cs->addCompositeOp(new KoCompositeOpErase<_Traits_>(cs));


[prev in list] [next in list] [prev in thread] [next in thread]