From 5384d209625958acadb723d793c32c4e747ca2c4 Mon Sep 17 00:00:00 2001
From: Jose Luis Blanco-Claraco <joseluisblancoc@gmail.com>
Date: Thu, 11 Jul 2019 14:26:50 +0200
Subject: [PATCH] Undo changes in CalibratedCamera

---
 gtsam/geometry/CalibratedCamera.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gtsam/geometry/CalibratedCamera.h b/gtsam/geometry/CalibratedCamera.h
index f2bc2f84a..1f791935d 100644
--- a/gtsam/geometry/CalibratedCamera.h
+++ b/gtsam/geometry/CalibratedCamera.h
@@ -18,10 +18,6 @@
 
 #pragma once
 
-//Needed if windows.h is included somehow.  
-//It defines min and max, which conflicts with numeric_limits::max()
-#define NOMINMAX  
-
 #include <gtsam/geometry/BearingRange.h>
 #include <gtsam/geometry/Point2.h>
 #include <gtsam/geometry/Pose3.h>
@@ -33,7 +29,8 @@
 
 namespace gtsam {
 
-class GTSAM_EXPORT CheiralityException: public ThreadsafeException<CheiralityException> {
+class GTSAM_EXPORT CheiralityException: public ThreadsafeException<
+    CheiralityException> {
 public:
   CheiralityException()
     : CheiralityException(std::numeric_limits<Key>::max()) {}