Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:58:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Android compilation fix

Browse source
This commit is contained in:
Olivier Prat 2019-03-27 08:15:07 +01:00
parent a93a081a9d
commit 12e8056e1f
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/image/src/image/Image.cpp
View file

@ -26,8 +26,9 @@
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include "TGAReader.h" #include "TGAReader.h"
#if !defined(Q_OS_ANDROID)
#include "OpenEXRReader.h" #include "OpenEXRReader.h"
#endif
#include "ImageLogging.h" #include "ImageLogging.h"
using namespace gpu; using namespace gpu;
@ -249,12 +250,15 @@ QImage processRawImageData(QIODevice& content, const std::string& filename) {
return image; return image;
} }
content.reset(); content.reset();
} else if (filenameExtension == "exr") { }
#if !defined(Q_OS_ANDROID)
else if (filenameExtension == "exr") {
QImage image = image::readOpenEXR(content, filename); QImage image = image::readOpenEXR(content, filename);
if (!image.isNull()) { if (!image.isNull()) {
return image; return image;
} }
} }
#endif
QImageReader imageReader(&content, filenameExtension.c_str()); QImageReader imageReader(&content, filenameExtension.c_str());

6
libraries/image/src/image/OpenEXRReader.cpp
View file

@ -17,6 +17,8 @@
#include <QIODevice> #include <QIODevice>
#include <QDebug> #include <QDebug>
#if !defined(Q_OS_ANDROID)
#include <OpenEXR/ImfIO.h> #include <OpenEXR/ImfIO.h>
#include <OpenEXR/ImfRgbaFile.h> #include <OpenEXR/ImfRgbaFile.h>
#include <OpenEXR/ImfArray.h> #include <OpenEXR/ImfArray.h>
@ -54,7 +56,10 @@ private:
QIODevice& _device; QIODevice& _device;
}; };
#endif
QImage image::readOpenEXR(QIODevice& content, const std::string& filename) { QImage image::readOpenEXR(QIODevice& content, const std::string& filename) {
#if !defined(Q_OS_ANDROID)
QIODeviceImfStream device(content, filename); QIODeviceImfStream device(content, filename);
if (Imf::isOpenExrFile(device)) { if (Imf::isOpenExrFile(device)) {
@ -88,6 +93,7 @@ QImage image::readOpenEXR(QIODevice& content, const std::string& filename) {
} else { } else {
qWarning(imagelogging) << "OpenEXR - File " << filename.c_str() << " doesn't have the proper format"; qWarning(imagelogging) << "OpenEXR - File " << filename.c_str() << " doesn't have the proper format";
} }
#endif
return QImage(); return QImage();
} }