From 84ec6341afd2c67ce6b29a9434d93242d410c7a8 Mon Sep 17 00:00:00 2001
From: Pavel Rojtberg <pavel.rojtberg@igd.fraunhofer.de>
Date: Tue, 22 Nov 2016 17:21:27 +0100
Subject: [PATCH] cnn_3dobj: add call to ocv_module_disable so documentation is
 generated

also fix some minor doxygen issues
---
 modules/cnn_3dobj/CMakeLists.txt                              | 4 +++-
 .../tutorials/data_generation/data_generation.markdown        | 1 -
 .../tutorials/feature_classification/classify.markdown        | 3 +--
 .../tutorials/model_analysis/model_analysis.markdown          | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/cnn_3dobj/CMakeLists.txt b/modules/cnn_3dobj/CMakeLists.txt
index 486eb3d2a..63e7d09ed 100755
--- a/modules/cnn_3dobj/CMakeLists.txt
+++ b/modules/cnn_3dobj/CMakeLists.txt
@@ -24,7 +24,9 @@ else()
   message(STATUS "Glog:   NO")
 endif()
 
-if(HAVE_CAFFE)
+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)
 
diff --git a/modules/cnn_3dobj/tutorials/data_generation/data_generation.markdown b/modules/cnn_3dobj/tutorials/data_generation/data_generation.markdown
index 34de7f3ae..ab1942c08 100755
--- a/modules/cnn_3dobj/tutorials/data_generation/data_generation.markdown
+++ b/modules/cnn_3dobj/tutorials/data_generation/data_generation.markdown
@@ -12,7 +12,6 @@ In this tutorial you will learn how to
 Code
 ----
 
-You can download the code from [here ](https://github.com/Wangyida/opencv_contrib/blob/cnn_3dobj/samples/demo_sphereview_data.cpp).
 @include cnn_3dobj/samples/demo_sphereview_data.cpp
 
 Explanation
diff --git a/modules/cnn_3dobj/tutorials/feature_classification/classify.markdown b/modules/cnn_3dobj/tutorials/feature_classification/classify.markdown
index e15576551..13257bcdd 100755
--- a/modules/cnn_3dobj/tutorials/feature_classification/classify.markdown
+++ b/modules/cnn_3dobj/tutorials/feature_classification/classify.markdown
@@ -1,4 +1,4 @@
-Classify {#tutorial_classify}
+Classify {#tutorial_feature_classification}
 ===============
 
 Goal
@@ -13,7 +13,6 @@ In this tutorial you will learn how to
 Code
 ----
 
-You can download the code from [here ](https://github.com/Wangyida/opencv_contrib/blob/cnn_3dobj/samples/demo_classify.cpp).
 @include cnn_3dobj/samples/demo_classify.cpp
 
 Explanation
diff --git a/modules/cnn_3dobj/tutorials/model_analysis/model_analysis.markdown b/modules/cnn_3dobj/tutorials/model_analysis/model_analysis.markdown
index 3292e1a3f..2d4550e27 100755
--- a/modules/cnn_3dobj/tutorials/model_analysis/model_analysis.markdown
+++ b/modules/cnn_3dobj/tutorials/model_analysis/model_analysis.markdown
@@ -1,4 +1,4 @@
-Training data generation using Icosphere {#tutorial_model_analysis}
+Training Model Analysis {#tutorial_model_analysis}
 =============
 
 Goal
@@ -12,7 +12,6 @@ In this tutorial you will learn how to
 Code
 ----
 
-You can download the code from [here ](https://github.com/Wangyida/opencv_contrib/blob/cnn_3dobj/samples/demo_model_analysis.cpp).
 @include cnn_3dobj/samples/demo_model_analysis.cpp
 
 Explanation