Merge pull request #3404 from alalek:openni2_patch

modules/videoio/src/cap_openni2.cpp

@@ -646,7 +646,7 @@ bool CvCapture_OpenNI2::setImageGeneratorProperty(int propIdx, double propValue)
         {
         case CV_CAP_PROP_OPENNI_OUTPUT_MODE :
         {
-            openni::VideoMode mode;
+            openni::VideoMode mode = color.getVideoMode();
 
             switch( cvRound(propValue) )
             {

samples/cpp/openni_capture.cpp

@@ -192,7 +192,11 @@ int main( int argc, char* argv[] )
     if( isVideoReading )
         capture.open( filename );
     else
-        capture.open( CAP_OPENNI );
+    {
+        capture.open( CAP_OPENNI2 );
+        if( !capture.isOpened() )
+            capture.open( CAP_OPENNI );
+    }
 
     cout << "done." << endl;