Merge branch 'dev' into spot-removal-tool

2019-12-08 00:37:54 +01:00
parent 1cf62a2a65 ba36a92240
commit c23f976302
463 changed files with 16158 additions and 10338 deletions
--- a/rtengine/image16.cc
+++ b/rtengine/image16.cc
@@ -16,11 +16,13 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
+#include <cstdio>
+
+#include "colortemp.h"
 #include "image16.h"
 #include "imagefloat.h"
 #include "image8.h"
-#include <cstdio>
-#include "rtengine.h"
+#include "rt_math.h"

 namespace
 {