Merge branch 'dev' into fix-double-promotion

2020-02-09 16:45:20 +01:00
parent 914daffa39 0aec0fe0e9
commit b627adea3a
145 changed files with 4907 additions and 3828 deletions
--- a/rtexif/kodakattribs.cc
+++ b/rtexif/kodakattribs.cc
@@ -1,8 +1,6 @@
 /*
 *  This file is part of RawTherapee.
 */
-#ifndef _KODAKATTRIBS_
-#define _KODAKATTRIBS_

 #include <string.h>
 #include "rtexif.h"
@@ -161,5 +159,4 @@ const TagAttrib kodakIfdAttribs[] = {
 };

 }
-#endif