From 12e8056e1f5e6febbae672f32d4cba81e9887e51 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 27 Mar 2019 08:15:07 +0100
Subject: [PATCH] Android compilation fix

---
 libraries/image/src/image/Image.cpp         | 8 ++++++--
 libraries/image/src/image/OpenEXRReader.cpp | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libraries/image/src/image/Image.cpp b/libraries/image/src/image/Image.cpp
index e8c6760adb..4154a46c8d 100644
--- a/libraries/image/src/image/Image.cpp
+++ b/libraries/image/src/image/Image.cpp
@@ -26,8 +26,9 @@
 #include <GLMHelpers.h>
 
 #include "TGAReader.h"
+#if !defined(Q_OS_ANDROID)
 #include "OpenEXRReader.h"
-
+#endif
 #include "ImageLogging.h"
 
 using namespace gpu;
@@ -249,12 +250,15 @@ QImage processRawImageData(QIODevice& content, const std::string& filename) {
             return image;
         }
         content.reset();
-    } else if (filenameExtension == "exr") {
+    } 
+#if !defined(Q_OS_ANDROID)
+    else if (filenameExtension == "exr") {
         QImage image = image::readOpenEXR(content, filename);
         if (!image.isNull()) {
             return image;
         }
     }
+#endif
 
     QImageReader imageReader(&content, filenameExtension.c_str());
 
diff --git a/libraries/image/src/image/OpenEXRReader.cpp b/libraries/image/src/image/OpenEXRReader.cpp
index 790372b736..14b5f52b1d 100644
--- a/libraries/image/src/image/OpenEXRReader.cpp
+++ b/libraries/image/src/image/OpenEXRReader.cpp
@@ -17,6 +17,8 @@
 #include <QIODevice>
 #include <QDebug>
 
+#if !defined(Q_OS_ANDROID)
+
 #include <OpenEXR/ImfIO.h>
 #include <OpenEXR/ImfRgbaFile.h>
 #include <OpenEXR/ImfArray.h>
@@ -54,7 +56,10 @@ private:
     QIODevice&  _device;
 };
 
+#endif
+
 QImage image::readOpenEXR(QIODevice& content, const std::string& filename) {
+#if !defined(Q_OS_ANDROID)
     QIODeviceImfStream device(content, filename);
 
     if (Imf::isOpenExrFile(device)) {
@@ -88,6 +93,7 @@ QImage image::readOpenEXR(QIODevice& content, const std::string& filename) {
     } else {
         qWarning(imagelogging) << "OpenEXR - File " << filename.c_str() << " doesn't have the proper format";
     }
+#endif
 
     return QImage();
 }