Skip to content

O
opencv
Commit a7a5dd05 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

updated version number; removed unnecessary index.html and ChangeLog.htm

parent ea3ccc6d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 136 deletions
CMakeLists.txt
View file @ a7a5dd05
......@@ -68,7 +68,7 @@ endif()
# ----------------------------------------------------------------------------
# Current version number:
# ----------------------------------------------------------------------------
set(OPENCV_VERSION "2.1.1")
set(OPENCV_VERSION "2.2.0")
string(REGEX MATCHALL "[0-9]" OPENCV_VERSION_PARTS "${OPENCV_VERSION}")
......@@ -1098,10 +1098,9 @@ if(WIN32)
#exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/win-install/\"")
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
#Install the OpenCVConfig.cmake file which has the right paths pointing to the install directory
install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/")
#configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
# Install the OpenCVConfig.cmake file which has the right paths pointing to the install directory
install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/")
# if videoInput support is enabled (which is by default on WIN32) copy the static library required to the installation path
# DESTINATION could also be "${CMAKE_INSTALL_PREFIX}/lib") to simplify dev environment setup of client applications
......
Package.cmake.in
View file @ a7a5dd05
......@@ -74,13 +74,13 @@ if(WIN32)
#set(CPACK_PACKAGE_ICON "utils/opencv.ico")
set(CPACK_NSIS_INSTALLED_ICON_NAME "${CMAKE_SOURCE_DIR}\\\\doc\\\\opencv.ico")
set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\opencvlibrary.sourceforge.net")
set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\opencvlibrary.sourceforge.net")
set(CPACK_NSIS_CONTACT "info@opencvlibrary.sourceforge.net")
set(CPACK_NSIS_DISPLAY_NAME "OpenCV SDK")
set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\opencv.willowgarage.com")
set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\opencv.willowgarage.com")
set(CPACK_NSIS_CONTACT "")
set(CPACK_NSIS_DISPLAY_NAME "Open Source Computer Vision Library")
set(CPACK_NSIS_MENU_LINKS
"doc\\\\index.htm" "Start Page"
"http://opencv.willowgarage.com" "Start Page"
"doc\\\\opencv.pdf" "The Reference Manual"
"CMakeLists.txt" "The Build Script (open with CMake)"
"samples\\\\c" "C Samples"
......
README
View file @ a7a5dd05
See doc/index.htm
See http://opencv.willowgarage.com
android/cvconfig.h.in
View file @ a7a5dd05
......@@ -131,13 +131,13 @@
#define PACKAGE_NAME "opencv"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "opencv 2.1.0"
#define PACKAGE_STRING "opencv 2.2.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "opencv"
/* Define to the version of this package. */
#define PACKAGE_VERSION "2.1.0"
#define PACKAGE_VERSION "2.2.0"
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
......@@ -148,7 +148,7 @@
/* #undef STACK_DIRECTION */
/* Version number of package */
#define VERSION "2.1.0"
#define VERSION "2.2.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
......
doc/ChangeLog.htm deleted 100644 → 0
View file @ ea3ccc6d
This diff is collapsed.
doc/index.htm deleted 100644 → 0
View file @ ea3ccc6d
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
<html><head>
<title>OpenCV Documentation</title>
</head><body>
<center><table cellspacing=0 cellpadding=5 bgcolor="#6a9bed">
<tr>
<td rowspan="2">
<img src="opencv-logo.png" width="200"></td>
<td>
<center><i><font color="#000000"><font size=+4>
Open Source Computer Vision Library
</font></font></i></center>
</td>
</tr>
</table></center>
<!-- <p align="center"><img src="opencv.jpg"></a></p>
<hr>-->
<h1>What is OpenCV</h1>
<p>OpenCV means Open Source Computer Vision Library.
It is a collection of C functions and a few C++ classes that implement
many popular Image Processing and Computer Vision algorithms.</p>
<hr>
<h1><a name="#ref">OpenCV Book</a></h1>
The official book for OpenCV is published by O'Reilly Press
Learning OpenCV Computer Vision with the OpenCV Library
by Gary Bradski and Adrian Kaehler
<a href="http://www.amazon.com/Learning-OpenCV-Computer-Vision-Library/dp/0596516134">
http://www.amazon.com/Learning-OpenCV-Computer-Vision-Library/dp/0596516134
</a>
<p>
This book is:
<ol>
<li>A tutorial on computer vision in general
<li>A user's guide to OpenCV
<li>A source of useful working sample code and detailed function descriptions.
</ol>
<hr>
<h1>The key features</h1>
<p>OpenCV provides cross-platform middle-to-high level API that includes
about 300 functions and a few C++ classes. Also there are
constantly improving Python bindings to OpenCV, see
interfaces/swig/python and samples/python.
OpenCV has no strict dependencies on external libraries,
though it can use some (such as libjpeg, ffmpeg, GTK+ etc.)
when it is possible.</p>
<p>OpenCV is free for both non-commercial and commercial use
(see the <a href="license.txt">license</a> for details).</p>
<p><a name="#ipp">OpenCV can be built with Intel&reg; Integrated Performance
Primitives (IPP).</a>
This makes it fast on all the architectures supported by the library,
where the optimal code for each host architecture is chosen at runtime.
More information about IPP can be retrieved at
<a href="http://www.intel.com/software/products/ipp/index.htm">
http://www.intel.com/software/products/ipp/index.htm</a></p>
Then, OpenCV itself can be built with <a href="http://www.threadingbuildingblocks.org/">TBB</a>
support, and, starting with v2.0,
OpenCV also includes SSE2-optimized code, so many of the functions run significantly
faster on the modern 32-bit x86 and 64-bit x64 platforms, and even faster on dual-,
quad- and many-core systems.
<hr>
<h1>Who created it</h1>
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.htm">ChangeLog</a>.
<hr>
<h1>Where to get OpenCV</h1>
<p>Go <a href="http://www.sourceforge.net/projects/opencvlibrary">http://www.sourceforge.net/projects/opencvlibrary</a>.
If it does not work, type "OpenCV" in
<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>
<li>Visit OpenCV Wiki-pages at
<a href="http://opencv.willowgarage.com/wiki/">http://opencv.willowgarage.com/wiki/</a> and
look for the information there (and/or add it when you have found a solution)
<li>Search through OpenCV archives at www.yahoogroups.com
(<a href="http://groups.yahoo.com/group/OpenCV/">http://groups.yahoo.com/group/OpenCV/</a>)
<li>Join OpenCV mailing list at yahoo groups (see FAQs on how to do it) and mail your questions
(the mailing list will probably migrate to
<a href="http://www.sourceforge.net/projects/opencvlibrary">OpenCV's SourceForge site</a>)
<li>Look at the OpenCV sample code, read the reference manual <a href="opencv.pdf">offline in PDF</a>
or online (<a href="http://opencv.willowgarage.com/documentation/c/index.html">C</a>,
<a href="http://opencv.willowgarage.com/documentation/cpp/index.html">C++</a> and
<a href="http://opencv.willowgarage.com/documentation/python/index.html">Python</a>).
</ol>
</body></html>
doc/latex2sphinx/conf.py
View file @ a7a5dd05
......@@ -46,9 +46,9 @@ copyright = u'2010, authors'
# built documents.
#
# The short X.Y version.
version = '2.1'
version = '2.2'
# The full version, including alpha/beta/rc tags.
release = '2.1'
release = '2.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
doc/opencv.pdf
View file @ a7a5dd05
This diff is collapsed.
doc/opencv.tex
View file @ a7a5dd05
......@@ -68,8 +68,8 @@ backgroundcolor=\color{shadecolor}
%%%%%%%%%%%%%%%
\title{OpenCV Reference Manual} % used by \maketitle
\author{v2.1} % used by \maketitle
\date{March 18, 2010} % used by \maketitle
\author{v2.2} % used by \maketitle
\date{December, 2010} % used by \maketitle
\begin{document}
\maketitle % automatic title!
......
doc/opencv_cheatsheet.tex
View file @ a7a5dd05
This diff is collapsed.
modules/core/include/opencv2/core/version.hpp
View file @ a7a5dd05
......@@ -48,8 +48,8 @@
#define __OPENCV_VERSION_HPP__
#define CV_MAJOR_VERSION 2
#define CV_MINOR_VERSION 1
#define CV_SUBMINOR_VERSION 1
#define CV_MINOR_VERSION 2
#define CV_SUBMINOR_VERSION 0
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment