removed OpenEXR support

RenderKit · Nov 11, 2016 · 483491e · 483491e
1 parent 3b64447
commit 483491e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 160 deletions.
diff --git a/common/cmake/FindOpenEXR.cmake b/common/cmake/FindOpenEXR.cmake
diff --git 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
diff --git a/tutorials/common/image/image.cpp b/tutorials/common/image/image.cpp
@@ -26,9 +26,6 @@ namespace embree
   Ref<Image> 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
@@ -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<Image> loadExr(const FileName& fileName);
-
   /*! Loads image from file. Format is auto detected. */
   Ref<Image> loadImage(const FileName& filename, bool cache = false);
 
@@ -171,9 +168,6 @@ namespace embree
   /*! Loads image from TIFF file. */
 //Ref<Image> loadTIFF(const FileName& fileName);
 
-  /*! Store image to EXR file. */
-  void storeExr(const Ref<Image>& img, const FileName& fileName);
-
   /*! Store image to file. Format is auto detected. */
   void storeImage(const Ref<Image>& image, const FileName& filename);