endforeach()\r
\r
message(STATUS "IPP detected: ${IPP_FOUND}")\r
+\r
+if(WIN32 AND NOT MSVC)\r
+ set(IPP_FOUND)\r
+endif()\r
+\r
set(USE_IPP ${IPP_FOUND} CACHE BOOL "Use IPP when available")\r
\r
if(IPP_FOUND AND USE_IPP)\r
\r
include(${CMAKE_BINARY_DIR}/.cpack/Package.cmake)\r
\r
- set(root_files AUTHORS README ChangeLog COPYING INSTALL NEWS THANKS)\r
+ set(root_files README ChangeLog)\r
\r
file(GLOB root_src_files *.in *.sh *.cmake CMakeLists.txt)\r
\r
COMPONENT main\r
)\r
\r
+ if(CMAKE_INSTALL_DEBUG_LIBRARIES)\r
+ foreach(m cxcore cv cvaux ml highgui opencv_ffmpeg)\r
+ install(FILES ${CMAKE_BINARY_DIR}/bin/Debug/${m}${OPENCV_DLLVERSION}d.dll\r
+ DESTINATION bin COMPONENT main)\r
+ install(FILES ${CMAKE_BINARY_DIR}/lib/Debug/${m}${OPENCV_DLLVERSION}d.lib\r
+ DESTINATION lib COMPONENT main)\r
+ endforeach() \r
+ endif()\r
+\r
install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)\r
install(DIRECTORY 3rdparty apps interfaces src tests utils DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)\r
install(DIRECTORY doc/ DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.tex")\r
install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)\r
install(DIRECTORY doc/plastex DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)\r
- endif()\r
+ \r
+ endif()\r
endif()\r
\r
\r
For Open Source Computer Vision Library
Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+Copyright (C) 2008-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,
SET(MSVC90_OPENMP_DIR
"${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugOPENMP")
SET(__install__libs ${__install__libs}
- "${MSVC90_CRT_DIR}/Microsoft.VC90.DebugOpenMP.manifest"
- "${MSVC90_CRT_DIR}/vcomp90d.dll"
+ "${MSVC90_OPENMP_DIR}/Microsoft.VC90.DebugOpenMP.manifest"
+ "${MSVC90_OPENMP_DIR}/vcomp90d.dll"
)
ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
ENDIF(CMAKE_INSTALL_OPENMP_LIBRARIES)
#
set(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
-set(CMAKE_INSTALL_OPENMP_LIBRARIES 1)
-#include(OpenCVInstallRequiredSystemLibraries.cmake)
-include(InstallRequiredSystemLibraries)
-
-
-if(WIN32)
- # Add "<install_path>/bin" to the system PATH
- SET(CPACK_NSIS_MODIFY_PATH ON)
-endif(WIN32)
+if(ENABLE_OPENMP)
+ set(CMAKE_INSTALL_OPENMP_LIBRARIES 1)
+endif()
+include(OpenCVInstallRequiredSystemLibraries.cmake)
+#include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_NAME "OpenCV")
set(CPACK_PACKAGE_VENDOR "OpenCV project opencvlibrary.sourceforge.net")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenCV SDK for ${CMAKE_GENERATOR} is an All-In-One package for developing computer vision applications")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+#set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/doc/license.txt")
set(CPACK_PACKAGE_VERSION_MAJOR "${OPENCV_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${OPENCV_VERSION_MINOR}")
set(CPACK_PACKAGE_EXECUTABLES "")
-set(CPACK_COMPONENTS_ALL main src)
+set(CPACK_COMPONENTS_ALL main src Unspecified)
set(CPACK_COMPONENT_main_DISPLAY_NAME "Binaries and the Documentation")
set(CPACK_COMPONENT_src_DISPLAY_NAME "The source code")
"\\\\.aux$"
"\\\\.bbl$"
"\\\\.blg$"
+ "\\\\.dsp$"
"\\\\.idx$"
"\\\\.ilg$"
"\\\\.ind$"
"\\\\.log$"
"\\\\.toc$"
"\\\\.out$"
+ "\\\\.vcproj$"
"/1$"
"${CPACK_SOURCE_IGNORE_FILES}")
if(WIN32)
- set(CPACK_GENERATOR "NSIS")
- set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}\\\\utils\\\\opencv.ico")
- set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}\\\\utils\\\\opencv.ico")
- #set(CPACK_PACKAGE_ICON "utils/opencv.ico")
+ set(CPACK_GENERATOR "NSIS")
+ set(CPACK_NSIS_PACKAGE_NAME "OpenCV ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}\\\\utils\\\\opencv.ico")
+ set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}\\\\utils\\\\opencv.ico")
+ #set(CPACK_PACKAGE_ICON "utils/opencv.ico")
set(CPACK_NSIS_INSTALLED_ICON_NAME "${CMAKE_SOURCE_DIR}\\\\utils\\\\opencv.ico")
set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\opencvlibrary.sourceforge.net")
"CMakeLists.txt" "The Build Script (open with CMake)"
"samples\\\\c" "C Samples"
"samples\\\\python" "Python Samples")
-else()
- set(CPACK_GENERATOR "TBZ2")
- set(CPACK_SOURCE_GENERATOR "TBZ2")
- set(CPACK_SOURCE_PACKAGE_FILE_NAME
- "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
- if(APPLE)
- set(CPACK_GENERATOR "PackageMaker;TBZ2")
- endif()
+ # Add "<install_path>/bin" to the system PATH
+ set(CPACK_NSIS_MODIFY_PATH ON)
+else()
+ set(CPACK_GENERATOR "TBZ2")
+ set(CPACK_SOURCE_GENERATOR "TBZ2")
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME
+ "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+ if(APPLE)
+ set(CPACK_GENERATOR "PackageMaker;TBZ2")
+ endif()
endif()
include(CPack)
-See docs/index.htm
+See doc/index.htm
\item Bayer $\rightarrow$ RGB (\texttt{CV\_BayerBG2BGR, CV\_BayerGB2BGR, CV\_BayerRG2BGR, CV\_BayerGR2BGR, CV\_BayerBG2RGB, CV\_BayerGB2RGB, CV\_BayerRG2RGB, CV\_BayerGR2RGB}) The Bayer pattern is widely used in CCD and CMOS cameras. It allows one to get color pictures from a single plane where R,G and B pixels (sensors of a particular component) are interleaved like this:
-\newcommand{\R}{\color{red}R}
-\newcommand{\G}{\color{green}G}
-\newcommand{\B}{\color{blue}B}
+\newcommand{\Rcell}{\color{red}R}
+\newcommand{\Gcell}{\color{green}G}
+\newcommand{\Bcell}{\color{blue}B}
\[
\definecolor{BackGray}{rgb}{0.8,0.8,0.8}
\begin{array}{ c c c c c }
-\R&\G&\R&\G&\R\\
-\G&\colorbox{BackGray}{\B}&\colorbox{BackGray}{\G}&\B&\G\\
-\R&\G&\R&\G&\R\\
-\G&\B&\G&\B&\G\\
-\R&\G&\R&\G&\R
+\Rcell&\Gcell&\Rcell&\Gcell&\Rcell\\
+\Gcell&\colorbox{BackGray}{\Bcell}&\colorbox{BackGray}{\Gcell}&\Bcell&\Gcell\\
+\Rcell&\Gcell&\Rcell&\Gcell&\Rcell\\
+\Gcell&\Bcell&\Gcell&\Bcell&\Gcell\\
+\Rcell&\Gcell&\Rcell&\Gcell&\Rcell
\end{array}
\]
\item Bayer $\rightarrow$ RGB (\texttt{CV\_BayerBG2BGR, CV\_BayerGB2BGR, CV\_BayerRG2BGR, CV\_BayerGR2BGR, CV\_BayerBG2RGB, CV\_BayerGB2RGB, CV\_BayerRG2RGB, CV\_BayerGR2RGB}) The Bayer pattern is widely used in CCD and CMOS cameras. It allows one to get color pictures from a single plane where R,G and B pixels (sensors of a particular component) are interleaved like this:
-\newcommand{\R}{\color{red}R}
-\newcommand{\G}{\color{green}G}
-\newcommand{\B}{\color{blue}B}
+\newcommand{\Rcell}{\color{red}R}
+\newcommand{\Gcell}{\color{green}G}
+\newcommand{\Bcell}{\color{blue}B}
\[
\definecolor{BackGray}{rgb}{0.8,0.8,0.8}
\begin{array}{ c c c c c }
-\R&\G&\R&\G&\R\\
-\G&\colorbox{BackGray}{\B}&\colorbox{BackGray}{\G}&\B&\G\\
-\R&\G&\R&\G&\R\\
-\G&\B&\G&\B&\G\\
-\R&\G&\R&\G&\R
+\Rcell&\Gcell&\Rcell&\Gcell&\Rcell\\
+\Gcell&\colorbox{BackGray}{\Bcell}&\colorbox{BackGray}{\Gcell}&\Bcell&\Gcell\\
+\Rcell&\Gcell&\Rcell&\Gcell&\Rcell\\
+\Gcell&\Bcell&\Gcell&\Bcell&\Gcell\\
+\Rcell&\Gcell&\Rcell&\Gcell&\Rcell
\end{array}
\]
The example scenarios of function use are:
\begin{itemize}
- \item vertical flipping of the image ($\texttt{flipCode} > 0$) to switch between top-left and bottom-left image origin, which is a typical operation in video processing in Windows.
+ \item vertical flipping of the image ($\texttt{flipCode} = 0$) to switch between top-left and bottom-left image origin, which is a typical operation in video processing in Windows.
\item horizontal flipping of the image with subsequent horizontal shift and absolute difference calculation to check for a vertical-axis symmetry ($\texttt{flipCode} > 0$)
\item simultaneous horizontal and vertical flipping of the image with subsequent shift and absolute difference calculation to check for a central symmetry ($\texttt{flipCode} < 0$)
\item reversing the order of 1d point arrays ($\texttt{flipCode} > 0$ or $\texttt{flipCode} = 0$)
The example scenarios of function use are:
\begin{itemize}
- \item vertical flipping of the image (flip\_mode > 0) to switch between top-left and bottom-left image origin, which is a typical operation in video processing under Win32 systems.
+ \item vertical flipping of the image (flip\_mode = 0) to switch between top-left and bottom-left image origin, which is a typical operation in video processing under Win32 systems.
\item horizontal flipping of the image with subsequent horizontal shift and absolute difference calculation to check for a vertical-axis symmetry (flip\_mode $>$ 0)
\item simultaneous horizontal and vertical flipping of the image with subsequent shift and absolute difference calculation to check for a central symmetry (flip\_mode $<$ 0)
\item reversing the order of 1d point arrays (flip\_mode > 0)
<hr>
<h1>Who created it</h1>
-<p>The list of authors and major contributors can be found in the file <a href="../THANKS">THANKS</a>.</p>
+The list of authors and major contributors can be found at
+<a href="http://opencv.willowgarage.com/wiki/Contributors">http://opencv.willowgarage.com/wiki/Contributors</a>.</p>
<hr>
<h1>What's New</h1>
-<p>See the <a href="../ChangeLog">ChangeLog</a>.
+<p>See the <a href="../ChangeLog.txt">ChangeLog.txt</a>.
<hr>
<h1>Where to get OpenCV</h1>
<a href="http://www.google.com/search?hl=en&ie=UTF-8&q=opencv+computer+vision&btnG=%D0%9F%D0%BE%D0%B8%D1%81%D0%BA&lr=">Google (http://www.google.com)</a>.</p>
<hr>
+<h1>How to build it</h1>
+<p>See the installation guide: <a href="http://opencv.willowgarage.com/wiki/InstallGuide">http://opencv.willowgarage.com/wiki/InstallGuide</a>.
+
+<hr>
+
<h1><a name="troubleshooting">If you have a problem with installing/running/using OpenCV</a></h1>
<ol>
For Open Source Computer Vision Library
Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+Copyright (C) 2008-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,
virtual bool train( const cv::Mat& _train_data, int _tflag,
const cv::Mat& _responses, const cv::Mat& _var_idx=cv::Mat(),
- const cv::Mat& _sample_idx=0, const cv::Mat& _var_type=cv::Mat(),
- const cv::Mat& _missing_mask=0,
+ const cv::Mat& _sample_idx=cv::Mat(), const cv::Mat& _var_type=cv::Mat(),
+ const cv::Mat& _missing_mask=cv::Mat(),
CvBoostParams params=CvBoostParams(),
bool update=false );
target_link_libraries(${the_target} ${PYTHON_LIBRARIES} cxcore cv highgui)
set_target_properties(${the_target} PROPERTIES PREFIX "")
set_target_properties(${the_target} PROPERTIES OUTPUT_NAME "cv")
-set_target_properties(${the_target} PROPERTIES SUFFIX ".so")
-install(FILES ${LIBRARY_OUTPUT_PATH}/cv.so DESTINATION ${PYTHON_PACKAGES_PATH})
+if(WIN32)
+ set(CVPY_SUFFIX ".pyd")
+else()
+ set(CVPY_SUFFIX ".so")
+endif()
+
+set_target_properties(${the_target} PROPERTIES SUFFIX ${CVPY_SUFFIX})
+
+set(cvpy_files cv${CVPY_SUFFIX})
+
+if(WIN32)
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main
+ LIBRARY DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main
+ ARCHIVE DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main
+ )
+else()
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION ${PYTHON_PLUGIN_INSTALL_PATH} COMPONENT main
+ LIBRARY DESTINATION ${PYTHON_PLUGIN_INSTALL_PATH} COMPONENT main
+ ARCHIVE DESTINATION ${PYTHON_PLUGIN_INSTALL_PATH} COMPONENT main
+ )
+endif()
_labels->create(nsamples, 1, CV_32SC1);
plabels = &(labels = *_labels);
}
- return train(&samples, sidx.data.ptr ? &sidx : 0, params, plabels);
+ return train(&samples, sidx.data.ptr ? &sidx : 0, _params, plabels);
}
float
{
CvMat tdata = _train_data, responses = _responses, sidx = _sample_idx;
- return train(_train_data, _responses, sidx.data.ptr ? &sidx : 0, _is_regression, _max_k, _update_base );
+ return train(&tdata, &responses, sidx.data.ptr ? &sidx : 0, _is_regression, _max_k, _update_base );
}
projects / opencv.git / commitdiff