liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partly revert rtengine/dcraw.cc and astyle again

Browse Source 
Also recreate `dcraw.patch` as suggested by Ingo.
This commit is contained in:
Flössie
2016-07-09 17:42:59 +02:00
parent 2e9f3fb9dc
commit e129510b62
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/dcraw.patch
View File

@@ -1,5 +1,5 @@
--- dcraw.c 2016-06-29 12:25:09 +0000
+++ dcraw.cc 2016-07-06 12:30:27 +0000
--- dcraw.c 2016-06-04 20:34:18.405932434 +0200
+++ dcraw.cc 2016-07-09 17:40:46.405632563 +0200
@@ -1,3 +1,16 @@
+/*RT*/#include <glib.h>
+/*RT*/#include <glib/gstdio.h>
@@ -153,7 +153,7 @@
+#define MIN(a,b) rtengine::min(a,static_cast<__typeof__(a)>(b))
+#define MAX(a,b) rtengine::max(a,static_cast<__typeof__(a)>(b))
+#define LIM(x,min,max) rtengine::LIM(x,static_cast<__typeof__(x)>(min),static_cast<__typeof__(x)>(max))
+#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<__typeof__(x)>(y),static_cast<__typeof__(x)>(z))
+#define ULIM(x,y,z) rtengine::median(x,static_cast<__typeof__(x)>(y),static_cast<__typeof__(x)>(z))
+#define CLIP(x) rtengine::CLIP(x)
#define SWAP(a,b) { a=a+b; b=a-b; a=a-b; }