fixed iOS framework compile errors after recent changes

diff --git a/modules/highgui/src/cap_avfoundation.mm b/modules/highgui/src/cap_avfoundation.mm
index 76c49a9..a2451a1 100644 (file)
--- a/modules/highgui/src/cap_avfoundation.mm
+++ b/modules/highgui/src/cap_avfoundation.mm
@@ -243,7 +243,7 @@ CvCaptureCAM::CvCaptureCAM(int cameraNum) {
     camNum = cameraNum;
 
     if (!startCaptureDevice(camNum)) {
-        cout << "Warning, camera failed to properly initialize!" << endl;
+        std::cout << "Warning, camera failed to properly initialize!" << std::endl;
         started = 0;
     } else {
         started = 1;
@@ -288,7 +288,7 @@ IplImage* CvCaptureCAM::retrieveFrame(int) {
 
 IplImage* CvCaptureCAM::queryFrame() {
     while (!grabFrame()) {
-        cout << "WARNING: Couldn't grab new frame from camera!!!" << endl;
+        std::cout << "WARNING: Couldn't grab new frame from camera!!!" << std::endl;
         /*
              cout << "Attempting to restart camera; set capture property DISABLE_AUTO_RESTART to disable." << endl;
              stopCaptureDevice();
@@ -320,7 +320,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
     AVCaptureDevice *device;
     NSArray* devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
     if ([devices count] == 0) {
-        cout << "AV Foundation didn't find any attached Video Input Devices!" << endl;
+        std::cout << "AV Foundation didn't find any attached Video Input Devices!" << std::endl;
         [localpool drain];
         return 0;
     }
@@ -328,7 +328,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
     if (cameraNum >= 0) {
         camNum = cameraNum % [devices count];
         if (camNum != cameraNum) {
-            cout << "Warning: Max Camera Num is " << [devices count]-1 << "; Using camera " << camNum << endl;
+            std::cout << "Warning: Max Camera Num is " << [devices count]-1 << "; Using camera " << camNum << std::endl;
         }
         device = [devices objectAtIndex:camNum];
     } else {
@@ -1166,8 +1166,8 @@ CvVideoWriter_AVFoundation::CvVideoWriter_AVFoundation(const char* filename, int
     cc[4] = 0;
     int cc2 = CV_FOURCC(cc[0], cc[1], cc[2], cc[3]);
     if (cc2!=fourcc) {
-        cout << "WARNING: Didn't properly encode FourCC. Expected " << fourcc
-            << " but got " << cc2 << "." << endl;
+        std::cout << "WARNING: Didn't properly encode FourCC. Expected " << fourcc
+            << " but got " << cc2 << "." << std::endl;
         //exception;
     }
 
@@ -1269,7 +1269,7 @@ bool CvVideoWriter_AVFoundation::writeFrame(const IplImage* iplimage) {
     BOOL success = FALSE;
 
     if (iplimage->height!=movieSize.height || iplimage->width!=movieSize.width){
-        cout<<"Frame size does not match video size."<<endl;
+        std::cout<<"Frame size does not match video size."<<std::endl;
         [localpool drain];
         return false;
     }

diff --git a/modules/softcascade/src/_random.hpp b/modules/softcascade/src/_random.hpp
index 63fa256..3e13d03 100644 (file)
--- a/modules/softcascade/src/_random.hpp
+++ b/modules/softcascade/src/_random.hpp
@@ -58,7 +58,7 @@ struct Random
 
 }}}
 
-#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__)
+#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__) && !defined(__APPLE__)
 # if defined (__cplusplus) && __cplusplus > 201100L
 #  include <random>