Merge branch 'master' into gsoc_textDetect_2017

modules/README.md

@@ -24,8 +24,6 @@ $ cmake -D OPENCV_EXTRA_MODULES_PATH=<opencv_contrib>/modules -D BUILD_opencv_<r
 
 - **datasets**: Datasets Reader -- Code for reading existing computer vision databases and samples of using the readers to train, test and run using that dataset's data.
 
-- **dnn**: Deep Neural Networks (DNNs) -- This module can read in image recogniton networks trained in the Caffe neural netowrk library and run them efficiently on CPU.
-
 - **dnns_easily_fooled**: Subvert DNNs -- This code can use the activations in a network to fool the networks into recognizing something else.
 
 - **dpm**: Deformable Part Model -- Felzenszwalb's Cascade with deformable parts object recognition code.

modules/aruco/samples/detector_params.yml

@@ -12,7 +12,7 @@ minCornerDistance: 10.0
 minDistanceToBorder: 3
 minMarkerDistance: 10.0
 minMarkerDistanceRate: 0.05
-doCornerRefinement: false
+cornerRefinementMethod: 0
 cornerRefinementWinSize: 5
 cornerRefinementMaxIterations: 30
 cornerRefinementMinAccuracy: 0.1

modules/aruco/src/aruco.cpp

@@ -1676,6 +1676,7 @@ void _drawPlanarBoardImpl(Board *_board, Size outSize, OutputArray _img, int mar
 
         // get marker
         Size dst_sz(outCorners[2] - outCorners[0]); // assuming CCW order
+        dst_sz.width = dst_sz.height = std::min(dst_sz.width, dst_sz.height); //marker should be square
         dictionary.drawMarker(_board->ids[m], dst_sz.width, marker, borderBits);
 
         if((outCorners[0].y == outCorners[1].y) && (outCorners[1].x == outCorners[2].x)) {

modules/aruco/test/test_misc.cpp

+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#include "test_precomp.hpp"
+#include <opencv2/aruco/charuco.hpp>
+
+TEST(CV_ArucoDrawMarker, regression_1226)
+{
+    int squares_x = 7;
+    int squares_y = 5;
+    int bwidth = 1600;
+    int bheight = 1200;
+
+    cv::Ptr<cv::aruco::Dictionary> dict = cv::aruco::getPredefinedDictionary(cv::aruco::DICT_4X4_50);
+    cv::Ptr<cv::aruco::CharucoBoard> board = cv::aruco::CharucoBoard::create(squares_x, squares_y, 1.0, 0.75, dict);
+    cv::Size sz(bwidth, bheight);
+    cv::Mat mat;
+
+    ASSERT_NO_THROW(
+    {
+        board->draw(sz, mat, 0, 1);
+    });
+}

modules/aruco/tutorials/aruco_detection/aruco_detection.markdown

@@ -702,23 +702,23 @@ Default value: 0.6
 #### Corner Refinement
 
 After markers have been detected and identified, the last step is performing subpixel refinement
-in the corner positions (see OpenCV ```cornerSubPix()```)
+in the corner positions (see OpenCV ```cornerSubPix()``` and ```cv::aruco::CornerRefineMethod```)
 
 Note that this step is optional and it only makes sense if the position of the marker corners have to
 be accurate, for instance for pose estimation. It is usually a time consuming step and it is disabled by default.
 
-- ```bool doCornerRefinement```
+- ```int cornerRefinementMethod```
 
 This parameter determines if the corner subpixel process is performed or not. It can be disabled
 if accurate corners are not necessary.
 
-Default value: false.
+Default value: ```CORNER_REFINE_NONE```.
 
  - ```int cornerRefinementWinSize```
 
 This parameter determines the window size of the subpixel refinement process.
 
-High values can produce that close image corners are included in the window region, so that the
+High values can produce the effect that close image corners are included in the window region, so that the
 marker corner moves to a different and wrong location during the process. Furthermore
 it can affect to performance.
 

modules/aruco/tutorials/charuco_detection/charuco_detection.markdown

@@ -142,7 +142,7 @@ are optional. A similar example without these parameters would be:
     std::vector<int> markerIds;
     std::vector<std::vector<cv::Point2f>> markerCorners;
     cv::Ptr<cv::aruco::DetectorParameters> params;
-    params->doCornerRefinement = false;
+    params->cornerRefinementMethod = cv::aruco::CORNER_REFINE_NONE;
     cv::aruco::detectMarkers(inputImage, board.dictionary, markerCorners, markerIds, params);
 
     // if at least one marker detected
@@ -207,7 +207,7 @@ Finally, this is a full example of ChArUco detection (without using calibration
     cv::Ptr<cv::aruco::CharucoBoard> board = cv::aruco::CharucoBoard::create(5, 7, 0.04, 0.02, dictionary);
 
     cv::Ptr<cv::aruco::DetectorParameters> params;
-    params->doCornerRefinement = false;
+    params->cornerRefinementMethod = cv::aruco::CORNER_REFINE_NONE;
 
     while (inputVideo.grab()) {
         cv::Mat image, imageCopy;

modules/contrib_world/CMakeLists.txt

@@ -11,7 +11,6 @@ set(OPENCV_MODULE_CHILDREN
   ccalib
   cvv
   datasets
-  dnn
   dpm
   face
   fuzzy

modules/dnn/3rdparty/protobuf/CMakeLists.txt

-project(libprotobuf)
-
-include(CheckIncludeFiles)
-
-if(NOT MSVC)
-  check_include_files("pthread.h" HAVE_PTHREAD)
-  if(HAVE_PTHREAD)
-    add_definitions(-DHAVE_PTHREAD=1)
-  endif()
-endif()
-
-if(MSVC)
-  add_definitions( -D_CRT_SECURE_NO_WARNINGS=1 )
-  ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146
-                                       /wd4305 /wd4127 /wd4100 /wd4512 /wd4125 /wd4389 /wd4510 /wd4610
-                                       /wd4702 /wd4456 /wd4457 /wd4065 /wd4310 /wd4661 /wd4506
-  )
-else()
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-deprecated -Wmissing-prototypes -Wmissing-declarations -Wshadow
-                                       -Wunused-parameter -Wunused-local-typedefs -Wsign-compare -Wsign-promo
-                                       -Wundef -Wtautological-undefined-compare -Wignored-qualifiers -Wextra
-                                       -Wunused-function -Wunused-const-variable
-  )
-endif()
-if(CV_ICC)
-  ocv_warnings_disable(CMAKE_CXX_FLAGS
-      -wd265 -wd858 -wd873 -wd2196
-  )
-endif()
-
-# Easier to support different versions of protobufs
-function(append_if_exist OUTPUT_LIST)
-    set(${OUTPUT_LIST})
-    foreach(fil ${ARGN})
-        if(EXISTS ${fil})
-            list(APPEND ${OUTPUT_LIST} "${fil}")
-        else()
-            message(WARNING "file missing: ${fil}")
-        endif()
-    endforeach()
-    set(${OUTPUT_LIST} ${${OUTPUT_LIST}} PARENT_SCOPE)
-endfunction()
-
-set(PROTOBUF_ROOT "${PROTOBUF_CPP_ROOT}")
-
-if(MSVC)
-  set(ATOMICOPS_INTERNALS ${PROTOBUF_ROOT}/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc)
-else()
-  set(ATOMICOPS_INTERNALS ${PROTOBUF_ROOT}/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc)
-endif()
-
-
-append_if_exist(PROTOBUF_SRCS
-# libprotobuf-lite
-  ${PROTOBUF_ROOT}/src/google/protobuf/arena.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/arenastring.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/extension_set.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/generated_message_util.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/io/coded_stream.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/io/zero_copy_stream.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/message_lite.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/repeated_field.cc
-  ${ATOMICOPS_INTERNALS}
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/bytestream.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/common.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/int128.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/once.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/status.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/statusor.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/stringpiece.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/stringprintf.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/structurally_valid.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/strutil.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/time.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/wire_format_lite.cc
-# libprotobuf
-  ${PROTOBUF_ROOT}/src/google/protobuf/any.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/any.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/api.pb.cc
-#  ${PROTOBUF_ROOT}/src/google/protobuf/compiler/importer.cc
-#  ${PROTOBUF_ROOT}/src/google/protobuf/compiler/parser.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/descriptor.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/descriptor.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/descriptor_database.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/duration.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/dynamic_message.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/empty.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/extension_set_heavy.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/field_mask.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/generated_message_reflection.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/io/gzip_stream.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/io/printer.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/io/strtod.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/io/tokenizer.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/io/zero_copy_stream_impl.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/map_field.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/message.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/reflection_ops.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/service.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/source_context.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/struct.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/mathlimits.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/stubs/substitute.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/text_format.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/timestamp.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/type.pb.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/unknown_field_set.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/field_comparator.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/field_mask_util.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/datapiece.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/default_value_objectwriter.cc
-#  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/error_listener.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/field_mask_utility.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/json_escaping.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/json_objectwriter.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/json_stream_parser.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/object_writer.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/proto_writer.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/protostream_objectsource.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/protostream_objectwriter.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/type_info.cc
-#  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/type_info_test_helper.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/internal/utility.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/json_util.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/message_differencer.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/time_util.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/util/type_resolver_util.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/wire_format.cc
-  ${PROTOBUF_ROOT}/src/google/protobuf/wrappers.pb.cc
-)
-
-if(CMAKE_VERSION VERSION_LESS 2.8.9 AND UNIX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-endif()
-
-add_library(libprotobuf STATIC ${PROTOBUF_SRCS})
-include_directories(${PROTOBUF_ROOT}/src)
-
-set_target_properties(libprotobuf
-    PROPERTIES
-    FOLDER "3rdparty"
-    POSITION_INDEPENDENT_CODE 1    # CMake 2.8.9+
-    OUTPUT_NAME libprotobuf
-    DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-    ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
-    )
-
-if(NOT BUILD_SHARED_LIBS)
-  ocv_install_target(libprotobuf EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
-endif()

modules/dnn/CMakeLists.txt

-if(WINRT)
-  ocv_module_disable(dnn)
-endif()
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/OpenCVFindLibProtobuf.cmake)
-if(NOT DEFINED PROTOBUF_INCLUDE_DIR)
-  ocv_module_disable(opencv_dnn)
-endif()
-
-set(the_description "Deep neural network module. It allows to load models from different frameworks and to make forward pass")
-
-ocv_add_module(dnn opencv_core opencv_imgproc WRAP python matlab)
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow -Wno-parentheses -Wmaybe-uninitialized -Wsign-promo
-                                     -Wmissing-declarations -Wmissing-prototypes
-)
-ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4701 /wd4100)
-
-if(MSVC)
-  add_definitions( -D_CRT_SECURE_NO_WARNINGS=1 )
-  ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146
-                                       /wd4305 /wd4127 /wd4100 /wd4512 /wd4125 /wd4389 /wd4510 /wd4610
-                                       /wd4702 /wd4456 /wd4457 /wd4065 /wd4310 /wd4661 /wd4506
-  )
-else()
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-deprecated -Wmissing-prototypes -Wmissing-declarations -Wshadow
-                                       -Wunused-parameter -Wunused-local-typedefs -Wsign-compare -Wsign-promo
-                                       -Wundef -Wtautological-undefined-compare -Wignored-qualifiers -Wextra
-                                       -Wunused-function -Wunused-const-variable -Wdeprecated-declarations
-  )
-endif()
-
-if(APPLE_FRAMEWORK)
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshorten-64-to-32)
-endif()
-
-if(ANDROID)
-  add_definitions(-DDISABLE_POSIX_MEMALIGN -DTH_DISABLE_HEAP_TRACKING)
-endif()
-
-# ----------------------------------------------------------------------------
-# Resolve libprotobuf dependency
-# ----------------------------------------------------------------------------
-if(NOT PROTOBUF_FOUND)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/protobuf "${PROTOBUF_CPP_PATH}")
-  add_definitions(-DHAVE_PROTOBUF=1)
-
-  #supress warnings in autogenerated caffe.pb.* files
-  ocv_warnings_disable(CMAKE_CXX_FLAGS
-      -Wunused-parameter -Wundef -Wignored-qualifiers -Wno-enum-compare
-      -Wdeprecated-declarations
-      /wd4125 /wd4267 /wd4127 /wd4244 /wd4512 /wd4702
-      /wd4456 /wd4510 /wd4610 /wd4800
-      -wd858 -wd2196
-  )
-endif()
-
-ocv_source_group("Src\\protobuf" FILES ${PROTOBUF_SRCS} ${PROTOBUF_HDRS})
-ocv_module_include_directories(include ${PROTOBUF_INCLUDE_DIR})
-
-ocv_glob_module_sources(${PROTOBUF_SRCS} ${PROTOBUF_HDRS} ${CBLAS_H_PROXY_PATH})
-ocv_create_module(${PROTOBUF_LIBRARIES} ${LAPACK_LIBRARIES})
-ocv_add_samples()
-ocv_add_accuracy_tests()
-ocv_add_perf_tests()
-
-# ----------------------------------------------------------------------------
-# Torch7 importer of blobs and models, produced by Torch.nn module
-# ----------------------------------------------------------------------------
-OCV_OPTION(${the_module}_BUILD_TORCH_IMPORTER "Build Torch model importer" ON)
-if(${the_module}_BUILD_TORCH_IMPORTER)
-    message(STATUS "Torch importer has been enabled. To run the tests you have to install Torch "
-      "('th' executable should be available) "
-      "and generate testdata using opencv_extra/testdata/dnn/generate_torch_models.py script.")
-    add_definitions(-DENABLE_TORCH_IMPORTER=1)
-    ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4702 /wd4127 /wd4267) #supress warnings in original torch files
-endif()

modules/dnn/README.md

-Deep Neural Network module
-==========================
\ No newline at end of file

modules/dnn/cmake/OpenCVFindLibProtobuf.cmake

-# By default, we use built-in protobuf sources and pre-generated .proto files
-# Note: In case of .proto model updates these variables should be used:
-# - PROTOBUF_PROTOC_EXECUTABLE (required)
-# - PROTOBUF_INCLUDE_DIR
-# - PROTOBUF_LIBRARIES or PROTOBUF_LIBRARY / PROTOBUF_LIBRARY_DEBUG for find_package()
-OCV_OPTION(BUILD_PROTOBUF "Force to build libprotobuf from sources" ON)
-OCV_OPTION(UPDATE_PROTO_FILES "Force to rebuild .proto files" OFF)
-
-if(UPDATE_PROTO_FILES)
-  if(NOT DEFINED PROTOBUF_PROTOC_EXECUTABLE)
-    find_package(Protobuf QUIET)
-  endif()
-  if(DEFINED PROTOBUF_PROTOC_EXECUTABLE AND EXISTS ${PROTOBUF_PROTOC_EXECUTABLE})
-    message(STATUS "The protocol buffer compiler is found (${PROTOBUF_PROTOC_EXECUTABLE})")
-    file(GLOB proto_files src/tensorflow/*.proto)
-    list(APPEND proto_files src/caffe/caffe.proto)
-    PROTOBUF_GENERATE_CPP(PROTOBUF_HDRS PROTOBUF_SRCS ${proto_files})
-  else()
-    message(FATAL_ERROR "The protocol buffer compiler is not found (PROTOBUF_PROTOC_EXECUTABLE='${PROTOBUF_PROTOC_EXECUTABLE}')")
-  endif()
-endif()
-
-if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES))
-  find_package(Protobuf QUIET)
-endif()
-
-if(PROTOBUF_FOUND)
-  # nothing
-else()
-  set(PROTOBUF_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/protobuf")
-  set(PROTOBUF_CPP_ROOT "${PROTOBUF_CPP_PATH}/protobuf-3.1.0")
-  ocv_download(FILENAME "protobuf-cpp-3.1.0.tar.gz"
-               HASH "bd5e3eed635a8d32e2b99658633815ef"
-               URL
-                 "${OPENCV_PROTOBUF_URL}"
-                 "$ENV{OPENCV_PROTOBUF_URL}"
-                 "https://github.com/google/protobuf/releases/download/v3.1.0/"
-               DESTINATION_DIR "${PROTOBUF_CPP_PATH}"
-               ID PROTOBUF
-               STATUS res
-               UNPACK RELATIVE_URL)
-  if(NOT res)
-    return()
-  endif()
-  set(PROTOBUF_LIBRARIES libprotobuf)
-  set(PROTOBUF_INCLUDE_DIR "${PROTOBUF_CPP_ROOT}/src")
-endif()
-
-if(NOT UPDATE_PROTO_FILES)
-  file(GLOB fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.cc)
-  file(GLOB fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.h)
-  list(APPEND fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.cc)
-  list(APPEND fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.h)
-  list(APPEND PROTOBUF_SRCS ${fw_srcs})
-  list(APPEND PROTOBUF_HDRS ${fw_hdrs})
-  list(APPEND PROTOBUF_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe)
-  list(APPEND PROTOBUF_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow)
-endif()

modules/dnn/include/opencv2/dnn.hpp

-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef __OPENCV_DNN_HPP__
-#define __OPENCV_DNN_HPP__
-
-// This is an umbrealla header to include into you project.
-// We are free to change headers layout in dnn subfolder, so please include
-// this header for future compartibility
-
-
-/** @defgroup dnn Deep Neural Network module
-  @{
-    This module contains:
-        - API for new layers creation, layers are building bricks of neural networks;
-        - set of built-in most-useful Layers;
-        - API to constuct and modify comprehensive neural networks from layers;
-        - functionality for loading serialized networks models from differnet frameworks.
-
-    Functionality of this module is designed only for forward pass computations (i. e. network testing).
-    A network training is in principle not supported.
-  @}
-*/
-#include <opencv2/dnn/dnn.hpp>
-
-#endif /* __OPENCV_DNN_HPP__ */

modules/dnn/include/opencv2/dnn/dict.hpp

-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef __OPENCV_DNN_DNN_DICT_HPP__
-#define __OPENCV_DNN_DNN_DICT_HPP__
-
-#include <opencv2/core.hpp>
-#include <map>
-#include <ostream>
-
-namespace cv
-{
-namespace dnn
-{
-//! @addtogroup dnn
-//! @{
-
-/** @brief This struct stores the scalar value (or array) of one of the following type: double, cv::String or int64.
- *  @todo Maybe int64 is useless because double type exactly stores at least 2^52 integers.
- */
-struct DictValue
-{
-    DictValue(const DictValue &r);
-    DictValue(int64 i = 0)      : type(Param::INT), pi(new AutoBuffer<int64,1>) { (*pi)[0] = i; }       //!< Constructs integer scalar
-    DictValue(int i)            : type(Param::INT), pi(new AutoBuffer<int64,1>) { (*pi)[0] = i; }       //!< Constructs integer scalar
-    DictValue(unsigned p)       : type(Param::INT), pi(new AutoBuffer<int64,1>) { (*pi)[0] = p; }       //!< Constructs integer scalar
-    DictValue(double p)         : type(Param::REAL), pd(new AutoBuffer<double,1>) { (*pd)[0] = p; }     //!< Constructs floating point scalar
-    DictValue(const String &s)  : type(Param::STRING), ps(new AutoBuffer<String,1>) { (*ps)[0] = s; }   //!< Constructs string scalar
-    DictValue(const char *s)    : type(Param::STRING), ps(new AutoBuffer<String,1>) { (*ps)[0] = s; }   //!< @overload
-
-    template<typename TypeIter>
-    static DictValue arrayInt(TypeIter begin, int size);    //!< Constructs integer array
-    template<typename TypeIter>
-    static DictValue arrayReal(TypeIter begin, int size);   //!< Constructs floating point array
-    template<typename TypeIter>
-    static DictValue arrayString(TypeIter begin, int size); //!< Constructs array of strings
-
-    template<typename T>
-    T get(int idx = -1) const; //!< Tries to convert array element with specified index to requested type and returns its.
-
-    int size() const;
-
-    bool isInt() const;
-    bool isString() const;
-    bool isReal() const;
-
-    DictValue &operator=(const DictValue &r);
-
-    friend std::ostream &operator<<(std::ostream &stream, const DictValue &dictv);
-
-    ~DictValue();
-
-private:
-
-    int type;
-
-    union
-    {
-        AutoBuffer<int64, 1> *pi;
-        AutoBuffer<double, 1> *pd;
-        AutoBuffer<String, 1> *ps;
-        void *pv;
-    };
-
-    DictValue(int _type, void *_p) : type(_type), pv(_p) {}
-    void release();
-};
-
-/** @brief This class implements name-value dictionary, values are instances of DictValue. */
-class CV_EXPORTS Dict
-{
-    typedef std::map<String, DictValue> _Dict;
-    _Dict dict;
-
-public:
-
-    //! Checks a presence of the @p key in the dictionary.
-    bool has(const String &key) const;
-
-    //! If the @p key in the dictionary then returns pointer to its value, else returns NULL.
-    DictValue *ptr(const String &key);
-
-    /** @overload */
-    const DictValue *ptr(const String &key) const;
-
-    //! If the @p key in the dictionary then returns its value, else an error will be generated.
-    const DictValue &get(const String &key) const;
-
-    /** @overload */
-    template <typename T>
-    T get(const String &key) const;
-
-    //! If the @p key in the dictionary then returns its value, else returns @p defaultValue.
-    template <typename T>
-    T get(const String &key, const T &defaultValue) const;
-
-    //! Sets new @p value for the @p key, or adds new key-value pair into the dictionary.
-    template<typename T>
-    const T &set(const String &key, const T &value);
-
-    friend std::ostream &operator<<(std::ostream &stream, const Dict &dict);
-};
-
-//! @}
-}
-}
-
-#endif

modules/dnn/include/opencv2/dnn/dnn.inl.hpp

-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef __OPENCV_DNN_DNN_INL_HPP__
-#define __OPENCV_DNN_DNN_INL_HPP__
-
-#include <opencv2/dnn.hpp>
-
-namespace cv
-{
-namespace dnn
-{
-
-template<typename TypeIter>
-DictValue DictValue::arrayInt(TypeIter begin, int size)
-{
-    DictValue res(Param::INT, new AutoBuffer<int64, 1>(size));
-    for (int j = 0; j < size; begin++, j++)
-        (*res.pi)[j] = *begin;
-    return res;
-}
-
-template<typename TypeIter>
-DictValue DictValue::arrayReal(TypeIter begin, int size)
-{
-    DictValue res(Param::REAL, new AutoBuffer<double, 1>(size));
-    for (int j = 0; j < size; begin++, j++)
-        (*res.pd)[j] = *begin;
-    return res;
-}
-
-template<typename TypeIter>
-DictValue DictValue::arrayString(TypeIter begin, int size)
-{
-    DictValue res(Param::STRING, new AutoBuffer<String, 1>(size));
-    for (int j = 0; j < size; begin++, j++)
-        (*res.ps)[j] = *begin;
-    return res;
-}
-
-template<>
-inline DictValue DictValue::get<DictValue>(int idx) const
-{
-    CV_Assert(idx == -1);
-    return *this;
-}
-
-template<>
-inline int64 DictValue::get<int64>(int idx) const
-{
-    CV_Assert((idx == -1 && size() == 1) || (idx >= 0 && idx < size()));
-    idx = (idx == -1) ? 0 : idx;
-
-    if (type == Param::INT)
-    {
-        return (*pi)[idx];
-    }
-    else if (type == Param::REAL)
-    {
-        double doubleValue = (*pd)[idx];
-
-        double fracpart, intpart;
-        fracpart = std::modf(doubleValue, &intpart);
-        CV_Assert(fracpart == 0.0);
-
-        return (int64)doubleValue;
-    }
-    else
-    {
-        CV_Assert(isInt() || isReal());
-        return 0;
-    }
-}
-
-template<>
-inline int DictValue::get<int>(int idx) const
-{
-    return (int)get<int64>(idx);
-}
-
-template<>
-inline unsigned DictValue::get<unsigned>(int idx) const
-{
-    return (unsigned)get<int64>(idx);
-}
-
-template<>
-inline bool DictValue::get<bool>(int idx) const
-{
-    return (get<int64>(idx) != 0);
-}
-
-template<>
-inline double DictValue::get<double>(int idx) const
-{
-    CV_Assert((idx == -1 && size() == 1) || (idx >= 0 && idx < size()));
-    idx = (idx == -1) ? 0 : idx;
-
-    if (type == Param::REAL)
-    {
-        return (*pd)[idx];
-    }
-    else if (type == Param::INT)
-    {
-        return (double)(*pi)[idx];
-    }
-    else
-    {
-        CV_Assert(isReal() || isInt());
-        return 0;
-    }
-}
-
-template<>
-inline float DictValue::get<float>(int idx) const
-{
-    return (float)get<double>(idx);
-}
-
-template<>
-inline String DictValue::get<String>(int idx) const
-{
-    CV_Assert(isString());
-    CV_Assert((idx == -1 && ps->size() == 1) || (idx >= 0 && idx < (int)ps->size()));
-    return (*ps)[(idx == -1) ? 0 : idx];
-}
-
-inline void DictValue::release()
-{
-    switch (type)
-    {
-    case Param::INT:
-        delete pi;
-        break;
-    case Param::STRING:
-        delete ps;
-        break;
-    case Param::REAL:
-        delete pd;
-        break;
-    }
-}
-
-inline DictValue::~DictValue()
-{
-    release();
-}
-
-inline DictValue & DictValue::operator=(const DictValue &r)
-{
-    if (&r == this)
-        return *this;
-
-    if (r.type == Param::INT)
-    {
-        AutoBuffer<int64, 1> *tmp = new AutoBuffer<int64, 1>(*r.pi);
-        release();
-        pi = tmp;
-    }
-    else if (r.type == Param::STRING)
-    {
-        AutoBuffer<String, 1> *tmp = new AutoBuffer<String, 1>(*r.ps);
-        release();
-        ps = tmp;
-    }
-    else if (r.type == Param::REAL)
-    {
-        AutoBuffer<double, 1> *tmp = new AutoBuffer<double, 1>(*r.pd);
-        release();
-        pd = tmp;
-    }
-
-    type = r.type;
-
-    return *this;
-}
-
-inline DictValue::DictValue(const DictValue &r)
-{
-    type = r.type;
-
-    if (r.type == Param::INT)
-        pi = new AutoBuffer<int64, 1>(*r.pi);
-    else if (r.type == Param::STRING)
-        ps = new AutoBuffer<String, 1>(*r.ps);
-    else if (r.type == Param::REAL)
-        pd = new AutoBuffer<double, 1>(*r.pd);
-}
-
-inline bool DictValue::isString() const
-{
-    return (type == Param::STRING);
-}
-
-inline bool DictValue::isInt() const
-{
-    return (type == Param::INT);
-}
-
-inline bool DictValue::isReal() const
-{
-    return (type == Param::REAL || type == Param::INT);
-}
-
-inline int DictValue::size() const
-{
-    switch (type)
-    {
-    case Param::INT:
-        return (int)pi->size();
-        break;
-    case Param::STRING:
-        return (int)ps->size();
-        break;
-    case Param::REAL:
-        return (int)pd->size();
-        break;
-    default:
-        CV_Error(Error::StsInternal, "");
-        return -1;
-    }
-}
-
-inline std::ostream &operator<<(std::ostream &stream, const DictValue &dictv)
-{
-    int i;
-
-    if (dictv.isInt())
-    {
-        for (i = 0; i < dictv.size() - 1; i++)
-            stream << dictv.get<int64>(i) << ", ";
-        stream << dictv.get<int64>(i);
-    }
-    else if (dictv.isReal())
-    {
-        for (i = 0; i < dictv.size() - 1; i++)
-            stream << dictv.get<double>(i) << ", ";
-        stream << dictv.get<double>(i);
-    }
-    else if (dictv.isString())
-    {
-        for (i = 0; i < dictv.size() - 1; i++)
-            stream << "\"" << dictv.get<String>(i) << "\", ";
-        stream << dictv.get<String>(i);
-    }
-
-    return stream;
-}
-
-/////////////////////////////////////////////////////////////////
-
-inline bool Dict::has(const String &key) const
-{
-    return dict.count(key) != 0;
-}
-
-inline DictValue *Dict::ptr(const String &key)
-{
-    _Dict::iterator i = dict.find(key);
-    return (i == dict.end()) ? NULL : &i->second;
-}
-
-inline const DictValue *Dict::ptr(const String &key) const
-{
-    _Dict::const_iterator i = dict.find(key);
-    return (i == dict.end()) ? NULL : &i->second;
-}
-
-inline const DictValue &Dict::get(const String &key) const
-{
-    _Dict::const_iterator i = dict.find(key);
-    if (i == dict.end())
-        CV_Error(Error::StsObjectNotFound, "Required argument \"" + key + "\" not found into dictionary");
-    return i->second;
-}
-
-template <typename T>
-inline T Dict::get(const String &key) const
-{
-    return this->get(key).get<T>();
-}
-
-template <typename T>
-inline T Dict::get(const String &key, const T &defaultValue) const
-{
-    _Dict::const_iterator i = dict.find(key);
-
-    if (i != dict.end())
-        return i->second.get<T>();
-    else
-        return defaultValue;
-}
-
-template<typename T>
-inline const T &Dict::set(const String &key, const T &value)
-{
-    _Dict::iterator i = dict.find(key);
-
-    if (i != dict.end())
-        i->second = DictValue(value);
-    else
-        dict.insert(std::make_pair(key, DictValue(value)));
-
-    return value;
-}
-
-inline std::ostream &operator<<(std::ostream &stream, const Dict &dict)
-{
-    Dict::_Dict::const_iterator it;
-    for (it = dict.dict.begin(); it != dict.dict.end(); it++)
-        stream << it->first << " : " << it->second << "\n";
-
-    return stream;
-}
-
-}
-}
-
-#endif

modules/dnn/include/opencv2/dnn/shape_utils.hpp

-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef __OPENCV_DNN_DNN_SHAPE_UTILS_HPP__
-#define __OPENCV_DNN_DNN_SHAPE_UTILS_HPP__
-
-#include <opencv2/core.hpp>
-#include <opencv2/core/types_c.h>
-#include <ostream>
-
-namespace cv {
-namespace dnn {
-
-//Useful shortcut
-inline std::ostream &operator<< (std::ostream &s, cv::Range &r)
-{
-    return s << "[" << r.start << ", " << r.end << ")";
-}
-
-//Reshaping
-//TODO: add -1 specifier for automatic size inferring
-
-/*template<typename Mat>
-void reshape(Mat &m, const BlobShape &shape)
-{
-    m = m.reshape(1, shape.dims(), shape.ptr());
-}
-
-template<typename Mat>
-Mat reshaped(const Mat &m, const BlobShape &shape)
-{
-    return m.reshape(1, shape.dims(), shape.ptr());
-}*/
-
-
-//Slicing
-
-struct _Range : public cv::Range
-{
-    _Range(const Range &r) : cv::Range(r) {}
-    _Range(int start, int size = 1) : cv::Range(start, start + size) {}
-};
-
-static inline Mat slice(const Mat &m, const _Range &r0)
-{
-    Range ranges[CV_MAX_DIM];
-    for (int i = 1; i < m.dims; i++)
-        ranges[i] = Range::all();
-    ranges[0] = r0;
-    return m(&ranges[0]);
-}
-
-static inline Mat slice(const Mat &m, const _Range &r0, const _Range &r1)
-{
-    CV_Assert(m.dims >= 2);
-    Range ranges[CV_MAX_DIM];
-    for (int i = 2; i < m.dims; i++)
-        ranges[i] = Range::all();
-    ranges[0] = r0;
-    ranges[1] = r1;
-    return m(&ranges[0]);
-}
-
-static inline Mat slice(const Mat &m, const _Range &r0, const _Range &r1, const _Range &r2)
-{
-    CV_Assert(m.dims >= 3);
-    Range ranges[CV_MAX_DIM];
-    for (int i = 3; i < m.dims; i++)
-        ranges[i] = Range::all();
-    ranges[0] = r0;
-    ranges[1] = r1;
-    ranges[2] = r2;
-    return m(&ranges[0]);
-}
-
-static inline Mat slice(const Mat &m, const _Range &r0, const _Range &r1, const _Range &r2, const _Range &r3)
-{
-    CV_Assert(m.dims >= 4);
-    Range ranges[CV_MAX_DIM];
-    for (int i = 4; i < m.dims; i++)
-        ranges[i] = Range::all();
-    ranges[0] = r0;
-    ranges[1] = r1;
-    ranges[2] = r2;
-    ranges[3] = r3;
-    return m(&ranges[0]);
-}
-
-static inline Mat getPlane(const Mat &m, int n, int cn)
-{
-    CV_Assert(m.dims > 2);
-    Range range[CV_MAX_DIM];
-    int sz[CV_MAX_DIM];
-    for(int i = 2; i < m.dims; i++)
-    {
-        sz[i-2] = m.size.p[i];
-        range[i] = Range::all();
-    }
-    range[0] = Range(n, n+1);
-    range[1] = Range(cn, cn+1);
-    return m(range).reshape(1, m.dims-2, sz);
-}
-
-static inline size_t shapeTotal(const std::vector<int>& shape)
-{
-    size_t i, n = shape.size(), p = 1;
-    for( i = 0; i < n; i++ ) p *= shape[i];
-
-    return p;
-}
-
-}
-}
-#endif

modules/dnn/misc/python/pyopencv_dnn.hpp

-#ifdef HAVE_OPENCV_DNN
-typedef dnn::DictValue LayerId;
-
-template<>
-bool pyopencv_to(PyObject *o, dnn::DictValue &dv, const char *name)
-{
-    (void)name;
-    if (!o || o == Py_None)
-        return true; //Current state will be used
-    else if (PyLong_Check(o))
-    {
-        dv = dnn::DictValue((int64)PyLong_AsLongLong(o));
-        return true;
-    }
-    else if (PyFloat_Check(o))
-    {
-        dv = dnn::DictValue(PyFloat_AS_DOUBLE(o));
-        return true;
-    }
-    else if (PyString_Check(o))
-    {
-        dv = dnn::DictValue(String(PyString_AsString(o)));
-        return true;
-    }
-    else
-        return false;
-}
-
-template<>
-bool pyopencv_to(PyObject *o, std::vector<Mat> &blobs, const char *name) //required for Layer::blobs RW
-{
-  return pyopencvVecConverter<Mat>::to(o, blobs, ArgInfo(name, false));
-}
-
-#endif

modules/dnn/misc/tensorflow/types.pb.cc

-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: types.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "types.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace tensorflow {
-
-namespace {
-
-const ::google::protobuf::EnumDescriptor* DataType_descriptor_ = NULL;
-
-}  // namespace
-
-
-void protobuf_AssignDesc_types_2eproto() GOOGLE_ATTRIBUTE_COLD;
-void protobuf_AssignDesc_types_2eproto() {
-  protobuf_AddDesc_types_2eproto();
-  const ::google::protobuf::FileDescriptor* file =
-    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
-      "types.proto");
-  GOOGLE_CHECK(file != NULL);
-  DataType_descriptor_ = file->enum_type(0);
-}
-
-namespace {
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
-void protobuf_AssignDescriptorsOnce() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
-                 &protobuf_AssignDesc_types_2eproto);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-}
-
-}  // namespace
-
-void protobuf_ShutdownFile_types_2eproto() {
-}
-
-void protobuf_InitDefaults_types_2eproto_impl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-}
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_InitDefaults_types_2eproto_once_);
-void protobuf_InitDefaults_types_2eproto() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_InitDefaults_types_2eproto_once_,
-                 &protobuf_InitDefaults_types_2eproto_impl);
-}
-void protobuf_AddDesc_types_2eproto_impl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  protobuf_InitDefaults_types_2eproto();
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-    "\n\013types.proto\022\ntensorflow*\234\005\n\010DataType\022\016"
-    "\n\nDT_INVALID\020\000\022\014\n\010DT_FLOAT\020\001\022\r\n\tDT_DOUBL"
-    "E\020\002\022\014\n\010DT_INT32\020\003\022\014\n\010DT_UINT8\020\004\022\014\n\010DT_IN"
-    "T16\020\005\022\013\n\007DT_INT8\020\006\022\r\n\tDT_STRING\020\007\022\020\n\014DT_"
-    "COMPLEX64\020\010\022\014\n\010DT_INT64\020\t\022\013\n\007DT_BOOL\020\n\022\014"
-    "\n\010DT_QINT8\020\013\022\r\n\tDT_QUINT8\020\014\022\r\n\tDT_QINT32"
-    "\020\r\022\017\n\013DT_BFLOAT16\020\016\022\r\n\tDT_QINT16\020\017\022\016\n\nDT"
-    "_QUINT16\020\020\022\r\n\tDT_UINT16\020\021\022\021\n\rDT_COMPLEX1"
-    "28\020\022\022\013\n\007DT_HALF\020\023\022\020\n\014DT_FLOAT_REF\020e\022\021\n\rD"
-    "T_DOUBLE_REF\020f\022\020\n\014DT_INT32_REF\020g\022\020\n\014DT_U"
-    "INT8_REF\020h\022\020\n\014DT_INT16_REF\020i\022\017\n\013DT_INT8_"
-    "REF\020j\022\021\n\rDT_STRING_REF\020k\022\024\n\020DT_COMPLEX64"
-    "_REF\020l\022\020\n\014DT_INT64_REF\020m\022\017\n\013DT_BOOL_REF\020"
-    "n\022\020\n\014DT_QINT8_REF\020o\022\021\n\rDT_QUINT8_REF\020p\022\021"
-    "\n\rDT_QINT32_REF\020q\022\023\n\017DT_BFLOAT16_REF\020r\022\021"
-    "\n\rDT_QINT16_REF\020s\022\022\n\016DT_QUINT16_REF\020t\022\021\n"
-    "\rDT_UINT16_REF\020u\022\025\n\021DT_COMPLEX128_REF\020v\022"
-    "\017\n\013DT_HALF_REF\020wB,\n\030org.tensorflow.frame"
-    "workB\013TypesProtosP\001\370\001\001b\006proto3", 750);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "types.proto", &protobuf_RegisterTypes);
-  ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_types_2eproto);
-}
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_types_2eproto_once_);
-void protobuf_AddDesc_types_2eproto() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_types_2eproto_once_,
-                 &protobuf_AddDesc_types_2eproto_impl);
-}
-// Force AddDescriptors() to be called at static initialization time.
-struct StaticDescriptorInitializer_types_2eproto {
-  StaticDescriptorInitializer_types_2eproto() {
-    protobuf_AddDesc_types_2eproto();
-  }
-} static_descriptor_initializer_types_2eproto_;
-const ::google::protobuf::EnumDescriptor* DataType_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return DataType_descriptor_;
-}
-bool DataType_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-    case 16:
-    case 17:
-    case 18:
-    case 19:
-    case 101:
-    case 102:
-    case 103:
-    case 104:
-    case 105:
-    case 106:
-    case 107:
-    case 108:
-    case 109:
-    case 110:
-    case 111:
-    case 112:
-    case 113:
-    case 114:
-    case 115:
-    case 116:
-    case 117:
-    case 118:
-    case 119:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace tensorflow
-
-// @@protoc_insertion_point(global_scope)

modules/dnn/perf/perf_main.cpp

-#include "perf_precomp.hpp"
-
-CV_PERF_TEST_MAIN(dnn)

modules/dnn/samples/.gitignore

-*.caffemodel