Merge branch '2.4'

modules/highgui/src/cap_qtkit.mm

@@ -503,6 +503,9 @@ bool CvCaptureCAM::setProperty(int property_id, double value) {
   didOutputVideoFrame:(CVImageBufferRef)videoFrame
      withSampleBuffer:(QTSampleBuffer *)sampleBuffer
        fromConnection:(QTCaptureConnection *)connection {
+    (void)captureOutput;
+    (void)sampleBuffer;
+    (void)connection;
 
     CVBufferRetain(videoFrame);
     CVImageBufferRef imageBufferToRelease  = mCurrentImageBuffer;
@@ -519,6 +522,9 @@ bool CvCaptureCAM::setProperty(int property_id, double value) {
 - (void)captureOutput:(QTCaptureOutput *)captureOutput
 didDropVideoFrameWithSampleBuffer:(QTSampleBuffer *)sampleBuffer
        fromConnection:(QTCaptureConnection *)connection {
+    (void)captureOutput;
+    (void)sampleBuffer;
+    (void)connection;
     cout << "Camera dropped frame!" << endl;
 }
 

modules/highgui/src/grfmt_exr.cpp

@@ -48,6 +48,10 @@
 #  pragma warning( disable: 4100 4244 4267 )
 #endif
 
+#if defined __GNUC__ && defined __APPLE__
+#  pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #include <ImfHeader.h>
 #include <ImfInputFile.h>
 #include <ImfOutputFile.h>

modules/highgui/src/grfmt_exr.hpp

@@ -45,6 +45,10 @@
 
 #ifdef HAVE_OPENEXR
 
+#if defined __GNUC__ && defined __APPLE__
+#  pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #include <ImfChromaticities.h>
 #include <ImfInputFile.h>
 #include <ImfChannelList.h>

modules/highgui/src/window_cocoa.mm

@@ -136,7 +136,7 @@ static bool wasInitialized = false;
     }
 }*/
 
-CV_IMPL int cvInitSystem( int argc, char** argv)
+CV_IMPL int cvInitSystem( int , char** )
 {
     //cout << "cvInitSystem" << endl;
     wasInitialized = true;
@@ -159,7 +159,7 @@ CV_IMPL int cvInitSystem( int argc, char** argv)
     return 0;
 }
 
-CVWindow *cvGetWindow(const char *name) {
+static CVWindow *cvGetWindow(const char *name) {
     //cout << "cvGetWindow" << endl;
     NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init];
     NSString *cvname = [NSString stringWithFormat:@"%s", name];
@@ -614,6 +614,7 @@ void cvSetModeWindow_COCOA( const char* name, double prop_value )
 @synthesize status;
 
 - (void)cvSendMouseEvent:(NSEvent *)event type:(int)type flags:(int)flags {
+    (void)event;
     //cout << "cvSendMouseEvent" << endl;
     NSPoint mp = [NSEvent mouseLocation];
     //NSRect visible = [[self contentView] frame];
@@ -924,6 +925,7 @@ void cvSetModeWindow_COCOA( const char* name, double prop_value )
 }
 
 - (void)sliderChanged:(NSNotification *)notification {
+    (void)notification;
     int pos = [slider intValue];
     if(value)
         *value = pos;

modules/highgui/test/test_framecount.cpp

@@ -109,6 +109,6 @@ void CV_FramecountTest::run(int)
         }
     }
 }
-#if BUILD_WITH_VIDEO_INPUT_SUPPORT
+#if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined HAVE_FFMPEG
 TEST(Highgui_Video, framecount) {CV_FramecountTest test; test.safe_run();}
 #endif

modules/highgui/test/test_positioning.cpp

@@ -217,7 +217,7 @@ void CV_VideoRandomPositioningTest::run(int)
     run_test(RANDOM);
 }
 
-#if BUILD_WITH_VIDEO_INPUT_SUPPORT
+#if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined HAVE_FFMPEG
 TEST (Highgui_Video, seek_progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); }
 TEST (Highgui_Video, seek_random) { CV_VideoRandomPositioningTest test; test.safe_run(); }
 #endif

modules/highgui/test/test_video_pos.cpp

@@ -173,6 +173,6 @@ public:
     Size framesize;
 };
 
-#if BUILD_WITH_VIDEO_INPUT_SUPPORT && BUILD_WITH_VIDEO_OUTPUT_SUPPORT
+#if BUILD_WITH_VIDEO_INPUT_SUPPORT && BUILD_WITH_VIDEO_OUTPUT_SUPPORT && defined HAVE_FFMPEG
 TEST(Highgui_Video, seek_random_synthetic) { CV_PositioningTest test; test.safe_run(); }
 #endif