From 7621b91769098359e893e68ad474040ca7940fa1 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Thu, 11 Apr 2019 17:46:28 +0300
Subject: [PATCH] Merge pull request #14292 from alalek:issue_14291

* macosx: fix C++11 build

backporting commit c3cf35ab63c04fb1d7b2f6760128f42c20cac0e1

* macosx: eliminate build warning
---
 modules/highgui/src/window_cocoa.mm         | 2 +-
 modules/videoio/src/cap_avfoundation_mac.mm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/highgui/src/window_cocoa.mm b/modules/highgui/src/window_cocoa.mm
index 962abe09c1..4041fa1c1e 100644
--- a/modules/highgui/src/window_cocoa.mm
+++ b/modules/highgui/src/window_cocoa.mm
@@ -266,7 +266,7 @@ CV_IMPL void cvResizeWindow( const char* name, int width, int height)
     CVWindow *window = cvGetWindow(name);
     if(window && ![window autosize]) {
         height += [window contentView].sliderHeight;
-        NSSize size = { width, height };
+        NSSize size = { (CGFloat)width, (CGFloat)height };
         [window setContentSize:size];
     }
     [localpool drain];
diff --git a/modules/videoio/src/cap_avfoundation_mac.mm b/modules/videoio/src/cap_avfoundation_mac.mm
index 5ca1a9eb9c..651887c4ed 100644
--- a/modules/videoio/src/cap_avfoundation_mac.mm
+++ b/modules/videoio/src/cap_avfoundation_mac.mm
@@ -181,7 +181,7 @@ class CvVideoWriter_AVFoundation : public CvVideoWriter {
                 double fps, CvSize frame_size,
                 int is_color=1);
         ~CvVideoWriter_AVFoundation();
-        bool writeFrame(const IplImage* image);
+        bool writeFrame(const IplImage* image) CV_OVERRIDE;
         int getCaptureDomain() const CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
     private:
         IplImage* argbimage;