drop cnn_3dobj_config.hpp. the HAVE_CAFFE check was pointless.

modules/cnn_3dobj/CMakeLists.txt

@@ -27,8 +27,6 @@ endif()
 if(NOT HAVE_CAFFE)
     ocv_module_disable(cnn_3dobj)
 else()
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cnn_3dobj_config.hpp.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/include/opencv2/cnn_3dobj_config.hpp @ONLY)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 

modules/cnn_3dobj/cnn_3dobj_config.hpp.in

-#ifndef __OPENCV_CNN_3DOBJ_CONFIG_HPP__
-#define __OPENCV_CNN_3DOBJ_CONFIG_HPP__
-// HAVE CAFFE
-#cmakedefine HAVE_CAFFE
-#endif

modules/cnn_3dobj/include/opencv2/cnn_3dobj.hpp

@@ -58,23 +58,17 @@ the use of this software, even if advised of the possibility of such damage.
 #include <dirent.h>
 #define CPU_ONLY
 
-#include <opencv2/cnn_3dobj_config.hpp>
-#ifdef HAVE_CAFFE
 #include <caffe/blob.hpp>
 #include <caffe/common.hpp>
 #include <caffe/net.hpp>
 #include <caffe/proto/caffe.pb.h>
 #include <caffe/util/io.hpp>
-#endif
 
 #include "opencv2/viz/vizcore.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc.hpp"
-using caffe::Blob;
-using caffe::Caffe;
-using caffe::Datum;
-using caffe::Net;
+
 /** @defgroup cnn_3dobj 3D object recognition and pose estimation API
 
 As CNN based learning algorithm shows better performance on the classification issues,

modules/cnn_3dobj/test/test_precomp.hpp

@@ -12,7 +12,6 @@
 #include <iostream>
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/cnn_3dobj_config.hpp"
 #include "opencv2/cnn_3dobj.hpp"
 
 #endif