text: cleanup dnn text detection part

modules/text/CMakeLists.txt

@@ -1,84 +1,24 @@
 set(the_description "Text Detection and Recognition")
-
-if(POLICY CMP0023)
-  message(STATUS "Explicitly setting policy CMP0023 to OLD")
-  cmake_policy(SET CMP0023 OLD)
-endif(POLICY CMP0023)
-
-# Using cmake scripts and modules
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-
-set(TEXT_DEPS opencv_ml opencv_highgui opencv_imgproc opencv_core opencv_features2d opencv_calib3d)
-
-find_package(Caffe)
-if(Caffe_FOUND)
-  message(STATUS "Caffe:   YES")
-  set(HAVE_CAFFE 1)
-else()
-  message(STATUS "Caffe:   NO")
-#  list(APPEND TEXT_DEPS opencv_dnn)
-endif()
-
-#internal dependencies
-find_package(Protobuf)
-if(Protobuf_FOUND)
-  message(STATUS "Protobuf:   YES")
-  set(HAVE_PROTOBUF 1)
-else()
-  message(STATUS "Protobuf:   NO")
-endif()
-
-find_package(Glog)
-if(Glog_FOUND)
-  message(STATUS "Glog:   YES")
-  set(HAVE_GLOG 1)
-else()
-  message(STATUS "Glog:   NO")
-endif()
-
-ocv_define_module(text opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_calib3d OPTIONAL opencv_dnn WRAP python)
-#ocv_define_module(text ${TEXT_DEPS} WRAP python)
-
-#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
-
-find_package(Tesseract)
-if(${Tesseract_FOUND})
-  message(STATUS "Tesseract:   YES")
-  include_directories(${Tesseract_INCLUDE_DIR})
-  target_link_libraries(opencv_text ${Tesseract_LIBS})
-  add_definitions(-DHAVE_TESSERACT)
-else()
-  message(STATUS "Tesseract:   NO")
+ocv_define_module(text opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn OPTIONAL opencv_highgui WRAP python java)
+
+if(NOT CMAKE_CROSSCOMPILING OR OPENCV_FIND_TESSERACT)
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+  find_package(Tesseract QUIET)
+  if(Tesseract_FOUND)
+    message(STATUS "Tesseract:   YES")
+    set(HAVE_TESSERACT 1)
+    ocv_include_directories(${Tesseract_INCLUDE_DIR})
+    ocv_target_link_libraries(${the_module} ${Tesseract_LIBRARIES})
+  else()
+    message(STATUS "Tesseract:   NO")
   endif()
+endif()
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/text_config.hpp.in
+               ${CMAKE_BINARY_DIR}/text_config.hpp @ONLY)
 
-if(HAVE_CAFFE AND HAVE_GLOG AND HAVE_PROTOBUF)
-  include_directories(${Caffe_INCLUDE_DIR})
-  find_package(HDF5 COMPONENTS HL REQUIRED)
-  include_directories(SYSTEM ${HDF5_INCLUDE_DIRS} ${HDF5_HL_INCLUDE_DIR})
-  list(APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES})
-  find_package(Boost 1.46 REQUIRED COMPONENTS system thread filesystem)
-  include_directories(SYSTEM ${Boost_INCLUDE_DIR})
-  include_directories(SYSTEM ${CUDA_INCLUDE_DIR})
-  link_directories(SYSTEM ${CUDA_LIBS})
- # include_directories(SYSTEM /usr/local/cuda-8.0/targets/x86_64-linux/include/ usr/local/cuda-8.0/include/ /usr/local/cuda-7.5/targets/x86_64-linux/include/ )
-  #link_directories(SYSTEM /usr/local/cuda-8.0/targets/x86_64-linux/lib/ usr/local/cuda-8.0/lib/ /usr/local/cuda-7.5/targets/x86_64-linux/lib/ /usr/lib/openblas-base/lib /usr/local/cuda-8.0/lib64)
-  list(APPEND Caffe_LINKER_LIBS ${Boost_LIBRARIES})
-  target_link_libraries(opencv_text atlas blas ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} ${HDF5_LIBRARIES} ${Boost_LIBRARIES})
-  add_definitions(-DHAVE_CAFFE)
-endif() #HAVE_CAFFE
-
-message(STATUS "TEXT CAFFE SEARCH")
-if()
-  message(STATUS "TEXT NO CAFFE CONFLICT")
-else()
-  message(STATUS "TEXT CAFFE CONFLICT")
-endif()
+ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-if(HAVE_opencv_dnn)
-	message(STATUS "dnn module found")
-	add_definitions(-DHAVE_DNN)
-	set(HAVE_DNN 1)
-else()
-	message(STATUS "dnn module not found")
-endif()
+ocv_add_testdata(samples/ contrib/text
+    FILES_MATCHING PATTERN "*.xml" PATTERN "*.xml.gz" REGEX "scenetext[0-9]+.jpg"
+)

modules/text/README.md

@@ -56,74 +56,3 @@ Intro
 -----
 
 The text module now have a text detection and recognition using deep CNN. The text detector deep CNN that takes an image which may contain multiple words. This outputs a list of Rects with bounding boxes and probability of text there. The text recognizer provides a probabillity over a given vocabulary for each of these rects.
-
-Two backends are supported 1) caffe 2) opencv-dnn
-
-
-
-
-Instalation of Caffe backend
-----------------------------
-* Please note a custom caffe based on SSD branch is required, the link of the custom caffe is provided below
-The caffe wrapping backend has the requirements caffe does.
-* Caffe can be built against OpenCV, if the caffe backend is enabled, a circular bependency arises.
-The simplest solution is to build caffe without support for OpenCV.
-* Only the OS supported by Caffe are supported by the backend.
-The scripts describing the module have been developed in ubuntu 16.04 and assume such a system.
-Other UNIX systems including OSX should be easy to adapt.
-
-Sample script for building Caffe
-
-```bash
-#!/bin/bash
-SRCROOT="${HOME}/caffe_inst/"
-mkdir -p "$SRCROOT"
-cd "$SRCROOT"
-git clone https://github.com/sghoshcvc/TextBoxes.git
-cd TextBoxes
-cat Makefile.config.example  > Makefile.config
-echo 'USE_OPENCV := 0' >> Makefile.config
-echo 'INCLUDE_DIRS += /usr/include/hdf5/serial/' >> Makefile.config
-echo 'LIBRARY_DIRS += /usr/lib/x86_64-linux-gnu/hdf5/serial/' >> Makefile.config
-
-
-echo "--- /tmp/caffe/include/caffe/net.hpp	2017-05-28 04:55:47.929623902 +0200
-+++ caffe/distribute/include/caffe/net.hpp	2017-05-28 04:51:33.437090768 +0200
-@@ -234,6 +234,7 @@
-
-     template <typename T>
-     friend class Net;
-+    virtual ~Callback(){}
-   };
-   const vector<Callback*>& before_forward() const { return before_forward_; }
-   void add_before_forward(Callback* value) {
-">/tmp/cleanup_caffe.diff
-
-patch < /tmp/cleanup_caffe.diff
-
-
-make -j 6
-
-make pycaffe
-
-make distribute
-```
-
-
-```bash
-#!/bin/bash
-cd $OPENCV_BUILD_DIR #You must set this
-CAFFEROOT="${HOME}/caffe_inst/" #If you used the previous code to compile Caffe in ubuntu 16.04
-
-cmake  -DCaffe_LIBS:FILEPATH="$CAFFEROOT/caffe/distribute/lib/libcaffe.so" -DBUILD_opencv_ts:BOOL="0" -DBUILD_opencv_dnn:BOOL="0" -DBUILD_opencv_dnn_modern:BOOL="0" -DCaffe_INCLUDE_DIR:PATH="$CAFFEROOT/caffe/distribute/include" -DWITH_MATLAB:BOOL="0" -DBUILD_opencv_cudabgsegm:BOOL="0"  -DWITH_QT:BOOL="1" -DBUILD_opencv_cudaoptflow:BOOL="0" -DBUILD_opencv_cudastereo:BOOL="0" -DBUILD_opencv_cudafilters:BOOL="0" -DBUILD_opencv_cudev:BOOL="1" -DOPENCV_EXTRA_MODULES_PATH:PATH="$OPENCV_CONTRIB/modules"   ./
-
-
-```
-where $OPECV_CONTRIB is the root directory containing opencv_contrib module
-
-Instalation of Caffe backend
-----------------------------
-
-Use of opencv-dnn does not need any additional library.
-
-The recent opencv-3.3.0 needs to be build with extra modules to use text module.

modules/text/cmake/FindTesseract.cmake

@@ -5,14 +5,17 @@ endif()
 if(NOT Tesseract_FOUND)
   find_path(Tesseract_INCLUDE_DIR tesseract/baseapi.h
     HINTS
+    /usr/include
     /usr/local/include)
 
   find_library(Tesseract_LIBRARY NAMES tesseract
     HINTS
+    /usr/lib
     /usr/local/lib)
 
   find_library(Lept_LIBRARY NAMES lept
     HINTS
+    /usr/lib
     /usr/local/lib)
 
   if(Tesseract_INCLUDE_DIR AND Tesseract_LIBRARY AND Lept_LIBRARY)

modules/text/include/opencv2/text.hpp

@@ -93,7 +93,7 @@ grouping horizontally aligned text, and the method proposed by Lluis Gomez and D
 in @cite Gomez13 @cite Gomez14 for grouping arbitrary oriented text (see erGrouping).
 
 To see the text detector at work, have a look at the textdetection demo:
-<https://github.com/Itseez/opencv_contrib/blob/master/modules/text/samples/textdetection.cpp>
+<https://github.com/opencv/opencv_contrib/blob/master/modules/text/samples/textdetection.cpp>
 
     @defgroup text_recognize Scene Text Recognition
   @}

modules/text/include/opencv2/text/erfilter.hpp

@@ -65,7 +65,6 @@ component tree of the image. :
  */
 struct CV_EXPORTS ERStat
 {
-
 public:
     //! Constructor
     explicit ERStat(int level = 256, int pixel = 0, int x = 0, int y = 0);