diff --git a/libs/image/tests/kis_iterators_ng_test.cpp b/libs/image/tests/kis_iterators_ng_test.cpp
index 28e2818515..930219f0a1 100644
--- a/libs/image/tests/kis_iterators_ng_test.cpp
+++ b/libs/image/tests/kis_iterators_ng_test.cpp
@@ -1,497 +1,497 @@
 /*
  *  Copyright (c) 2007 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2010 Cyrille Berger <cberger@cberger.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "kis_iterators_ng_test.h"
 #include <QApplication>
 
 #include <QTest>
 #include <KoColor.h>
 #include <KoColorSpace.h>
 #include <KoColorSpaceRegistry.h>
 #include <KoColorProfile.h>
 
 #include "kis_random_accessor_ng.h"
 #include "kis_random_sub_accessor.h"
 
 #include "kis_paint_device.h"
 #include <kis_iterator_ng.h>
 #include "kis_global.h"
 #include "testutil.h"
 
 
 void KisIteratorTest::allCsApplicator(void (KisIteratorTest::* funcPtr)(const KoColorSpace*cs))
 {
     QList<const KoColorSpace*> colorsapces = KoColorSpaceRegistry::instance()->allColorSpaces(KoColorSpaceRegistry::AllColorSpaces, KoColorSpaceRegistry::OnlyDefaultProfile);
 
     Q_FOREACH (const KoColorSpace* cs, colorsapces) {
 
         dbgKrita << "Testing with" << cs->id();
         if (cs->id() != "GRAYU16") // No point in testing extend for GRAYU16
             (this->*funcPtr)(cs);
     }
 }
 
 inline quint8* allocatePixels(const KoColorSpace *colorSpace, int numPixels)
 {
     quint8 * bytes = new quint8[colorSpace->pixelSize() * 64 * 64 * 10];
     KoColor color(Qt::red, colorSpace);
     const int pixelSize = colorSpace->pixelSize();
     for(int i = 0; i < numPixels; i++) {
         memcpy(bytes + i * pixelSize, color.data(), pixelSize);
     }
 
     return bytes;
 }
 
 void KisIteratorTest::writeBytes(const KoColorSpace * colorSpace)
 {
 
 
     KisPaintDevice dev(colorSpace);
 
-    QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev.extent(), QRect(0, 0, 0, 0));
 
     // Check allocation on tile boundaries
 
     // Allocate memory for a 2 * 5 tiles grid
     QScopedArrayPointer<quint8> bytes(allocatePixels(colorSpace, 64 * 64 * 10));
 
     // Covers 5 x 2 tiles
     dev.writeBytes(bytes.data(), 0, 0, 5 * 64, 2 * 64);
 
     // Covers
     QCOMPARE(dev.extent(), QRect(0, 0, 64 * 5, 64 * 2));
     QCOMPARE(dev.exactBounds(), QRect(0, 0, 64 * 5, 64 * 2));
 
     dev.clear();
     QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
 
     dev.clear();
     // Covers three by three tiles
     dev.writeBytes(bytes.data(), 10, 10, 130, 130);
 
     QCOMPARE(dev.extent(), QRect(0, 0, 64 * 3, 64 * 3));
     QCOMPARE(dev.exactBounds(), QRect(10, 10, 130, 130));
 
     dev.clear();
     // Covers 11 x 2 tiles
     dev.writeBytes(bytes.data(), -10, -10, 10 * 64, 64);
 
     QCOMPARE(dev.extent(), QRect(-64, -64, 64 * 11, 64 * 2));
     QCOMPARE(dev.exactBounds(), QRect(-10, -10, 640, 64));
 }
 
 void KisIteratorTest::fill(const KoColorSpace * colorSpace)
 {
 
     KisPaintDevice dev(colorSpace);
 
-    QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev.extent(), QRect(0, 0, 0, 0));
 
     QScopedArrayPointer<quint8> bytes(allocatePixels(colorSpace, 1));
 
     dev.fill(0, 0, 5, 5, bytes.data());
     QCOMPARE(dev.extent(), QRect(0, 0, 64, 64));
     QCOMPARE(dev.exactBounds(), QRect(0, 0, 5, 5));
 
     dev.clear();
     dev.fill(5, 5, 5, 5, bytes.data());
     QCOMPARE(dev.extent(), QRect(0, 0, 64, 64));
     QCOMPARE(dev.exactBounds(), QRect(5, 5, 5, 5));
 
     dev.clear();
     dev.fill(5, 5, 500, 500, bytes.data());
     QCOMPARE(dev.extent(), QRect(0, 0, 8 * 64, 8 * 64));
     QCOMPARE(dev.exactBounds(), QRect(5, 5, 500, 500));
 
     dev.clear();
     dev.fill(33, -10, 348, 1028, bytes.data());
     QCOMPARE(dev.extent(), QRect(0, -64, 6 * 64, 17 * 64));
     QCOMPARE(dev.exactBounds(), QRect(33, -10, 348, 1028));
 }
 
 void KisIteratorTest::sequentialIter(const KoColorSpace * colorSpace)
 {
 
     KisPaintDeviceSP dev = new KisPaintDevice(colorSpace);
 
-    QCOMPARE(dev->extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev->extent(), QRect(0, 0, 0, 0));
 
     // Const does not extend the extent
     {
         KisSequentialConstIterator it(dev, QRect(0, 0, 128, 128));
         while (it.nextPixel());
-        QCOMPARE(dev->extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+        QCOMPARE(dev->extent(), QRect(0, 0, 0, 0));
         QCOMPARE(dev->exactBounds(), QRect(QPoint(0, 0), QPoint(-1, -1)));
     }
 
     // Non-const does
     {
         KisSequentialIterator it(dev, QRect(0, 0, 128, 128));
         int i = -1;
 
         while (it.nextPixel()) {
             i++;
             KoColor c(QColor(i % 255, i / 255, 0), colorSpace);
             memcpy(it.rawData(), c.data(), colorSpace->pixelSize());
 
             QCOMPARE(it.x(), i % 128);
             QCOMPARE(it.y(), i / 128);
         }
 
         QCOMPARE(dev->extent(), QRect(0, 0, 128, 128));
         QCOMPARE(dev->exactBounds(), QRect(0, 0, 128, 128));
     }
 
     { // check const iterator
         KisSequentialConstIterator it(dev, QRect(0, 0, 128, 128));
         int i = -1;
 
         while (it.nextPixel()) {
             i++;
             KoColor c(QColor(i % 255, i / 255, 0), colorSpace);
             QVERIFY(memcmp(it.rawDataConst(), c.data(), colorSpace->pixelSize()) == 0);
         }
 
         QCOMPARE(dev->extent(), QRect(0, 0, 128, 128));
         QCOMPARE(dev->exactBounds(), QRect(0, 0, 128, 128));
     }
 
     { // check const iterator with **empty** area! It should neither crash nor enter the loop
         KisSequentialConstIterator it(dev, QRect());
 
         QVERIFY(!it.rawDataConst());
         QVERIFY(!it.oldRawData());
 
         while (it.nextPixel()) {
             QVERIFY(0 && "we should never enter the loop");
         }
     }
 
     { // check const iterator with strides
         KisSequentialConstIterator it(dev, QRect(0, 0, 128, 128));
         int i = -1;
 
         int numConseqPixels = it.nConseqPixels();
         while (it.nextPixels(numConseqPixels)) {
 
             numConseqPixels = it.nConseqPixels();
 
             for (int j = 0; j < numConseqPixels; j++) {
                 i++;
                 KoColor c(QColor(i % 255, i / 255, 0), colorSpace);
                 QVERIFY(memcmp(it.rawDataConst() + j * colorSpace->pixelSize(),
                                c.data(),
                                colorSpace->pixelSize()) == 0);
             }
         }
 
         QCOMPARE(dev->extent(), QRect(0, 0, 128, 128));
         QCOMPARE(dev->exactBounds(), QRect(0, 0, 128, 128));
     }
 
     { // check const iterator with strides and **empty** area
         KisSequentialConstIterator it(dev, QRect());
 
         QVERIFY(!it.rawDataConst());
         QVERIFY(!it.oldRawData());
 
         int numConseqPixels = it.nConseqPixels();
         while (it.nextPixels(numConseqPixels)) {
             QVERIFY(0 && "we should never enter the loop");
         }
     }
 
     dev->clear();
 
     {
         KisSequentialIterator it(dev, QRect(10, 10, 128, 128));
         int i = -1;
 
         while (it.nextPixel()) {
             i++;
             KoColor c(QColor(i % 255, i / 255, 0), colorSpace);
 
             memcpy(it.rawData(), c.data(), colorSpace->pixelSize());
         }
 
         QCOMPARE(dev->extent(), QRect(0, 0, 3 * 64, 3 * 64));
         QCOMPARE(dev->exactBounds(), QRect(10, 10, 128, 128));
     }
 
     dev->clear();
     dev->setX(10);
     dev->setY(-15);
 
     {
         KisSequentialIterator it(dev, QRect(10, 10, 128, 128));
         int i = -1;
 
         while (it.nextPixel()) {
             i++;
             KoColor c(QColor(i % 255, i / 255, 0), colorSpace);
 
             memcpy(it.rawData(), c.data(), colorSpace->pixelSize());
         }
         QCOMPARE(dev->extent(), QRect(10, -15, 128, 192));
         QCOMPARE(dev->exactBounds(), QRect(10, 10, 128, 128));
     }
     {
         KisSequentialIterator it(dev, QRect(10, 10, 128, 128));
         QCOMPARE(it.rawData(), it.oldRawData());
     }
 }
 
 void KisIteratorTest::hLineIter(const KoColorSpace * colorSpace)
 {
     KisPaintDevice dev(colorSpace);
 
     QScopedArrayPointer<quint8> bytes(allocatePixels(colorSpace, 1));
 
-    QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev.extent(), QRect(0, 0, 0, 0));
 
     KisHLineConstIteratorSP cit = dev.createHLineConstIteratorNG(0, 0, 128);
     while (!cit->nextPixel());
-    QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev.extent(), QRect(0, 0, 0, 0));
     QCOMPARE(dev.exactBounds(), QRect(QPoint(0, 0), QPoint(-1, -1)));
 
     dev.clear();
     KisHLineIteratorSP it = dev.createHLineIteratorNG(0, 0, 128);
     do {
         memcpy(it->rawData(), bytes.data(), colorSpace->pixelSize());
     } while (it->nextPixel());
 
 
     QCOMPARE(dev.extent(), QRect(0, 0, 128, 64));
     QCOMPARE(dev.exactBounds(), QRect(0, 0, 128, 1));
 
     dev.clear();
 
     it = dev.createHLineIteratorNG(0, 1, 128);
     do {
         memcpy(it->rawData(), bytes.data(), colorSpace->pixelSize());
     } while (it->nextPixel());
 
     QCOMPARE(dev.extent(), QRect(0, 0, 128, 64));
     QCOMPARE(dev.exactBounds(), QRect(0, 1, 128, 1));
 
     dev.clear();
 
     it = dev.createHLineIteratorNG(10, 10, 128);
     do {
         memcpy(it->rawData(), bytes.data(), colorSpace->pixelSize());
     } while (it->nextPixel());
 
     QCOMPARE(dev.extent(), QRect(0, 0, 192, 64));
     QCOMPARE(dev.exactBounds(), QRect(10, 10, 128, 1));
 
     dev.clear();
     dev.setX(10);
     dev.setY(-15);
 
     it = dev.createHLineIteratorNG(10, 10, 128);
     do {
         memcpy(it->rawData(), bytes.data(), colorSpace->pixelSize());
     } while (it->nextPixel());
 
     QCOMPARE(dev.extent(), QRect(10, -15, 128, 64));
     QCOMPARE(dev.exactBounds(), QRect(10, 10, 128, 1));
     
     it = dev.createHLineIteratorNG(10, 10, 128);
     it->nextRow();
     QCOMPARE(it->rawData(), it->oldRawData());
 }
 
 void KisIteratorTest::justCreation(const KoColorSpace * colorSpace)
 {
     KisPaintDevice dev(colorSpace);
     dev.createVLineConstIteratorNG(0, 0, 128);
     dev.createVLineIteratorNG(0, 0, 128);
     dev.createHLineConstIteratorNG(0, 0, 128);
     dev.createHLineIteratorNG(0, 0, 128);
 }
 
 void KisIteratorTest::vLineIter(const KoColorSpace * colorSpace)
 {
 
     KisPaintDevice dev(colorSpace);
     QScopedArrayPointer<quint8> bytes(allocatePixels(colorSpace, 1));
 
-    QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev.extent(), QRect(0, 0, 0, 0));
 
     KisVLineConstIteratorSP cit = dev.createVLineConstIteratorNG(0, 0, 128);
     while (cit->nextPixel());
-    QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev.extent(), QRect(0, 0, 0, 0));
     QCOMPARE(dev.exactBounds(), QRect(QPoint(0, 0), QPoint(-1, -1)));
     cit.clear();
 
     KisVLineIteratorSP it = dev.createVLineIteratorNG(0, 0, 128);
     do {
         memcpy(it->rawData(), bytes.data(), colorSpace->pixelSize());
     } while(it->nextPixel());
     
     QCOMPARE((QRect) dev.extent(), QRect(0, 0, 64, 128));
     QCOMPARE((QRect) dev.exactBounds(), QRect(0, 0, 1, 128));
     it.clear();
 
     dev.clear();
 
     it = dev.createVLineIteratorNG(10, 10, 128);
     do {
         memcpy(it->rawData(), bytes.data(), colorSpace->pixelSize());
     } while(it->nextPixel());
 
     QCOMPARE(dev.extent(), QRect(0, 0, 64, 192));
     QCOMPARE(dev.exactBounds(), QRect(10, 10, 1, 128));
     
     dev.clear();
     dev.setX(10);
     dev.setY(-15);
 
     it = dev.createVLineIteratorNG(10, 10, 128);
     do {
         memcpy(it->rawData(), bytes.data(), colorSpace->pixelSize());
     } while(it->nextPixel());
 
     QCOMPARE(dev.extent(), QRect(10, -15, 64, 192));
     QCOMPARE(dev.exactBounds(), QRect(10, 10, 1, 128));
 
     it = dev.createVLineIteratorNG(10, 10, 128);
     it->nextColumn();
     QCOMPARE(it->rawData(), it->oldRawData());
 }
 
 void KisIteratorTest::randomAccessor(const KoColorSpace * colorSpace)
 {
 
     KisPaintDevice dev(colorSpace);
     QScopedArrayPointer<quint8> bytes(allocatePixels(colorSpace, 1));
 
-    QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev.extent(), QRect(0, 0, 0, 0));
 
     KisRandomConstAccessorSP acc = dev.createRandomConstAccessorNG(0, 0);
     for (int y = 0; y < 128; ++y) {
         for (int x = 0; x < 128; ++x) {
             acc->moveTo(x, y);
         }
     }
-    QCOMPARE(dev.extent(), QRect(qint32_MAX, qint32_MAX, 0, 0));
+    QCOMPARE(dev.extent(), QRect(0, 0, 0, 0));
 
     KisRandomAccessorSP ac = dev.createRandomAccessorNG(0, 0);
     for (int y = 0; y < 128; ++y) {
         for (int x = 0; x < 128; ++x) {
             ac->moveTo(x, y);
             memcpy(ac->rawData(), bytes.data(), colorSpace->pixelSize());
         }
     }
     QCOMPARE(dev.extent(), QRect(0, 0, 128, 128));
     QCOMPARE(dev.exactBounds(), QRect(0, 0, 128, 128));
 
     dev.clear();
     dev.setX(10);
     dev.setY(-15);
 
     ac = dev.createRandomAccessorNG(0, 0);
     for (int y = 0; y < 128; ++y) {
         for (int x = 0; x < 128; ++x) {
             ac->moveTo(x, y);
             memcpy(ac->rawData(), bytes.data(), colorSpace->pixelSize());
         }
     }
     QCOMPARE(dev.extent(), QRect(-54, -15, 192, 192));
     QCOMPARE(dev.exactBounds(), QRect(0, 0, 128, 128));
 }
 
 
 void KisIteratorTest::writeBytes()
 {
     allCsApplicator(&KisIteratorTest::writeBytes);
 }
 
 void KisIteratorTest::fill()
 {
     allCsApplicator(&KisIteratorTest::fill);
 }
 
 void KisIteratorTest::sequentialIter()
 {
     allCsApplicator(&KisIteratorTest::sequentialIter);
 }
 
 #include <KisSequentialIteratorProgress.h>
 
 void KisIteratorTest::sequentialIteratorWithProgress()
 {
     KisPaintDeviceSP dev = new KisPaintDevice(KoColorSpaceRegistry::instance()->rgb8());
 
     const QRect rc(10,10,200,200);
     TestUtil::TestProgressBar proxy;
 
     KisSequentialConstIteratorProgress it (dev, rc, &proxy);
 
     while (it.nextPixel()) {
         QCOMPARE(proxy.min(), rc.top());
         QCOMPARE(proxy.max(), rc.top() + rc.height());
         QCOMPARE(proxy.value(), it.y());
     }
 
     QCOMPARE(proxy.max(), rc.top() + rc.height());
     QCOMPARE(proxy.value(), proxy.max());
 }
 
 void KisIteratorTest::sequentialIteratorWithProgressIncomplete()
 {
     KisPaintDeviceSP dev = new KisPaintDevice(KoColorSpaceRegistry::instance()->rgb8());
 
     const QRect rc(10,10,100,100);
     TestUtil::TestProgressBar proxy;
 
     {
         KisSequentialConstIteratorProgress it (dev, rc, &proxy);
 
         QCOMPARE(proxy.max(), rc.top() + rc.height());
         QCOMPARE(proxy.value(), rc.top());
     }
 
     // on desruction, iterator automatically completes progress reporting
     QCOMPARE(proxy.max(), rc.top() + rc.height());
     QCOMPARE(proxy.value(), proxy.max());
 }
 
 void KisIteratorTest::hLineIter()
 {
     allCsApplicator(&KisIteratorTest::hLineIter);
 }
 
 void KisIteratorTest::justCreation()
 {
     allCsApplicator(&KisIteratorTest::justCreation);
 }
 
 void KisIteratorTest::vLineIter()
 {
     allCsApplicator(&KisIteratorTest::vLineIter);
 }
 
 void KisIteratorTest::randomAccessor()
 {
     allCsApplicator(&KisIteratorTest::randomAccessor);
 }
 
 QTEST_MAIN(KisIteratorTest)