From a9bc2042e3a9129700586c428fe0b7da8faaa234 Mon Sep 17 00:00:00 2001
From: Peter Rekdal Sunde <peter.sunde@gmail.com>
Date: Thu, 9 Jul 2015 14:48:13 +0200
Subject: [PATCH 1/2] When pressing keyboard key 'q', output prewarp
 configuration and exit program.

---
 src/misc_utilities/calibrate.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/misc_utilities/calibrate.cpp b/src/misc_utilities/calibrate.cpp
index 54175dd..0175ecc 100644
--- a/src/misc_utilities/calibrate.cpp
+++ b/src/misc_utilities/calibrate.cpp
@@ -382,7 +382,10 @@ int main(int argc, char** argv) {
     if (c == 'o')
     {
       cout << "prewarp = " << get_config() << endl;
-
+    } else if (c == 'q')
+    {
+      cout << "prewarp = " << get_config() << endl;
+      break;
     }
   }
 

From 2b9e06a9dd3dbf1677b79a932e9d661dc3e33d27 Mon Sep 17 00:00:00 2001
From: Peter Rekdal Sunde <peter.sunde@gmail.com>
Date: Thu, 9 Jul 2015 15:03:23 +0200
Subject: [PATCH 2/2] If user closes calibration utility image window, then
 exit.

---
 src/misc_utilities/calibrate.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/misc_utilities/calibrate.cpp b/src/misc_utilities/calibrate.cpp
index 0175ecc..392a13a 100644
--- a/src/misc_utilities/calibrate.cpp
+++ b/src/misc_utilities/calibrate.cpp
@@ -373,8 +373,7 @@ int main(int argc, char** argv) {
 
   drawImage(imgOriginal);
 
-  
-  while (true)
+  while (cvGetWindowHandle(WINDOW_NAME.c_str()) != 0)
   {
 
     char c = waitKey(15);
@@ -387,6 +386,7 @@ int main(int argc, char** argv) {
       cout << "prewarp = " << get_config() << endl;
       break;
     }
+
   }
 
   cvDestroyAllWindows();