Diffusion Krita 89ab840d816c

Merge branch 'master' into wolthera/T5411-modernise-calligraphy-tool
89ab840d816c
Actions

Authored by woltherav on Apr 28 2017, 1:52 PM.

Description

Merge branch 'master' into wolthera/T5411-modernise-calligraphy-tool

Details

Committed

woltherav

Apr 28 2017, 1:52 PM

Parents

R37:8005a0242786: Merge remote-tracking branch 'origin/master' into kazakov/refactor-alpha…
R37:e9bfb426887a: Merge branch 'master' into wolthera/T5411-modernise-calligraphy-tool

Branches

Unknown

Tags

Unknown

woltherav committed R37:89ab840d816c: Merge branch 'master' into wolthera/T5411-modernise-calligraphy-tool (authored by woltherav).Apr 28 2017, 1:52 PM

Merged Changes

Commit		Author	Details	Committed
8005a0242786	D5610	dkazakov	Merge remote-tracking branch 'origin/master' into kazakov/refactor-alpha…	Apr 28 2017
c4db541cf465		dkazakov	Fix memory leak in the psd saving code	Apr 28 2017
82bcbd7b91dc		fazek	fix CSV file saver crash	Apr 27 2017
da5528ed5d39		rempt	Remove superfluous line	Apr 27 2017
989a4797359b		dkazakov	Fix writing of 16-bit transparency masks to a PSD file	Apr 27 2017
cf54d5bd50de		dkazakov	Rewrite alpha colorspaces using templates and make them correct	Apr 27 2017
1ac04bc1683e		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 27 2017
53967664db91		scottpetrovic	add reset button for curve widget in brush editor. This code was reviewed as…	Apr 26 2017
f22f9ed69406		rempt	Update licensing file for windows packages	Apr 26 2017
9d80ab01c19d		rempt	Update the licensing info: Krita is effectively GPLv3-only	Apr 26 2017
dcb9aab8cb9f		dkazakov	Implement reading of zipped layer transparency masks from PSD	Apr 25 2017
9a4b00c1898e		dkazakov	Small fixes for the PSD test	Apr 25 2017
08427a2b37bb		rempt	BUG:378990 Make it possible to configure a shortcut for the zoom tool	Apr 25 2017
581b87f64698		rempt	BUG:376405 Set correct default values for hsv slider	Apr 25 2017
77540d4be574		rempt	BUG:378134 Check the pointer before dereferencing	Apr 25 2017
3c37f43d9a4f		rempt	BUG:379114 Don't crash when loading images with a file layer	Apr 25 2017

Changes (42)

				Path	Packages
	M			COPYING
	D			COPYING.LIB
	M			README.md
	M			krita/krita.action
	M			libs/libpaintop/forms/wdgcurveoption.ui
	M			libs/libpaintop/kis_curve_option_widget.cpp
	M			libs/libpaintop/kis_curve_option_widget.h
	M			libs/pigment/CMakeLists.txt
	M			libs/pigment/KoColorConversionAlphaTransformation.cpp
	M			libs/pigment/KoColorConversionAlphaTransformation.h
	M			libs/pigment/KoColorConversionSystem.cpp
	M			libs/pigment/KoColorConversionSystem_p.h
	P			libs/pigment/KoColorModelStandardIdsUtils.h Copied from libs/flake/tools/KoInteractionStrategyFactory.cpp
	M			libs/pigment/KoColorSpace.h
	M			libs/pigment/KoColorSpaceFactory.h
	M			libs/pigment/KoColorSpaceRegistry.cpp
	M			libs/pigment/colorspaces/KoAlphaColorSpace.cpp
	V			libs/pigment/colorspaces/{KoAlphaColorSpace.h ← KoAlphaU16ColorSpace.h}
	D			libs/pigment/colorspaces/KoAlphaF16ColorSpace.cpp
	D			libs/pigment/colorspaces/KoAlphaF16ColorSpace.h
	D			libs/pigment/colorspaces/KoAlphaF32ColorSpace.cpp
	D			libs/pigment/colorspaces/KoAlphaF32ColorSpace.h
	D			libs/pigment/colorspaces/KoAlphaU16ColorSpace.cpp
	V			libs/pigment/colorspaces/{KoAlphaU16ColorSpace.h → KoAlphaColorSpace.h}
	M			libs/pigment/colorspaces/KoSimpleColorSpaceFactory.h
	M			libs/pigment/tests/TestColorConversionSystem.cpp
	M			libs/pigment/tests/TestColorConversionSystem.h
	M			libs/ui/KisImportExportManager.cpp
	M			libs/ui/KisPaletteModel.cpp
	D			packaging/windows/license_gpl-2.0.rtf
	A			packaging/windows/license_gpl-3.0.rtf
	M			plugins/color/lcms2engine/LcmsColorSpace.h
	M			plugins/extensions/pykrita/plugin/plugins/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/extensions/pykrita/plugin/plugins/hello/kritapykrita_hello.desktop
	M			plugins/extensions/pykrita/plugin/plugins/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
	M			plugins/impex/csv/csv_saver.cpp
	M			plugins/impex/psd/psd_layer_record.cpp
	M			plugins/impex/psd/psd_layer_record.h
	M			plugins/impex/psd/psd_pixel_utils.cpp
	M			plugins/impex/psd/psd_pixel_utils.h
	M			plugins/impex/psd/tests/kis_psd_test.cpp