Commit a96466a7 authored by Roman Donchenko's avatar Roman Donchenko

Merge pull request #1062 from kirill-kornyakov:fixes-for-documentation

parents 156155ad aef347e7
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
{% if theme_lang == 'c' %} {% if theme_lang == 'c' %}
{% endif %} {% endif %}
{% if theme_lang == 'cpp' %} {% if theme_lang == 'cpp' %}
<li>Try the <a href="http://docs.opencv.org/trunk/opencv_cheatsheet.pdf">Cheatsheet</a>.</li> <li>Try the <a href="http://docs.opencv.org/opencv_cheatsheet.pdf">Cheatsheet</a>.</li>
{% endif %} {% endif %}
{% if theme_lang == 'py' %} {% if theme_lang == 'py' %}
<li>Try the <a href="cookbook.html">Cookbook</a>.</li> <li>Try the <a href="cookbook.html">Cookbook</a>.</li>
......
This diff is collapsed.
.. note:: .. note::
Unfortunetly we have no tutorials into this section. Nevertheless, our tutorial writting team is working on it. If you have a tutorial suggestion or you have writen yourself a tutorial (or coded a sample code) that you would like to see here please contact us via our :opencv_group:`user group <>`. Unfortunetly we have no tutorials into this section. And you can help us with that, since OpenCV is a community effort. If you have a tutorial suggestion or you have written a tutorial yourself (or coded a sample code) that you would like to see here, please contact follow these instructions: :ref:`howToWriteTutorial` and :how_to_contribute:`How to contribute <>`.
\ No newline at end of file \ No newline at end of file
...@@ -62,7 +62,7 @@ The GPU has its own memory. When you read data from the hard drive with OpenCV i ...@@ -62,7 +62,7 @@ The GPU has its own memory. When you read data from the hard drive with OpenCV i
I1 = gI1; // Download, gI1.download(I1) will work too I1 = gI1; // Download, gI1.download(I1) will work too
Once you have your data up in the GPU memory you may call GPU enabled functions of OpenCV. Most of the functions keep the same name just as on the CPU, with the difference that they only accept *GpuMat* inputs. A full list of these you will find in the documentation: `online here <http://opencv.itseez.com/modules/gpu/doc/gpu.html>`_ or the OpenCV reference manual that comes with the source code. Once you have your data up in the GPU memory you may call GPU enabled functions of OpenCV. Most of the functions keep the same name just as on the CPU, with the difference that they only accept *GpuMat* inputs. A full list of these you will find in the documentation: `online here <http://docs.opencv.org/modules/gpu/doc/gpu.html>`_ or the OpenCV reference manual that comes with the source code.
Another thing to keep in mind is that not for all channel numbers you can make efficient algorithms on the GPU. Generally, I found that the input images for the GPU images need to be either one or four channel ones and one of the char or float type for the item sizes. No double support on the GPU, sorry. Passing other types of objects for some functions will result in an exception thrown, and an error message on the error output. The documentation details in most of the places the types accepted for the inputs. If you have three channel images as an input you can do two things: either adds a new channel (and use char elements) or split up the image and call the function for each image. The first one isn't really recommended as you waste memory. Another thing to keep in mind is that not for all channel numbers you can make efficient algorithms on the GPU. Generally, I found that the input images for the GPU images need to be either one or four channel ones and one of the char or float type for the item sizes. No double support on the GPU, sorry. Passing other types of objects for some functions will result in an exception thrown, and an error message on the error output. The documentation details in most of the places the types accepted for the inputs. If you have three channel images as an input you can do two things: either adds a new channel (and use char elements) or split up the image and call the function for each image. The first one isn't really recommended as you waste memory.
......
...@@ -98,7 +98,7 @@ The structure of package contents looks as follows: ...@@ -98,7 +98,7 @@ The structure of package contents looks as follows:
* :file:`doc` folder contains various OpenCV documentation in PDF format. * :file:`doc` folder contains various OpenCV documentation in PDF format.
It's also available online at http://docs.opencv.org. It's also available online at http://docs.opencv.org.
.. note:: The most recent docs (nightly build) are at http://docs.opencv.org/trunk/. .. note:: The most recent docs (nightly build) are at http://docs.opencv.org/2.4.
Generally, it's more up-to-date, but can refer to not-yet-released functionality. Generally, it's more up-to-date, but can refer to not-yet-released functionality.
.. TODO: I'm not sure that this is the best place to talk about OpenCV Manager .. TODO: I'm not sure that this is the best place to talk about OpenCV Manager
......
...@@ -292,7 +292,7 @@ Building the library ...@@ -292,7 +292,7 @@ Building the library
This will create an *Install* directory inside the *Build* one collecting all the built binaries into a single place. Use this only after you built both the *Release* and *Debug* versions. This will create an *Install* directory inside the *Build* one collecting all the built binaries into a single place. Use this only after you built both the *Release* and *Debug* versions.
To test your build just go into the :file:`Build/bin/Debug` or :file:`Build/bin/Release` directory and start a couple of applications like the *contours.exe*. If they run, you are done. Otherwise, something definitely went awfully wrong. In this case you should contact us via our :opencv_group:`user group <>`. To test your build just go into the :file:`Build/bin/Debug` or :file:`Build/bin/Release` directory and start a couple of applications like the *contours.exe*. If they run, you are done. Otherwise, something definitely went awfully wrong. In this case you should contact us at our :opencv_qa:`Q&A forum <>`.
If everything is okay the *contours.exe* output should resemble the following image (if built with Qt support): If everything is okay the *contours.exe* output should resemble the following image (if built with Qt support):
.. image:: images/WindowsQtContoursOutput.png .. image:: images/WindowsQtContoursOutput.png
......
...@@ -86,7 +86,7 @@ The names of the libraries are as follow: ...@@ -86,7 +86,7 @@ The names of the libraries are as follow:
opencv_(The Name of the module)(The version Number of the library you use)d.lib opencv_(The Name of the module)(The version Number of the library you use)d.lib
A full list, for the currently latest trunk version would contain: A full list, for the latest version would contain:
.. code-block:: bash .. code-block:: bash
......
...@@ -129,7 +129,7 @@ Explanation ...@@ -129,7 +129,7 @@ Explanation
3. **Train the SVM** 3. **Train the SVM**
We call the method `CvSVM::train <http://opencv.itseez.com/modules/ml/doc/support_vector_machines.html#cvsvm-train>`_ to build the SVM model. We call the method `CvSVM::train <http://docs.opencv.org/modules/ml/doc/support_vector_machines.html#cvsvm-train>`_ to build the SVM model.
.. code-block:: cpp .. code-block:: cpp
......
...@@ -14,7 +14,9 @@ It has been tested with the motempl sample program ...@@ -14,7 +14,9 @@ It has been tested with the motempl sample program
First Patch: August 24, 2004 Travis Wood TravisOCV@tkwood.com First Patch: August 24, 2004 Travis Wood TravisOCV@tkwood.com
For Release: OpenCV-Linux Beta4 opencv-0.9.6 For Release: OpenCV-Linux Beta4 opencv-0.9.6
Tested On: LMLBT44 with 8 video inputs Tested On: LMLBT44 with 8 video inputs
Problems? Post problems/fixes to OpenCV group on groups.yahoo.com Problems? Post your questions at answers.opencv.org,
Report bugs at code.opencv.org,
Submit your fixes at https://github.com/Itseez/opencv/
Patched Comments: Patched Comments:
TW: The cv cam utils that came with the initial release of OpenCV for LINUX Beta4 TW: The cv cam utils that came with the initial release of OpenCV for LINUX Beta4
......
...@@ -14,7 +14,9 @@ It has been tested with the motempl sample program ...@@ -14,7 +14,9 @@ It has been tested with the motempl sample program
First Patch: August 24, 2004 Travis Wood TravisOCV@tkwood.com First Patch: August 24, 2004 Travis Wood TravisOCV@tkwood.com
For Release: OpenCV-Linux Beta4 opencv-0.9.6 For Release: OpenCV-Linux Beta4 opencv-0.9.6
Tested On: LMLBT44 with 8 video inputs Tested On: LMLBT44 with 8 video inputs
Problems? Post problems/fixes to OpenCV group on groups.yahoo.com Problems? Post your questions at answers.opencv.org,
Report bugs at code.opencv.org,
Submit your fixes at https://github.com/Itseez/opencv/
Patched Comments: Patched Comments:
TW: The cv cam utils that came with the initial release of OpenCV for LINUX Beta4 TW: The cv cam utils that came with the initial release of OpenCV for LINUX Beta4
......
...@@ -17,8 +17,6 @@ import android.util.Log; ...@@ -17,8 +17,6 @@ import android.util.Log;
/** /**
* This only class is Android specific. * This only class is Android specific.
*
* @see <a href="http://opencv.itseez.com">OpenCV</a>
*/ */
public class OpenCVTestRunner extends InstrumentationTestRunner { public class OpenCVTestRunner extends InstrumentationTestRunner {
......
...@@ -56,7 +56,7 @@ public class VideoCapture { ...@@ -56,7 +56,7 @@ public class VideoCapture {
* * CV_CAP_PROP_FRAME_WIDTH width of the frames in the video stream. * * CV_CAP_PROP_FRAME_WIDTH width of the frames in the video stream.
* * CV_CAP_PROP_FRAME_HEIGHT height of the frames in the video stream. * * CV_CAP_PROP_FRAME_HEIGHT height of the frames in the video stream.
* *
* @see <a href="http://opencv.itseez.com/modules/highgui/doc/reading_and_writing_images_and_video.html#videocapture-get">org.opencv.highgui.VideoCapture.get</a> * @see <a href="http://docs.opencv.org/modules/highgui/doc/reading_and_writing_images_and_video.html#videocapture-get">org.opencv.highgui.VideoCapture.get</a>
*/ */
public double get(int propId) public double get(int propId)
{ {
...@@ -178,7 +178,7 @@ public class VideoCapture { ...@@ -178,7 +178,7 @@ public class VideoCapture {
* * CV_CAP_PROP_FRAME_HEIGHT height of the frames in the video stream. * * CV_CAP_PROP_FRAME_HEIGHT height of the frames in the video stream.
* @param value value of the property. * @param value value of the property.
* *
* @see <a href="http://opencv.itseez.com/modules/highgui/doc/reading_and_writing_images_and_video.html#videocapture-set">org.opencv.highgui.VideoCapture.set</a> * @see <a href="http://docs.opencv.org/modules/highgui/doc/reading_and_writing_images_and_video.html#videocapture-set">org.opencv.highgui.VideoCapture.set</a>
*/ */
public boolean set(int propId, double value) public boolean set(int propId, double value)
{ {
......
...@@ -1646,7 +1646,7 @@ class AreaTests(OpenCVTests): ...@@ -1646,7 +1646,7 @@ class AreaTests(OpenCVTests):
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))
return cv.DecodeImageM(imagefiledata) return cv.DecodeImageM(imagefiledata)
urllib.urlretrieve("http://opencv.itseez.com/data/camera_calibration.tar.gz", "camera_calibration.tar.gz") urllib.urlretrieve("http://docs.opencv.org/data/camera_calibration.tar.gz", "camera_calibration.tar.gz")
tf = tarfile.open("camera_calibration.tar.gz") tf = tarfile.open("camera_calibration.tar.gz")
num_x_ints = 8 num_x_ints = 8
......
...@@ -56,7 +56,7 @@ static void help( char** argv ) ...@@ -56,7 +56,7 @@ static void help( char** argv )
} }
int main( int argc, char** argv ) { int main( int argc, char** argv ) {
// check http://opencv.itseez.com/doc/tutorials/features2d/table_of_content_features2d/table_of_content_features2d.html // check http://docs.opencv.org/doc/tutorials/features2d/table_of_content_features2d/table_of_content_features2d.html
// for OpenCV general detection/matching framework details // for OpenCV general detection/matching framework details
if( argc != 3 ) { if( argc != 3 ) {
......
...@@ -14,15 +14,12 @@ ...@@ -14,15 +14,12 @@
Or: http://oreilly.com/catalog/9780596516130/ Or: http://oreilly.com/catalog/9780596516130/
ISBN-10: 0596516134 or: ISBN-13: 978-0596516130 ISBN-10: 0596516134 or: ISBN-13: 978-0596516130
OTHER OPENCV SITES: OPENCV WEBSITES:
* The source code is on sourceforge at: Homepage: http://opencv.org
http://sourceforge.net/projects/opencvlibrary/ Online docs: http://docs.opencv.org
* The OpenCV wiki page (As of Oct 1, 2008 this is down for changing over servers, but should come back): Q&A forum: http://answers.opencv.org
http://opencvlibrary.sourceforge.net/ Issue tracker: http://code.opencv.org
* An active user group is at: GitHub: https://github.com/Itseez/opencv/
http://tech.groups.yahoo.com/group/OpenCV/
* The minutes of weekly OpenCV development meetings are at:
http://code.opencv.org/projects/opencv/wiki/Meeting_notes
************************************************** */ ************************************************** */
#include "opencv2/calib3d/calib3d.hpp" #include "opencv2/calib3d/calib3d.hpp"
......
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