Added video.hpp header (for convenience with other modules); added option to specify...

diff --git a/include/opencv2/opencv.hpp b/include/opencv2/opencv.hpp
index 4d1c2af..f338163 100644 (file)
--- a/include/opencv2/opencv.hpp
+++ b/include/opencv2/opencv.hpp
@@ -48,8 +48,7 @@
 #include "opencv2/flann/flann.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/video/tracking.hpp"
-#include "opencv2/video/background_segm.hpp"
+#include "opencv2/video/video.hpp"
 #include "opencv2/features2d/features2d.hpp"
 #include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/calib3d/calib3d.hpp"

diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
index be12d9b..94dfd58 100644 (file)
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -13,15 +13,19 @@ SET(GEN_JAVA "${CMAKE_CURRENT_SOURCE_DIR}/gen_java.py")
 SET(HDR_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/../python/src2/hdr_parser.py")
 
 foreach(module ${OPENCV_JAVA_MODULES})
-    IF(${module} STREQUAL core)
-        SET (module_cppheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include/opencv2/${module}/${module}.hpp")
+    IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/config/${module}.filelist")
+        FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/config/${module}.filelist" headers_to_parse)
         SET (module_cheaders "")
+        SET (module_cppheaders "")
+        foreach(header ${headers_to_parse})
+            list(APPEND module_cppheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/${header}")
+        endforeach()
     ELSE()
         FILE(GLOB module_cheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include/opencv2/${module}/*.h")
         FILE(GLOB module_cppheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include/opencv2/${module}/*.hpp")
+        list(SORT module_cheaders)
+        list(SORT module_cppheaders)
     ENDIF()
-    list(SORT module_cheaders)
-    list(SORT module_cppheaders)
 
     add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${module}.java"

diff --git a/modules/java/config/core.filelist b/modules/java/config/core.filelist
new file mode 100644 (file)
index 0000000..76d6dd9
--- /dev/null
+++ b/modules/java/config/core.filelist
@@ -0,0 +1 @@
+include/opencv2/core/core.hpp

diff --git a/modules/video/include/opencv2/video/video.hpp b/modules/video/include/opencv2/video/video.hpp
new file mode 100644 (file)
index 0000000..21a2fce
--- /dev/null
+++ b/modules/video/include/opencv2/video/video.hpp
@@ -0,0 +1,49 @@
+/*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) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., 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_VIDEO_HPP__
+#define __OPENCV_VIDEO_HPP__
+
+#include "opencv2/video/tracking.hpp"
+#include "opencv2/video/background_segm.hpp"
+
+#endif //__OPENCV_VIDEO_HPP__