From 0451779d2c6c3da0d218119e3c7dc363e9d8f79f Mon Sep 17 00:00:00 2001 From: Bernat Gabor Date: Fri, 19 Aug 2011 10:12:33 +0000 Subject: [PATCH] Ticket #1240 resolved. --- doc/conf.py | 6 +++--- doc/tutorials/introduction/linux_install/linux_install.rst | 5 ++++- doc/tutorials/introduction/windows_install/windows_install.rst | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 28100b3..41b190a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -277,9 +277,9 @@ man_pages = [ # ---- External links for tutorials ----------------- extlinks = {'cvt_color': ('http://opencv.willowgarage.com/documentation/cpp/imgproc_miscellaneous_image_transformations.html#cv-cvtcolor%s', None), - 'imread': ('http://opencv.willowgarage.com/documentation/cpp/highgui_reading_and_writing_images_and_video.html?highlight=imread#imread%s', None), - 'imwrite': ('http://opencv.willowgarage.com/documentation/cpp/highgui_reading_and_writing_images_and_video.html?highlight=imread#cv-imwrite%s', None), - 'imshow': ('http://opencv.willowgarage.com/documentation/cpp/highgui_user_interface.html?highlight=imshow#imshow%s', None), + 'imread': ('http://opencv.willowgarage.com/documentation/cpp/highgui_reading_and_writing_images_and_video.html?highlight=imread#imread%s', None), + 'imwrite': ('http://opencv.willowgarage.com/documentation/cpp/highgui_reading_and_writing_images_and_video.html?highlight=imread#cv-imwrite%s', None), + 'imshow': ('http://opencv.willowgarage.com/documentation/cpp/highgui_user_interface.html?highlight=imshow#imshow%s', None), 'named_window': ('http://opencv.willowgarage.com/documentation/cpp/highgui_user_interface.html?highlight=namedwindow#namedWindow%s', None), 'wait_key': ('http://opencv.willowgarage.com/documentation/cpp/highgui_user_interface.html?highlight=namedwindow#cv-waitkey%s', None), 'add_weighted': ('http://opencv.willowgarage.com/documentation/cpp/core_operations_on_arrays.html?highlight=addweighted#addWeighted%s', None), diff --git a/doc/tutorials/introduction/linux_install/linux_install.rst b/doc/tutorials/introduction/linux_install/linux_install.rst index e78e1d8..f41777c 100644 --- a/doc/tutorials/introduction/linux_install/linux_install.rst +++ b/doc/tutorials/introduction/linux_install/linux_install.rst @@ -28,7 +28,7 @@ All the libraries above can be installed via Terminal or by using Synaptic Manag Getting OpenCV source code ============================ -You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest snapshot from the SVN repository: +You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest snapshot from the `SVN repository < http://code.ros.org/svn/opencv/>`_. Getting the latest stable OpenCV version ------------------------------------------ @@ -82,4 +82,7 @@ Building OpenCV from source using CMake, using the command line make sudo make install +.. note:: + + If the size of the created library is a critical issue (like in case of an Android build) you can use the ``install/strip`` command to get the smallest size as possible. The *stripped* version appears to be twice as small. However, we do not recommend using this unless those extra megabytes do really matter. diff --git a/doc/tutorials/introduction/windows_install/windows_install.rst b/doc/tutorials/introduction/windows_install/windows_install.rst index 720249d..26c6240 100644 --- a/doc/tutorials/introduction/windows_install/windows_install.rst +++ b/doc/tutorials/introduction/windows_install/windows_install.rst @@ -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 - https://code.ros.org/svn/opencv/branches/2.3 (this will change with every new realease) + + stable and tested build - https://code.ros.org/svn/opencv/branches/2.3 (the number at the end will change with every new realease, so change it to that) + development build - https://code.ros.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