Merge remote-tracking branch 'upstream/2.4' into 2.4

apps/annotation/CMakeLists.txt

@@ -1,5 +1,5 @@
-SET(deps opencv_core opencv_highgui opencv_imgproc)
+SET(OPENCV_ANNOTATION_DEPS opencv_core opencv_highgui opencv_imgproc)
-ocv_check_dependencies(${deps})
+ocv_check_dependencies(${OPENCV_ANNOTATION_DEPS})
 
 if(NOT OCV_DEPENDENCIES_FOUND)
    return()
@@ -8,12 +8,13 @@ endif()
 project(annotation)
 
 ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" "${OpenCV_SOURCE_DIR}/include/opencv")
-ocv_include_modules(${deps})
+ocv_include_modules(${OPENCV_ANNOTATION_DEPS})
 
+set(annotation_files opencv_annotation.cpp)
 set(the_target opencv_annotation)
 
-add_executable(${the_target} opencv_annotation.cpp)
+add_executable(${the_target} ${annotation_files})
-target_link_libraries(${the_target} ${deps})
+target_link_libraries(${the_target} ${OPENCV_ANNOTATION_DEPS})
 
 set_target_properties(${the_target} PROPERTIES
                       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"

apps/annotation/opencv_annotation.cpp

@@ -152,6 +152,15 @@ void get_annotations(Mat input_image, stringstream* output_stream)
 
 int main( int argc, const char** argv )
 {
+    // If no arguments are given, then supply some information on how this tool works
+    if( argc == 1 ){
+       cout << "Usage: " << argv[0] << endl;
+       cout << "  -images <folder_location> [example - /data/testimages/]" << endl;
+       cout << "  -annotations <ouput_file> [example - /data/annotations.txt]" << endl;
+
+       return -1;
+    }
+
     // Read in the input arguments
     string image_folder;
     string annotations;

apps/traincascade/traincascade.cpp

@@ -14,8 +14,8 @@ int main( int argc, char* argv[] )
     int numPos    = 2000;
     int numNeg    = 1000;
     int numStages = 20;
-    int precalcValBufSize = 256,
+    int precalcValBufSize = 1024,
-        precalcIdxBufSize = 256;
+        precalcIdxBufSize = 1024;
     bool baseFormatSave = false;
 
     CvCascadeParams cascadeParams;

doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst

@@ -57,7 +57,7 @@ How does it work?
 
    We consider only points such that :math:`r > 0` and :math:`0< \theta < 2 \pi`.
 
-#. We can do the same operation above for all the points in an image. If the curves of two different points intersect in the plane :math:`\theta` - :math:`r`, that means that both points belong to a same line. For instance, following with the example above and drawing the plot for two more points: :math:`x_{1} = 9`, :math:`y_{1} = 4` and :math:`x_{2} = 12`, :math:`y_{2} = 3`, we get:
+#. We can do the same operation above for all the points in an image. If the curves of two different points intersect in the plane :math:`\theta` - :math:`r`, that means that both points belong to a same line. For instance, following with the example above and drawing the plot for two more points: :math:`x_{1} = 4`, :math:`y_{1} = 9` and :math:`x_{2} = 12`, :math:`y_{2} = 3`, we get:
 
    .. image:: images/Hough_Lines_Tutorial_Theory_2.jpg
       :alt: Polar plot of the family of lines for three points

modules/highgui/src/window_QT.cpp

@@ -1848,7 +1848,7 @@ bool CvWindow::isOpenGl()
 
 void CvWindow::setViewportSize(QSize _size)
 {
-    myView->getWidget()->resize(_size);
+    resize(_size);
     myView->setSize(_size);
 }
 

samples/cpp/videocapture_pvapi.cpp

@@ -5,6 +5,23 @@
 // Succesfully tested on Prosilica and Manta series //
 //////////////////////////////////////////////////////
 
+// --------------------------------------------------------------------------------
+// Some remarks for ensuring the correct working of the interface between camera
+// and the pc from which you will capture data - Linux based settings. The settings
+// for Windows are the same, but edited in the graphical interface of the
+// network card.
+//
+// You have to be sure that OpenCV is built with the PvAPI interface enabled.
+//
+// FIRST CONFIGURE IP SETTINGS
+// - Change the IP address of your pc to 169.254.1.1
+// - Change the subnet mask of your pc to 255.255.0.0
+// - Change the gateway of your pc to 169.254.1.2
+//
+// CHANGE SOME NETWORK CARD SETTINGS
+// - sudo ifconfig eth0 mtu 9000 - or 9016 ideally if your card supports that
+// --------------------------------------------------------------------------------
+
 #include <iostream>
 #include "opencv2/opencv.hpp"