From 527c45c68588ba7ce9bfc83dbedeabb17c5507e0 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 2 Jan 2016 14:28:48 +0100 Subject: [PATCH] Build failure on ARM and PowerPC architectures, fixes #3053 --- rtengine/dcraw.cc | 2 +- rtengine/dcraw.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index 9c41e17f9..b1260e307 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -1925,7 +1925,7 @@ void CLASS hasselblad_correct() blur than this, but this does not need any buffer and makes nice-looking radial gradients */ ushort *corners_weight = (ushort *)malloc(bw*bh*9*sizeof(*corners_weight)); - const char corners_mix[9][4][2] = { { {0,0}, {0,1}, {1,0}, {1,1} }, + const int corners_mix[9][4][2] = { { {0,0}, {0,1}, {1,0}, {1,1} }, { {0,1}, {1,1}, {-1,-1}, {-1,-1} }, { {0,1}, {0,2}, {1,1}, {1,2} }, { {1,0}, {1,1}, {-1,-1}, {-1,-1} }, diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch index 5b0a2b2ec..4451e8909 100644 --- a/rtengine/dcraw.patch +++ b/rtengine/dcraw.patch @@ -1,5 +1,5 @@ ---- dcraw.c 2015-11-24 19:17:16 +0000 -+++ dcraw.cc 2015-11-27 12:35:05 +0000 +--- dcraw.c 2016-01-02 12:05:48 +0000 ++++ dcraw.cc 2016-01-02 13:21:21 +0000 @@ -1,3 +1,15 @@ +/*RT*/#include +/*RT*/#include @@ -470,7 +470,7 @@ + blur than this, but this does not need any buffer and makes nice-looking + radial gradients */ + ushort *corners_weight = (ushort *)malloc(bw*bh*9*sizeof(*corners_weight)); -+ const char corners_mix[9][4][2] = { { {0,0}, {0,1}, {1,0}, {1,1} }, ++ const int corners_mix[9][4][2] = { { {0,0}, {0,1}, {1,0}, {1,1} }, + { {0,1}, {1,1}, {-1,-1}, {-1,-1} }, + { {0,1}, {0,2}, {1,1}, {1,2} }, + { {1,0}, {1,1}, {-1,-1}, {-1,-1} },