cnn_3dobj: add call to ocv_module_disable so documentation is generated

also fix some minor doxygen issues
pull/869/head
Pavel Rojtberg 8 years ago
parent e36e2ff0a7
commit 84ec6341af
  1. 4
      modules/cnn_3dobj/CMakeLists.txt
  2. 1
      modules/cnn_3dobj/tutorials/data_generation/data_generation.markdown
  3. 3
      modules/cnn_3dobj/tutorials/feature_classification/classify.markdown
  4. 3
      modules/cnn_3dobj/tutorials/model_analysis/model_analysis.markdown

@ -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)

@ -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

@ -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

@ -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

Loading…
Cancel
Save