Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 922cdf19 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Remove the log blend mode

Differential Revision: https://phabricator.kde.org/D19204
parent e6f675ae
......@@ -66,7 +66,6 @@ KoCompositeOpRegistry::KoCompositeOpRegistry()
m_map.insert(m_categories[1], KoID(COMPOSITE_NOT_CONVERSE , i18n("NOT CONVERSE")));
m_map.insert(m_categories[2], KoID(COMPOSITE_BURN , i18n("Burn")));
m_map.insert(m_categories[2], KoID(COMPOSITE_BURN_LOGARITHMIC , i18n("Burn - Logarithmic")));
m_map.insert(m_categories[2], KoID(COMPOSITE_LINEAR_BURN, i18n("Linear Burn")));
m_map.insert(m_categories[2], KoID(COMPOSITE_DARKEN , i18n("Darken")));
m_map.insert(m_categories[2], KoID(COMPOSITE_GAMMA_DARK , i18n("Gamma Dark")));
......@@ -76,7 +75,6 @@ KoCompositeOpRegistry::KoCompositeOpRegistry()
m_map.insert(m_categories[2], KoID(COMPOSITE_EASY_BURN , i18n("Easy Burn")));
m_map.insert(m_categories[3], KoID(COMPOSITE_DODGE , i18n("Color Dodge")));
m_map.insert(m_categories[3], KoID(COMPOSITE_DODGE_LOGARITHMIC , i18n("Color Dodge - Logarithmic")));
m_map.insert(m_categories[3], KoID(COMPOSITE_LINEAR_DODGE, i18n("Linear Dodge")));
m_map.insert(m_categories[3], KoID(COMPOSITE_LIGHTEN , i18n("Lighten")));
m_map.insert(m_categories[3], KoID(COMPOSITE_LINEAR_LIGHT, i18n("Linear Light")));
......
......@@ -93,7 +93,6 @@ const QString COMPOSITE_PENUMBRAD = "penumbra d";
const QString COMPOSITE_DARKEN = "darken";
const QString COMPOSITE_BURN = "burn";//this is also known as 'color burn'.
const QString COMPOSITE_BURN_LOGARITHMIC = "burn_logarithmic";
const QString COMPOSITE_LINEAR_BURN = "linear_burn";
const QString COMPOSITE_GAMMA_DARK = "gamma_dark";
const QString COMPOSITE_SHADE_IFS_ILLUSIONS = "shade_ifs_illusions";
......@@ -102,7 +101,6 @@ const QString COMPOSITE_EASY_BURN = "easy burn";
const QString COMPOSITE_LIGHTEN = "lighten";
const QString COMPOSITE_DODGE = "dodge";
const QString COMPOSITE_DODGE_LOGARITHMIC = "dodge_logarithmic";
const QString COMPOSITE_LINEAR_DODGE = "linear_dodge";
const QString COMPOSITE_SCREEN = "screen";
const QString COMPOSITE_HARD_LIGHT = "hard_light";
......
......@@ -896,29 +896,6 @@ inline T cfModuloContinuous(T src, T dst) {
return cfMultiply(cfDivisiveModuloContinuous(src,dst),src);
}
template<class T>
inline T cfColorBurnLogarithmic(T src, T dst) {
using namespace Arithmetic;
//Also known as Darken from EffectBank/Illusions.hu. IFS Illusions had used this blending mode.
qreal fsrc = scale<qreal>(src);
qreal fdst = scale<qreal>(dst);
if (inv(fdst) == zeroValue<T>()) {
return scale<T>(log2(1.0 + abs(fsrc)/abs(inv(.999999))/8));
}
return scale<T>(log2(1.0 + abs(fsrc)/abs(inv(fdst))/8));
}
template<class T>
inline T cfColorDodgeLogarithmic(T src, T dst) {
using namespace Arithmetic;
//Also known as Lighten from EffectBank/Illusions.hu. IFS Illusions had used this blending mode.
return inv(cfColorBurnLogarithmic(inv(src),inv(dst)));
}
template<class T>
inline T cfEasyDodge(T src, T dst) {
using namespace Arithmetic;
......
......@@ -161,7 +161,6 @@ struct AddGeneralOps<Traits, true>
add<&cfSuperLight<Arg> >(cs, COMPOSITE_SUPER_LIGHT , i18n("Super Light") , KoCompositeOp::categoryLight());
add<&cfTintIFSIllusions<Arg> >(cs, COMPOSITE_TINT_IFS_ILLUSIONS , i18n("Tint (IFS Illusions)") , KoCompositeOp::categoryLight());
add<&cfFogLightenIFSIllusions<Arg> >(cs, COMPOSITE_FOG_LIGHTEN_IFS_ILLUSIONS , i18n("Fog Lighten (IFS Illusions)") , KoCompositeOp::categoryLight());
add<&cfColorDodgeLogarithmic<Arg> >(cs, COMPOSITE_DODGE_LOGARITHMIC , i18n("Color Dodge - Logarithmic") , KoCompositeOp::categoryLight());
add<&cfEasyDodge<Arg> >(cs, COMPOSITE_EASY_DODGE , i18n("Easy Dodge") , KoCompositeOp::categoryLight());
add<&cfColorBurn<Arg> >(cs, COMPOSITE_BURN , i18n("Color Burn") , KoCompositeOp::categoryDark());
......@@ -170,7 +169,6 @@ struct AddGeneralOps<Traits, true>
add<&cfGammaDark<Arg> >(cs, COMPOSITE_GAMMA_DARK , i18n("Gamma Dark") , KoCompositeOp::categoryDark());
add<&cfShadeIFSIllusions<Arg> >(cs, COMPOSITE_SHADE_IFS_ILLUSIONS , i18n("Shade (IFS_Illusions)") , KoCompositeOp::categoryDark());
add<&cfFogDarkenIFSIllusions<Arg> >(cs, COMPOSITE_FOG_DARKEN_IFS_ILLUSIONS , i18n("Fog Darken (IFS Illusions)") , KoCompositeOp::categoryDark());
add<&cfColorBurnLogarithmic<Arg> >(cs, COMPOSITE_BURN_LOGARITHMIC , i18n("Color Burn - Logarithmic") , KoCompositeOp::categoryDark());
add<&cfEasyBurn<Arg> >(cs, COMPOSITE_EASY_BURN , i18n("Easy Burn") , KoCompositeOp::categoryDark());
add<&cfAddition<Arg> >(cs, COMPOSITE_ADD , i18n("Addition") , KoCompositeOp::categoryArithmetic());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment