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

Fixing compilation errors in windows and mac

Browse Source
This commit is contained in:
Aman Verma
2015-10-19 10:58:43 +00:00
parent b0209ad7f7
commit d5e314e728
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/src/window_cocoa.mm
View File

@@ -446,6 +446,8 @@ CV_IMPL void cvSetTrackbarMax(const char* trackbar_name, const char* window_name
slider = [[window sliders] valueForKey:[NSString stringWithFormat:@"%s", trackbar_name]]; slider = [[window sliders] valueForKey:[NSString stringWithFormat:@"%s", trackbar_name]];
if(slider) { if(slider) {
if(maxval >= 0) { if(maxval >= 0) {
int minval = [[slider slider] minValue];
maxval = (minval>maxval)?minval:maxval;
[[slider slider] setMaxValue:maxval]; [[slider slider] setMaxValue:maxval];
} }
} }
@@ -464,7 +466,6 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
NSAutoreleasePool* localpool5 = nil; NSAutoreleasePool* localpool5 = nil;
__BEGIN__; __BEGIN__;
//cout << "cvSetTrackbarPos" << endl;
if(trackbar_name == NULL || window_name == NULL) if(trackbar_name == NULL || window_name == NULL)
CV_ERROR( CV_StsNullPtr, "NULL trackbar or window name" ); CV_ERROR( CV_StsNullPtr, "NULL trackbar or window name" );
@@ -476,6 +477,8 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
slider = [[window sliders] valueForKey:[NSString stringWithFormat:@"%s", trackbar_name]]; slider = [[window sliders] valueForKey:[NSString stringWithFormat:@"%s", trackbar_name]];
if(slider) { if(slider) {
if(minval >= 0) { if(minval >= 0) {
int maxval = [[slider slider] maxValue];
minval = (minval<maxval)?minval:maxval;
[[slider slider] setMinValue:minval]; [[slider slider] setMinValue:minval];
} }
} }
@@ -485,7 +488,7 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
__END__; __END__;
} }
CV_IMPL void* cvGetWindowHandle( const char* name )k CV_IMPL void* cvGetWindowHandle( const char* name )
{ {
//cout << "cvGetWindowHandle" << endl; //cout << "cvGetWindowHandle" << endl;
return cvGetWindow(name); return cvGetWindow(name);

3
modules/highgui/src/window_w32.cpp
View File

@@ -138,6 +138,7 @@ typedef struct CvTrackbar
int* data; int* data;
int pos; int pos;
int maxval; int maxval;
int minval;
void (*notify)(int); void (*notify)(int);
void (*notify2)(int, void*); void (*notify2)(int, void*);
void* userdata; void* userdata;
@@ -2341,7 +2342,7 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
__BEGIN__; __BEGIN__;
if (maxval >= 0) if (minval >= 0)
{ {
CvWindow* window = 0; CvWindow* window = 0;
CvTrackbar* trackbar = 0; CvTrackbar* trackbar = 0;