Merged version references fix

a4ec89fb · Andrey Kamaev · 249bf008 · a4ec89fb · a4ec89fb · a4ec89fb
Commit a4ec89fb authored Jul 02, 2012 by Andrey Kamaev
5 changed files
--- a/android/service/doc/JavaHelper.rst
+++ b/android/service/doc/JavaHelper.rst
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@@ -150,7 +150,7 @@ if(OpenCV_LIB_PATH AND EXISTS "${OpenCV_LIB_PATH}/OpenCVConfig.cmake")
  endif()
 else()
  if(NOT OpenCV_FIND_QUIETLY)
-    message(WARNING "Found OpenCV 2.4.0 Windows Super Pack but it has not binaries compatible with your configuration.
+    message(WARNING "Found OpenCV 2.4.2 Windows Super Pack but it has not binaries compatible with your configuration.
    You should manually point CMake variable OpenCV_DIR to your build of OpenCV library.")
  endif()
  set(OpenCV_FOUND FALSE CACHE BOOL "" FORCE)

--- a/doc/tutorials/introduction/android_binary_package/android_binary_package.rst
+++ b/doc/tutorials/introduction/android_binary_package/android_binary_package.rst
@@ -154,12 +154,12 @@ Get the OpenCV package for Android development

   .. code-block:: bash

-      tar -jxvf ~/Downloads/OpenCV-2.4.1-android-bin2.tar.bz2
+      tar -jxvf ~/Downloads/OpenCV-2.4.2-android-sdk.tar.bz2

   For this tutorial I have unpacked OpenCV to the :file:`C:\\Work\\android-opencv\\` directory.

-.. |opencv_android_bin_pack| replace:: OpenCV-2.4.1-android-bin2.tar.bz2
-.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.1/OpenCV-2.4.1-android-bin2.tar.bz2/download
+.. |opencv_android_bin_pack| replace:: OpenCV-2.4.2-android-sdk.tar.bz2
+.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.2/OpenCV-2.4.2-android-sdk.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/

--- a/doc/tutorials/introduction/android_binary_package/android_binary_package_using_with_NDK.rst
+++ b/doc/tutorials/introduction/android_binary_package/android_binary_package_using_with_NDK.rst
--- 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.4.1).
+#. Open the folder for the latest version (currently this is 2.4.2).

 #. 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/tags/2.4.1 (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/tags/2.4.2 (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 some 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 the most up to date version of it.