Added Smoothing tutorial in reST and links to the code in samples/cpp/tutorial_code

doc/conf.py

@@ -290,7 +290,11 @@ extlinks = {'cvt_color': ('http://opencv.willowgarage.com/documentation/cpp/imgp
             'circle': ('http://opencv.willowgarage.com/documentation/cpp/core_drawing_functions.html?#cv-circle%s', None),
             'fill_poly': ('http://opencv.willowgarage.com/documentation/cpp/core_drawing_functions.html?#cv-fillpoly%s', None),
             'rng': ('http://opencv.willowgarage.com/documentation/cpp/core_operations_on_arrays.html?#rng%s', None),
-            'put_text': ('http://opencv.willowgarage.com/documentation/cpp/core_drawing_functions.html?#putText%s', None)
+            'put_text': ('http://opencv.willowgarage.com/documentation/cpp/core_drawing_functions.html?#putText%s', None),
+            'gaussian_blur': ('http://opencv.willowgarage.com/documentation/cpp/image_filtering.html#cv-gaussianblur%s', None),
+	    'blur': ('http://opencv.willowgarage.com/documentation/cpp/image_filtering.html#cv-blur%s', None),
+            'median_blur': ('http://opencv.willowgarage.com/documentation/cpp/image_filtering.html#cv-medianblur%s', None), 
+            'bilateral_filter': ('http://opencv.willowgarage.com/documentation/cpp/image_filtering.html#cv-bilateralfilter%s', None)
            }
 
 

doc/tutorials/Drawing_1.rst

@@ -51,7 +51,7 @@ Scalar
 
 Code
 =====
-It can be found in the samples folder in OpenCV (**Drawing_1.cpp**)
+* This code is in your OpenCV sample folder. Otherwise you can grab it from `here <https://code.ros.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Basic/Drawing_1.cpp>`_
 
 Explanation
 =============

doc/tutorials/Drawing_2.rst

@@ -17,7 +17,7 @@ Code
  
 * In this tutorial, we intend to use *random* values for the drawing parameters. Also, we intend to populate our image with a big number of geometric figures. Since we will be initializing them in a random fashion, this process will be automatic and made by using *loops*
 
-* You will find the code in the *samples/cpp* folder of your OpenCV distribution. The file is **drawing_2.cpp**
+* This code is in your OpenCV sample folder. Otherwise you can grab it from `here <https://code.ros.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Basic/Drawing_2.cpp>`_
 
 Explanation
 ============

doc/tutorials/tutorials.rst

-#################
-OpenCV Tutorials
-#################
-
 .. toctree::
 
 The following links describe a set of basic OpenCV  tutorials. All the source code mentioned here is provide as part of the OpenCV regular releases, so check before you start copy & pasting the code. The list of tutorials below is automatically generated from reST files located in our SVN repository.
@@ -175,3 +171,20 @@ As always, we would be happy to hear your comments and receive your contribution
     
      .. |Beginners_7| image:: images/Drawing_2_Tutorial_Result_7.png
                       :height: 200px
+
+
+* **IMAGE PROCESSING**
+
+  * :ref:`Smoothing`
+
+     ===================== ======================================================
+      |ImageProcessing_1|  *Title:* **Smoothing Images**
+
+	                   *Compatibility:* > OpenCV 2.0
+
+                 	   Let's take a look at some basic linear filters!
+    
+     ===================== ======================================================
+    
+     .. |ImageProcessing_1| image:: images/Smoothing_Tutorial_Cover.png
+                            :height: 200px

samples/cpp/Qt_sample/main.cpp

@@ -6,7 +6,7 @@
 #include <vector>
 
 #include <opencv/highgui.h>
-#include <gl/GL.h>
+#include <GL/gl.h>
 #include <opencv/cxcore.h>
 #include <opencv/cv.h>
 using namespace std;

samples/cpp/tutorial_code/Image_Processing/FilterDemo1.cpp → samples/cpp/tutorial_code/Image_Processing/Smoothing.cpp

 /**
- * file FilterDemo1.cpp
+ * file Smoothing.cpp
  * brief Sample code for simple filters
  * author OpenCV team
  */
@@ -19,7 +19,7 @@ int DELAY_BLUR = 100;
 int MAX_KERNEL_LENGTH = 31;
 
 Mat src; Mat dst;
-char window_name[] = "Filter Demo 1";
+char window_name[] = "Smoothing Demo";
 
 /// Function headers
 int display_caption( char* caption );