generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed warnings

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-07-01 14:31:25 +04:00 committed by Alexander Alekhin
parent effff27c4e
commit 93f8581b69
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/highgui/src/cap_qtkit.mm
View File

@ -448,13 +448,12 @@ double CvCaptureCAM::getProperty(int property_id){
QTFormatDescription* format = [[connections objectAtIndex:0] formatDescription]; QTFormatDescription* format = [[connections objectAtIndex:0] formatDescription];
NSSize s1 = [[format attributeForKey:QTFormatDescriptionVideoCleanApertureDisplaySizeAttribute] sizeValue]; NSSize s1 = [[format attributeForKey:QTFormatDescriptionVideoCleanApertureDisplaySizeAttribute] sizeValue];
int width=s1.width, height=s1.height;
switch (property_id) { switch (property_id) {
case CV_CAP_PROP_FRAME_WIDTH: case CV_CAP_PROP_FRAME_WIDTH:
retval = width; retval = s1.width;
break; break;
case CV_CAP_PROP_FRAME_HEIGHT: case CV_CAP_PROP_FRAME_HEIGHT:
retval = height; retval = s1.height;
break; break;
default: default:
retval = 0; retval = 0;
@ -1011,22 +1010,22 @@ bool CvVideoWriter_QT::writeFrame(const IplImage* image) {
cvCvtColor(image, argbimage, CV_BGR2BGRA); cvCvtColor(image, argbimage, CV_BGR2BGRA);
unsigned char* imagedata = (unsigned char*)argbimage->imageData; unsigned char* imagedata_ = (unsigned char*)argbimage->imageData;
//BGRA --> ARGB //BGRA --> ARGB
for (int j = 0; j < argbimage->height; j++) { for (int j = 0; j < argbimage->height; j++) {
int rowstart = argbimage->widthStep * j; int rowstart = argbimage->widthStep * j;
for (int i = rowstart; i < rowstart+argbimage->widthStep; i+=4) { for (int i = rowstart; i < rowstart+argbimage->widthStep; i+=4) {
unsigned char temp = imagedata[i]; unsigned char temp = imagedata_[i];
imagedata[i] = 255; imagedata_[i] = 255;
imagedata[i+3] = temp; imagedata_[i+3] = temp;
temp = imagedata[i+2]; temp = imagedata_[i+2];
imagedata[i+2] = imagedata[i+1]; imagedata_[i+2] = imagedata_[i+1];
imagedata[i+1] = temp; imagedata_[i+1] = temp;
} }
} }
NSBitmapImageRep* imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:&imagedata NSBitmapImageRep* imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:&imagedata_
pixelsWide:movieSize.width pixelsWide:movieSize.width
pixelsHigh:movieSize.height pixelsHigh:movieSize.height
bitsPerSample:8 bitsPerSample:8