TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent afbfdc507b
commit 7c71ab86d1
776 changed files with 18038 additions and 18038 deletions
Show Stats Download Patch File Download Diff File

4
chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
Unescape Escape View File

@ -132,7 +132,7 @@ void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -148,7 +148,7 @@ void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst,
return;
switch (op.op()) {
case COMPOSITE_COPY:
compositeCopy(dst, dststride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
compositeCopy(dst, dststride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
return;
case COMPOSITE_CLEAR:
linesize = sizeof(TQ_UINT8) * cols;

2
chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h
Unescape Escape View File

@ -80,7 +80,7 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,

46
chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
Unescape Escape View File

@ -262,12 +262,12 @@ void KisLabColorSpace::getSingleChannelPixel(TQ_UINT8 *dst, const TQ_UINT8 *src,
}
}
void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
while (rows > 0) {
const Pixel *src = reinterpret_cast<const Pixel *>(srcRowStart);
Pixel *dst = reinterpret_cast<Pixel *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -331,8 +331,8 @@ printf("%d %d %d\n", dst->lightness, dst->a, dst->b);
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -342,7 +342,7 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
TQ_UINT16 /*opacity*/)
@ -372,7 +372,7 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
@ -382,7 +382,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -395,7 +395,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -425,16 +425,16 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
//compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
//compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_RED:
//compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -469,22 +469,22 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
//compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
//compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -493,24 +493,24 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
//compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
//compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
//compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
//compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
CHANNEL_ALPHA, NUM_COLOR_CHANNELS, NUM_CHANNELS>(
dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride,
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
break;
default:

30
chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
Unescape Escape View File

@ -81,28 +81,28 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
/*
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
*/
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
private:
struct Pixel {

68
chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
Unescape Escape View File

@ -119,13 +119,13 @@ TQ_UINT8 KisXyzColorSpace::intensity8(const TQ_UINT8 * src) const
return 0;
}
void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
while (rows > 0) {
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -186,8 +186,8 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -198,7 +198,7 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = tqmaskRowStart; \
const TQ_UINT8 *tqmask = maskRowStart; \
\
while (columns > 0) { \
\
@ -248,12 +248,12 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
rows--; \
srcRowStart += srcRowStride; \
dstRowStart += dstRowStride; \
if(tqmaskRowStart) { \
tqmaskRowStart += tqmaskRowStride; \
if(maskRowStart) { \
maskRowStart += maskRowStride; \
} \
}
void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -273,7 +273,7 @@ void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
COMMON_COMPOSITE_OP_EPILOG();
}
void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -294,7 +294,7 @@ void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
COMMON_COMPOSITE_OP_EPILOG();
}
void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -315,7 +315,7 @@ void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
COMMON_COMPOSITE_OP_EPILOG();
}
void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -336,7 +336,7 @@ void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
COMMON_COMPOSITE_OP_EPILOG();
}
void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -357,7 +357,7 @@ void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
COMMON_COMPOSITE_OP_EPILOG();
}
void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -379,7 +379,7 @@ void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
COMMON_COMPOSITE_OP_EPILOG();
}
void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -400,7 +400,7 @@ void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
COMMON_COMPOSITE_OP_EPILOG();
}
void KisXyzColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisXyzColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -428,7 +428,7 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
TQ_UINT16 /*opacity*/)
@ -458,7 +458,7 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
@ -468,7 +468,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -481,7 +481,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -510,16 +510,16 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_RED:
//compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -554,22 +554,22 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -578,24 +578,24 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
PIXEL_ALPHA, xyz::MAX_CHANNEL_XYZ, xyz::MAX_CHANNEL_XYZA>(
dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride,
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
break;
default:

22
chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h
Unescape Escape View File

@ -78,7 +78,7 @@ public:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -87,16 +87,16 @@ public:
KisCompositeOpList userVisiblecompositeOps() const;
protected:
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
private:

8
chalk/chalkcolor/kis_abstract_colorspace.cc
Unescape Escape View File

@ -638,7 +638,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -671,7 +671,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst,
m_conversionCache.data(),
srcRowStride,
srcAlphaMask,
tqmaskRowStride,
maskRowStride,
opacity,
rows,
cols,
@ -684,7 +684,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst,
src,
srcRowStride,
srcAlphaMask,
tqmaskRowStride,
maskRowStride,
opacity,
rows,
cols,
@ -741,7 +741,7 @@ cmsHTRANSFORM KisAbstractColorSpace::createTransform(KisColorSpace * dstColorSpa
return 0;
}
void KisAbstractColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 * /*tqmaskRowStart*/, TQ_INT32 /*tqmaskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisAbstractColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 * /*maskRowStart*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
TQ_UINT8 *dst = dstRowStart;
const TQ_UINT8 *src = srcRowStart;

14
chalk/chalkcolor/kis_abstract_colorspace.h
Unescape Escape View File

@ -181,7 +181,7 @@ public:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -201,7 +201,7 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -212,7 +212,7 @@ protected:
KisProfile * dstProfile,
TQ_INT32 renderingIntent);
virtual void compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity);
virtual void compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity);
// So I don't need to re-implement it everywhere.
@ -221,7 +221,7 @@ protected:
int AlphaPos, int NonAlphaSize, int TotalSize>
void abstractCompositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride,
const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride,
const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride,
TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity,
NativeMult nativeMult, Uint8ToNative uint8ToNative,
NativeOpacityTest nativeOpacityTest) {
@ -229,7 +229,7 @@ protected:
const ColorType *src = reinterpret_cast<const ColorType*>(srcRowStart);
ColorType *dst = reinterpret_cast<ColorType*>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -263,8 +263,8 @@ protected:
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}

2
chalk/chalkcolor/kis_colorspace.h
Unescape Escape View File

@ -401,7 +401,7 @@ public:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,

68
chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
Unescape Escape View File

@ -210,13 +210,13 @@ void KisCmykU16ColorSpace::getSingleChannelPixel(TQ_UINT8 *dstPixel, const TQ_UI
}
}
void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
while (rows > 0) {
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -278,8 +278,8 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -290,7 +290,7 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = tqmaskRowStart; \
const TQ_UINT8 *tqmask = maskRowStart; \
\
while (columns > 0) { \
\
@ -340,12 +340,12 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
rows--; \
srcRowStart += srcRowStride; \
dstRowStart += dstRowStride; \
if(tqmaskRowStart) { \
tqmaskRowStart += tqmaskRowStride; \
if(maskRowStart) { \
maskRowStart += maskRowStride; \
} \
}
void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -366,7 +366,7 @@ void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dst
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -387,7 +387,7 @@ void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -408,7 +408,7 @@ void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -429,7 +429,7 @@ void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -450,7 +450,7 @@ void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -472,7 +472,7 @@ void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -493,7 +493,7 @@ void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisCmykU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -519,7 +519,7 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
TQ_UINT16 /*opacity*/)
@ -549,7 +549,7 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
@ -560,7 +560,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -573,7 +573,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -602,16 +602,16 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_CYAN:
//compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -646,22 +646,22 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -670,24 +670,24 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
PIXEL_ALPHA, MAX_CHANNEL_CMYK, MAX_CHANNEL_CMYKA>(
dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride,
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
break;
default:

22
chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h
Unescape Escape View File

@ -72,22 +72,22 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
private:
friend class KisCmykU16ColorSpaceTester;

68
chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
Unescape Escape View File

@ -208,13 +208,13 @@ void KisCmykColorSpace::getSingleChannelPixel(TQ_UINT8 *dstPixel, const TQ_UINT8
}
}
void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -276,8 +276,8 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -288,7 +288,7 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
const TQ_UINT8 *src = srcRowStart; \
TQ_UINT8 *dst = dstRowStart; \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = tqmaskRowStart; \
const TQ_UINT8 *tqmask = maskRowStart; \
\
while (columns > 0) { \
\
@ -338,12 +338,12 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
rows--; \
srcRowStart += srcRowStride; \
dstRowStart += dstRowStride; \
if(tqmaskRowStart) { \
tqmaskRowStart += tqmaskRowStride; \
if(maskRowStart) { \
maskRowStart += maskRowStride; \
} \
}
void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -364,7 +364,7 @@ void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -385,7 +385,7 @@ void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -406,7 +406,7 @@ void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -427,7 +427,7 @@ void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -448,7 +448,7 @@ void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -470,7 +470,7 @@ void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -491,7 +491,7 @@ void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
COMMON_COMPOSITE_OP_EPILOG();
}
void KisCmykColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisCmykColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -517,7 +517,7 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
TQ_UINT8 /*opacity*/)
@ -547,7 +547,7 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
@ -557,7 +557,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -569,7 +569,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -598,16 +598,16 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY_CYAN:
//compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -642,22 +642,22 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -666,24 +666,24 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT8, U8Mult, Uint8ToU8, U8OpacityTest,
PIXEL_CMYK_ALPHA, cmyk::MAX_CHANNEL_CMYK, cmyk::MAX_CHANNEL_CMYKA>(
dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride,
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
rows, cols, opacity, U8Mult(), Uint8ToU8(), U8OpacityTest());
break;
default:

22
chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
Unescape Escape View File

@ -74,22 +74,22 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
private:

68
chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
Unescape Escape View File

@ -161,13 +161,13 @@ TQ_UINT32 KisGrayU16ColorSpace::pixelSize() const
return MAX_CHANNEL_GRAYA * sizeof(TQ_UINT16);
}
void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
while (rows > 0) {
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -226,8 +226,8 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -238,7 +238,7 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = tqmaskRowStart; \
const TQ_UINT8 *tqmask = maskRowStart; \
\
while (columns > 0) { \
\
@ -288,12 +288,12 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
rows--; \
srcRowStart += srcRowStride; \
dstRowStart += dstRowStride; \
if(tqmaskRowStart) { \
tqmaskRowStart += tqmaskRowStride; \
if(maskRowStart) { \
maskRowStart += maskRowStride; \
} \
}
void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -310,7 +310,7 @@ void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dst
COMMON_COMPOSITE_OP_EPILOG();
}
void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -331,7 +331,7 @@ void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -352,7 +352,7 @@ void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -373,7 +373,7 @@ void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
COMMON_COMPOSITE_OP_EPILOG();
}
void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -394,7 +394,7 @@ void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -416,7 +416,7 @@ void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
COMMON_COMPOSITE_OP_EPILOG();
}
void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -437,7 +437,7 @@ void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisGrayU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisGrayU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -464,7 +464,7 @@ void KisGrayU16ColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
TQ_UINT16 /*opacity*/)
@ -494,7 +494,7 @@ void KisGrayU16ColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
@ -504,7 +504,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -517,7 +517,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -546,16 +546,16 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_RED:
//compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -590,22 +590,22 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -614,24 +614,24 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
PIXEL_ALPHA, MAX_CHANNEL_GRAY, MAX_CHANNEL_GRAYA>(
dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride,
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
break;
default:

22
chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h
Unescape Escape View File

@ -70,22 +70,22 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
private:
friend class KisGrayU16ColorSpaceTester;

110
chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
Unescape Escape View File

@ -200,7 +200,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -208,37 +208,37 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
{
switch (op.op()) {
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_CLEAR: {
TQ_UINT8 *d;
@ -253,7 +253,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
}
break;
case COMPOSITE_ALPHA_DARKEN:
compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
default:
@ -278,14 +278,14 @@ KisCompositeOpList KisGrayColorSpace::userVisiblecompositeOps() const
return list;
}
void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -341,19 +341,19 @@ void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -407,19 +407,19 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -478,19 +478,19 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -549,19 +549,19 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -620,19 +620,19 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -691,19 +691,19 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -763,19 +763,19 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -834,19 +834,19 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -905,8 +905,8 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
@ -915,7 +915,7 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
TQ_UINT8 /*opacity*/)
@ -944,21 +944,21 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
if(srcAlphaMask)
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
src += srcRowSize;
}
}
void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride,
const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride,
const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride,
TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -991,7 +991,7 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}

24
chalk/colorspaces/gray_u8/kis_gray_colorspace.h
Unescape Escape View File

@ -61,7 +61,7 @@ public:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -70,17 +70,17 @@ public:
KisCompositeOpList userVisiblecompositeOps() const;
protected:
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
private:

22
chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
Unescape Escape View File

@ -220,13 +220,13 @@ TQImage KisLmsF32ColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT32 w
}
void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
while (rows > 0) {
const float *src = reinterpret_cast<const float *>(srcRowStart);
float *dst = reinterpret_cast<float *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -287,8 +287,8 @@ void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -298,7 +298,7 @@ void KisLmsF32ColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
float /*opacity*/)
@ -328,13 +328,13 @@ void KisLmsF32ColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
void KisLmsF32ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
const TQ_UINT8 */*tqmaskRowStart*/, TQ_INT32 /*tqmaskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, float /*opacity*/)
const TQ_UINT8 */*maskRowStart*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, float /*opacity*/)
{
while (rows > 0) {
memcpy(dstRowStart, srcRowStart, numColumns * sizeof(Pixel));
@ -349,7 +349,7 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -362,13 +362,13 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
default:
break;

8
chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
Unescape Escape View File

@ -81,15 +81,15 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
private:
inline TQ_UINT8 computeRed(float l, float m, float s) const

76
chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
Unescape Escape View File

@ -299,13 +299,13 @@ TQImage KisRgbF16HalfColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT
}
void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
while (rows > 0) {
const half *src = reinterpret_cast<const half *>(srcRowStart);
half *dst = reinterpret_cast<half *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -366,8 +366,8 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -378,7 +378,7 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
const half *src = reinterpret_cast<const half *>(srcRowStart); \
half *dst = reinterpret_cast<half *>(dstRowStart); \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = tqmaskRowStart; \
const TQ_UINT8 *tqmask = maskRowStart; \
\
while (columns > 0) { \
\
@ -428,12 +428,12 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
rows--; \
srcRowStart += srcRowStride; \
dstRowStart += dstRowStride; \
if(tqmaskRowStart) { \
tqmaskRowStart += tqmaskRowStride; \
if(maskRowStart) { \
maskRowStart += maskRowStride; \
} \
}
void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -463,7 +463,7 @@ void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -484,7 +484,7 @@ void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 ds
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -505,7 +505,7 @@ void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 ds
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -526,7 +526,7 @@ void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 d
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -547,7 +547,7 @@ void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dst
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -569,7 +569,7 @@ void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -590,7 +590,7 @@ void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 ds
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -611,7 +611,7 @@ void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 d
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -645,7 +645,7 @@ void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -679,7 +679,7 @@ void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT3
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -713,7 +713,7 @@ void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dst
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF16HalfColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
void KisRgbF16HalfColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -752,7 +752,7 @@ void KisRgbF16HalfColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
half /*opacity*/)
@ -782,7 +782,7 @@ void KisRgbF16HalfColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
@ -792,7 +792,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -805,7 +805,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -834,16 +834,16 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_RED:
//compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -878,22 +878,22 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -902,24 +902,24 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<half, F16HalfMult, Uint8ToF16Half, F16HalfOpacityTest,
PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>(
dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride,
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
rows, cols,
U8_opacity, F16HalfMult(), Uint8ToF16Half(), F16HalfOpacityTest());
break;

30
chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
Unescape Escape View File

@ -79,26 +79,26 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
private:
friend class KisRgbF16HalfColorSpaceTester;

76
chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
Unescape Escape View File

@ -298,13 +298,13 @@ TQImage KisRgbF32ColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT32 w
}
void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
while (rows > 0) {
const float *src = reinterpret_cast<const float *>(srcRowStart);
float *dst = reinterpret_cast<float *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -365,8 +365,8 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -377,7 +377,7 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
const float *src = reinterpret_cast<const float *>(srcRowStart); \
float *dst = reinterpret_cast<float *>(dstRowStart); \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = tqmaskRowStart; \
const TQ_UINT8 *tqmask = maskRowStart; \
\
while (columns > 0) { \
\
@ -427,12 +427,12 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--; \
srcRowStart += srcRowStride; \
dstRowStart += dstRowStride; \
if(tqmaskRowStart) { \
tqmaskRowStart += tqmaskRowStride; \
if(maskRowStart) { \
maskRowStart += maskRowStride; \
} \
}
void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -462,7 +462,7 @@ void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -483,7 +483,7 @@ void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -504,7 +504,7 @@ void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -525,7 +525,7 @@ void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -546,7 +546,7 @@ void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -568,7 +568,7 @@ void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -589,7 +589,7 @@ void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -610,7 +610,7 @@ void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -644,7 +644,7 @@ void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -678,7 +678,7 @@ void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 ds
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -712,7 +712,7 @@ void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbF32ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
void KisRgbF32ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -751,7 +751,7 @@ void KisRgbF32ColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
float /*opacity*/)
@ -781,7 +781,7 @@ void KisRgbF32ColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
@ -791,7 +791,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -804,7 +804,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -833,16 +833,16 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_RED:
//compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -877,22 +877,22 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -901,24 +901,24 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<float, F32Mult, Uint8ToF32, F32OpacityTest,
PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>(
dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride,
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
rows, cols, U8_opacity, F32Mult(), Uint8ToF32(), F32OpacityTest());
default:
break;

30
chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
Unescape Escape View File

@ -83,26 +83,26 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
private:
friend class KisRgbF32ColorSpaceTester;

76
chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
Unescape Escape View File

@ -196,13 +196,13 @@ TQ_UINT32 KisRgbU16ColorSpace::pixelSize() const
}
void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
while (rows > 0) {
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -263,8 +263,8 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
@ -275,7 +275,7 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = tqmaskRowStart; \
const TQ_UINT8 *tqmask = maskRowStart; \
\
while (columns > 0) { \
\
@ -325,12 +325,12 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--; \
srcRowStart += srcRowStride; \
dstRowStart += dstRowStride; \
if(tqmaskRowStart) { \
tqmaskRowStart += tqmaskRowStride; \
if(maskRowStart) { \
maskRowStart += maskRowStride; \
} \
}
void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -350,7 +350,7 @@ void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -371,7 +371,7 @@ void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -392,7 +392,7 @@ void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -413,7 +413,7 @@ void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -434,7 +434,7 @@ void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -456,7 +456,7 @@ void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -477,7 +477,7 @@ void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -498,7 +498,7 @@ void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -540,7 +540,7 @@ void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -582,7 +582,7 @@ void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 ds
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -624,7 +624,7 @@ void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
COMMON_COMPOSITE_OP_EPILOG();
}
void KisRgbU16ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
void KisRgbU16ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
{
COMMON_COMPOSITE_OP_PROLOG();
@ -671,7 +671,7 @@ void KisRgbU16ColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
TQ_UINT16 /*opacity*/)
@ -701,7 +701,7 @@ void KisRgbU16ColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
@ -711,7 +711,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -724,7 +724,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -753,16 +753,16 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_RED:
//compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -797,22 +797,22 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -821,24 +821,24 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>(
dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride,
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
break;
default:

30
chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
Unescape Escape View File

@ -74,26 +74,26 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
private:
friend class KisRgbU16ColorSpaceTester;

150
chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
Unescape Escape View File

@ -265,14 +265,14 @@ TQImage KisRgbColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 width,
void KisRgbColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride,
const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride,
const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride,
TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -331,22 +331,22 @@ void KisRgbColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride,
const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride,
const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride,
TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -379,20 +379,20 @@ void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -461,19 +461,19 @@ void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -532,19 +532,19 @@ void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -603,19 +603,19 @@ void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -675,19 +675,19 @@ void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -747,19 +747,19 @@ void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -819,19 +819,19 @@ void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -890,19 +890,19 @@ void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -961,19 +961,19 @@ void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -1044,19 +1044,19 @@ void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -1127,19 +1127,19 @@ void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -1210,19 +1210,19 @@ void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
TQ_INT32 columns = numColumns;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
while (columns > 0) {
@ -1293,8 +1293,8 @@ void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
@ -1303,7 +1303,7 @@ void KisRgbColorSpace::compositeErase(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowSize,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_INT32 rows,
TQ_INT32 cols,
TQ_UINT8 /*opacity*/)
@ -1332,7 +1332,7 @@ void KisRgbColorSpace::compositeErase(TQ_UINT8 *dst,
dst += dstRowSize;
if(srcAlphaMask)
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
src += srcRowSize;
}
}
@ -1342,7 +1342,7 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -1354,10 +1354,10 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -1387,16 +1387,16 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY_RED:
compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -1431,22 +1431,22 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -1455,19 +1455,19 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
default:
break;

32
chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
Unescape Escape View File

@ -69,27 +69,27 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
};
class KisRgbColorSpaceFactory : public KisColorSpaceFactory

2
chalk/colorspaces/wet/kis_wet_colorspace.cc
Unescape Escape View File

@ -350,7 +350,7 @@ void KisWetColorSpace::bitBlt( TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 */*srcAlphaMask*/,
TQ_INT32 /*tqmaskRowStride*/,
TQ_INT32 /*maskRowStride*/,
TQ_UINT8 /*opacity*/,
TQ_INT32 rows,
TQ_INT32 cols,

2
chalk/colorspaces/wet/kis_wet_colorspace.h
Unescape Escape View File

@ -167,7 +167,7 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,

12
chalk/colorspaces/wet/kis_wetop.cc
Unescape Escape View File

@ -164,15 +164,15 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
double eff_height;
double press, contact;
int tqmaskW = brush->tqmaskWidth(inf);
int tqmaskH = brush->tqmaskHeight(inf);
int maskW = brush->maskWidth(inf);
int maskH = brush->maskHeight(inf);
KoPoint dest = (pos - (brush->hotSpot(inf)));
int xStart = (int)dest.x();
int yStart = (int)dest.y();
for (int y = 0; y < tqmaskH; y++) {
KisHLineIteratorPixel dabIt = dab->createHLineIterator(0, y, tqmaskW, false);
KisHLineIteratorPixel it = device->createHLineIterator(xStart, yStart+y, tqmaskW, true);
for (int y = 0; y < maskH; y++) {
KisHLineIteratorPixel dabIt = dab->createHLineIterator(0, y, maskW, false);
KisHLineIteratorPixel it = device->createHLineIterator(xStart, yStart+y, maskW, true);
while (!dabIt.isDone()) {
// This only does something with .paint, and not with adsorb.
@ -226,5 +226,5 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
}
}
m_painter->addDirtyRect(TQRect(xStart, yStart, tqmaskW, tqmaskH));
m_painter->addDirtyRect(TQRect(xStart, yStart, maskW, maskH));
}

2
chalk/colorspaces/wet/wdgpressure.ui
Unescape Escape View File

@ -56,5 +56,5 @@
</widget>
</hbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/colorspaces/wet/wetphysicsfilter.cc
Unescape Escape View File

@ -88,7 +88,7 @@ void WetPhysicsFilter::flow(KisPaintDeviceSP src, KisPaintDeviceSP /*dst*/, cons
kdDebug() << "Flowing: " << r << endl;
/* width of a line in a layer in pixel units, not in bytes -- used to move to the next
line in the fluid tqmasks below */
line in the fluid masks below */
int rs = width; // rowstride
double * flow_t = new double[width * height];

2
chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
Unescape Escape View File

@ -96,7 +96,7 @@ void KisWSBrushOp::paintAt(const KisPoint &pos,
}
m_painter -> setPressure(pressure);
TQRect dabRect = TQRect(0, 0, brush -> tqmaskWidth(pressure), brush -> tqmaskHeight(pressure));
TQRect dabRect = TQRect(0, 0, brush -> maskWidth(pressure), brush -> maskHeight(pressure));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device -> image();

16
chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
Unescape Escape View File

@ -357,7 +357,7 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -368,18 +368,18 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
default:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
break;
}
}
void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
// XXX: This is basically the same as with rgb and used to composite layers for Composition for
// painting works differently
@ -389,7 +389,7 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
@ -461,13 +461,13 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart)
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart)
maskRowStart += maskRowStride;
}
}
void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity)
void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity)
{
TQ_INT32 linesize = sizeof(CELL) * columns;
TQ_UINT8 *d;

8
chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h
Unescape Escape View File

@ -124,7 +124,7 @@ protected:
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
@ -139,9 +139,9 @@ protected:
private:
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeClear(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeClear(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
};

2
chalk/colorspaces/wetsticky/wstool.ui
Unescape Escape View File

@ -250,7 +250,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

20
chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
Unescape Escape View File

@ -204,33 +204,33 @@ TQImage KisYCbCrU16ColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 w
}
void KisYCbCrU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op)
void KisYCbCrU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op)
{
switch (op.op()) {
case COMPOSITE_UNDEF:
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
break;
default:
break;
}
}
void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -291,13 +291,13 @@ void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/)
void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/)
{
while (rows-- > 0)
{
@ -324,7 +324,7 @@ void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, c
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}

6
chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
Unescape Escape View File

@ -69,14 +69,14 @@ class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
private:
#define CLAMP_TO_16BITCHANNEL(a) CLAMP(a, 0, TQ_UINT16_MAX)

22
chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
Unescape Escape View File

@ -204,33 +204,33 @@ TQImage KisYCbCrU8ColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 wi
}
void KisYCbCrU8ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op)
void KisYCbCrU8ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op)
{
switch (op.op()) {
case COMPOSITE_UNDEF:
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
break;
default:
break;
}
}
void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
{
while (rows > 0) {
const TQ_UINT8 *src = srcRowStart;
TQ_UINT8 *dst = dstRowStart;
const TQ_UINT8 *tqmask = tqmaskRowStart;
const TQ_UINT8 *tqmask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -289,13 +289,13 @@ void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
rows--;
srcRowStart += srcRowStride;
dstRowStart += dstRowStride;
if(tqmaskRowStart) {
tqmaskRowStart += tqmaskRowStride;
if(maskRowStart) {
maskRowStart += maskRowStride;
}
}
}
void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/)
void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/)
{
while (rows-- > 0)
{
@ -320,12 +320,12 @@ void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, co
dst += dstRowSize;
src += srcRowSize;
if(srcAlphaMask) {
srcAlphaMask += tqmaskRowStride;
srcAlphaMask += maskRowStride;
}
}
}
void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*tqmask*/, TQ_INT32 /*tqmaskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 /*opacity*/)
void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*tqmask*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 /*opacity*/)
{
while (rows > 0) {
memcpy(dstRowStart, srcRowStart, numColumns * sizeof(Pixel));

8
chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
Unescape Escape View File

@ -69,15 +69,15 @@ class KisYCbCrU8ColorSpace : public KisU8BaseColorSpace
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *srcAlphaMask,
TQ_INT32 tqmaskRowStride,
TQ_INT32 maskRowStride,
TQ_UINT8 opacity,
TQ_INT32 rows,
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
private:
#define CLAMP_TO_8BITCHANNEL(a) CLAMP(a, 0, TQ_UINT8_MAX)

2
chalk/core/kis_alpha_mask.h
Unescape Escape View File

@ -70,7 +70,7 @@ class KisAlphaMask : public KShared {
Returns TQ_UINT8 OPACITY_TRANSPARENT if the value is
outside the bounds of the tqmask.
XXX: this is, of course, not the best way of tqmasking.
XXX: this is, of course, not the best way of masking.
Better would be to let KisAlphaMask fill a chunk of memory
with the alpha values at the right position, something like
void applyMask(TQ_UINT8 *pixeldata, TQ_INT32 pixelWidth,

24
chalk/core/kis_brush.cc
Unescape Escape View File

@ -392,7 +392,7 @@ KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixel
KisAlphaMaskSP outputMask = 0;
if (belowBrush != 0) {
// We're in between two tqmasks. Interpolate between them.
// We're in between two masks. Interpolate between them.
KisAlphaMaskSP scaledAboveMask = scaleMask(aboveBrush, scale, subPixelX, subPixelY);
KisAlphaMaskSP scaledBelowMask = scaleMask(belowBrush, scale, subPixelX, subPixelY);
@ -608,13 +608,13 @@ double KisBrush::scaleForPressure(double pressure)
return scale;
}
TQ_INT32 KisBrush::tqmaskWidth(const KisPaintInformation& info) const
TQ_INT32 KisBrush::maskWidth(const KisPaintInformation& info) const
{
// Add one for sub-pixel shift
return static_cast<TQ_INT32>(ceil(width() * scaleForPressure(info.pressure)) + 1);
}
TQ_INT32 KisBrush::tqmaskHeight(const KisPaintInformation& info) const
TQ_INT32 KisBrush::maskHeight(const KisPaintInformation& info) const
{
// Add one for sub-pixel shift
return static_cast<TQ_INT32>(ceil(height() * scaleForPressure(info.pressure)) + 1);
@ -971,7 +971,7 @@ void KisBrush::findScaledBrushes(double scale, const ScaledBrush **aboveBrush, c
}
}
KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue, double subPixelX, double subPixelY)
KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 maskValue, double subPixelX, double subPixelY)
{
int srcWidth = 1;
int srcHeight = 1;
@ -986,10 +986,10 @@ KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue
for (int y = 0; y < dstHeight; y++) {
for (int x = 0; x < dstWidth; x++) {
TQ_UINT8 topLeft = (x > 0 && y > 0) ? tqmaskValue : OPACITY_TRANSPARENT;
TQ_UINT8 bottomLeft = (x > 0 && y < srcHeight) ? tqmaskValue : OPACITY_TRANSPARENT;
TQ_UINT8 topRight = (x < srcWidth && y > 0) ? tqmaskValue : OPACITY_TRANSPARENT;
TQ_UINT8 bottomRight = (x < srcWidth && y < srcHeight) ? tqmaskValue : OPACITY_TRANSPARENT;
TQ_UINT8 topLeft = (x > 0 && y > 0) ? maskValue : OPACITY_TRANSPARENT;
TQ_UINT8 bottomLeft = (x > 0 && y < srcHeight) ? maskValue : OPACITY_TRANSPARENT;
TQ_UINT8 topRight = (x < srcWidth && y > 0) ? maskValue : OPACITY_TRANSPARENT;
TQ_UINT8 bottomRight = (x < srcWidth && y < srcHeight) ? maskValue : OPACITY_TRANSPARENT;
// Bi-linear interpolation
int d = static_cast<int>(a * b * topLeft
@ -1244,8 +1244,8 @@ void KisBrush::setHeight(TQ_INT32 h)
KisLayerSP layer = image(KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),""),
KisPaintInformation(pressure));
KisBoundary bounds(layer.data());
int w = tqmaskWidth(pressure);
int h = tqmaskHeight(pressure);
int w = maskWidth(pressure);
int h = maskHeight(pressure);
bounds.generateBoundary(w, h);
TQPixmap pix(bounds.pixmap(w, h));
@ -1256,8 +1256,8 @@ void KisBrush::setHeight(TQ_INT32 h)
void KisBrush::generateBoundary() {
KisPaintDeviceSP dev;
int w = tqmaskWidth(KisPaintInformation());
int h = tqmaskHeight(KisPaintInformation());
int w = maskWidth(KisPaintInformation());
int h = maskHeight(KisPaintInformation());
if (brushType() == IMAGE || brushType() == PIPE_IMAGE) {
dev = image(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("RGBA",""),""), KisPaintInformation());

6
chalk/core/kis_brush.h
Unescape Escape View File

@ -95,8 +95,8 @@ public:
double ySpacing(double pressure = PRESSURE_DEFAULT) const;
// Dimensions in pixels of the tqmask/image at a given pressure.
TQ_INT32 tqmaskWidth(const KisPaintInformation& info) const;
TQ_INT32 tqmaskHeight(const KisPaintInformation& info) const;
TQ_INT32 maskWidth(const KisPaintInformation& info) const;
TQ_INT32 maskHeight(const KisPaintInformation& info) const;
virtual void setUseColorAsMask(bool useColorAsMask) { m_useColorAsMask = useColorAsMask; }
virtual bool useColorAsMask() const { return m_useColorAsMask; }
@ -157,7 +157,7 @@ private:
static TQImage scaleImage(const TQImage& srcImage, int width, int height);
static TQImage interpolate(const TQImage& image1, const TQImage& image2, double t);
static KisAlphaMaskSP scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue, double subPixelX, double subPixelY);
static KisAlphaMaskSP scaleSinglePixelMask(double scale, TQ_UINT8 maskValue, double subPixelX, double subPixelY);
static TQImage scaleSinglePixelImage(double scale, TQRgb pixel, double subPixelX, double subPixelY);
// Find the scaled brush(es) nearest to the given scale.

6
chalk/core/kis_merge_visitor.h
Unescape Escape View File

@ -153,9 +153,9 @@ public:
KisSelectionSP tqmask = layer->getMaskAsSelection();
// The indirect painting happens on the tqmask
if (tempTarget && layer->editMask()) {
KisPaintDeviceSP tqmaskSrc = layer->getMask();
KisPaintDeviceSP temp = new KisPaintDevice(tqmaskSrc->colorSpace());
temp = paintIndirect(tqmaskSrc, temp, layer, sx, sy, dx, dy, w, h);
KisPaintDeviceSP maskSrc = layer->getMask();
KisPaintDeviceSP temp = new KisPaintDevice(maskSrc->colorSpace());
temp = paintIndirect(maskSrc, temp, layer, sx, sy, dx, dy, w, h);
// Blegh
KisRectIteratorPixel srcIt = temp->createRectIterator(sx, sy, w, h, false);
KisRectIteratorPixel dstIt = tqmask->createRectIterator(sx, sy, w, h, true);

12
chalk/core/kis_paint_device.cc
Unescape Escape View File

@ -343,14 +343,14 @@ DCOPObject *KisPaintDevice::dcopObject()
return m_dcop;
}
KisLayer *KisPaintDevice::tqparentLayer() const
KisLayer *KisPaintDevice::parentLayer() const
{
return m_parentLayer;
}
void KisPaintDevice::setParentLayer(KisLayer *tqparentLayer)
void KisPaintDevice::setParentLayer(KisLayer *parentLayer)
{
m_parentLayer = tqparentLayer;
m_parentLayer = parentLayer;
}
void KisPaintDevice::setDirty(const TQRect & rc)
@ -1115,15 +1115,15 @@ void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask)
for (TQ_INT32 y = r.top(); y <= r.bottom(); ++y) {
KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true);
KisHLineIterator tqmaskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false);
KisHLineIterator maskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false);
while (!pixelIt.isDone()) {
// XXX: Optimize by using stretches
m_colorSpace->applyAlphaU8Mask( pixelIt.rawData(), tqmaskIt.rawData(), 1);
m_colorSpace->applyAlphaU8Mask( pixelIt.rawData(), maskIt.rawData(), 1);
++pixelIt;
++tqmaskIt;
++maskIt;
}
}
}

12
chalk/core/kis_paint_device.h
Unescape Escape View File

@ -90,13 +90,13 @@ public:
/**
* Create a new paint device with the specified colorspace. The
* tqparentLayer will be notified of changes to this paint device.
* parentLayer will be notified of changes to this paint device.
*
* @param tqparentLayer the layer that contains this paint device.
* @param parentLayer the layer that contains this paint device.
* @param colorSpace the colorspace of this paint device
* @param name for debugging purposes
*/
KisPaintDevice(KisLayer *tqparentLayer, KisColorSpace * colorSpace, const char * name = 0);
KisPaintDevice(KisLayer *parentLayer, KisColorSpace * colorSpace, const char * name = 0);
KisPaintDevice(const KisPaintDevice& rhs);
virtual ~KisPaintDevice();
@ -386,7 +386,7 @@ public:
/**
* Return the image that contains this paint device, or 0 if it is not
* part of an image. This is the same as calling tqparentLayer()->image().
* part of an image. This is the same as calling parentLayer()->image().
*/
KisImage *image() const;
@ -394,13 +394,13 @@ public:
* Returns the KisLayer that contains this paint device, or 0 if this is not
* part of a layer.
*/
KisLayer *tqparentLayer() const;
KisLayer *parentLayer() const;
/**
* Set the KisLayer that contains this paint device, or 0 if this is not
* part of a layer.
*/
void setParentLayer(KisLayer *tqparentLayer);
void setParentLayer(KisLayer *parentLayer);
/**
* Add the specified rect top the tqparent layer (if present)

42
chalk/core/kis_paint_layer.cc
Unescape Escape View File

@ -40,7 +40,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
Q_ASSERT(dev);
m_paintdev = dev;
m_tqmask = 0;
m_tqmaskAsSelection = 0;
m_maskAsSelection = 0;
m_paintdev->setParentLayer(this);
m_renderMask = false;
m_editMask = true;
@ -53,7 +53,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
Q_ASSERT(img);
m_paintdev = new KisPaintDevice(this, img->colorSpace(), name.latin1());
m_tqmask = 0;
m_tqmaskAsSelection = 0;
m_maskAsSelection = 0;
m_renderMask = false;
m_editMask = true;
}
@ -65,7 +65,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
Q_ASSERT(colorSpace);
m_paintdev = new KisPaintDevice(this, colorSpace, name.latin1());
m_tqmask = 0;
m_tqmaskAsSelection = 0;
m_maskAsSelection = 0;
m_renderMask = false;
m_editMask = true;
}
@ -193,7 +193,7 @@ void KisPaintLayer::removeMask() {
m_tqmask->setParentLayer(0);
m_tqmask = 0;
m_tqmaskAsSelection = 0;
m_maskAsSelection = 0;
setDirty();
emit sigMaskInfoChanged();
@ -210,7 +210,7 @@ void KisPaintLayer::applyMask() {
// A bit slow; but it works
KisPaintDeviceSP temp = new KisPaintDevice(m_paintdev->colorSpace());
KisPainter gc(temp);
gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_tqmaskAsSelection, OPACITY_OPAQUE, x, y, w, h);
gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_maskAsSelection, OPACITY_OPAQUE, x, y, w, h);
gc.end();
gc.begin(m_paintdev);
gc.bitBlt(x, y, COMPOSITE_COPY, temp, OPACITY_OPAQUE, x, y, w, h);
@ -252,7 +252,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) {
->getColorSpace(KisID("GRAYA"), 0));
m_tqmask->setParentLayer(this);
m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough
m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
// Default pixel is opaque white == don't tqmask?
TQ_UINT8 const defPixel[] = { 255, 255 };
@ -292,7 +292,7 @@ KisPaintDeviceSP KisPaintLayer::getMask() {
KisSelectionSP KisPaintLayer::getMaskAsSelection() {
createMask();
kdDebug() << k_funcinfo << endl;
return m_tqmaskAsSelection;
return m_maskAsSelection;
}
void KisPaintLayer::setEditMask(bool b) {
@ -312,7 +312,7 @@ void KisPaintLayer::setRenderMask(bool b) {
void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
KisRectIteratorPixel srcIt = m_tqmask->createRectIterator(r.x(), r.y(),
r.width(), r.height(), false);
KisRectIteratorPixel dstIt = m_tqmaskAsSelection->createRectIterator(r.x(), r.y(),
KisRectIteratorPixel dstIt = m_maskAsSelection->createRectIterator(r.x(), r.y(),
r.width(), r.height(), true);
while(!dstIt.isDone()) {
@ -328,7 +328,7 @@ void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
void KisPaintLayer::genericMaskCreationHelper() {
m_tqmask->setParentLayer(this);
m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough
m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
// Default pixel is opaque white == don't tqmask?
TQ_UINT8 const defPixel[] = { 255, 255 };
@ -374,35 +374,35 @@ namespace {
class KisMaskFromSelectionCommand : public KNamedCommand {
typedef KNamedCommand super;
KisPaintLayerSP m_layer;
KisPaintDeviceSP m_tqmaskBefore;
KisPaintDeviceSP m_tqmaskAfter;
KisPaintDeviceSP m_maskBefore;
KisPaintDeviceSP m_maskAfter;
KisSelectionSP m_selection;
public:
KisMaskFromSelectionCommand(const TQString& name, KisPaintLayer* layer)
: super(name), m_layer(layer) {
if (m_layer->hasMask())
m_tqmaskBefore = m_layer->getMask();
m_maskBefore = m_layer->getMask();
else
m_tqmaskBefore = 0;
m_tqmaskAfter = 0;
m_maskBefore = 0;
m_maskAfter = 0;
if (m_layer->paintDevice()->hasSelection())
m_selection = m_layer->paintDevice()->selection();
else
m_selection = 0;
}
virtual void execute() {
if (!m_tqmaskAfter) {
if (!m_maskAfter) {
m_layer->createMaskFromSelection(m_selection);
m_tqmaskAfter = m_layer->getMask();
m_maskAfter = m_layer->getMask();
} else {
m_layer->paintDevice()->deselect();
m_layer->createMaskFromPaintDevice(m_tqmaskAfter);
m_layer->createMaskFromPaintDevice(m_maskAfter);
}
}
virtual void unexecute() {
m_layer->paintDevice()->setSelection(m_selection);
if (m_tqmaskBefore)
m_layer->createMaskFromPaintDevice(m_tqmaskBefore);
if (m_maskBefore)
m_layer->createMaskFromPaintDevice(m_maskBefore);
else
m_layer->removeMask();
}
@ -488,11 +488,11 @@ KNamedCommand* KisPaintLayer::createMaskCommand() {
return new KisCreateMaskCommand(i18n("Create Layer Mask"), this);
}
KNamedCommand* KisPaintLayer::tqmaskFromSelectionCommand() {
KNamedCommand* KisPaintLayer::maskFromSelectionCommand() {
return new KisMaskFromSelectionCommand(i18n("Mask From Selection"), this);
}
KNamedCommand* KisPaintLayer::tqmaskToSelectionCommand() {
KNamedCommand* KisPaintLayer::maskToSelectionCommand() {
return new KisMaskToSelectionCommand(i18n("Mask to Selection"), this);
}

8
chalk/core/kis_paint_layer.h
Unescape Escape View File

@ -106,15 +106,15 @@ public:
/// Undoable version of createMask
KNamedCommand* createMaskCommand();
/// Undoable version of createMaskFromSelection
KNamedCommand* tqmaskFromSelectionCommand();
KNamedCommand* maskFromSelectionCommand();
/// Undoable, removes the current tqmask, but converts it to the current selection
KNamedCommand* tqmaskToSelectionCommand();
KNamedCommand* maskToSelectionCommand();
/// Undoable version of removeMask
KNamedCommand* removeMaskCommand();
/// Undoable version of applyMask
KNamedCommand* applyMaskCommand();
/// Returns true if the tqmasked part of the tqmask will be rendered instead of being transparent
/// Returns true if the masked part of the tqmask will be rendered instead of being transparent
bool renderMask() const { return m_renderMask; }
/// Set the renderMask property
void setRenderMask(bool b);
@ -146,7 +146,7 @@ private:
// Layer tqmask related:
// XXX It would be nice to merge the next 2 devices...
KisPaintDeviceSP m_tqmask; // The tqmask that we can edit and display easily
KisSelectionSP m_tqmaskAsSelection; // The tqmask as selection, to apply and render easily
KisSelectionSP m_maskAsSelection; // The tqmask as selection, to apply and render easily
bool m_renderMask;
bool m_editMask;
};

8
chalk/core/kis_paintop.cc
Unescape Escape View File

@ -65,14 +65,14 @@ KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs
TQ_INT32 pixelSize = colorSpace->pixelSize();
TQ_INT32 tqmaskWidth = tqmask->width();
TQ_INT32 tqmaskHeight = tqmask->height();
TQ_INT32 maskWidth = tqmask->width();
TQ_INT32 maskHeight = tqmask->height();
// Convert the kiscolor to the right colorspace.
kc.convertTo(colorSpace);
KisHLineIteratorPixel hiter = m_dab->createHLineIterator(0, 0, tqmaskWidth, true);
for (int y = 0; y < tqmaskHeight; y++)
KisHLineIteratorPixel hiter = m_dab->createHLineIterator(0, 0, maskWidth, true);
for (int y = 0; y < maskHeight; y++)
{
int x=0;
while(! hiter.isDone())

4
chalk/core/kis_selection.cc
Unescape Escape View File

@ -35,7 +35,7 @@
#include "kis_selection.h"
KisSelection::KisSelection(KisPaintDeviceSP dev)
: super(dev->tqparentLayer()
: super(dev->parentLayer()
, KisMetaRegistry::instance()->csRegistry()->getAlpha8()
, (TQString("selection for ") + dev->name()).latin1())
, m_parentPaintDevice(dev)
@ -79,7 +79,7 @@ void KisSelection::setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s)
*pix = s;
}
TQImage KisSelection::tqmaskImage()
TQImage KisSelection::maskImage()
{
// If part of a KisAdjustmentLayer, there may be no tqparent device.
TQImage img;

4
chalk/core/kis_selection.h
Unescape Escape View File

@ -69,7 +69,7 @@ public:
void setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s);
TQImage tqmaskImage();
TQImage maskImage();
void select(TQRect r);
@ -115,7 +115,7 @@ public:
virtual void setDirty(const TQRect & rc);
virtual void setDirty();
inline KisPaintDeviceSP tqparentPaintDevice() { return m_parentPaintDevice; }
inline KisPaintDeviceSP parentPaintDevice() { return m_parentPaintDevice; }
private:
void paintUniformSelectionRegion(TQImage img, const TQRect& imageRect, const TQRegion& uniformRegion);

4
chalk/core/kis_transaction.cc
Unescape Escape View File

@ -62,7 +62,7 @@ void KisTransaction::execute()
m_private->m_memento->extent(x,y,width,height);
rc.setRect(x + m_private->m_device->getX(), y + m_private->m_device->getY(), width, height);
KisLayerSP l = m_private->m_device->tqparentLayer();
KisLayerSP l = m_private->m_device->parentLayer();
if (l) l->setDirty(rc);
}
@ -76,7 +76,7 @@ void KisTransaction::unexecute()
m_private->m_memento->extent(x,y,width,height);
rc.setRect(x + m_private->m_device->getX(), y + m_private->m_device->getY(), width, height);
KisLayerSP l = m_private->m_device->tqparentLayer();
KisLayerSP l = m_private->m_device->parentLayer();
if (l) l->setDirty(rc);
}

4
chalk/core/kis_transform_worker.cc
Unescape Escape View File

@ -665,8 +665,8 @@ bool KisTransformWorker::run()
rotateNone(tmpdev3, m_dev);
}
if (m_dev->tqparentLayer()) {
m_dev->tqparentLayer()->setDirty();
if (m_dev->parentLayer()) {
m_dev->parentLayer()->setDirty();
}
//progress info
emit notifyProgressDone();

2
chalk/core/tiles/kis_tilemanager.h
Unescape Escape View File

@ -114,7 +114,7 @@ private:
TQMutex * m_swapMutex;
// This is the constant that we will use to see if we want to add a new tempfile
// We use 1<<30 (one gigabyte) because aptqparently 32bit systems don't really like very
// We use 1<<30 (one gigabyte) because apparently 32bit systems don't really like very
// large files.
static const long MaxSwapFileSize = 1<<30; // For debugging purposes: 1<<20 is a megabyte

2
chalk/doc/DESIGN.obsolete
Unescape Escape View File

@ -26,7 +26,7 @@ Design Patterns
here.
* The composite pattern is used in paint devices, layers, channels,
etc. (What about tqmasks?)
etc. (What about masks?)
* Change colourspace handling to a Strategy pattern
(strategy/kis_strategy_color)

2
chalk/doc/background_paper.txt
Unescape Escape View File

@ -68,7 +68,7 @@ trying to use a pencil on a watercolor layer causes a nasty flow-impeding
useless error box to popup.
Media and ordinary layers can be grouped and mixed at will, together with adjustment
layers. Adjustment layers can also be attached to selection tqmasks, per layer.
layers. Adjustment layers can also be attached to selection masks, per layer.
The composited layers is either scaled and color corrected, or color corrected and
then scaled, depending on whether the zoom > 100% or < 100%.

6
chalk/doc/brush.txt
Unescape Escape View File

@ -16,17 +16,17 @@ grayscale or rgba images. If the image is grayscale, the gray image is
intended to be used as an alpha tqmask: each gray level corresponds to
a certain alpha level, and when painting the current painting colour
is composited in the image with this level as its alpha component. The
image brushes should be tqmasked -- i.e., these are coloured images placed
image brushes should be masked -- i.e., these are coloured images placed
on a white background. The white background should be made transparent,
and then the brush image can be composited onto our image.
This is currently only half supported: I make tqmasks of everything,
This is currently only half supported: I make masks of everything,
partly because I like that better, partly because until very recently
there was no way of making out the difference between gray and rgb
brushes because KisBrush didn't remember that bit of data.
Making the initial tqmask of a brush is however by now pretty well done; the next
problem is painting with those tqmasks.
problem is painting with those masks.
Here we have two situations, one easy, one difficult. The easy one is the single
mouse click. If the user clicks or taps with his stylus, we can composite the

2
chalk/doc/chalk-features
Unescape Escape View File

@ -206,7 +206,7 @@ of a tablet. Tilt and rotation is not yet supported.
** custom brush tqshapes
** text brush tqshapes
** brushes created from layers or images. These brushes can be saved
** colored brushes can also be used as tqmasks
** colored brushes can also be used as masks
* Fills

14450
chalk/doc/chalk.xmi
View File

File diff suppressed because it is too large Load Diff

2
chalk/doc/channels_masks_selections
Unescape Escape View File

@ -1,4 +1,4 @@
We did a rethink on channels, selections and tqmasks last summer.
We did a rethink on channels, selections and masks last summer.
Traditionally, a tqmask is seen as an extra channel for an image, analogous
to the alpha channel. We want to do away with that idea.

7328
chalk/doc/colorspaces.xmi
View File

File diff suppressed because it is too large Load Diff

8
chalk/doc/colorstrategyAPI
Unescape Escape View File

@ -41,17 +41,17 @@ void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask)
for (Q_INT32 y = r.top(); y <= r.bottom(); ++y) {
KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true);
KisHLineIterator tqmaskIt = tqmask -> createHLineIterator(r.x(), y, r.width(), false);
KisHLineIterator maskIt = tqmask -> createHLineIterator(r.x(), y, r.width(), false);
while (!pixelIt.isDone()) {
KisPixel pixel = toPixel(pixelIt.rawData());
KisPixel tqmaskValue = tqmask -> toPixel(tqmaskIt.rawData());
KisPixel maskValue = tqmask -> toPixel(maskIt.rawData());
pixel.alpha() = (pixel.alpha() * tqmaskValue.alpha()) / MAX_SELECTED;
pixel.alpha() = (pixel.alpha() * maskValue.alpha()) / MAX_SELECTED;
++pixelIt;
++tqmaskIt;
++maskIt;
}
}
}

5540
chalk/doc/controller.xmi
View File

File diff suppressed because it is too large Load Diff

2
chalk/doc/doc-outline
Unescape Escape View File

@ -62,7 +62,7 @@ The current outline (working towards 1.6):
- Layer box
- Working with layers ([TODO] expand)
- Adjustment layers ([TODO] expand)
- [TODO] Layer tqmasks
- [TODO] Layer masks
- Compositing modes ([TODO] expand)
- [TODO] Create, transform, combine, histograms, ...

2
chalk/doc/howtofilters.txt
Unescape Escape View File

@ -22,7 +22,7 @@ Just copy the following in a file named (for instance) myfiltercw.ui :
<string>kisFilterConfigurationWidget1</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>
And then open Qt/Designer

2
chalk/doc/paint_device.txt
Unescape Escape View File

@ -59,7 +59,7 @@ per channel; QUANTUM can be bigger.
Fill the buf with the data. x1, y1, x2, y2 are the top left and bottom
right corner of the section you want. stride is the width of the
section in bytes, i.e. (x2 - x1 + 1) * depth. Note that stride does
not need to be pre-multiplied with sizeof(QUANTUM), aptqparently.
not need to be pre-multiplied with sizeof(QUANTUM), apparently.
tilemgr -> readPixelData(x1, y1, x2, y2, buf, stride);

2
chalk/plugins/filters/blur/wdgblur.ui
Unescape Escape View File

@ -212,7 +212,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/filters/bumpmap/wdgbumpmap.ui
Unescape Escape View File

@ -360,7 +360,7 @@ layer, the current layer will be used.</string>
<tabstop>intWaterLevel</tabstop>
<tabstop>intAmbient</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

16
chalk/plugins/filters/cimg/CImg.h
Unescape Escape View File

@ -8799,8 +8799,8 @@ namespace cimg_library {
- -1 = Backward finite differences
- 0 = Centered finite differences
- 1 = Forward finite differences
- 2 = Using Sobel tqmasks
- 3 = Using rotation invariant tqmasks
- 2 = Using Sobel masks
- 3 = Using rotation invariant masks
- 4 = Using Deriche recusrsive filter.
**/
CImgl<typename cimg::largest<T,float>::type> get_gradientXY(const int scheme=0) const {
@ -9822,7 +9822,7 @@ namespace cimg_library {
}
#endif
//! Draw a tqmasked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0).
//! Draw a masked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0).
/**
\param sprite = sprite image.
\param tqmask = tqmask image.
@ -9830,7 +9830,7 @@ namespace cimg_library {
\param y0 = Y-coordinate of the sprite position in the instance image.
\param z0 = Z-coordinate of the sprite position in the instance image.
\param v0 = V-coordinate of the sprite position in the instance image.
\param tqmask_valmax = Maximum pixel value of the tqmask image \c tqmask.
\param mask_valmax = Maximum pixel value of the tqmask image \c tqmask.
\param opacity = opacity of the drawing.
\note Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite.
\note Clipping is supported.
@ -9838,7 +9838,7 @@ namespace cimg_library {
**/
template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& tqmask,
const int x0=0,const int y0=0,const int z0=0,const int v0=0,
const tm tqmask_valmax=1,const float opacity=1) {
const tm mask_valmax=1,const float opacity=1) {
if (!is_empty()) {
if (sprite.is_empty())
throw CImgArgumentException("CImg<%s>::draw_image() : Specified sprite image (%u,%u,%u,%u,%p) is empty.",
@ -9873,8 +9873,8 @@ namespace cimg_library {
for (int y=0; y<lY; y++) {
for (int x=0; x<lX; x++) {
const float mopacity = *(ptrm++)*opacity,
nopacity = cimg::abs(mopacity), copacity = tqmask_valmax-cimg::max(mopacity,0.0f);
*ptrd = (T)((nopacity*(*(ptrs++))+copacity*(*ptrd))/tqmask_valmax);
nopacity = cimg::abs(mopacity), copacity = mask_valmax-cimg::max(mopacity,0.0f);
*ptrd = (T)((nopacity*(*(ptrs++))+copacity*(*ptrd))/mask_valmax);
ptrd++;
}
ptrd+=offX; ptrs+=soffX; ptrm+=soffX;
@ -12042,7 +12042,7 @@ namespace cimg_library {
}
}
} else {
// Generic version for other tqmasks
// Generic version for other masks
const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2);
cimg_mapV(*this,v)
if (!weighted_correl) { // Classical correlation

2
chalk/plugins/filters/cimg/wdg_cimg.ui
Unescape Escape View File

@ -276,7 +276,7 @@
<tabstop>chkLinearInterpolation</tabstop>
<tabstop>chkNormalize</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/filters/colorify/WdgColorifyBase.ui
Unescape Escape View File

@ -90,7 +90,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

2
chalk/plugins/filters/colors/wdgcolortoalphabase.ui
Unescape Escape View File

@ -106,7 +106,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

2
chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
Unescape Escape View File

@ -285,7 +285,7 @@
<data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcurve.h</includehint>
</includehints>

2
chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
Unescape Escape View File

@ -183,7 +183,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcurve.h</includehint>
</includehints>

2
chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
Unescape Escape View File

@ -185,5 +185,5 @@
<data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
Unescape Escape View File

@ -66,7 +66,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
Unescape Escape View File

@ -213,7 +213,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/filters/levelfilter/wdg_level.ui
Unescape Escape View File

@ -323,7 +323,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kgradientslider.h</includehint>
<includehint>kgradientslider.h</includehint>

2
chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
Unescape Escape View File

@ -101,7 +101,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
Unescape Escape View File

@ -123,7 +123,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/filters/unsharp/wdgunsharp.ui
Unescape Escape View File

@ -126,7 +126,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
Unescape Escape View File

@ -261,7 +261,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
Unescape Escape View File

@ -122,7 +122,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
m_painter->setDab(dab); // Cache dab for future paints in the painter.
m_painter->setPressure(info.pressure); // Cache pressure in the current painter.
TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();

4
chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
Unescape Escape View File

@ -251,8 +251,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
m_painter->setPressure(adjustedInfo.pressure);
TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo),
brush->tqmaskHeight(adjustedInfo));
TQRect dabRect = TQRect(0, 0, brush->maskWidth(adjustedInfo),
brush->maskHeight(adjustedInfo));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();

2
chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
Unescape Escape View File

@ -262,7 +262,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcurve.h</includehint>
<includehint>kcurve.h</includehint>

2
chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
Unescape Escape View File

@ -312,7 +312,7 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf
OPACITY_OPAQUE, 0, 0, sw, sh);
copyPainter.end();
TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();

8
chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
Unescape Escape View File

@ -99,19 +99,19 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab");
Q_CHECK_PTR(dab);
TQ_INT32 tqmaskWidth = tqmask->width();
TQ_INT32 tqmaskHeight = tqmask->height();
TQ_INT32 maskWidth = tqmask->width();
TQ_INT32 maskHeight = tqmask->height();
TQRect dstRect;
KisRectIteratorPixel it = dab->createRectIterator(0, 0, tqmaskWidth, tqmaskHeight, true);
KisRectIteratorPixel it = dab->createRectIterator(0, 0, maskWidth, maskHeight, true);
KisColorSpace* cs = dab->colorSpace();
while (!it.isDone()) {
cs->setAlpha(it.rawData(), TQ_UINT8_MAX - tqmask->alphaAt(it.x(), it.y()), 1);
++it;
}
TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight);
TQRect dabRect = TQRect(0, 0, maskWidth, maskHeight);
dstRect = TQRect(destX, destY, dabRect.width(), dabRect.height());
KisImage * image = device->image();

2
chalk/plugins/paintops/defaultpaintops/kis_penop.cc
Unescape Escape View File

@ -85,7 +85,7 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
}
m_painter->setPressure(info.pressure);
TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();

4
chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
Unescape Escape View File

@ -263,8 +263,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
m_painter->setPressure(adjustedInfo.pressure);
TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo),
brush->tqmaskHeight(adjustedInfo));
TQRect dabRect = TQRect(0, 0, brush->maskWidth(adjustedInfo),
brush->maskHeight(adjustedInfo));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();

2
chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
Unescape Escape View File

@ -163,5 +163,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
Unescape Escape View File

@ -88,7 +88,7 @@ private:
m_layer->setX(pos.x());
m_layer->setY(pos.y());
m_layer->tqparentPaintDevice()->setDirty();
m_layer->parentPaintDevice()->setDirty();
if (m_layer->undoAdapter()) {
m_layer->undoAdapter()->setUndo(true);

2
chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
Unescape Escape View File

@ -204,7 +204,7 @@
<tabstop>cmbType</tabstop>
<tabstop>bnCrop</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/tools/tool_curves/wdg_tool_example.ui
Unescape Escape View File

@ -120,7 +120,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

14
chalk/plugins/tools/tool_filter/kis_filterop.cc
Unescape Escape View File

@ -88,8 +88,8 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
m_painter->setPressure(info.pressure);
TQ_INT32 tqmaskWidth = tqmask->width();
TQ_INT32 tqmaskHeight = tqmask->height();
TQ_INT32 maskWidth = tqmask->width();
TQ_INT32 maskHeight = tqmask->height();
// Create a temporary paint device
KisPaintDeviceSP tmpDev = new KisPaintDevice(colorSpace, "filterop tmpdev");
@ -98,17 +98,17 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
// Copy the layer data onto the new paint device
KisPainter p( tmpDev );
p.bitBlt( 0, 0, COMPOSITE_COPY, m_source, OPACITY_OPAQUE, x, y, tqmaskWidth, tqmaskHeight );
p.bitBlt( 0, 0, COMPOSITE_COPY, m_source, OPACITY_OPAQUE, x, y, maskWidth, maskHeight );
// Filter the paint device
filter->disableProgress();
filter->process( tmpDev, tmpDev, m_filterConfiguration, TQRect( 0, 0, tqmaskWidth, tqmaskHeight ));
filter->process( tmpDev, tmpDev, m_filterConfiguration, TQRect( 0, 0, maskWidth, maskHeight ));
filter->enableProgress();
// Apply the tqmask on the paint device (filter before tqmask because edge pixels may be important)
for (int y = 0; y < tqmaskHeight; y++)
for (int y = 0; y < maskHeight; y++)
{
KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, tqmaskWidth, false);
KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, maskWidth, false);
int x=0;
while(! hiter.isDone())
{
@ -120,7 +120,7 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
}
// Blit the paint device onto the layer
TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight);
TQRect dabRect = TQRect(0, 0, maskWidth, maskHeight);
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = m_painter->device()->image();

2
chalk/plugins/tools/tool_star/wdg_tool_star.ui
Unescape Escape View File

@ -120,7 +120,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
Unescape Escape View File

@ -235,7 +235,7 @@
<tabstop>intEndX</tabstop>
<tabstop>intEndY</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>kis_cmb_idlist.h</includehint>

2
chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
Unescape Escape View File

@ -239,7 +239,7 @@ void DlgColorRange::updatePreview()
TQ_INT32 x, y, w, h;
m_dev->exactBounds(x, y, w, h);
TQPixmap pix = TQPixmap(m_selection->tqmaskImage().smoothScale(350, 350, TQ_ScaleMin));
TQPixmap pix = TQPixmap(m_selection->maskImage().smoothScale(350, 350, TQ_ScaleMin));
m_subject->canvasController()->updateCanvas();
m_page->pixSelection->setPixmap(pix);
}

2
chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
Unescape Escape View File

@ -248,5 +248,5 @@
</images>
<tabstops>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui
Unescape Escape View File

@ -214,5 +214,5 @@ colors (Pantone, TruMatch, logo colors, ...)</string>
<data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui
Unescape Escape View File

@ -228,7 +228,7 @@
<tabstop>opacitySpinBox</tabstop>
<tabstop>allowResizingCheckBox</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

2
chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui
Unescape Escape View File

@ -115,7 +115,7 @@
<data format="PNG" length="1122">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kis_previewwidget.h</includehint>
<includehint>kis_filters_listview.h</includehint>

2
chalk/plugins/viewplugins/histogram/wdghistogram.ui
Unescape Escape View File

@ -222,7 +222,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kis_histogram_view.h</includehint>
</includehints>

2
chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
Unescape Escape View File

@ -358,7 +358,7 @@
<tabstop>chkConstrain</tabstop>
<tabstop>radioScale</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>

2
chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
Unescape Escape View File

@ -227,7 +227,7 @@
<tabstop>intHeightPercent</tabstop>
<tabstop>chkConstrain</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>

2
chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
Unescape Escape View File

@ -138,7 +138,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui
Unescape Escape View File

@ -53,5 +53,5 @@
<tabstops>
<tabstop>radiusSpinBox</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui
Unescape Escape View File

@ -53,5 +53,5 @@
<tabstops>
<tabstop>radiusSpinBox</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui
Unescape Escape View File

@ -64,5 +64,5 @@
<tabstops>
<tabstop>radiusSpinBox</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
Unescape Escape View File

@ -275,7 +275,7 @@
<tabstops>
<tabstop>intTestCount</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
Unescape Escape View File

@ -238,7 +238,7 @@
<data format="PNG" length="363">89504e470d0a1a0a0000000d494844520000002c0000002e0806000000534cfb0a00000132494441545885ed994b12032108449b54ee7f65b3cd5440f92a56a5f7326f5a11451a63608b8806c6a0689857068b5a446177f6020361e8fdc04008fa0c30e086a6b4a4f3ba664cc418704212013041fb80b340bfa5847e9b825680022687f549d70016d03aac815d7d988be1a87c6be015acb7dc3ac7cd8167b091734160acbc861bc2029e4a77101690f661c9dd840f46a577b8012cc00157edb749d239dcc45de0e4f1d2a927705235aad4e50e5fa03f70b56c0778ab227bba90ec7d1d167eb62f30c0423f81b9696856aa7b3bcc487fa7f3543ccb18e54cfe3adca914332ce7aff9c6d83cb0e47205b4f176634fba4c68472c1978b69633a09db7f2753330bb91128ca7eb5e56b5aaac316069b756573ce54cf5b8e65fd3d0769870e6c920305bfb1e659296541ef0265d77bcbc0ef803779f9c39421cd9b50000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>

10
chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
Unescape Escape View File

@ -413,15 +413,15 @@ void KSnapshot::performGrab()
contents += TQRegion( w - border, 0, border, h );
}
//Get the tqmasked away area.
TQRegion tqmaskedAway = bbox - contents;
TQMemArray<TQRect> tqmaskedAwayRects = tqmaskedAway.rects();
//Get the masked away area.
TQRegion maskedAway = bbox - contents;
TQMemArray<TQRect> maskedAwayRects = maskedAway.rects();
//Construct a bitmap tqmask from the rectangles
TQPainter p(&tqmask);
p.fillRect(0, 0, w, h, TQt::color1);
for (uint pos = 0; pos < tqmaskedAwayRects.count(); pos++)
p.fillRect(tqmaskedAwayRects[pos], TQt::color0);
for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
p.fillRect(maskedAwayRects[pos], TQt::color0);
p.end();
snapshot.setMask(tqmask);

4
chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
Unescape Escape View File

@ -330,6 +330,6 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
<function specifier="non virtual" returnType="TQPixmap">preview()</function>
</functions>
<pixmapfunction>SmallIconSet</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>

12
chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
Unescape Escape View File

@ -39,7 +39,7 @@ namespace ChalkCore {
//<beurk> stupid TQt which doesn't support templated TQObject
class IteratorMemoryManaged {
public:
virtual void tqinvalidateIterator() = 0;
virtual void invalidateIterator() = 0;
};
class IteratorMemoryManager : public TQObject {
@ -49,13 +49,13 @@ class IteratorMemoryManager : public TQObject {
IteratorMemoryManager(IteratorMemoryManaged* it) : m_it(it)
{
// Connect the Monitor to know when the invalidating of iterator is needed
connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(tqinvalidateIterator()));
connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(invalidateIterator()));
}
public slots:
void tqinvalidateIterator()
void invalidateIterator()
{
m_it->tqinvalidateIterator();
m_it->invalidateIterator();
}
private:
IteratorMemoryManaged* m_it;
@ -147,7 +147,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
~Iterator()
{
tqinvalidateIterator();
invalidateIterator();
delete m_itmm;
}
virtual const TQString getClassName() const {
@ -282,7 +282,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
return 0;
}
private:
virtual void tqinvalidateIterator()
virtual void invalidateIterator()
{
kdDebug(41011) << "invalidating iterator" << endl;
if(m_it)

2
chalk/plugins/viewplugins/separate_channels/wdg_separations.ui
Unescape Escape View File

@ -178,5 +178,5 @@
<tabstop>chkDownscale</tabstop>
<tabstop>chkColors</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui
Unescape Escape View File

@ -92,7 +92,7 @@
<tabstops>
<tabstop>shearAngleX</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
Unescape Escape View File

@ -214,7 +214,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

2
chalk/plugins/viewplugins/variations/wdg_variations.ui
View File

File diff suppressed because one or more lines are too long

2
chalk/sdk/kis_global.h
Unescape Escape View File

@ -57,7 +57,7 @@ enum enumResourceTypes {
/*
* Most wacom pads have 512 levels of pressure; TQt only supports 256, and even
* this is downscaled to 127 levels because the line would be too jittery, and
* the amount of tqmasks take too much memory otherwise.
* the amount of masks take too much memory otherwise.
*/
const TQ_INT32 PRESSURE_LEVELS= 127;
const double PRESSURE_MIN = 0.0;

8
chalk/ui/kis_canvas.cc
Unescape Escape View File

@ -304,23 +304,23 @@ void KisCanvasWidget::initX11Support()
Display *x11Display = TQApplication::desktop()->x11Display();
// Look at the modifier mapping and get the correct tqmasks for alt/meta
// Look at the modifier mapping and get the correct masks for alt/meta
XModifierKeymap *map = XGetModifierMapping(x11Display);
if (map) {
int mapIndex = 0;
for (int tqmaskIndex = 0; tqmaskIndex < 8; tqmaskIndex++) {
for (int maskIndex = 0; maskIndex < 8; maskIndex++) {
for (int i = 0; i < map->max_keypermod; i++) {
if (map->modifiermap[mapIndex]) {
KeySym sym = XKeycodeToKeysym(x11Display, map->modifiermap[mapIndex], 0);
if (X11AltMask == 0 && (sym == XK_Alt_L || sym == XK_Alt_R)) {
X11AltMask = 1 << tqmaskIndex;
X11AltMask = 1 << maskIndex;
}
if (X11MetaMask == 0 && (sym == XK_Meta_L || sym == XK_Meta_R)) {
X11MetaMask = 1 << tqmaskIndex;
X11MetaMask = 1 << maskIndex;
}
}

2
chalk/ui/kis_canvas.h
Unescape Escape View File

@ -140,7 +140,7 @@ protected:
static bool X11SupportInitialised;
// Modifier tqmasks for alt/meta - detected at run-time
// Modifier masks for alt/meta - detected at run-time
static long X11AltMask;
static long X11MetaMask;

8
chalk/ui/kis_cursor.cc
Unescape Escape View File

@ -344,7 +344,7 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
TQBitmap tqmask(cursorImage.width(), cursorImage.height());
TQPainter bitmapPainter(&bitmap);
TQPainter tqmaskPainter(&tqmask);
TQPainter maskPainter(&tqmask);
for (TQ_INT32 x = 0; x < cursorImage.width(); ++x) {
for (TQ_INT32 y = 0; y < cursorImage.height(); ++y) {
@ -353,9 +353,9 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
if (tqAlpha(pixel) < 128) {
bitmapPainter.setPen(TQt::color0);
tqmaskPainter.setPen(TQt::color0);
maskPainter.setPen(TQt::color0);
} else {
tqmaskPainter.setPen(TQt::color1);
maskPainter.setPen(TQt::color1);
if (tqGray(pixel) < 128) {
bitmapPainter.setPen(TQt::color1);
@ -365,7 +365,7 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
}
bitmapPainter.drawPoint(x, y);
tqmaskPainter.drawPoint(x, y);
maskPainter.drawPoint(x, y);
}
}

8
chalk/ui/kis_doc.cc
Unescape Escape View File

@ -137,8 +137,8 @@ namespace {
}
KisDoc::KisDoc(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) :
super(tqparentWidget, widgetName, tqparent, name, singleViewMode)
KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) :
super(parentWidget, widgetName, tqparent, name, singleViewMode)
{
m_undo = false;
@ -182,7 +182,7 @@ DCOPObject *KisDoc::dcopObject()
return m_dcop;
}
bool KisDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
bool KisDoc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
{
if (!init())
return false;
@ -203,7 +203,7 @@ bool KisDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
file,
dlgtype,
"chalk_template",
tqparentWidget);
parentWidget);
setUndo(false);
if (ret == KoTemplateChooseDia::Template) {

4
chalk/ui/kis_doc.h
Unescape Escape View File

@ -53,7 +53,7 @@ class KRITACORE_EXPORT KisDoc : public KoDocument, private KisUndoAdapter {
TQ_OBJECT
public:
KisDoc(TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false);
KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false);
virtual ~KisDoc();
public:
@ -62,7 +62,7 @@ public:
virtual bool completeLoading(KoStore *store);
virtual bool completeSaving(KoStore*);
virtual DCOPObject* dcopObject();
virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
virtual bool loadOasis( const TQDomDocument&, KoOasisStyles&, const TQDomDocument&, KoStore* );
virtual bool saveOasis( KoStore*, KoXmlWriter* );
virtual bool loadChildren( KoStore* store);

4
chalk/ui/kis_factory.cc
Unescape Escape View File

@ -78,13 +78,13 @@ KisFactory::~KisFactory()
/**
* Create the document
*/
KParts::Part* KisFactory::createPartObject( TQWidget *tqparentWidget,
KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget,
const char *widgetName, TQObject* tqparent,
const char* name, const char* classname, const TQStringList & )
{
bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
KisDoc *doc = new KisDoc( tqparentWidget,
KisDoc *doc = new KisDoc( parentWidget,
widgetName, tqparent, name, !bWantKoDocument );
Q_CHECK_PTR(doc);

2
chalk/ui/kis_factory.h
Unescape Escape View File

@ -41,7 +41,7 @@ public:
KisFactory( TQObject* tqparent = 0, const char* name = 0 );
~KisFactory();
virtual KParts::Part *createPartObject(TQWidget *tqparentWidget = 0,
virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0,
const char *widgetName = 0,
TQObject *tqparent = 0,
const char *name = 0,

2
chalk/ui/kis_filter_manager.cc
Unescape Escape View File

@ -289,7 +289,7 @@ bool KisFilterManager::apply()
return false;
} else {
if (dev->tqparentLayer()) dev->tqparentLayer()->setDirty(rect);
if (dev->parentLayer()) dev->parentLayer()->setDirty(rect);
m_doc->setModified(true);
if (img->undo() && cmd) img->undoAdapter()->addCommand(cmd);
return true;

6
chalk/ui/kis_layerbox.cc
Unescape Escape View File

@ -229,15 +229,15 @@ void KisLayerBox::slotLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent,
void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP)
{
int tqparentID = layer->tqparent()->id();
int parentID = layer->tqparent()->id();
if (layer->tqparent() == m_image->rootLayer())
tqparentID = -1;
parentID = -1;
int siblingID = -1;
if (layer->prevSibling())
siblingID = layer->prevSibling()->id();
list()->moveLayer(layer->id(), tqparentID, siblingID);
list()->moveLayer(layer->id(), parentID, siblingID);
markModified(layer->tqparent());
markModified(wasParent);

4
chalk/ui/kis_layerlist.h
Unescape Escape View File

@ -35,9 +35,9 @@ class KisLayerList: public LayerList
signals:
void requestNewObjectLayer( LayerItem *tqparent, LayerItem *after, const KoDocumentEntry &entry );
void requestNewObjectLayer( int tqparentID, int afterID, const KoDocumentEntry &entry );
void requestNewObjectLayer( int parentID, int afterID, const KoDocumentEntry &entry );
void requestNewAdjustmentLayer( LayerItem *tqparent, LayerItem *after );
void requestNewAdjustmentLayer( int tqparentID, int afterID );
void requestNewAdjustmentLayer( int parentID, int afterID );
public:
KisLayerList( TQWidget *tqparent = 0, const char *name = 0 );

2
chalk/ui/kis_matrix_widget.ui
Unescape Escape View File

@ -206,5 +206,5 @@
<Q_SLOTS>
<slot access="private">spinboxValueChanged()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/ui/kis_opengl_image_context.h
Unescape Escape View File

@ -141,7 +141,7 @@ private:
int m_numImageTextureTileColumns;
// We create a single OpenGL context and share it between all views
// in the process. Aptqparently with some OpenGL implementations, only
// in the process. Apparently with some OpenGL implementations, only
// one context will be hardware accelerated.
static TQGLWidget *SharedContextWidget;
static int SharedContextWidgetRefCount;

4
chalk/ui/kis_part_layer.cc
Unescape Escape View File

@ -83,7 +83,7 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child)
TQRect rect = extent();
m_activated = true;
setDirty(rect);
TQPtrList<KoView> views = child->tqparentDocument()->views();
TQPtrList<KoView> views = child->parentDocument()->views();
Q_ASSERT(views.count());
// XXX iterate over views
connect(views.at(0), TQT_SIGNAL(activated(bool)),
@ -97,7 +97,7 @@ void KisPartLayerImpl::childDeactivated(bool activated)
// We probably changed, notify the image that it needs to tqrepaint where we currently updated
// We use the original tqgeometry
if (m_activated && !activated /* no clue, but debugging suggests it is false here */) {
TQPtrList<KoView> views = m_doc->tqparentDocument()->views();
TQPtrList<KoView> views = m_doc->parentDocument()->views();
Q_ASSERT(views.count());
views.at(0)->disconnect(TQT_SIGNAL(activated(bool)));
m_activated = false;

6
chalk/ui/kis_previewwidget.cc
Unescape Escape View File

@ -333,8 +333,8 @@ void KisPreviewWidget::runFilterHelper() {
if (m_origDevice->image())
{
m_scaledImage = new KisImage(*m_origDevice->image());
if(!m_origDevice->tqparentLayer()) return;
TQString layerName = m_origDevice->tqparentLayer()->name();
if(!m_origDevice->parentLayer()) return;
TQString layerName = m_origDevice->parentLayer()->name();
KisPaintLayerSP pl = ::tqqt_cast<KisPaintLayer*>(m_scaledImage->findLayer(layerName));
if(!pl) return;
scaledDevice = pl->paintDevice();
@ -356,7 +356,7 @@ void KisPreviewWidget::runFilterHelper() {
0.0, 0.0, 0.0, 0, 0, NULL, &strategy);
tw.run();
scaledDevice->setSelection(select);
select->setParentLayer(scaledDevice->tqparentLayer());
select->setParentLayer(scaledDevice->parentLayer());
}
// Crop by the zoom value instead of cropping by rectangle. It gives better results

2
chalk/ui/kis_previewwidgetbase.ui
Unescape Escape View File

@ -260,7 +260,7 @@
<data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>imageviewer.h</includehint>
<includehint>kpushbutton.h</includehint>

4
chalk/ui/kis_tool_freehand.cc
Unescape Escape View File

@ -255,9 +255,9 @@ void KisToolFreehand::endPaint()
m_dirtyRect.width(), m_dirtyRect.height());
KisLayerSupportsIndirectPainting* layer =
dynamic_cast<KisLayerSupportsIndirectPainting*>(m_source->tqparentLayer());
dynamic_cast<KisLayerSupportsIndirectPainting*>(m_source->parentLayer());
layer->setTemporaryTarget(0);
m_source->tqparentLayer()->setDirty(m_dirtyRect);
m_source->parentLayer()->setDirty(m_dirtyRect);
if (m_currentImage->undo()) {
m_currentImage->undoAdapter()->addCommand(painter.endTransaction());

22
chalk/ui/kis_view.cc
Unescape Escape View File

@ -646,11 +646,11 @@ void KisView::setupActions()
m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask");
m_tqmaskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMaskFromSelection()), actionCollection(),
"tqmask_fromsel");
m_tqmaskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMaskToSelection()), actionCollection(), "tqmask_tosel");
"mask_fromsel");
m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel");
m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()),
actionCollection(), "apply_tqmask");
m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this),
@ -3185,7 +3185,7 @@ void KisView::connectCurrentImg()
connect(m_image, TQT_SIGNAL(sigProfileChanged(KisProfile * )), TQT_SLOT(profileChanged(KisProfile * )));
connect(m_image, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQT_SLOT(layersUpdated()));
connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(tqmaskUpdated()));
connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(maskUpdated()));
connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), TQT_SLOT(layersUpdated()));
connect(m_image, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated()));
connect(m_image, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated()));
@ -3198,7 +3198,7 @@ void KisView::connectCurrentImg()
connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)),
TQT_SLOT(handlePartLayerAdded(KisLayerSP)));
tqmaskUpdated();
maskUpdated();
#ifdef HAVE_GL
if (m_OpenGLImageContext != 0) {
connect(m_OpenGLImageContext, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotOpenGLImageUpdated(TQRect)));
@ -3933,7 +3933,7 @@ void KisView::slotMaskFromSelection() {
if (!layer)
return;
KNamedCommand *cmd = layer->tqmaskFromSelectionCommand();
KNamedCommand *cmd = layer->maskFromSelectionCommand();
cmd->execute();
if (undoAdapter() && undoAdapter()->undo()) {
undoAdapter()->addCommand(cmd);
@ -3945,7 +3945,7 @@ void KisView::slotMaskToSelection() {
if (!layer)
return;
KNamedCommand *cmd = layer->tqmaskToSelectionCommand();
KNamedCommand *cmd = layer->maskToSelectionCommand();
cmd->execute();
if (undoAdapter() && undoAdapter()->undo()) {
undoAdapter()->addCommand(cmd);
@ -3992,7 +3992,7 @@ void KisView::slotShowMask() {
layer->setRenderMask(m_showMask->isChecked());
}
void KisView::tqmaskUpdated() {
void KisView::maskUpdated() {
KisPaintLayer* layer = dynamic_cast<KisPaintLayer*>(currentImg()->activeLayer().data());
if (!layer) {
m_createMask->setEnabled(false);
@ -4003,8 +4003,8 @@ void KisView::tqmaskUpdated() {
return;
}
m_createMask->setEnabled(!layer->hasMask());
m_tqmaskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection?
m_tqmaskToSelection->setEnabled(layer->hasMask());
m_maskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection?
m_maskToSelection->setEnabled(layer->hasMask());
m_applyMask->setEnabled(layer->hasMask());
m_removeMask->setEnabled(layer->hasMask());

6
chalk/ui/kis_view.h
Unescape Escape View File

@ -428,7 +428,7 @@ private:
private slots:
void layersUpdated(); // Used in the channel separation to notify the view that we have added a few layers.
void tqmaskUpdated(); // To update the enabled or disabled status of the tqmask entries
void maskUpdated(); // To update the enabled or disabled status of the tqmask entries
void slotSetFGQColor(const TQColor & c);
void slotSetBGQColor(const TQColor & c);
@ -560,8 +560,8 @@ private:
KAction *m_layerTop;
KAction *m_createMask;
KAction *m_tqmaskFromSelection;
KAction *m_tqmaskToSelection;
KAction *m_maskFromSelection;
KAction *m_maskToSelection;
KAction *m_applyMask;
KAction *m_removeMask;
KToggleAction *m_editMask;

16
chalk/ui/layerlist.cpp
Unescape Escape View File

@ -128,7 +128,7 @@ public:
m_pos = pos;
LayerItem *prev = m_item;
m_item = static_cast<LayerItem*>(m_list->itemAt( m_pos ));
if( TQToolTip::tqparentWidget() && m_list->showToolTips() && m_item )
if( TQToolTip::parentWidget() && m_list->showToolTips() && m_item )
{
if( m_item != prev )
hideTip();
@ -216,7 +216,7 @@ public:
void position()
{
const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::tqparentWidget() );
const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() );
const TQSize size = tqsizeHint();
const int width = size.width(), height = size.height();
const TQRect tmp = m_item->rect();
@ -228,7 +228,7 @@ public:
else
y = kMax( drect.top(), irect.top() - height );
int x = kMax( drect.x(), TQToolTip::tqparentWidget()->mapToGlobal( m_pos ).x() - width/2 );
int x = kMax( drect.x(), TQToolTip::parentWidget()->mapToGlobal( m_pos ).x() - width/2 );
if( x + width > drect.right() )
x = drect.right() - width;
@ -617,9 +617,9 @@ LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *
return 0;
}
LayerItem *LayerList::addLayerToParent( const TQString &displayName, int tqparentID, int afterID, int id ) //SLOT
LayerItem *LayerList::addLayerToParent( const TQString &displayName, int parentID, int afterID, int id ) //SLOT
{
return addLayerToParent( displayName, folder( tqparentID ), layer( afterID ), id );
return addLayerToParent( displayName, folder( parentID ), layer( afterID ), id );
}
void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ) //SLOT
@ -643,9 +643,9 @@ void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *aft
setCurrentItem( current ); //HACK, sometimes TQt changes this under us
}
void LayerList::moveLayer( int id, int tqparentID, int afterID ) //SLOT
void LayerList::moveLayer( int id, int parentID, int afterID ) //SLOT
{
moveLayer( layer( id ), folder( tqparentID ), layer( afterID ) );
moveLayer( layer( id ), folder( parentID ), layer( afterID ) );
}
void LayerList::removeLayer( LayerItem *layer ) //SLOT
@ -723,7 +723,7 @@ void LayerList::hideTip()
void LayerList::maybeTip()
{
d->tooltip->maybeTip( d->tooltip->TQToolTip::tqparentWidget()->mapFromGlobal( TQCursor::pos() ) );
d->tooltip->maybeTip( d->tooltip->TQToolTip::parentWidget()->mapFromGlobal( TQCursor::pos() ) );
}
void LayerList::constructMenu( LayerItem *layer )

10
chalk/ui/layerlist.h
Unescape Escape View File

@ -98,10 +98,10 @@ public slots:
LayerItem *addLayer( const TQString &displayName, int afterID, int id = -1 );
LayerItem *addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 );
LayerItem *addLayerToParent( const TQString &displayName, int tqparentID, int afterID = -1, int id = -1 );
LayerItem *addLayerToParent( const TQString &displayName, int parentID, int afterID = -1, int id = -1 );
void moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after );
void moveLayer( int id, int tqparentID, int afterID );
void moveLayer( int id, int parentID, int afterID );
void removeLayer( LayerItem *layer );
void removeLayer( int id );
@ -117,13 +117,13 @@ signals:
void propertyChanged( int id, const TQString &name, bool on );
void layerMoved( LayerItem *layer, LayerItem *tqparent, LayerItem *after );
void layerMoved( int id, int tqparentID, int afterID );
void layerMoved( int id, int parentID, int afterID );
void requestNewLayer( LayerItem *tqparent, LayerItem *after );
void requestNewLayer( int tqparentID, int afterID );
void requestNewLayer( int parentID, int afterID );
void requestNewFolder( LayerItem *tqparent, LayerItem *after );
void requestNewFolder( int tqparentID, int afterID );
void requestNewFolder( int parentID, int afterID );
void requestRemoveLayer( LayerItem *layer );
void requestRemoveLayer( int id );

2
chalk/ui/wdgapplyprofile.ui
Unescape Escape View File

@ -168,5 +168,5 @@
<tabstops>
<tabstop>cmbProfile</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/ui/wdgautobrush.ui
Unescape Escape View File

@ -351,5 +351,5 @@
<data format="PNG" length="242">89504e470d0a1a0a0000000d49484452000000190000001a0806000000427df7cd000000b9494441544889dd95410ec4200845b1e9ba78ff538a176056260c5181569bccfca590ff2a204da510ecd601008078ed8778953372cec8db20d23c0a72417aa611900999997941a795500a256d2acf7a434354bf212d4927ebc488a417518d4dd75d0dcbb5f2ed983d59f101af94eb7f20d39e3c1963136299f7e2b361f89d9e8c6ed16efc4ee3892a205ecb9adc24fdcc176ffd4b9839e9b896592eb9d623b1106464e605b821da340200086e61afb91ea2a377e89577e57f00357f504513c00b590000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/ui/wdgautogradient.ui
Unescape Escape View File

@ -392,7 +392,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

6
chalk/ui/wdgbirdeye.ui
Unescape Escape View File

@ -23,9 +23,9 @@
<property name="caption">
<string>Overview</string>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<property name="tqlayoutSpacing" stdset="0">
<property name="layoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@ -296,7 +296,7 @@
<slot>zoomPlus()</slot>
</Q_SLOTS>
<pixmapfunction>BarIcon</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktoolbar.h</includehint>
<includehint>knuminput.h</includehint>

2
chalk/ui/wdgcolorsettings.ui
Unescape Escape View File

@ -346,7 +346,7 @@ The different rendering intent methods will affect only what is shown on screen,
<data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kis_cmb_idlist.h</includehint>
<includehint>kcombobox.h</includehint>

2
chalk/ui/wdgcustombrush.ui
Unescape Escape View File

@ -195,5 +195,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
chalk/ui/wdgcustompalette.ui
Unescape Escape View File

@ -81,7 +81,7 @@
<data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kis_palette_view.h</includehint>
</includehints>

2
chalk/ui/wdgcustompattern.ui
Unescape Escape View File

@ -152,5 +152,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>