From d5e314e72800266657c0455e9cc4f82228b6795b Mon Sep 17 00:00:00 2001
From: Aman Verma <aman11dhanpat@gmail.com>
Date: Mon, 19 Oct 2015 10:58:43 +0000
Subject: [PATCH] Fixing compilation errors in windows and mac

---
 modules/highgui/src/window_cocoa.mm | 7 +++++--
 modules/highgui/src/window_w32.cpp  | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/highgui/src/window_cocoa.mm b/modules/highgui/src/window_cocoa.mm
index f8c48fc4cc..4ab1e360e1 100644
--- a/modules/highgui/src/window_cocoa.mm
+++ b/modules/highgui/src/window_cocoa.mm
@@ -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]];
         if(slider) {
             if(maxval >= 0) {
+                int minval = [[slider slider] minValue];
+                maxval = (minval>maxval)?minval:maxval;
                 [[slider slider] setMaxValue:maxval];
             }
         }
@@ -464,7 +466,6 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
     NSAutoreleasePool* localpool5 = nil;
 
     __BEGIN__;
-    //cout << "cvSetTrackbarPos" << endl;
     if(trackbar_name == NULL || window_name == NULL)
         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]];
         if(slider) {
             if(minval >= 0) {
+                int maxval = [[slider slider] maxValue];
+                minval = (minval<maxval)?minval:maxval;
                 [[slider slider] setMinValue:minval];
             }
         }
@@ -485,7 +488,7 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
     __END__;
 }
 
-CV_IMPL void* cvGetWindowHandle( const char* name )k
+CV_IMPL void* cvGetWindowHandle( const char* name )
 {
     //cout << "cvGetWindowHandle" << endl;
     return cvGetWindow(name);
diff --git a/modules/highgui/src/window_w32.cpp b/modules/highgui/src/window_w32.cpp
index 395c46dcf7..cadbdf7069 100644
--- a/modules/highgui/src/window_w32.cpp
+++ b/modules/highgui/src/window_w32.cpp
@@ -138,6 +138,7 @@ typedef struct CvTrackbar
     int* data;
     int pos;
     int maxval;
+    int minval;
     void (*notify)(int);
     void (*notify2)(int, void*);
     void* userdata;
@@ -2341,7 +2342,7 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
 
     __BEGIN__;
 
-    if (maxval >= 0)
+    if (minval >= 0)
     {
         CvWindow* window = 0;
         CvTrackbar* trackbar = 0;