Diffusion digiKam 30be2a8e4c3f

Merge branch 'master' of invent.kde.org:kde/digikam
30be2a8e4c3f
Actions

Authored by cgilles on Jul 12 2019, 2:39 PM.

Description

Merge branch 'master' of invent.kde.org:kde/digikam

Details

Committed

cgilles

Jul 12 2019, 2:39 PM

Parents

R482:de54c441b811: switch script to LANG=C
R482:f74751a58427: add read/write ICC Profile to the ImageMagick loader and catch warnings from…

Branches

Unknown

Tags

Unknown

cgilles committed R482:30be2a8e4c3f: Merge branch 'master' of invent.kde.org:kde/digikam (authored by cgilles).Jul 12 2019, 2:39 PM

Merged Changes

Commit	Author	Details	Committed
f74751a58427	mqualmann	add read/write ICC Profile to the ImageMagick loader and catch warnings from…	Jul 12 2019
d07912bab310	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Jul 12 2019
77e22672b2b1	cgilles	Internal Libraw updated to last stable 0.19.3. New camera supported: Canon A560…	Jul 12 2019
a7c922ea0bfa	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 12 2019

Changes (51)

				Path	Packages
	M			NEWS
	M			core/dplugins/generic/tools/htmlgallery/themes/vanilla/vanilla.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_10.5x14.8cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_10x15cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_20x25cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_8x10.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_9x13cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/2_photos_13x18cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/2_photos_5x7.desktop
	M			core/dplugins/generic/tools/printcreator/templates/3_photos_10x15cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/3_photos_4x6.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4_photos_10x13.33cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4_photos_3.5x5.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4_photos_4.5x5cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4_photos_9x13cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4x6Album.desktop
	M			core/dplugins/generic/tools/printcreator/templates/6_photos_3.5x4.5cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/6_photos_3.5x4cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/8_photos_6x9cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Album-Collage.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Album-Collage1.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Album_10x15cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Album_11.5x15cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/FullPage.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Photoframe.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Thumbnails_5x4.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Thumbnails_6x5.desktop
	M			core/libs/dimg/loaders/magickloader.cpp
	M			core/libs/rawengine/libraw/Changelog.txt
	M			core/libs/rawengine/libraw/README.md
	M			core/libs/rawengine/libraw/internal/dcraw_common.cpp
	M			core/libs/rawengine/libraw/internal/dcraw_fileio.cpp
	M			core/libs/rawengine/libraw/internal/defines.h
	M			core/libs/rawengine/libraw/libraw/libraw.h
	M			core/libs/rawengine/libraw/libraw/libraw_alloc.h
	M			core/libs/rawengine/libraw/libraw/libraw_const.h
	M			core/libs/rawengine/libraw/libraw/libraw_datastream.h
	M			core/libs/rawengine/libraw/libraw/libraw_internal.h
	M			core/libs/rawengine/libraw/libraw/libraw_types.h
	M			core/libs/rawengine/libraw/libraw/libraw_version.h
	M			core/libs/rawengine/libraw/samples/4channels.cpp
	M			core/libs/rawengine/libraw/samples/dcraw_emu.cpp
	M			core/libs/rawengine/libraw/samples/dcraw_half.c
	M			core/libs/rawengine/libraw/samples/half_mt.c
	M			core/libs/rawengine/libraw/samples/half_mt_win32.c
	M			core/libs/rawengine/libraw/samples/mem_image.cpp
	M			core/libs/rawengine/libraw/samples/multirender_test.cpp
	M			core/libs/rawengine/libraw/samples/openbayer_sample.cpp
	M			core/libs/rawengine/libraw/samples/postprocessing_benchmark.cpp
	M			core/libs/rawengine/libraw/samples/raw-identify.cpp
	M			core/libs/rawengine/libraw/samples/simple_dcraw.cpp