Diffusion Krita e42aaaafaafb

Merge branch 'master' into ivany/T8580-Brush-AVX-Optim
e42aaaafaafb
Actions

Authored by vanyossi on Jul 26 2018, 10:11 AM.

Description

Merge branch 'master' into ivany/T8580-Brush-AVX-Optim

Details

Committed

vanyossi

Jul 26 2018, 10:11 AM

Parents

R37:da249312e649: Implement Vc Optimization for Default Rect Mask
R37:b59ed45b0039: debug--

Branches

Unknown

Tags

Unknown

vanyossi committed R37:e42aaaafaafb: Merge branch 'master' into ivany/T8580-Brush-AVX-Optim (authored by vanyossi).Jul 26 2018, 10:11 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
b59ed45b0039	rempt	debug--	Jul 26 2018
6fa9587f1167	rempt	Move the schemas to the data folder so tests can find them without installing	Jul 26 2018
6c801c76d59d	rempt	Also check for resources in extra_resource_dirs + alias	Jul 26 2018
c0e91569d64d	rempt	warning-- : mytool.json does not exist	Jul 26 2018
3d50841fed7c	rempt	Fix KisIteratorsNG test with KISTEST_MAIN	Jul 26 2018
3bd75fb26635	rempt	Revert "Remove safe assert checking for shape managers"	Jul 26 2018
17e2d401edc4	rempt	Move the benchmarks from KisPainterTest to KisPainterBenchmark	Jul 26 2018
1f1215e4b3ca	rempt	Fix kisiteratortest by porting to KISTEST_MAIN	Jul 26 2018
ccf8c4af1a6e	rempt	Fix the name of the KisNodeJugglerCompressedTest test	Jul 26 2018
36bd161e4376	rempt	Fix the animation exporter test	Jul 26 2018
fa4a15514a50	rempt	Fix kis_shape_selection_test	Jul 26 2018
7ea2da047460	rempt	Make all libs/ui test prefixes the same	Jul 26 2018
e854150201b3	rempt	Fix building kis_input_manager_test	Jul 26 2018
ed8c240583b6	rempt	Fix the prefix for the BaseNodeTest	Jul 26 2018
2551561bb252	rempt	Fix TestKoColor and TestKoColorSpaceSanity by porting to KISTEST_MAIN	Jul 26 2018
6f4c1c0e473f	rempt	Remove obsolete asserts for QGradient::ObjectBoundingMode	Jul 26 2018
17bc93cda0e3	rempt	Try to fix the TestPointMergeCommand unittest	Jul 26 2018
899b02999e81	rempt	Remove safe assert checking for shape managers	Jul 26 2018
87962bd68b53	rempt	Port KoResourceTaggingTest to KisTest	Jul 26 2018
152eaf5d7582	rempt	Fix TestColorConversionSystem	Jul 26 2018
d3d349bde318	rempt	Check pointers before dereferencing	Jul 26 2018
5c3edc73e902	l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 26 2018
db2d098d56ef	dkazakov	Selection masks can paint outside internal selection	Jul 25 2018
d3f37d481208	dkazakov	Merge remote-tracking branch 'origin/kazakov/realtime-selections'	Jul 25 2018
e4a43a1c4e8b	dkazakov	Fix KisColorizeMaskTest	Jul 25 2018
38a265e6e80a	rempt	Also find single resources in the extra resources folder, even if they don't…	Jul 25 2018
8c775c8cb1a6	rempt	Add more default filter configs for testing	Jul 25 2018
5c60d63d7df5	rempt	Use KISTEST_MAIN where necessary	Jul 25 2018
f9ee9a42da64	rempt	Make it possible for tests to access resources	Jul 25 2018
01b24dd68a09	rempt	Replace the KritaDevs build type with a cmake option	Jul 25 2018
6d0832fb1469	rempt	Remove documents at the end of each test	Jul 25 2018
1cace269f8a3	dkazakov	Fix misprint in KisNodeTest	Jul 25 2018
8af5c21538e7	dkazakov	Fix updates when switching frame on a layer with scalar channel	Jul 25 2018
a8bdfd8a2ce4	rempt	Return a default value if the resources snapshot doesn't have a paintop preset	Jul 25 2018
6d4b21c747ab	rempt	Fix test document for KisKraLoaderTest	Jul 25 2018
1c9c6ba2debc	dkazakov	Fix warning	Jul 25 2018
87712b613ac1	dkazakov	Fix to/fromLab16/Rgb16 methods of the Alpha color space	Jul 25 2018
15f7153b0e6b	dkazakov	Fix KisSelectionTest	Jul 25 2018
36554a45915e	dkazakov	Activate broken tests that run correctly now	Jul 25 2018
fe466dc9f026	rempt	Update kis_iterators_ng_test	Jul 25 2018
cea9f3d38c70	rempt	Update kis_iterator_test	Jul 25 2018
787e3b8fbe82	lieroz	Merge remote-tracking branch 'origin/master' into akamakin/tile-manager-bug…	Jul 24 2018
a7d9c52acf0f	dkazakov	Fix TestSvgTextRoundTrip	Jul 24 2018
a9eb14cca6ed	dkazakov	Selection mask doesn't write to the config	Jul 24 2018
d273eb184b39	dkazakov	Add read-only switch for KisImageConfig into transform stroke	Jul 24 2018
ab21101250f5	rempt	Follow new KisImageConfig API	Jul 24 2018
0a67284c09d2	rempt	Build fix to follow KisImageConfig api change	Jul 24 2018
8cbb5052cd3f	dkazakov	Fix TestSvgParser	Jul 24 2018
a50bee7d5328	rempt	Merge branch 'master' into kazakov/realtime-selections	Jul 24 2018
3c27312e5efa	dkazakov	Change Verdana to DejaVu Sans	Jul 24 2018

Changes (206)

		Path
M		CMakeLists.txt
M		KoConfig.h.cmake
M		benchmarks/kis_painter_benchmark.cpp
M		benchmarks/kis_painter_benchmark.h
M		krita/data/CMakeLists.txt
A	(dir)	krita/data/metadata/
A	(dir)	krita/data/metadata/schemas/
A		krita/data/metadata/schemas/CMakeLists.txt
V		{krita/data ← libs/image}/metadata/schemas/dc.schema
V		{krita/data ← libs/image}/metadata/schemas/exif.schema
V		{krita/data ← libs/image}/metadata/schemas/mkn.schema
V		{krita/data ← libs/image}/metadata/schemas/tiff.schema
V		{krita/data ← libs/image}/metadata/schemas/xmp.schema
V		{krita/data ← libs/image}/metadata/schemas/xmpmm.schema
V		{krita/data ← libs/image}/metadata/schemas/xmprights.schema
M		krita/org.kde.krita.appdata.xml
M		libs/flake/KoConnectionShape.cpp
M		libs/flake/KoGradientBackground.cpp
M		libs/flake/KoHatchBackground.cpp
M		libs/flake/KoPathShape.cpp
M		libs/flake/KoShape.cpp
M		libs/flake/KoShapeGroup.cpp
M		libs/flake/KoToolFactoryBase.h
M		libs/flake/svg/SvgStyleWriter.cpp
M		libs/flake/svg/SvgWriter.cpp
M		libs/flake/tests/CMakeLists.txt
M		libs/flake/tests/TestKoMarkerCollection.cpp
M		libs/flake/tests/TestKoShapeRegistry.cpp
M		libs/flake/tests/TestPointMergeCommand.cpp
M		libs/flake/tests/TestPointRemoveCommand.cpp
M		libs/flake/tests/TestShapePainting.cpp
M		libs/flake/tests/TestSnapStrategy.cpp
M		libs/flake/tests/TestSvgParser.cpp
M		libs/flake/tests/TestSvgParser.h
M		libs/flake/tests/TestSvgText.cpp
M		libs/flake/tests/data/svg_render/load_image_aspect_default.png
M		libs/flake/tests/data/svg_render/load_text_baseline_shift.png
M		libs/flake/tests/data/svg_render/load_text_decorations.png
M		libs/flake/tests/data/svg_render/load_text_hindi.png
M		libs/flake/tests/data/svg_render/load_text_multiple_absolute_offsets_arabic.png
M		libs/flake/tests/data/svg_render/load_text_right_to_left.png
M		libs/image/CMakeLists.txt
V		libs/image/{KisImageConfigNotifier.cpp ← KisUpdateSchedulerConfigNotifier.cpp}
V		libs/image/{KisImageConfigNotifier.h ← KisUpdateSchedulerConfigNotifier.h}
V		libs/image/{KisUpdateSchedulerConfigNotifier.cpp → KisImageConfigNotifier.cpp}
V		libs/image/{KisUpdateSchedulerConfigNotifier.h → KisImageConfigNotifier.h}
M		libs/image/commands/kis_node_property_list_command.cpp
M		libs/image/kis_async_merger.cpp
M		libs/image/kis_base_rects_walker.h
M		libs/image/kis_image.cc
M		libs/image/kis_image.h
M		libs/image/kis_image_animation_interface.cpp
M		libs/image/kis_image_config.cpp
M		libs/image/kis_image_config.h
M		libs/image/kis_image_signal_router.cpp
M		libs/image/kis_layer.cc
M		libs/image/kis_layer.h
M		libs/image/kis_layer_utils.cpp
M		libs/image/kis_layer_utils.h
M		libs/image/kis_mask.cc
M		libs/image/kis_mask.h
M		libs/image/kis_node_graph_listener.cpp
M		libs/image/kis_node_graph_listener.h
M		libs/image/kis_projection_leaf.cpp
M		libs/image/kis_projection_leaf.h
M		libs/image/kis_refresh_subtree_walker.h
M		libs/image/kis_selection_mask.cpp
M		libs/image/kis_selection_mask.h
M		libs/image/kis_time_range.cpp
M		libs/image/kis_time_range.h
M		libs/image/kis_transparency_mask.cc
M		libs/image/kis_transparency_mask.h
M		libs/image/kis_update_scheduler.cpp
M		libs/image/lazybrush/kis_colorize_mask.cpp
M		libs/image/metadata/kis_meta_data_entry.cc
M		libs/image/metadata/kis_meta_data_schema_registry.cc
M		libs/image/metadata/kis_meta_data_store.cc
D		libs/image/metadata/schemas
V		{libs/image → krita/data}/metadata/schemas/dc.schema
V		{libs/image → krita/data}/metadata/schemas/exif.schema
V		{libs/image → krita/data}/metadata/schemas/mkn.schema
V		{libs/image → krita/data}/metadata/schemas/tiff.schema
V		{libs/image → krita/data}/metadata/schemas/xmp.schema
V		{libs/image → krita/data}/metadata/schemas/xmpmm.schema
V		{libs/image → krita/data}/metadata/schemas/xmprights.schema
M		libs/image/tests/CMakeLists.txt
M		libs/image/tests/KisMaskGeneratorBenchmark.cpp
M		libs/image/tests/kis_base_node_test.cpp
M		libs/image/tests/kis_colorize_mask_test.cpp
M		libs/image/tests/kis_image_test.cpp
M		libs/image/tests/kis_image_test.h
M		libs/image/tests/kis_iterator_test.cpp
M		libs/image/tests/kis_iterators_ng_test.cpp
M		libs/image/tests/kis_iterators_ng_test.h
M		libs/image/tests/kis_meta_data_test.cpp
M		libs/image/tests/kis_meta_data_test.h
M		libs/image/tests/kis_node_test.cpp
M		libs/image/tests/kis_painter_test.cpp
M		libs/image/tests/kis_painter_test.h
M		libs/image/tests/kis_projection_leaf_test.cpp
M		libs/image/tests/kis_projection_leaf_test.h
M		libs/image/tiles3/KisTiledExtentManager.cpp
M		libs/libkis/tests/TestDocument.cpp
M		libs/libkis/tests/TestFilter.cpp
M		libs/libkis/tests/TestNotifier.cpp
M		libs/odf/KoColumns.cpp
M		libs/odf/KoGenStyle.cpp
M		libs/odf/KoGenStyle.h
M		libs/odf/KoOdfGraphicStyles.cpp
M		libs/odf/tests/CMakeLists.txt
D		libs/odf/tests/TestXmlReader.cpp
M		libs/odf/tests/TestXmlWriter.cpp
M		libs/pigment/KoColorConversionSystem.cpp
M		libs/pigment/KoColorConversionSystem_p.h
M		libs/pigment/KoColorSpaceRegistry.h
M		libs/pigment/colorspaces/KoAlphaColorSpace.cpp
M		libs/pigment/tests/TestColorConversionSystem.cpp
M		libs/pigment/tests/TestKoColor.cpp
M		libs/pigment/tests/TestKoColorSpaceSanity.cpp
M		libs/store/KoXmlReaderForward.h
M		libs/store/KoXmlWriter.cpp
M		libs/store/KoXmlWriter.h
M		libs/ui/KisApplication.cpp
M		libs/ui/KisMainWindow.cpp
M		libs/ui/KisView.cpp
M		libs/ui/KisView.h
M		libs/ui/KisViewManager.cpp
M		libs/ui/canvas/kis_canvas_controller.cpp
M		libs/ui/dialogs/KisAsyncAnimationCacheRenderDialog.cpp
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/kis_animation_frame_cache.cpp
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_node_manager.cpp
M		libs/ui/kis_selection_decoration.cc
M		libs/ui/tests/CMakeLists.txt
P		libs/ui/tests/data/load_test.kra Copied from plugins/impex/libkra/tests/data/load_test.kra
M		libs/ui/tests/kis_action_manager_test.cpp
M		libs/ui/tests/kis_animation_exporter_test.cpp
M		libs/ui/tests/kis_derived_resources_test.cpp
M		libs/ui/tests/kis_file_layer_test.cpp
M		libs/ui/tests/kis_input_manager_test.cpp
M		libs/ui/tests/kis_node_manager_test.cpp
M		libs/ui/tests/kis_node_model_test.cpp
M		libs/ui/tests/kis_node_view_test.cpp
M		libs/ui/tests/kis_selection_manager_test.cpp
M		libs/ui/tests/kis_shape_commands_test.cpp
M		libs/ui/tests/kis_shape_controller_test.cpp
M		libs/ui/tests/kis_shape_layer_test.cpp
M		libs/ui/tests/kis_shape_selection_test.cpp
M		libs/ui/tool/KisStrokeSpeedMonitor.cpp
M		libs/ui/tool/kis_resources_snapshot.cpp
M		libs/widgets/tests/CMakeLists.txt
M		libs/widgets/tests/KoResourceTaggingTest.cpp
M		libs/widgetutils/KoResourcePaths.cpp
M		libs/widgetutils/KoResourcePaths.h
M		plugins/color/lcms2engine/LcmsEnginePlugin.cpp
M		plugins/dockers/animation/tests/timeline_model_test.cpp
M		plugins/extensions/pykrita/CMakeLists.txt
M		plugins/extensions/qmic/PluginSettings.cpp
M		plugins/extensions/qmic/QMic.cpp
M		plugins/extensions/qmic/kis_import_qmic_processing_visitor.cpp
M		plugins/extensions/qmic/kis_qmic_applicator.cpp
M		plugins/extensions/qmic/kis_qmic_applicator.h
M		plugins/extensions/qmic/kis_qmic_data.cpp
M		plugins/extensions/qmic/kis_qmic_data.h
M		plugins/extensions/qmic/kis_qmic_simple_convertor.cpp
M		plugins/extensions/qmic/kis_qmic_synchronize_image_size_command.cpp
M		plugins/extensions/qmic/kis_qmic_synchronize_layers_command.cpp
M		plugins/extensions/qmic/tests/kis_qmic_tests.cpp
M		plugins/extensions/qmic/tests/kis_qmic_tests.h
A		plugins/filters/tests/data/asc-cdl.cfg
A		plugins/filters/tests/data/blur.cfg
A		plugins/filters/tests/data/burn.cfg
A		plugins/filters/tests/data/colorbalance.cfg
A		plugins/filters/tests/data/crosschannel.cfg
A		plugins/filters/tests/data/dodge.cfg
A		plugins/filters/tests/data/edge detection.cfg
A		plugins/filters/tests/data/gradientmap.cfg
A		plugins/filters/tests/data/halftone.cfg
M		plugins/flake/artistictextshape/ArtisticTextShape.cpp
M		plugins/flake/pathshapes/ellipse/EllipseShape.cpp
M		plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
M		plugins/flake/pathshapes/rectangle/RectangleShape.cpp
M		plugins/flake/textshape/kotext/styles/KoListLevelProperties.cpp
M		plugins/flake/textshape/kotext/styles/KoParagraphStyle.cpp
M		plugins/flake/textshape/kotext/styles/KoSectionStyle.cpp
M		plugins/impex/exr/tests/kis_exr_test.cpp
M		plugins/impex/heightmap/tests/kis_heightmap_test.cpp
M		plugins/impex/jpeg/tests/kis_jpeg_test.cpp
P		plugins/impex/libkra/tests/data/load_test.kra Copied to libs/ui/tests/data/load_test.kra
M		plugins/impex/libkra/tests/kis_kra_loader_test.cpp
M		plugins/impex/libkra/tests/kis_kra_saver_test.cpp
M		plugins/impex/png/tests/kis_png_test.cpp
M		plugins/impex/ppm/tests/kis_ppm_test.cpp
M		plugins/impex/psd/tests/kis_psd_test.cpp
M		plugins/impex/svg/tests/CMakeLists.txt
M		plugins/impex/svg/tests/kis_svg_test.cpp
M		plugins/impex/tiff/tests/kis_tiff_test.cpp
M		plugins/impex/xcf/tests/kis_xcf_test.cpp
M		plugins/tools/tool_transform2/kis_tool_transform.cc
M		plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
M		plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h
A		sdk/tests/kistest.h
M		sdk/tests/qimage_based_test.h
M		sdk/tests/testutil.h