Drop unsupported imageio from grfmt

CMakeLists.txt

@@ -120,7 +120,6 @@ OCV_OPTION(WITH_EIGEN          "Include Eigen2/Eigen3 support"               ON)
 OCV_OPTION(WITH_FFMPEG         "Include FFMPEG support"                      ON   IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_GSTREAMER      "Include Gstreamer support"                   ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_GTK            "Include GTK support"                         ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
-OCV_OPTION(WITH_IMAGEIO        "ImageIO support for OS X"                    OFF  IF APPLE)
 OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   OFF  IF (MSVC OR X86 OR X86_64) )
 OCV_OPTION(WITH_JASPER         "Include JPEG2K support"                      ON   IF (NOT IOS) )
 OCV_OPTION(WITH_JPEG           "Include JPEG support"                        ON   IF (NOT IOS) )

cmake/templates/cvconfig.h.cmake

@@ -58,9 +58,6 @@
 /* OpenEXR codec */
 #cmakedefine  HAVE_ILMIMF
 
-/* Apple ImageIO Framework */
-#cmakedefine  HAVE_IMAGEIO
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine  HAVE_INTTYPES_H 1
 

modules/highgui/CMakeLists.txt

@@ -171,13 +171,6 @@ if(HAVE_PVAPI)
   list(APPEND HIGHGUI_LIBRARIES ${PVAPI_LIBRARY})
 endif()
 
-if(WITH_IMAGEIO)
-  add_definitions(-DHAVE_IMAGEIO=1)
-  if(IOS)
-    list(APPEND HIGHGUI_LIBRARIES "-framework ImageIO")
-  endif()
-endif(WITH_IMAGEIO)
-
 if(WITH_AVFOUNDATION)
   add_definitions(-DHAVE_AVFOUNDATION=1)
   list(APPEND highgui_srcs src/cap_avfoundation.mm)

modules/highgui/src/grfmt_imageio.hpp

-/*
- *  grfmt_imageio.h
- *
- *
- *  Created by Morgan Conbere on 5/17/07.
- *
- */
-
-#ifndef _GRFMT_IMAGEIO_H_
-#define _GRFMT_IMAGEIO_H_
-
-#ifdef HAVE_IMAGEIO
-
-#include "grfmt_base.hpp"
-#include <TargetConditionals.h>
-
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-
-#include <MobileCoreServices/MobileCoreServices.h>
-#include <ImageIO/ImageIO.h>
-
-#else
-
-#include <ApplicationServices/ApplicationServices.h>
-
-#endif
-
-namespace cv
-{
-
-class ImageIODecoder : public BaseImageDecoder
-{
-public:
-
-    ImageIODecoder();
-    ~ImageIODecoder();
-
-    bool  readData( Mat& img );
-    bool  readHeader();
-    void  close();
-
-    size_t signatureLength() const;
-    bool checkSignature( const string& signature ) const;
-
-    ImageDecoder newDecoder() const;
-
-protected:
-
-    CGImageRef imageRef;
-};
-
-class ImageIOEncoder : public BaseImageEncoder
-{
-public:
-    ImageIOEncoder();
-    ~ImageIOEncoder();
-
-    bool  write( const Mat& img, const vector<int>& params );
-
-    ImageEncoder newEncoder() const;
-};
-
-}
-
-#endif/*HAVE_IMAGEIO*/
-
-#endif/*_GRFMT_IMAGEIO_H_*/

modules/highgui/src/grfmts.hpp

@@ -43,7 +43,6 @@
 #define _GRFMTS_H_
 
 #include "grfmt_base.hpp"
-#include "grfmt_imageio.hpp"
 #include "grfmt_bmp.hpp"
 #include "grfmt_sunras.hpp"
 #include "grfmt_jpeg.hpp"

modules/highgui/src/loadsave.cpp

@@ -84,12 +84,6 @@ struct ImageCodecInitializer
         decoders.push_back( new ExrDecoder );
         encoders.push_back( new ExrEncoder );
     #endif
-    // because it is a generic image I/O API, supporting many formats,
-    // it should be last in the list.
-    #ifdef HAVE_IMAGEIO
-        decoders.push_back( new ImageIODecoder );
-        encoders.push_back( new ImageIOEncoder );
-    #endif
     }
 
     vector<ImageDecoder> decoders;