From 5f33aecd30cfe41836f3fc232764f94b52a70641 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 12 Apr 2012 12:48:58 +0000 Subject: [PATCH] changed 2.3 to 2.4 in some guides & tutorials (ticket #1794) --- doc/opencv_cheatsheet.tex | 2 +- .../android_binary_package/android_binary_package.rst | 8 ++++---- doc/tutorials/introduction/linux_install/linux_install.rst | 13 ++++++------- .../introduction/windows_install/windows_install.rst | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/doc/opencv_cheatsheet.tex b/doc/opencv_cheatsheet.tex index 5bca286..cbbd6cf 100644 --- a/doc/opencv_cheatsheet.tex +++ b/doc/opencv_cheatsheet.tex @@ -134,7 +134,7 @@ \setlength{\columnsep}{2pt} \begin{center} - \Large{\textbf{OpenCV 2.3 Cheat Sheet (C++)}} \\ + \Large{\textbf{OpenCV 2.4 Cheat Sheet (C++)}} \\ \end{center} \newlength{\MyLen} \settowidth{\MyLen}{\texttt{letterpaper}/\texttt{a4paper} \ } diff --git a/doc/tutorials/introduction/android_binary_package/android_binary_package.rst b/doc/tutorials/introduction/android_binary_package/android_binary_package.rst index e711cb8..4707784 100644 --- a/doc/tutorials/introduction/android_binary_package/android_binary_package.rst +++ b/doc/tutorials/introduction/android_binary_package/android_binary_package.rst @@ -100,7 +100,7 @@ You need the following tools to be installed: Check the `Android SDK System Requirements `_ document for a list of Eclipse versions that are compatible with the Android SDK. - For OpenCV 2.3.1 we recommend Eclipse 3.7 (Indigo) or Eclipse 3.6 (Helios). They work well for OpenCV under both Windows and Linux. + For OpenCV 2.4.1 we recommend Eclipse 3.6 (Helios) or later versions. They work well for OpenCV under both Windows and Linux. If you have no Eclipse installed, you can download it from this location: @@ -154,12 +154,12 @@ Get the OpenCV package for Android development .. code-block:: bash - tar -jxvf ~/Downloads/OpenCV-2.3.1-android-bin.tar.bz2 + tar -jxvf ~/Downloads/OpenCV-2.4.0-android-bin.tar.bz2 For this tutorial I have unpacked OpenCV to the :file:`C:\\Work\\android-opencv\\` directory. -.. |opencv_android_bin_pack| replace:: OpenCV-2.3.1-android-bin.tar.bz2 -.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.3.1/OpenCV-2.3.1-android-bin.tar.bz2/download +.. |opencv_android_bin_pack| replace:: OpenCV-2.4.0-android-bin.tar.bz2 +.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.0/OpenCV-2.4.0-android-bin.tar.bz2/download .. |opencv_android_bin_pack_url| replace:: |opencv_android_bin_pack| .. |seven_zip| replace:: 7-Zip .. _seven_zip: http://www.7-zip.org/ diff --git a/doc/tutorials/introduction/linux_install/linux_install.rst b/doc/tutorials/introduction/linux_install/linux_install.rst index ebe4b63..13b5f60 100644 --- a/doc/tutorials/introduction/linux_install/linux_install.rst +++ b/doc/tutorials/introduction/linux_install/linux_install.rst @@ -7,7 +7,7 @@ These steps have been tested for Ubuntu 10.04 but should work with other distros Required packages ================== - * GCC 4.x or later. This can be installed with + * GCC 4.4.x or later. This can be installed with .. code-block:: bash @@ -15,13 +15,12 @@ Required packages * CMake 2.6 or higher * Subversion (SVN) client - * GTK+2.x or higher, including headers + * GTK+2.x or higher, including headers (libgtk2.0-dev) * pkgconfig - * libpng, zlib, libjpeg, libtiff, libjasper with development files (e.g. libpjeg-dev) - * Python 2.3 or later with developer packages (e.g. python-dev) - * SWIG 1.3.30 or later (only for versions prior to OpenCV 2.3) - * libavcodec - * libdc1394 2.x + * Python 2.6 or later and Numpy 1.5 or later with developer packages (python-dev, python-numpy) + * ffmpeg or libav development packages: libavcodec-dev, libavformat-dev, libswscale-dev + * [optional] libdc1394 2.x + * [optional] libjpeg-dev, libpng-dev, libtiff-dev, libjasper-dev. All the libraries above can be installed via Terminal or by using Synaptic Manager diff --git a/doc/tutorials/introduction/windows_install/windows_install.rst b/doc/tutorials/introduction/windows_install/windows_install.rst index adf45e5..9b3a82d 100644 --- a/doc/tutorials/introduction/windows_install/windows_install.rst +++ b/doc/tutorials/introduction/windows_install/windows_install.rst @@ -16,7 +16,7 @@ Installation by using the pre-built libraries 1. Open up a web browser and go to: http://sourceforge.net/projects/opencvlibrary/files/opencv-win/ -#. Open the folder for the latest version (currently this is 2.3). +#. Open the folder for the latest version (currently this is 2.4). #. Choose a build you want to use and download it. The naming conventions used will show what kind of support they offer. For example: @@ -60,7 +60,7 @@ If you are building your own libraries you can take either the source files from .. container:: enumeratevisibleitemswithsquare - + stable and tested build - http://code.opencv.org/svn/opencv/branches/2.3 (the number at the end will change with every new realease, so change it to that) + + stable and tested build - http://code.opencv.org/svn/opencv/branches/2.4 (the number at the end will change with every new realease, so change it to that) + development build - http://code.opencv.org/svn/opencv/trunk/ While the later one may contain a couple of new and experimental algorithms, performance increases and interface improvements, be aware, that it may also contain many-many bugs. Using the first one is recommended in most of the cases. That is unless you are extending the OpenCV library itself or really need to most up to date version of it. -- 2.7.4