diff --git a/libs/brush/tests/kis_auto_brush_test.cpp b/libs/brush/tests/kis_auto_brush_test.cpp --- a/libs/brush/tests/kis_auto_brush_test.cpp +++ b/libs/brush/tests/kis_auto_brush_test.cpp @@ -116,7 +116,7 @@ dabSizeHelper(a, "2x, 45d", KisDabShape(2.0, 1.0, 0.25 * M_PI), 22, 22); dabSizeHelper(a, "0.5x, 45d", KisDabShape(0.5, 1.0, 0.25 * M_PI), 6, 6); dabSizeHelper(a, "0.5x, 45d", KisDabShape(0.5, 1.0, 0.25 * M_PI), 6, 6); - dabSizeHelper(a, "0.5y", KisDabShape(1.0, 0.5, 0.0), 10, 3); + dabSizeHelper(a, "0.5y", KisDabShape(1.0, 0.5, 0.0), 10, 5); } //#define SAVE_OUTPUT_IMAGES diff --git a/libs/image/kis_selection_filters.cpp b/libs/image/kis_selection_filters.cpp --- a/libs/image/kis_selection_filters.cpp +++ b/libs/image/kis_selection_filters.cpp @@ -779,7 +779,7 @@ delete[] buffer; delete[] max; for (qint32 i = 0; i < m_yRadius + 1; i++) - delete buf[i]; + delete[] buf[i]; delete[] buf; delete[] out; } diff --git a/libs/image/tests/kis_convolution_painter_test.cpp b/libs/image/tests/kis_convolution_painter_test.cpp --- a/libs/image/tests/kis_convolution_painter_test.cpp +++ b/libs/image/tests/kis_convolution_painter_test.cpp @@ -280,7 +280,7 @@ int diameter = 1; - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 4; i++) { KisCircleMaskGenerator* kas = new KisCircleMaskGenerator(diameter, 1.0, 5, 5, 2, false); KisConvolutionKernelSP kernel = KisConvolutionKernel::fromMaskGenerator(kas); @@ -300,7 +300,7 @@ dbgKrita << "Diameter:" << diameter << "time:" << timer.elapsed(); - if(diameter < 10) { + if(diameter < 4) { diameter += 2; } else { diameter += 8; diff --git a/libs/image/tests/kis_fixed_paint_device_test.cpp b/libs/image/tests/kis_fixed_paint_device_test.cpp --- a/libs/image/tests/kis_fixed_paint_device_test.cpp +++ b/libs/image/tests/kis_fixed_paint_device_test.cpp @@ -252,7 +252,7 @@ t.start(); int x; - for (x = 0; x < 1000; ++x) { + for (x = 0; x < 100; ++x) { KisPainter gc(dev); gc.bltFixed(QPoint(0, 0), fdev, image.rect()); } diff --git a/libs/image/tests/kis_warp_transform_worker_test.cpp b/libs/image/tests/kis_warp_transform_worker_test.cpp --- a/libs/image/tests/kis_warp_transform_worker_test.cpp +++ b/libs/image/tests/kis_warp_transform_worker_test.cpp @@ -346,7 +346,7 @@ d.updater); QCOMPARE(KritaUtils::sampleRectWithPoints(d.bounds.toAlignedRect()).size(), 9); - QCOMPARE(worker.approxChangeRect(d.bounds.toAlignedRect()), QRect(-89,-89, 1072,1076)); + QCOMPARE(worker.approxChangeRect(d.bounds.toAlignedRect()), QRect(-44,-44, 982,986)); } diff --git a/libs/ui/tests/kis_derived_resources_test.cpp b/libs/ui/tests/kis_derived_resources_test.cpp --- a/libs/ui/tests/kis_derived_resources_test.cpp +++ b/libs/ui/tests/kis_derived_resources_test.cpp @@ -33,15 +33,46 @@ #include #include #include - +#include #include "testutil.h" +void addResourceTypes() +{ + // All Krita's resource types + KoResourcePaths::addResourceType("kis_pics", "data", "/pics/"); + KoResourcePaths::addResourceType("kis_images", "data", "/images/"); + KoResourcePaths::addResourceType("icc_profiles", "data", "/profiles/"); + KoResourcePaths::addResourceType("metadata_schema", "data", "/metadata/schemas/"); + KoResourcePaths::addResourceType("kis_brushes", "data", "/brushes/"); + KoResourcePaths::addResourceType("kis_taskset", "data", "/taskset/"); + KoResourcePaths::addResourceType("kis_taskset", "data", "/taskset/"); + KoResourcePaths::addResourceType("gmic_definitions", "data", "/gmic/"); + KoResourcePaths::addResourceType("kis_resourcebundles", "data", "/bundles/"); + KoResourcePaths::addResourceType("kis_defaultpresets", "data", "/defaultpresets/"); + KoResourcePaths::addResourceType("kis_paintoppresets", "data", "/paintoppresets/"); + KoResourcePaths::addResourceType("kis_workspaces", "data", "/workspaces/"); + KoResourcePaths::addResourceType("psd_layer_style_collections", "data", "/asl"); + KoResourcePaths::addResourceType("ko_patterns", "data", "/patterns/", true); + KoResourcePaths::addResourceType("ko_gradients", "data", "/gradients/"); + KoResourcePaths::addResourceType("ko_gradients", "data", "/gradients/", true); + KoResourcePaths::addResourceType("ko_palettes", "data", "/palettes/", true); + KoResourcePaths::addResourceType("kis_shortcuts", "data", "/shortcuts/"); + KoResourcePaths::addResourceType("kis_actions", "data", "/actions"); + KoResourcePaths::addResourceType("icc_profiles", "data", "/color/icc"); + KoResourcePaths::addResourceType("ko_effects", "data", "/effects/"); + KoResourcePaths::addResourceType("tags", "data", "/tags/"); + +} + void KisDerivedResourcesTest::test() { KisDocument* doc = createEmptyDocument(); + + addResourceTypes(); + KisMainWindow* mainWindow = KisPart::instance()->createMainWindow(); QPointer view = new KisView(doc, mainWindow->resourceManager(), mainWindow->actionCollection(), mainWindow); KisViewManager *viewManager = new KisViewManager(mainWindow, mainWindow->actionCollection()); @@ -79,11 +110,17 @@ QCOMPARE(spy[2][0].toInt(), (int)KisCanvasResourceProvider::LodAvailability); QCOMPARE(spy[2][1].toBool(), true); - QCOMPARE(spy[3][0].toInt(), (int)KisCanvasResourceProvider::Opacity); + QCOMPARE(spy[3][0].toInt(), (int)KisCanvasResourceProvider::Size); QCOMPARE(spy[3][1].toDouble(), 1.0); - QCOMPARE(spy[4][0].toInt(), (int)KisCanvasResourceProvider::CurrentEffectiveCompositeOp); - QCOMPARE(spy[4][1].toString(), COMPOSITE_OVER); + QCOMPARE(spy[4][0].toInt(), (int)KisCanvasResourceProvider::Flow); + QCOMPARE(spy[4][1].toDouble(), 1.0); + + QCOMPARE(spy[5][0].toInt(), (int)KisCanvasResourceProvider::Opacity); + QCOMPARE(spy[5][1].toDouble(), 1.0); + + QCOMPARE(spy[6][0].toInt(), (int)KisCanvasResourceProvider::CurrentEffectiveCompositeOp); + QCOMPARE(spy[6][1].toString(), COMPOSITE_OVER); spy.clear(); diff --git a/plugins/color/lcms2engine/tests/TestKoLcmsColorProfile.cpp b/plugins/color/lcms2engine/tests/TestKoLcmsColorProfile.cpp --- a/plugins/color/lcms2engine/tests/TestKoLcmsColorProfile.cpp +++ b/plugins/color/lcms2engine/tests/TestKoLcmsColorProfile.cpp @@ -189,7 +189,7 @@ cmsHPROFILE sRgbProfile = cmsCreate_sRGBProfile(); cmsHPROFILE LabProfile = cmsCreateLab4Profile(NULL); - quint16 alarm[4];//cyan! + quint16 alarm[cmsMAXCHANNELS]={0}; alarm[0] = 65535; alarm[1] = 0; alarm[2] = 0; @@ -208,7 +208,7 @@ cmsDoTransform(tf, (quint8 *)&src, (quint8 *)&dst, 1); qDebug()<