Merge branch 'dev' into spot-removal-tool

AUTHORS.txt

@@ -3,8 +3,9 @@ Project initiator:
 
   Gábor Horváth <hgabor@rawtherapee.com>
 
-Developement contributors, in last name alphabetical order:
+Development contributors, in last name alphabetical order:
 
+  Roel Baars
   Martin Burri
   Javier Celaya
   Jacques Desmis
@@ -43,6 +44,7 @@ Other contributors (profiles, ideas, mockups, testing, forum activity, translati
   Rodrigo Nuno Bragança da Cunha
   Pat David
   Reine Edvardsson
+  Andrea Ferrero
   André Gauthier
   Sébastien Guyader
   M. Dávid Gyurkó
@@ -61,4 +63,5 @@ Other contributors (profiles, ideas, mockups, testing, forum activity, translati
   Johan Thor
   Vitalis Tiknius
   TooWaBoo
+  Franz Trischberger
   Colin Walker

CMakeLists.txt

@@ -1,13 +1,11 @@
-if(WIN32)
-    cmake_minimum_required(VERSION 2.8.4)
-elseif(APPLE)
+if(APPLE)
     cmake_minimum_required(VERSION 3.3)
-    CMAKE_POLICY(SET CMP0025 NEW)
+    cmake_policy(SET CMP0025 NEW)
 else()
-    cmake_minimum_required(VERSION 2.6)
+    cmake_minimum_required(VERSION 2.8.8)
 endif()
 
-# Must stay before the PROJECT() command:
+# Must stay before the project() command:
 if(${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
     set(CMAKE_CXX_COMPILER_ARG1 "-std=c++11" CACHE STRING "C++ version for eclipse" FORCE)
     # Users building with Eclipse should set CMAKE_ECLIPSE_VERSION through the
@@ -15,7 +13,7 @@ if(${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
     #set(CMAKE_ECLIPSE_VERSION "4.6.0" CACHE STRING "Eclipse version" FORCE)
 endif()
 
-PROJECT(RawTherapee)
+project(RawTherapee)
 
 # The default target is Debug:
 if(CMAKE_BUILD_TYPE STREQUAL "")
@@ -25,8 +23,8 @@ endif()
 string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE)
 
 # Set required C and C++ standards and check GCC version:
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
     message(FATAL_ERROR "Building RawTherapee requires using GCC version 4.9 or higher!")
@@ -92,6 +90,20 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PROC_FLAGS}")
 # Stop compilation on typos such as std:swap (missing colon will be detected as unused label):
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=unused-label")
 
+# Special treatment for x87 and x86-32 SSE (see GitHub issue #4324)
+include(FindX87Math)
+if(HAVE_X87_MATH)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
+endif()
+if(HAVE_X86_SSE_MATH)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
+endif()
+
+# On i386 Linux we can fix unaligned SSE malloc (see GitHub issue #4432)
+include(FindUnalignedMalloc)
+
 if(WIN32)
     # Add additional paths. Look in the MinGW path first, then in the Gtkmm path.
     # If you wish to build some dependent libraries, you have to install them in MinGW to use them:
@@ -240,6 +252,12 @@ if(DEFINED LENSFUNDBDIR AND NOT IS_ABSOLUTE "${LENSFUNDBDIR}")
     set(LENSFUNDBDIR "${DATADIR}/${LENSFUNDBDIR}")
 endif()
 
+if(APPLE)
+    if("${CODESIGNID}")
+        set(CODESIGNID "${CODESIGNID}" CACHE STRING "Codesigning Identity")
+    endif()
+endif()
+
 # Enforce absolute paths for non-bundle builds:
 if(NOT BUILD_BUNDLE)
     foreach(path BINDIR DATADIR LIBDIR DOCDIR CREDITSDIR LICENCEDIR)
@@ -304,9 +322,9 @@ pkg_check_modules(LCMS REQUIRED lcms2>=2.6)
 pkg_check_modules(EXPAT REQUIRED expat>=2.1)
 pkg_check_modules(FFTW3F REQUIRED fftw3f)
 pkg_check_modules(IPTCDATA REQUIRED libiptcdata)
+pkg_check_modules(TIFF REQUIRED libtiff-4>=4.0.4)
 find_package(JPEG REQUIRED)
 find_package(PNG REQUIRED)
-find_package(TIFF REQUIRED)
 find_package(ZLIB REQUIRED)
 if(WITH_SYSTEM_KLT)
     find_package(KLT REQUIRED)
@@ -323,27 +341,43 @@ if(WITH_MYFILE_MMAP)
 endif()
 
 if(WITH_LTO)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
+    # Using LTO with older versions of binutils requires setting extra flags
+    set(BINUTILS_VERSION_MININUM "2.29")
+    execute_process(COMMAND ar --version OUTPUT_VARIABLE BINUTILS_VERSION_DETECTED)
+    string(REGEX REPLACE ".* ([0-9.]+)\n.*" "\\1" BINUTILS_VERSION_DETECTED "${BINUTILS_VERSION_DETECTED}")
+    if("${BINUTILS_VERSION_DETECTED}" VERSION_LESS "${BINUTILS_VERSION_MININUM}")
+        if(APPLE)
+            set(CMAKE_AR "/opt/local/bin/ar")
+            set(CMAKE_RANLIB "/opt/local/bin/ranlib")
+        else()
+            set(CMAKE_AR "/usr/bin/gcc-ar")
+            set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
+        endif()
+        message(STATUS "Binutils version detected as less than " ${BINUTILS_VERSION_MININUM} " - setting CMake parameters to enable LTO linking:\n    CMAKE_AR=\"" ${CMAKE_AR} "\"\n    CMAKE_RANLIB=\"" ${CMAKE_RANLIB} "\"")
+    endif()
+
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 endif()
 
 if(WITH_SAN)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${WITH_SAN}")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${WITH_SAN}")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${WITH_SAN}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${WITH_SAN}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${WITH_SAN}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${WITH_SAN}")
 endif()
 
 if(WITH_PROF)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
 endif()
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Wno-deprecated-declarations -Wno-unused-result")
 if(OPTION_OMP)
     find_package(OpenMP)
     if(OPENMP_FOUND)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -Werror=unknown-pragmas -Wall -Wno-unused-result -Wno-deprecated-declarations")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -Werror=unknown-pragmas")
     endif()
 endif()
 
@@ -482,7 +516,7 @@ if(WIN32)
 endif()
 
 if(UNIX)
-    install(FILES rawtherapee.appdata.xml DESTINATION "${APPDATADIR}")
+    install(FILES com.rawtherapee.RawTherapee.appdata.xml DESTINATION "${APPDATADIR}")
 endif()
 
 # check whether the used version of lensfun has lfDatabase::LoadDirectory

CONTRIBUTING.md

@@ -16,5 +16,13 @@ The most useful feedback is based on the latest development code, and in the cas
 - Announce and discuss your plans in GitHub before starting work.
 - Work in a new branch. Fork if necessary.
 - Keep branches small so that completed and working features can be merged into the "dev" branch often, and so that they can be abandoned if they head in the wrong direction.
-- Use C++11
+- Use C++11.
+- To break header dependencies use forward declarations as much as possible. See [#5197](https://github.com/Beep6581/RawTherapee/pull/5197#issuecomment-468938190) for some tips.
+- The naming isn't homogeneous throughout the code but here is a rough guideline:
+  - *Identifiers* (variables, functions, methods, keys, enums, etc.) should be clear and unambiguous. Make them as long as necessary to ensure that your code is understandable to others.
+  - *Types* (classes, structs, enums, typedefs...) should be named with `UpperCamelCase`.
+  - *Functions* and *methods* should be named with `lowerCamelCase`.
+  - *Variables* should be either named with `lowerCamelCase` or better with `lower_underscores` to avoid conflicts.
+  - *Enum values* should be named with `UPPER_UNDERSCORES`.
+  - Be consistent, even when not sticking to the rules.
 - Code may be run through astyle version 3 or newer. If using astyle, it is important that the astyle changes go into their own commit, so that style changes are not mixed with actual code changes. Command: `astyle --options=rawtherapee.astylerc code.cc`

LICENSE.txt

@@ -1,6 +1,6 @@
     RawTherapee - A powerful, cross-platform raw image processing program.
     Copyright (C) 2004-2012 Gabor Horvath <hgabor@rawtherapee.com>
-    Copyright (C) 2010-2017 RawTherapee development team.
+    Copyright (C) 2010-2018 RawTherapee development team.
 
     RawTherapee is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

README.md

@@ -1,10 +1,10 @@
 ![RawTherapee logo](http://rawtherapee.com/images/logos/rawtherapee_logo_discuss.png)
 
-RawTherapee is a powerful, cross-platform raw photo processing program, released under the [GNU General Public License Version 3](https://opensource.org/licenses/gpl-3.0.html) and written in C++ using a [GTK+](http://www.gtk.org/) front-end. It uses a patched version of [dcraw](http://www.cybercom.net/~dcoffin/dcraw/) for reading raw files, with an in-house solution which adds the highest quality support for certain camera models unsupported by dcraw and enhances the accuracy of certain raw files already supported by dcraw. It is notable for the advanced control it gives the user over the demosaicing and development process.
+RawTherapee is a powerful, cross-platform raw photo processing program, released as [libre software](https://en.wikipedia.org/wiki/Free_software) under the [GNU General Public License Version 3](https://opensource.org/licenses/gpl-3.0.html). It is written mostly in C++ using a [GTK+](http://www.gtk.org/) front-end. It uses a patched version of [dcraw](http://www.cybercom.net/~dcoffin/dcraw/) for reading raw files, with an in-house solution which adds the highest quality support for certain camera models unsupported by dcraw and enhances the accuracy of certain raw files already supported by dcraw. It is notable for the advanced control it gives the user over the demosaicing and development process.
 
 ## Target audience
 
-RawTherapee is a [libre software](https://en.wikipedia.org/wiki/Free_software) designed for developing raw files from a broad range of digital cameras, as well as [HDR DNG](https://helpx.adobe.com/photoshop/digital-negative.html) files and non-raw image formats ([JPEG](https://en.wikipedia.org/wiki/JPEG), [TIFF](https://en.wikipedia.org/wiki/Tagged_Image_File_Format) and [PNG](https://en.wikipedia.org/wiki/Portable_Network_Graphics)). The target audience ranges from enthusiast newcomers who wish to broaden their understanding of how digital imaging works to semi-professional photographers. Knowledge in color science is not compulsory, but it is recommended that you are eager to learn and ready to read our documentation ([RawPedia](http://rawpedia.rawtherapee.com/)) as well as look up basic concepts which lie outside the scope of RawPedia, such as [color balance](https://en.wikipedia.org/wiki/Color_balance), elsewhere.
+RawTherapee is designed for developing raw files from a broad range of digital cameras, as well as [HDR DNG](https://helpx.adobe.com/photoshop/digital-negative.html) files and non-raw image formats ([JPEG](https://en.wikipedia.org/wiki/JPEG), [TIFF](https://en.wikipedia.org/wiki/Tagged_Image_File_Format) and [PNG](https://en.wikipedia.org/wiki/Portable_Network_Graphics)). The target audience ranges from enthusiast newcomers who wish to broaden their understanding of how digital imaging works to semi-professional photographers. Knowledge in color science is not compulsory, but it is recommended that you are eager to learn and ready to read our documentation ([RawPedia](http://rawpedia.rawtherapee.com/)) as well as look up basic concepts which lie outside the scope of RawPedia, such as [color balance](https://en.wikipedia.org/wiki/Color_balance), elsewhere.
 
 Of course, professionals may use RawTherapee too while enjoying complete freedom, but will probably lack some peripheral features such as [Digital Asset Management](https://en.wikipedia.org/wiki/Digital_asset_management), printing, uploading, etc. RawTherapee is not aimed at being an inclusive all-in-one program, and the [open-source community](https://en.wikipedia.org/wiki/Open-source_movement) is sufficiently developed by now to offer all those peripheral features in other specialized software.
 
@@ -28,9 +28,6 @@ http://rawtherapee.com/downloads
 Download source code tarballs:
 http://rawtherapee.com/shared/source/
 
-Git handbook:
-http://git-scm.com/book/en/
-
 ## Compilation, branches and Git
 Refer to RawPedia for a detailed explanation of how to get the necessary dependencies and how to compile RawTherapee.
 

RELEASE_NOTES.txt

@@ -1,10 +1,9 @@
-RAWTHERAPEE 5.3-dev RELEASE NOTES
------------------------------
+RAWTHERAPEE 5.5-dev RELEASE NOTES
+
 This is a development version of RawTherapee. We update the code almost daily. Every few months, once enough changes have accumulated and the code is stabilized, we make a new official release. Every code change between these releases is known as a "development" version, and this is one of them.
 
-RawTherapee provides you with a selection of powerful tools with which you can practise the art of developing raw photos. Be sure to read RawPedia to understand how each tool works so that you may make the most of it.
+Start by reading the "Getting Started" article on RawPedia:
 http://rawpedia.rawtherapee.com/
-A great place to start is the "Getting Started" article. Click on "Main page" in the top-left corner when you have finished reading that article to see all other articles.
 
 While we only commit tested and relatively stable code and so the development versions should be fairly stable, you should be aware that:
 - Development versions only had limited testing, so there may be bugs unknown to us.
@@ -13,71 +12,78 @@ While we only commit tested and relatively stable code and so the development ve
 - The way new tools work in the development versions is likely to change as we tweak and tune them, so your processing profiles may produce different results when used in a future stable version.
 - Bugs present in the stable versions get fixed in the development versions, and make it into the next stable version when we make a new official release. That means that in some ways the development versions can be "more stable" than the latest stable release. At the same time, new features may introduce new bugs. This is a trade-off you should be aware of.
 
-News Relevant to Photographers
-------------------------------
-RawTherapee supports most raw formats, including Pentax Pixel Shift, Canon Dual-Pixel, and those from Foveon and X-Trans sensors.
+
+
+NEWS RELEVANT TO PHOTOGRAPHERS
+
+RawTherapee supports most raw formats, including Pentax and Sony Pixel Shift, Canon Dual-Pixel, and those from Foveon and X-Trans sensors.
 If you're wondering whether it supports your camera's raw format, first download RawTherapee and try for yourself. If a raw format is not supported it will either not open, or the preview in the Editor tab will appear black, white, or have a strong color cast - usually magenta. In that case, read the "Adding Support for New Raw Formats" RawPedia article.
 
 In order to use RawTherapee efficiently you should know that:
 - You can scroll all panels using the mouse scroll-wheel.
 - You can right-click on a tool's name to automatically expand it while collapsing all others.
 - To change slider values or drop-down list items with the mouse scroll-wheel, hold the Shift key. This is so that you can safely scroll the panels without accidentally changing a slider or other tool setting.
-- All curves support the Shift and Ctrl keys while dragging a point. Shift+drag makes the point snap to meaningful axes (top, bottom, diagonal, other), while Ctrl+drag makes your mouse movement super-fine for precise point positioning.
+- All curves support the Shift and Ctrl keys while dragging a point. Shift+drag makes the point snap to a meaningful axis (top, bottom, diagonal, other), while Ctrl+drag makes your mouse movement super-fine for precise point positioning.
 - There are many keyboard shortcuts which make working with RawTherapee much faster and give you greater control. Make sure you familiarize yourself with them on RawPedia's "Keyboard Shortcuts" page!
 
-New features since 5.3:
-- To be filled in when 5.4 is released.
+New features since 5.5:
+TODO.
+
+
+
+NEWS RELEVANT TO PACKAGE MAINTAINERS
 
-News Relevant to Package Maintainers
-------------------------------------
 In general:
-- Requires GTK+ version >=3.16, though 3.22 is recommended.
+- To get the source code, either clone from git or use the tarball from http://rawtherapee.com/shared/source/ . Do not use the auto-generated GitHub release tarballs.
+- Requires GTK+ version >=3.16, though >=3.22.24 is recommended.
 - RawTherapee 5 requires GCC-4.9 or higher, or Clang.
 - Do not use -ffast-math, it will not make RawTherapee faster but will introduce artifacts.
 - Use -O3, it will make RawTherapee faster with no known side-effects.
 - For stable releases use -DCACHE_NAME_SUFFIX=""
 - For development builds and release-candidates use -DCACHE_NAME_SUFFIX="5-dev"
 
-Changes since 5.2:
-- To be filled in when 5.4 is released.
 
-News Relevant to Developers
----------------------------
-- Announce and discuss your plans in GitHub before starting work.
-- Keep branches small so that completed and working features can be merged into the "dev" branch often, and so that they can be abandoned if they head in the wrong direction.
-- Use C++11.
+
+NEWS RELEVANT TO DEVELOPERS
+
+See CONTRIBUTING.md
+
+
 
 DOCUMENTATION
--------------
-http://rawtherapee.com/blog/documentation
+
 http://rawpedia.rawtherapee.com/
+http://rawtherapee.com/blog/documentation
+
+
 
 REPORTING BUGS
---------------
+
 If you found a problem, don't keep it to yourself. Read the "How to write useful bug reports" article to get the problem fixed:
 http://rawpedia.rawtherapee.com/How_to_write_useful_bug_reports
 
+
+
 FORUM
------
+
 RawTherapee shares a forum with users and developers of other Free/Libre/Open Source Software:
 https://discuss.pixls.us/c/software/rawtherapee
 
+
+
 LIVE CHAT WITH USERS AND DEVELOPERS
---------------------------------------
-  Network: freenode
-  Server:  chat.freenode.net
-  Channel: #rawtherapee
+
+Network: freenode
+Server: chat.freenode.net
+Channel: #rawtherapee
 
 You can use freenode webchat to communicate without installing anything:
 http://webchat.freenode.net/?randomnick=1&channels=rawtherapee&prompt=1
 More information here: http://rawpedia.rawtherapee.com/IRC
 
-SOCIAL NETWORKS
----------------
-Google+
-http://plus.google.com/106783532637761598368
+
 
 REVISION HISTORY
-----------------
+
 The complete changelog is available at:
 https://github.com/Beep6581/RawTherapee/commits/

cmake/modules/FindUnalignedMalloc.cmake

@@ -0,0 +1,49 @@
+# This file is part of RawTherapee.
+#
+# Copyright (C) 2018 Flössie <floessie.mail@gmail.com>
+#
+# RawTherapee 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 3 of the License, or
+# (at your option) any later version.
+#
+# RawTherapee 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 RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+
+include(CheckCXXSourceCompiles)
+
+set(CMAKE_REQUIRED_QUIET_COPY "${CMAKE_REQUIRED_QUIET}")
+set(CMAKE_REQUIRED_QUIET ON)
+
+set(TEST_SOURCE
+"
+#include <cstddef>
+#include <type_traits>
+
+int main()
+{
+#if defined(__SSE2__) && (defined(__i386) || defined(_M_IX86)) && defined(__linux)
+    static_assert(std::alignment_of<std::max_align_t>::value >= 16, \"Unaligned heap objects possible\");
+#endif
+
+    return 0;
+}
+")
+
+CHECK_CXX_SOURCE_COMPILES("${TEST_SOURCE}" HAVE_ALIGNED_MALLOC)
+
+if(NOT HAVE_ALIGNED_MALLOC)
+    set(HAVE_UNALIGNED_MALLOC 1)
+else()
+    unset(HAVE_ALIGNED_MALLOC)
+endif()
+
+unset(TEST_SOURCE)
+
+set(CMAKE_REQUIRED_QUIET "${CMAKE_REQUIRED_QUIET_COPY}")
+unset(CMAKE_REQUIRED_QUIET_COPY)

cmake/modules/FindX87Math.cmake

@@ -0,0 +1,60 @@
+# This file is part of RawTherapee.
+#
+# Copyright (C) 2018 Flössie <floessie.mail@gmail.com>
+#
+# RawTherapee 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 3 of the License, or
+# (at your option) any later version.
+#
+# RawTherapee 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 RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+
+include(CheckCXXSourceCompiles)
+
+set(CMAKE_REQUIRED_QUIET_COPY "${CMAKE_REQUIRED_QUIET}")
+set(CMAKE_REQUIRED_QUIET ON)
+
+set(TEST_SOURCE
+"
+#if !defined(__i386) && !defined(_M_IX86)
+#error
+#endif
+
+#if defined(__SSE2__)
+#error
+#endif
+
+int main()
+{
+}
+")
+
+CHECK_CXX_SOURCE_COMPILES("${TEST_SOURCE}" HAVE_X87_MATH)
+
+set(TEST_SOURCE
+"
+#if !defined(__i386) && !defined(_M_IX86)
+#error
+#endif
+
+#if !defined(__SSE2__)
+#error
+#endif
+
+int main()
+{
+}
+")
+
+CHECK_CXX_SOURCE_COMPILES("${TEST_SOURCE}" HAVE_X86_SSE_MATH)
+
+unset(TEST_SOURCE)
+
+set(CMAKE_REQUIRED_QUIET "${CMAKE_REQUIRED_QUIET_COPY}")
+unset(CMAKE_REQUIRED_QUIET_COPY)

com.rawtherapee.RawTherapee.appdata.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>com.rawtherapee.RawTherapee</id>
+    <name>RawTherapee</name>
+    <summary>An advanced raw photo development program</summary>
+    <summary xml:lang="cs">Program pro konverzi a zpracování digitálních raw fotografií</summary>
+    <summary xml:lang="fr">Logiciel de conversion et de traitement de photos numériques de format raw (but de capteur)</summary>
+    <summary xml:lang="pl">Zaawansowany program do wywoływania zdjęć typu raw</summary>
+    <translation type="gettext">rawtherapee</translation>
+    <description>
+        <p>
+            RawTherapee is a powerful, cross-platform raw photo processing program. It is written mostly in C++ using a GTK+ front-end. It uses a patched version of dcraw for reading raw files, with an in-house solution which adds the highest quality support for certain camera models unsupported by dcraw and enhances the accuracy of certain raw files already supported by dcraw. It is notable for the advanced control it gives the user over the demosaicing and development process.
+        </p>
+        <p>
+            RawTherapee is designed for developing raw files from a broad range of digital cameras, as well as HDR DNG files and non-raw image formats (JPEG, TIFF and PNG). The target audience ranges from enthusiast newcomers who wish to broaden their understanding of how digital imaging works to semi-professional photographers. Knowledge in color science is not compulsory, but it is recommended that you are eager to learn and ready to read our documentation (RawPedia) as well as look up basic concepts which lie outside the scope of RawPedia, such as color balance, elsewhere.
+        </p>
+        <p>
+            Of course, professionals may use RawTherapee too while enjoying complete freedom, but will probably lack some peripheral features such as Digital Asset Management, printing, uploading, etc. RawTherapee is not aimed at being an inclusive all-in-one program, and the open-source community is sufficiently developed by now to offer all those peripheral features in other specialized software.
+        </p>
+    </description>
+    <keywords>
+        <keyword>raw</keyword>
+        <keyword>photo</keyword>
+        <keyword>photography</keyword>
+        <keyword>develop</keyword>
+        <keyword>pp3</keyword>
+        <keyword>graphics</keyword>
+    </keywords>
+    <metadata_license>CC-BY-SA-4.0</metadata_license>
+    <project_license>GPL-3.0+</project_license>
+    <url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url>
+    <url type="donation">https://www.paypal.me/rawtherapee</url>
+    <url type="help">http://rawpedia.rawtherapee.com/</url>
+    <url type="homepage">http://rawtherapee.com/</url>
+    <url type="translate">https://discuss.pixls.us/t/localization-how-to-translate-rawtherapee-and-rawpedia/2594</url>
+    <launchable type="desktop-id">rawtherapee.desktop</launchable>
+    <releases>
+        <release version="5.5" date="2018-12-17" type="stable"></release>
+    </releases>
+    <provides>
+        <binary>rawtherapee</binary>
+        <binary>rawtherapee-cli</binary>
+    </provides>
+    <screenshots>
+        <screenshot type="default">
+            <caption>HDR DNG of a misty morning in the countryside</caption>
+            <image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_1.jpg</image>
+        </screenshot>
+        <screenshot>
+            <caption>Straight-out-of-camera vs RawTherapee</caption>
+            <image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_2.jpg</image>
+        </screenshot>
+        <screenshot>
+            <caption>RawTherapee using the Auto-Matched Tone Curve tool</caption>
+            <image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_3.jpg</image>
+        </screenshot>
+    </screenshots>
+    <update_contact>contactus@rawtherapee.com</update_contact>
+</component>

rawtherapee.appdata.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017 Maciej Dworak www.rawtherapee.com -->
-<component>
-    <id type="desktop">rawtherapee.desktop</id>
-    <metadata_license>CC-BY-SA-4.0</metadata_license>
-    <project_license>GPL-3.0+</project_license>
-    <name>RawTherapee</name>
-    <summary>A powerful cross-platform raw image processing program</summary>
-    <description>
-        <p>
-            RawTherapee is a powerful raw image processing program. All the internal calculations are done in a high precision 32-bit floating point engine which facilitates non-destructive editing. Images are opened directly without the hassle of having to import them. Adjustments made by the user are immediately reflected in the preview and saved to a separate sidecar file. These adjustments are then applied during the export process, or can be copied (fully and partially) onto other images, thereby allowing easy batch image processing.
-        </p>
-        <p>
-            All aspects of RawTherapee are documented in the RawPedia wiki. There is also an active forum and IRC channel for interaction with the developers and other users.
-        </p>
-    </description>
-    <screenshots>
-        <screenshot type="default">
-            <image>http://rawpedia.rawtherapee.com/images/9/99/Rt-5-misty1.jpg</image>
-        </screenshot>
-        <screenshot>
-            <image>http://rawpedia.rawtherapee.com/images/2/2f/Rt-5-cc24-lcp.jpg</image>
-        </screenshot>
-        <screenshot>
-            <image>http://rawtherapee.com/images/screenshots/rt-42_07-hdr-landscape.jpg</image>
-        </screenshot>
-        <screenshot>
-            <image>http://rawtherapee.com/images/screenshots/rt-42_03-macro-detail-toning.jpg</image>
-        </screenshot>
-        <screenshot>
-            <image>http://rawtherapee.com/images/screenshots/rt-42_05-cow-bw-toning.jpg</image>
-        </screenshot>
-        <screenshot>
-            <image>http://rawtherapee.com/images/screenshots/rt-42_08-fb-metadata.jpg</image>
-        </screenshot>
-        <screenshot>
-            <image>http://rawtherapee.com/images/screenshots/rt-42_09-queue.jpg</image>
-        </screenshot>
-    </screenshots>
-    <keywords>
-        <keyword>raw</keyword>
-        <keyword>photography</keyword>
-        <keyword>develop</keyword>
-        <keyword>pp3</keyword>
-        <keyword>graphics</keyword>
-    </keywords>
-    <url type="homepage">http://rawtherapee.com/</url>
-    <update_contact>contactus@rawtherapee.com</update_contact>
-</component>

rtdata/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 file(GLOB LANGUAGEFILES "languages/*")
 file(GLOB SOUNDFILES "sounds/*")
 file(GLOB INPUTICCFILES "iccprofiles/input/*")
@@ -7,11 +6,17 @@ file(GLOB DCPFILES "dcpprofiles/*")
 file(GLOB FONTS "fonts/*")
 
 set(PROFILESDIR "profiles")
-set(IMAGESDIR "images")
-
-# THEMEDIR includes subfolders for image resources for some themes; doing the normal glob won't work.
 set(THEMEDIR "themes")
 
+# Images, mostly icons, which are generated using the generatePngIcons script:
+set(IMAGES_THEMED
+    "images/themed/png/dark"
+    "images/themed/png/light"
+    )
+
+# Other images which are generated manually:
+file(GLOB IMAGES_NONTHEMED "images/non-themed/png/*")
+
 if(WIN32)
     set(OPTIONSFILE "options/options.win")
 elseif(APPLE)
@@ -25,17 +30,15 @@ if(WIN32)
 endif()
 
 if(UNIX)
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/icons/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop" DESTINATION ${DESKTOPDIR})
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi16-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/16x16/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi24-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/24x24/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi32-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/32x32/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi48-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/48x48/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi128-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/128x128/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi256-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/256x256/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-16.png" DESTINATION "${ICONSDIR}/hicolor/16x16/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-24.png" DESTINATION "${ICONSDIR}/hicolor/24x24/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-48.png" DESTINATION "${ICONSDIR}/hicolor/48x48/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-128.png" DESTINATION "${ICONSDIR}/hicolor/128x128/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-256.png" DESTINATION "${ICONSDIR}/hicolor/256x256/apps" RENAME rawtherapee.png)
 endif()
 
-install(FILES ${IMAGEFILES} DESTINATION "${DATADIR}/images")
 install(FILES ${LANGUAGEFILES} DESTINATION "${DATADIR}/languages")
 install(FILES ${SOUNDFILES} DESTINATION "${DATADIR}/sounds")
 install(FILES ${INPUTICCFILES} DESTINATION "${DATADIR}/iccprofiles/input")
@@ -48,8 +51,14 @@ endif()
 
 install(DIRECTORY ${PROFILESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.pp3")
 install(DIRECTORY ${THEMEDIR} DESTINATION "${DATADIR}")
-install(DIRECTORY ${IMAGESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "index.theme")
-install(DIRECTORY ${IMAGESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.png")
+
+foreach(theme ${IMAGES_THEMED})
+    install(DIRECTORY ${theme} DESTINATION "${DATADIR}/images")
+endforeach()
+
+#install(DIRECTORY ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images" FILES_MATCHING PATTERN "*.png")
+#install(DIRECTORY ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images/")
+install(FILES ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images")
 
 if(APPLE)
     # CMake escapes first item quote character. Do not remove 'DUMMY_VARIABLE='

rtdata/dcpprofiles/camera_model_aliases.json

@@ -0,0 +1,34 @@
+{
+    "Canon EOS 100D": ["Canon EOS Kiss X7", "Canon EOS REBEL SL1"],
+    "Canon EOS 200D": ["Canon EOS Kiss X9", "Canon EOS Rebel SL2"],
+    "Canon EOS 300D": ["Canon EOS Kiss Digital", "Canon EOS Digital Rebel"],
+    "Canon EOS 350D": ["Canon EOS 350D DIGITAL", "Canon EOS Kiss Digital N", "Canon EOS DIGITAL REBEL XT"],
+    "Canon EOS 400D": ["Canon EOS 400D DIGITAL", "Canon EOS Kiss Digital X", "Canon EOS DIGITAL REBEL XTi"],
+    "Canon EOS 450D": ["Canon EOS Kiss Digital X2", "Canon EOS Kiss X2", "Canon EOS DIGITAL REBEL XSi"],
+    "Canon EOS 500D": ["Canon EOS Kiss X3", "Canon EOS REBEL T1i"],
+    "Canon EOS 550D": ["Canon EOS Kiss X4", "Canon EOS REBEL T2i"],
+    "Canon EOS 600D": ["Canon EOS Kiss X5", "Canon EOS REBEL T3i"],
+    "Canon EOS 650D": ["Canon EOS Kiss X6i", "Canon EOS REBEL T4i"],
+    "Canon EOS 700D": ["Canon EOS Kiss X7i", "Canon EOS REBEL T5i"],
+    "Canon EOS 750D": ["Canon EOS Kiss X8i", "Canon EOS Rebel T6i"],
+    "Canon EOS 760D": ["Canon EOS 8000D", "Canon EOS Rebel T6s"],
+    "Canon EOS 800D": ["Canon EOS Kiss X9i", "Canon EOS Rebel T7i"],
+    "Canon EOS 1000D": ["Canon EOS Kiss Digital F", "Canon EOS DIGITAL REBEL XS"],
+    "Canon EOS 1200D": ["Canon EOS Kiss X70", "Canon EOS REBEL T5"],
+    "Canon EOS 1300D": ["Canon EOS Kiss X80", "Canon EOS Rebel T6"],
+
+    "MINOLTA DYNAX 5D": ["Minolta Maxxum 5D", "Minolta Alpha 5D", "Minolta Alpha Sweet"],
+    "MINOLTA DYNAX 7D": ["Minolta Maxxum 7D", "Minolta Alpha 7D"],
+
+    "NIKON D800E": ["NIKON D800"],
+
+    "Panasonic DC-FZ82": ["Panasonic DMC-FZ80", "Panasonic DMC-FZ85"],
+    "Panasonic DC-TZ91": ["Panasonic DC-TZ90", "Panasonic DC-TZ92", "Panasonic DC-TZ93", "Panasonic DC-ZS70"],
+    "Panasonic DMC-G8": ["Panasonic DMC-G80", "Panasonic DMC-G81", "Panasonic DMC-G85"],
+    "Panasonic DMC-GX85": ["Panasonic DMC-GX80", "Panasonic DMC-GX7MK2"],
+    "Panasonic DMC-LX15": ["Panasonic DMC-LX9", "Panasonic DMC-LX10"],
+    "Panasonic DC-TZ100": ["Panasonic DC-ZS100", "Panasonic DC-ZS110", "Panasonic DC-TZ101", "Panasonic DC-TZ110"],
+    "Panasonic DMC-TZ61": ["Panasonic DMC-TZ60", "Panasonic DMC-ZS40"],
+    "Panasonic DMC-TZ71": ["Panasonic DMC-TZ70", "Panasonic DMC-ZS50"],
+    "Panasonic DMC-TZ81": ["Panasonic DMC-TZ80", "Panasonic DMC-TZ85", "Panasonic DMC-ZS60"]
+}