diff --git a/common/cmake/FindOpenEXR.cmake b/common/cmake/FindOpenEXR.cmake deleted file mode 100644 index ab4acb4375..0000000000 --- a/common/cmake/FindOpenEXR.cmake +++ /dev/null @@ -1,44 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2016 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -SET(LIBRARY_PATHS - /usr/lib /usr/local/lib /opt/local/lib) - -FIND_PATH(OPENEXR_INCLUDE_DIR ImfHeader.h - /usr/include /usr/include/OpenEXR - /usr/local/include /usr/local/include/OpenEXR - /opt/local/include /opt/local/include/OpenEXR) - -FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS ${LIBRARY_PATHS}) -FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS ${LIBRARY_PATHS}) -FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS ${LIBRARY_PATHS}) -FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS ${LIBRARY_PATHS}) -FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread PATHS ${LIBRARY_PATHS}) - -SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}) -SET(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY}) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENEXR DEFAULT_MSG OPENEXR_INCLUDE_DIR OPENEXR_HALF_LIBRARY OPENEXR_IEX_LIBRARY OPENEXR_IMATH_LIBRARY OPENEXR_ILMIMF_LIBRARY OPENEXR_ILMTHREAD_LIBRARY) - -MARK_AS_ADVANCED( - OPENEXR_INCLUDE_DIR - OPENEXR_HALF_LIBRARY - OPENEXR_IEX_LIBRARY - OPENEXR_IMATH_LIBRARY - OPENEXR_ILMIMF_LIBRARY - OPENEXR_ILMTHREAD_LIBRARY -) diff --git a/tutorials/common/image/CMakeLists.txt b/tutorials/common/image/CMakeLists.txt index d2cd6bf063..b84eb11590 100644 --- a/tutorials/common/image/CMakeLists.txt +++ b/tutorials/common/image/CMakeLists.txt @@ -43,15 +43,6 @@ IF (EMBREE_TUTORIALS_LIBJPEG) SET(ADDITIONAL_SOURCES ${ADDITIONAL_SOURCES} jpeg.cpp) ENDIF (EMBREE_TUTORIALS_LIBJPEG) -FIND_PACKAGE(OpenEXR) -CMAKE_DEPENDENT_OPTION(EMBREE_TUTORIALS_OPENEXR "Enables OpenEXR image codec." ON "OPENEXR_FOUND" OFF) -IF (EMBREE_TUTORIALS_OPENEXR) - ADD_DEFINITIONS(-DEMBREE_TUTORIALS_OPENEXR) - INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIRS}) - SET(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${OPENEXR_LIBRARIES}) - SET(ADDITIONAL_SOURCES ${ADDITIONAL_SOURCES} exr.cpp) -ENDIF (EMBREE_TUTORIALS_OPENEXR) - FIND_PACKAGE(PNG) CMAKE_DEPENDENT_OPTION(EMBREE_TUTORIALS_LIBPNG "Enables PNG image codecs." ON "PNG_FOUND" OFF) IF (EMBREE_TUTORIALS_LIBPNG) diff --git a/tutorials/common/image/exr.cpp b/tutorials/common/image/exr.cpp deleted file mode 100644 index b7dfdfd9b8..0000000000 --- a/tutorials/common/image/exr.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// ======================================================================== // -// Copyright 2009-2016 Intel Corporation // -// // -// Licensed under the Apache License, Version 2.0 (the "License"); // -// you may not use this file except in compliance with the License. // -// You may obtain a copy of the License at // -// // -// http://www.apache.org/licenses/LICENSE-2.0 // -// // -// Unless required by applicable law or agreed to in writing, software // -// distributed under the License is distributed on an "AS IS" BASIS, // -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // -// See the License for the specific language governing permissions and // -// limitations under the License. // -// ======================================================================== // - -#ifdef EMBREE_TUTORIALS_OPENEXR - -#include "image.h" - -#if defined(__clang__) - #pragma clang diagnostic ignored "-Wdeprecated-register" -#endif - -/* include OpenEXR headers */ -#ifdef __WIN32__ -#include -#include -#pragma comment (lib, "Half.lib") -#pragma comment (lib, "Iex.lib") -#pragma comment (lib, "IlmImf.lib") -#pragma comment (lib, "IlmThread.lib") -#pragma comment (lib, "Imath.lib") -#pragma comment (lib, "zlib.lib") -#else -#include -#include -#endif - -namespace embree -{ - /*! load an EXR file from disk */ - Ref loadExr(const FileName& filename) - { - Imf::RgbaInputFile file (filename.c_str()); - Imath::Box2i dw = file.dataWindow(); - ssize_t width = dw.max.x - dw.min.x + 1; - ssize_t height = dw.max.y - dw.min.y + 1; - - Imf::Array2D pixels(height, width); - file.setFrameBuffer (&pixels[0][0] - dw.min.x - dw.min.y * width, 1, width); - file.readPixels (dw.min.y, dw.max.y); - - Ref img = new Image3f(width,height,filename); - - if (file.lineOrder() == Imf::INCREASING_Y) { - for (ssize_t y=0; yset(x,y,Color4(c.r,c.g,c.b,c.a)); - } - } - } - else { - for (ssize_t y=0; yset(x,height-y-1,Color4(c.r,c.g,c.b,c.a)); - } - } - } - - return img; - } - - /*! store an EXR file to disk */ - void storeExr(const Ref& img, const FileName& filename) - { - Imf::Array2D pixels(img->height,img->width); - for (size_t y=0; yheight; y++) { - for (size_t x=0; xwidth; x++) { - const Color4 c = img->get(x,y); - pixels[y][x] = Imf::Rgba(c.r,c.g,c.b,c.a); - } - } - - Imf::RgbaOutputFile file(filename.c_str(), img->width, img->height, Imf::WRITE_RGBA); - file.setFrameBuffer(&pixels[0][0], 1, img->width); - file.writePixels(img->height); - } -} - -#endif // EMBREE_TUTORIALS_OPENEXR - diff --git a/tutorials/common/image/image.cpp b/tutorials/common/image/image.cpp index cc18baaab6..6a66afc6b9 100644 --- a/tutorials/common/image/image.cpp +++ b/tutorials/common/image/image.cpp @@ -26,9 +26,6 @@ namespace embree Ref loadImageFromDisk(const FileName& fileName) { std::string ext = toLowerCase(fileName.ext()); -#ifdef EMBREE_TUTORIALS_OPENEXR - if (ext == "exr" ) return loadExr(fileName); -#endif #ifdef EMBREE_TUTORIALS_LIBPNG if (ext == "png" ) return loadPNG(fileName); @@ -72,10 +69,6 @@ namespace embree { std::string ext = toLowerCase(fileName.ext()); -#ifdef EMBREE_TUTORIALS_OPENEXR - if (ext == "exr" ) { storeExr(img, fileName); return; } -#endif - #ifdef EMBREE_TUTORIALS_LIBJPEG if (ext == "jpg" ) { storeJPEG(img, fileName); return; } #endif diff --git a/tutorials/common/image/image.h b/tutorials/common/image/image.h index 2e12ed5c09..b9814274c9 100644 --- a/tutorials/common/image/image.h +++ b/tutorials/common/image/image.h @@ -147,9 +147,6 @@ namespace embree /*! Generate a JPEG encoded image from a RGB8 buffer in memory. */ void encodeRGB8_to_JPEG(unsigned char *image, size_t width, size_t height, unsigned char **encoded, unsigned long *capacity); - /*! Loads image from EXR file. */ - Ref loadExr(const FileName& fileName); - /*! Loads image from file. Format is auto detected. */ Ref loadImage(const FileName& filename, bool cache = false); @@ -171,9 +168,6 @@ namespace embree /*! Loads image from TIFF file. */ //Ref loadTIFF(const FileName& fileName); - /*! Store image to EXR file. */ - void storeExr(const Ref& img, const FileName& fileName); - /*! Store image to file. Format is auto detected. */ void storeImage(const Ref& image, const FileName& filename);