diff --git a/benchmarks/kis_composition_benchmark.cpp b/benchmarks/kis_composition_benchmark.cpp index ad75225..a19ee5c 100644 --- a/benchmarks/kis_composition_benchmark.cpp +++ b/benchmarks/kis_composition_benchmark.cpp @@ -189,14 +189,14 @@ void generateDataLine(uint seed, int numPixels, quint8 *srcPixels, quint8 *dstPi void printData(int numPixels, quint8 *srcPixels, quint8 *dstPixels, quint8 *mask) { for (int i = 0; i < numPixels; i++) { - dbgKrita << "Src: " + qDebug() << "Src: " << srcPixels[i*4] << "\t" << srcPixels[i*4+1] << "\t" << srcPixels[i*4+2] << "\t" << srcPixels[i*4+3] << "\t" << "Msk:" << mask[i]; - dbgKrita << "Dst: " + qDebug() << "Dst: " << dstPixels[i*4] << "\t" << dstPixels[i*4+1] << "\t" << dstPixels[i*4+2] << "\t" @@ -300,19 +300,19 @@ bool compareTwoOpsPixels(QVector &tiles, channel_type prec) { for (int i = 0; i < numPixels; i++) { if (!comparePixels(dst1, dst2, prec)) { - dbgKrita << "Wrong result:" << i; - dbgKrita << "Act: " << dst1[0] << dst1[1] << dst1[2] << dst1[3]; - dbgKrita << "Exp: " << dst2[0] << dst2[1] << dst2[2] << dst2[3]; - dbgKrita << "Dif: " << dst1[0] - dst2[0] << dst1[1] - dst2[1] << dst1[2] - dst2[2] << dst1[3] - dst2[3]; + qDebug() << "Wrong result:" << i; + qDebug() << "Act: " << dst1[0] << dst1[1] << dst1[2] << dst1[3]; + qDebug() << "Exp: " << dst2[0] << dst2[1] << dst2[2] << dst2[3]; + qDebug() << "Dif: " << dst1[0] - dst2[0] << dst1[1] - dst2[1] << dst1[2] - dst2[2] << dst1[3] - dst2[3]; channel_type *s1 = src1 + 4 * i; channel_type *s2 = src2 + 4 * i; - dbgKrita << "SrcA:" << s1[0] << s1[1] << s1[2] << s1[3]; - dbgKrita << "SrcE:" << s2[0] << s2[1] << s2[2] << s2[3]; + qDebug() << "SrcA:" << s1[0] << s1[1] << s1[2] << s1[3]; + qDebug() << "SrcE:" << s2[0] << s2[1] << s2[2] << s2[3]; - dbgKrita << "MskA:" << tiles[0].mask[i]; - dbgKrita << "MskE:" << tiles[1].mask[i]; + qDebug() << "MskA:" << tiles[0].mask[i]; + qDebug() << "MskE:" << tiles[1].mask[i]; return false; } @@ -431,14 +431,14 @@ void benchmarkCompositeOp(const KoCompositeOp *op, op->composite(params); } - dbgKrita << testName << "RESULT:" << timer.elapsed() << "msec"; + qDebug() << testName << "RESULT:" << timer.elapsed() << "msec"; freeTiles(tiles, srcAlignmentShift, dstAlignmentShift); } void benchmarkCompositeOp(const KoCompositeOp *op, const QString &postfix) { - dbgKrita << "Testing Composite Op:" << op->id() << "(" << postfix << ")"; + qDebug() << "Testing Composite Op:" << op->id() << "(" << postfix << ")"; benchmarkCompositeOp(op, true, 0.5, 0.3, 0, 0, ALPHA_RANDOM, ALPHA_RANDOM); benchmarkCompositeOp(op, true, 0.5, 0.3, 8, 0, ALPHA_RANDOM, ALPHA_RANDOM); @@ -503,9 +503,9 @@ void checkRounding(qreal opacity, qreal flow, qreal averageOpacity = -1, quint32 for (int j = 0; j < vecSize; j++) { //if (8 * i + j == 7080) { - // dbgKrita << "src: " << src2[0] << src2[1] << src2[2] << src2[3]; - // dbgKrita << "dst: " << dst2[0] << dst2[1] << dst2[2] << dst2[3]; - // dbgKrita << "msk:" << msk2[0]; + // qDebug() << "src: " << src2[0] << src2[1] << src2[2] << src2[3]; + // qDebug() << "dst: " << dst2[0] << dst2[1] << dst2[2] << dst2[3]; + // qDebug() << "msk:" << msk2[0]; //} Compositor::template compositeOnePixelScalar(src2, dst2, msk2, params.opacity, paramsWrapper); @@ -529,12 +529,12 @@ void checkRounding(qreal opacity, qreal flow, qreal averageOpacity = -1, quint32 } if(!compareResult || errorcount > 1) { - dbgKrita << "Wrong rounding in pixel:" << 8 * i + j; - dbgKrita << "Vector version: " << dst1[0] << dst1[1] << dst1[2] << dst1[3]; - dbgKrita << "Scalar version: " << dst2[0] << dst2[1] << dst2[2] << dst2[3]; + qDebug() << "Wrong rounding in pixel:" << 8 * i + j; + qDebug() << "Vector version: " << dst1[0] << dst1[1] << dst1[2] << dst1[3]; + qDebug() << "Scalar version: " << dst2[0] << dst2[1] << dst2[2] << dst2[3]; - dbgKrita << "src:" << src1[0] << src1[1] << src1[2] << src1[3]; - dbgKrita << "msk:" << msk1[0]; + qDebug() << "src:" << src1[0] << src1[1] << src1[2] << src1[3]; + qDebug() << "msk:" << msk1[0]; QFAIL("Wrong rounding"); }