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
d5e314e7
Commit
d5e314e7
authored
Oct 19, 2015
by
Aman Verma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing compilation errors in windows and mac
parent
b0209ad7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
window_cocoa.mm
modules/highgui/src/window_cocoa.mm
+5
-2
window_w32.cpp
modules/highgui/src/window_w32.cpp
+2
-1
No files found.
modules/highgui/src/window_cocoa.mm
View file @
d5e314e7
...
@@ -446,6 +446,8 @@ CV_IMPL void cvSetTrackbarMax(const char* trackbar_name, const char* window_name
...
@@ -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
...
@@ -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
...
@@ -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
...
@@ -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);
...
...
modules/highgui/src/window_w32.cpp
View file @
d5e314e7
...
@@ -138,6 +138,7 @@ typedef struct CvTrackbar
...
@@ -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
...
@@ -2341,7 +2342,7 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
__BEGIN__
;
__BEGIN__
;
if
(
m
ax
val
>=
0
)
if
(
m
in
val
>=
0
)
{
{
CvWindow
*
window
=
0
;
CvWindow
*
window
=
0
;
CvTrackbar
*
trackbar
=
0
;
CvTrackbar
*
trackbar
=
0
;
...
...
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