Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/ovis/include/opencv2/ovis.hpp

@@ -31,6 +31,7 @@ enum SceneSettings
 enum MaterialProperty
 {
     MATERIAL_POINT_SIZE,
+    MATERIAL_LINE_WIDTH,
     MATERIAL_OPACITY,
     MATERIAL_EMISSIVE,
     MATERIAL_TEXTURE0,

modules/ovis/src/ovis.cpp

@@ -753,6 +753,13 @@ void setMaterialProperty(const String& name, int prop, const Scalar& val)
         col.saturate();
         rpass->setEmissive(col);
         break;
+    case MATERIAL_LINE_WIDTH:
+#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 2)
+        rpass->setLineWidth(val[0]);
+#else
+        CV_Error(Error::StsError, "needs OGRE 1.11.2+ for this");
+#endif
+        break;
     default:
         CV_Error(Error::StsBadArg, "invalid or non Scalar property");
         break;

modules/ximgproc/samples/peilin.cpp

@@ -4,13 +4,6 @@
 
 #include <iostream>
 
-static void help()
-{
-    std::cout << "\nThis program demonstrates Pei&Lin Normalization\n"
-                 "Usage:\n"
-                 "./peilin [image1_name -- default is ../data/peilin_plane.png] [image2_name -- default is ../data/peilin_shape.png]\n" << std::endl;
-}
-
 static inline cv::Mat operator& ( const cv::Mat& lhs, const cv::Matx23d& rhs )
 {
     cv::Mat ret;
@@ -27,12 +20,10 @@ static inline cv::Mat operator& ( const cv::Matx23d& lhs, const cv::Mat& rhs )
 
 int main(int argc, char** argv)
 {
-    cv::CommandLineParser parser(argc, argv, "{help h | | }{ @input1 | ../data/peilin_plane.png | }{ @input2 | ../data/peilin_plane.png | }");
-    if (parser.has("help"))
-    {
-        help();
-        return 0;
-    }
+    cv::CommandLineParser parser(argc, argv, "{ @input1 | ../data/peilin_plane.png | }{ @input2 | ../data/peilin_shape.png | }");
+    parser.about("\nThis program demonstrates Pei&Lin Normalization\n");
+    parser.printMessage();
+
     std::string filename1 = parser.get<std::string>("@input1");
     std::string filename2 = parser.get<std::string>("@input2");