Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ACGL
acgl
Commits
229a3569
Commit
229a3569
authored
Feb 27, 2013
by
Robert Menzel
Browse files
fixed option not to include OpenEXR loading
parent
6873cc20
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ACGL/OpenGL/Data/TextureDataLoadStore.cc
View file @
229a3569
...
...
@@ -25,11 +25,15 @@
#include <QImageWriter>
#endif
// EXR:
#ifndef ACGL_BUILD_WITH_EXR
#define ACGL_BUILD_WITH_EXR
#endif
//
// OpenEXR:
// Only compile with OpenEXR support if explicitly wanted so.
// Note that the application has to be linked to libIlmImf and libIex and the include path has to be set.
// (in your CMakeLists.txt add:
// ADD_DEFINITIONS(-DACGL_BUILD_WITH_EXR)
// ADD_DEFINITIONS(-I"/usr/include/OpenEXR/")
// SET(LIBRARIES ${LIBRARIES} "-lIlmImf -lIex")
//
#ifdef ACGL_BUILD_WITH_EXR
//#include <ImfInputFile.h>
#include <ImfRgbaFile.h>
...
...
@@ -250,7 +254,7 @@ SharedTextureData loadTextureDataFromRGBE(const std::string &_filename)
SharedTextureData
loadTextureDataFromEXR
(
const
std
::
string
&
_filename
)
{
#ifndef ACGL_BUILD_WITH_EXR
error
()
<<
"can't load EXR file "
<<
_filename
<<
" ACGL was not build with EXR support"
<<
endl
;
error
()
<<
"can't load EXR file "
<<
_filename
<<
" ACGL was not build with EXR support"
<<
std
::
endl
;
return
SharedTextureData
();
#else
SharedTextureData
data
=
SharedTextureData
(
new
TextureData
()
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment