From fff685baa90c9a015ac5b47393e8ee7639ce1fe1 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Mon, 13 May 2013 15:30:36 -0400
Subject: [PATCH] made Point(const Vec2& v) and Point(const Vec3& v) ctors
explicit to avoid ambiguous implicit conversions
---
modules/img/base/src/point.hh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/img/base/src/point.hh b/modules/img/base/src/point.hh
index 58040f4c5..443c1b644 100644
--- a/modules/img/base/src/point.hh
+++ b/modules/img/base/src/point.hh
@@ -86,7 +86,7 @@ public:
}
//! conversion from Vec2
- Point(const Vec2& v):
+ explicit Point(const Vec2& v):
x(static_cast<int>(round(v[0]))),
y(static_cast<int>(round(v[1]))),
z()
@@ -95,7 +95,7 @@ public:
//! conversion from Vec3
- Point(const Vec3& v):
+ explicit Point(const Vec3& v):
x(static_cast<int>(round(v[0]))),
y(static_cast<int>(round(v[1]))),
z(static_cast<int>(round(v[2])))
--
GitLab