openimageio: fix build against libraw-0.17.0

This commit is contained in:
Alessio Sergi 2015-08-30 00:33:12 +02:00
parent b3553ff2d1
commit ab94d7954f

View file

@ -0,0 +1,30 @@
From f80e48f22dd58f92a0a9eb9d03cee5c1970af141 Mon Sep 17 00:00:00 2001
From: Christoph Willing <chris.willing@iinet.net.au>
Date: Fri, 21 Aug 2015 22:06:29 +1000
Subject: [PATCH] Only reference LIBRAW_DECODER_FLATFIELD within an #ifdef that
ensures that it is defined
---
src/raw.imageio/rawinput.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git src/raw.imageio/rawinput.cpp src/raw.imageio/rawinput.cpp
index 6295958..1de1081 100644
--- src/raw.imageio/rawinput.cpp
+++ src/raw.imageio/rawinput.cpp
@@ -201,6 +201,7 @@ RawInput::open (const std::string &name, ImageSpec &newspec,
if (demosaic == demosaic_algs[d])
m_processor.imgdata.params.user_qual = d;
else if (demosaic == "none") {
+#ifdef LIBRAW_DECODER_FLATFIELD
// See if we can access the Bayer patterned data for this raw file
libraw_decoder_info_t decoder_info;
m_processor.get_decoder_info(&decoder_info);
@@ -209,6 +210,7 @@ RawInput::open (const std::string &name, ImageSpec &newspec,
return false;
}
+#endif
// User has selected no demosaicing, so no processing needs to be done
m_process = false;