Commit a7a2e61b authored by Dmitry Kazakov's avatar Dmitry Kazakov

Fix compilation on newer version of GCC

parent da6b03e7
......@@ -186,7 +186,7 @@ void KisFrameCacheStore::saveFrame(int frameId, KisOpenGLUpdateInfoSP info, cons
frame.pixelSize = pixelSize;
for (auto it = info->tileList.begin(); it != info->tileList.end(); ++it) {
KisFrameDataSerializer::FrameTile tile(0); // TODO: fix null!
KisFrameDataSerializer::FrameTile tile(KisTextureTileInfoPoolSP(0)); // TODO: fix the pool should never be null!
tile.col = (*it)->tileCol();
tile.row = (*it)->tileRow();
tile.rect = (*it)->realPatchRect();
......
......@@ -162,7 +162,7 @@ void KisFrameSerializerTest::testFrameUniquenessEstimation()
boost::optional<qreal> result;
result = KisFrameDataSerializer::estimateFrameUniqueness(testFrame1, testFrame2, 0.1);
QVERIFY(result);
QVERIFY(!!result);
QVERIFY(qFuzzyCompare(*result, 0.0));
KisFrameDataSerializer::Frame testFrame3 = generateTestFrame(3, pool);
......@@ -174,7 +174,7 @@ void KisFrameSerializerTest::testFrameUniquenessEstimation()
randomizeFrame(testFrame2, 0.5);
result = KisFrameDataSerializer::estimateFrameUniqueness(testFrame1, testFrame2, 0.01);
QVERIFY(result);
QVERIFY(!!result);
QVERIFY(*result >= 0.45);
QVERIFY(*result <= 0.55);
}
......@@ -191,7 +191,7 @@ void KisFrameSerializerTest::testFrameArithmetics()
boost::optional<qreal> result =
KisFrameDataSerializer::estimateFrameUniqueness(testFrame1, testFrame2, 0.01);
QVERIFY(result);
QVERIFY(!!result);
QVERIFY(*result >= 0.15);
QVERIFY(*result <= 0.25);
......@@ -214,7 +214,7 @@ void KisFrameSerializerTest::testFrameArithmetics()
KisFrameDataSerializer::addFrames(testFrame3, testFrame1);
result = KisFrameDataSerializer::estimateFrameUniqueness(testFrame3, testFrame2, 1.0);
QVERIFY(result);
QVERIFY(!!result);
QVERIFY(*result == 0.0);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment