summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2021-08-31 14:01:27 +0200
committerSlávek Banko <[email protected]>2021-08-31 14:01:44 +0200
commit009f17d837597a72c6ef1152d1a2dc491d6febd0 (patch)
treeaac5f47d3f88e4b967ae8b54fa26cb65cd0dcd30
parent553c340a1916bbf6ff386cd6c0291301b88d9fab (diff)
downloadlibkdcraw-009f17d837597a72c6ef1152d1a2dc491d6febd0.tar.gz
libkdcraw-009f17d837597a72c6ef1152d1a2dc491d6febd0.zip
Fix FTBFS in dcraw and test.r14.0.11
This resolves issue #3. Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 5d4026f547b8bb62556d5bc818a8c56d5591b6f1)
-rw-r--r--libkdcraw/dcraw/dcraw.c4
-rw-r--r--libkdcraw/test/CMakeLists.txt5
2 files changed, 7 insertions, 2 deletions
diff --git a/libkdcraw/dcraw/dcraw.c b/libkdcraw/dcraw/dcraw.c
index 1b9dce6..36dcc71 100644
--- a/libkdcraw/dcraw/dcraw.c
+++ b/libkdcraw/dcraw/dcraw.c
@@ -3935,7 +3935,7 @@ void CLASS vng_interpolate()
signed char y1, x1, y2, x2, weight;
unsigned char grads;
};
- static const interpolate_terms terms[] = {
+ static const struct interpolate_terms terms[] = {
{-2,-2,+0,-1,0,0x01}, {-2,-2,+0,+0,1,0x01}, {-2,-1,-1,+0,0,0x01},
{-2,-1,+0,-1,0,0x02}, {-2,-1,+0,+0,0,0x03}, {-2,-1,+0,+1,1,0x01},
{-2,+0,+0,-1,0,0x06}, {-2,+0,+0,+0,1,0x02}, {-2,+0,+0,+1,0,0x03},
@@ -3959,7 +3959,7 @@ void CLASS vng_interpolate()
{+1,-1,+1,+1,0,0x88}, {+1,+0,+1,+2,0,0x08}, {+1,+0,+2,-1,0,0x40},
{+1,+0,+2,+1,0,0x10}
};
- const interpolate_terms *cpt;
+ const struct interpolate_terms *cpt;
signed char *cp;
signed char chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
ushort (*brow[5])[4], *pix;
diff --git a/libkdcraw/test/CMakeLists.txt b/libkdcraw/test/CMakeLists.txt
index c412d45..2e4a718 100644
--- a/libkdcraw/test/CMakeLists.txt
+++ b/libkdcraw/test/CMakeLists.txt
@@ -6,6 +6,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/libkdcraw/libkdcraw
)
+include_directories( SYSTEM
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
##### test programs