potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Updated broken links of tutorials in core and fixed weird-looking bullets (error of mine)

Browse Source
This commit is contained in:
Ana Huaman
2011-08-15 01:25:36 +00:00
parent 8b0092eaf5
commit a0d73eadd3
6 changed files with 138 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/tutorials/introduction/display_image/display_image.rst
+14 -12
View File
@@ -17,7 +17,7 @@ In this tutorial you will learn how to:
Source Code
===========
Download the :download:`source code from here <../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp>` or look it up in our library at :file:`samples/cpp/tutorial_code/introduction/display_image/display_image.cpp`.
Download the source code from `here <https://code.ros.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp>`_.
.. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
:language: cpp
@@ -108,20 +108,22 @@ Because we want our window to be displayed until the user presses a key (otherwi
Result
=======
* Compile your code and then run the executable giving an image path as argument. If you're on Windows the executable will of course contain an *exe* extension too. Of course assure the image file is near your program file.
.. container:: enumeratevisibleitemswithsquare
.. code-block:: bash
* Compile your code and then run the executable giving an image path as argument. If you're on Windows the executable will of course contain an *exe* extension too. Of course assure the image file is near your program file.
./DisplayImage HappyFish.jpg
.. code-block:: bash
* You should get a nice window as the one shown below:
./DisplayImage HappyFish.jpg
.. image:: images/Display_Image_Tutorial_Result.jpg
:alt: Display Image Tutorial - Final Result
:align: center
* You should get a nice window as the one shown below:
.. raw:: html
.. image:: images/Display_Image_Tutorial_Result.jpg
:alt: Display Image Tutorial - Final Result
:align: center
<div align="center">
<iframe title="Introduction - Display an Image" width="560" height="349" src="http://www.youtube.com/embed/1OJEqpuaGc4?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
</div>
.. raw:: html
<div align="center">
<iframe title="Introduction - Display an Image" width="560" height="349" src="http://www.youtube.com/embed/1OJEqpuaGc4?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
</div>
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
+6 -4
View File
@@ -6,12 +6,14 @@ Using OpenCV with gcc and CMake
.. note::
We assume that you have successfully installed OpenCV in your workstation.
The easiest way of using OpenCV in your code is to use `CMake <http://www.cmake.org/>`_. A few advantages (taken from the Wiki):
.. container:: enumeratevisibleitemswithsquare
* No need to change anything when porting between Linux and Windows
* Can easily be combined with other tools by CMake( i.e. Qt, ITK and VTK )
* The easiest way of using OpenCV in your code is to use `CMake <http://www.cmake.org/>`_. A few advantages (taken from the Wiki):
If you are not familiar with CMake, checkout the `tutorial <http://www.cmake.org/cmake/help/cmake_tutorial.html>`_ on its website.
#. No need to change anything when porting between Linux and Windows
#. Can easily be combined with other tools by CMake( i.e. Qt, ITK and VTK )
* If you are not familiar with CMake, checkout the `tutorial <http://www.cmake.org/cmake/help/cmake_tutorial.html>`_ on its website.
Steps
======