Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
11ba220e
Commit
11ba220e
authored
Feb 27, 2013
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed iOS framework compile errors after recent changes
parent
d620ef0d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
cap_avfoundation.mm
modules/highgui/src/cap_avfoundation.mm
+7
-7
_random.hpp
modules/softcascade/src/_random.hpp
+1
-1
No files found.
modules/highgui/src/cap_avfoundation.mm
View file @
11ba220e
...
...
@@ -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;
}
...
...
modules/softcascade/src/_random.hpp
View file @
11ba220e
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment