generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed 2.3 to 2.4 in some guides & tutorials (ticket #1794)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-12 12:48:58 +00:00
parent 1371c96935
commit 5f33aecd30
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/tutorials/introduction/android_binary_package/android_binary_package.rst
View File

@@ -100,7 +100,7 @@ You need the following tools to be installed:
Check the `Android SDK System Requirements
<http://developer.android.com/sdk/requirements.html>`_ 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/