From ae7f75d8810bf63d3cac858d45baa908add1d437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20M=C3=B6ller?= <matthias.moeller@rwth-aachen.de>
Date: Mon, 1 Jun 2015 12:09:32 +0000
Subject: [PATCH] - remove paranthese warning - remove redundant double
 negation, as the type is already bool - replaced inline condition with cast

closes #2491

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1270 fdac6126-5c0c-442c-9429-916003d36597
---
 .../Core/IO/SR_binary_vector_of_bool.inl      | 31 +++++++++---------
 src/OpenMesh/Core/Utils/Property.hh           | 32 +++++++++----------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl b/src/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl
index 51f1d93d..3ec619ca 100644
--- a/src/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl
+++ b/src/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl
@@ -26,15 +26,14 @@ template <> struct binary< std::vector<bool> >
 
     for (idx=0; idx < N; ++idx)
     {
-      bits = 0;
-      bits = bits |  (_v[idx+0] ? 1 : 0);
-      bits = bits | ((_v[idx+1] ? 1 : 0) << 1);
-      bits = bits | ((_v[idx+2] ? 1 : 0) << 2);
-      bits = bits | ((_v[idx+3] ? 1 : 0) << 3);
-      bits = bits | ((_v[idx+4] ? 1 : 0) << 4);
-      bits = bits | ((_v[idx+5] ? 1 : 0) << 5);
-      bits = bits | ((_v[idx+6] ? 1 : 0) << 6);
-      bits = bits | ((_v[idx+7] ? 1 : 0) << 7);
+      bits = static_cast<unsigned char>(_v[idx])
+        | (static_cast<unsigned char>(_v[idx+1]) << 1)
+        | (static_cast<unsigned char>(_v[idx+2]) << 2)
+        | (static_cast<unsigned char>(_v[idx+3]) << 3)
+        | (static_cast<unsigned char>(_v[idx+4]) << 4)
+        | (static_cast<unsigned char>(_v[idx+5]) << 5)
+        | (static_cast<unsigned char>(_v[idx+6]) << 6)
+        | (static_cast<unsigned char>(_v[idx+7]) << 7);
       _ostr << bits;
     }
     bytes = N;
@@ -44,13 +43,13 @@ template <> struct binary< std::vector<bool> >
       bits = 0;
       switch(R)
       {
-	case 7: bits = bits | ((_v[idx+6] ? 1 : 0) << 6);
-	case 6: bits = bits | ((_v[idx+5] ? 1 : 0) << 5);
-	case 5: bits = bits | ((_v[idx+4] ? 1 : 0) << 4);
-	case 4: bits = bits | ((_v[idx+3] ? 1 : 0) << 3);
-	case 3: bits = bits | ((_v[idx+2] ? 1 : 0) << 2);
-	case 2: bits = bits | ((_v[idx+1] ? 1 : 0) << 1);
-	case 1: bits = bits |  (_v[idx+0] ? 1 : 0);
+	case 7: bits |= (static_cast<unsigned char>(_v[idx+6]) << 6);
+	case 6: bits |= (static_cast<unsigned char>(_v[idx+5]) << 5);
+	case 5: bits |= (static_cast<unsigned char>(_v[idx+4]) << 4);
+	case 4: bits |= (static_cast<unsigned char>(_v[idx+3]) << 3);
+	case 3: bits |= (static_cast<unsigned char>(_v[idx+2]) << 2);
+	case 2: bits |= (static_cast<unsigned char>(_v[idx+1]) << 1);
+	case 1: bits |= static_cast<unsigned char>(_v[idx+0]);
       }
       _ostr << bits;
       ++bytes;
diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh
index 7e2db868..b7fed815 100644
--- a/src/OpenMesh/Core/Utils/Property.hh
+++ b/src/OpenMesh/Core/Utils/Property.hh
@@ -278,14 +278,14 @@ public:
 
     for (bidx=idx=0; idx < N; ++idx, bidx+=8)
     {
-      bits = !!data_[bidx]
-        | (!!data_[bidx+1] << 1)
-        | (!!data_[bidx+2] << 2)
-        | (!!data_[bidx+3] << 3)
-        | (!!data_[bidx+4] << 4)
-        | (!!data_[bidx+5] << 5)
-        | (!!data_[bidx+6] << 6)
-        | (!!data_[bidx+7] << 7);
+      bits = static_cast<unsigned char>(data_[bidx])
+        | (static_cast<unsigned char>(data_[bidx+1]) << 1)
+        | (static_cast<unsigned char>(data_[bidx+2]) << 2)
+        | (static_cast<unsigned char>(data_[bidx+3]) << 3)
+        | (static_cast<unsigned char>(data_[bidx+4]) << 4)
+        | (static_cast<unsigned char>(data_[bidx+5]) << 5)
+        | (static_cast<unsigned char>(data_[bidx+6]) << 6)
+        | (static_cast<unsigned char>(data_[bidx+7]) << 7);
       _ostr << bits;
     }
     bytes = N;
@@ -320,14 +320,14 @@ public:
     for (bidx=idx=0; idx < N; ++idx, bidx+=8)
     {
       _istr >> bits;
-      data_[bidx+0] = !!(bits & 0x01);
-      data_[bidx+1] = !!(bits & 0x02);
-      data_[bidx+2] = !!(bits & 0x04);
-      data_[bidx+3] = !!(bits & 0x08);
-      data_[bidx+4] = !!(bits & 0x10);
-      data_[bidx+5] = !!(bits & 0x20);
-      data_[bidx+6] = !!(bits & 0x40);
-      data_[bidx+7] = !!(bits & 0x80);
+      data_[bidx+0] = (bits & 0x01) != 0;
+      data_[bidx+1] = (bits & 0x02) != 0;
+      data_[bidx+2] = (bits & 0x04) != 0;
+      data_[bidx+3] = (bits & 0x08) != 0;
+      data_[bidx+4] = (bits & 0x10) != 0;
+      data_[bidx+5] = (bits & 0x20) != 0;
+      data_[bidx+6] = (bits & 0x40) != 0;
+      data_[bidx+7] = (bits & 0x80) != 0;
     }
     bytes = N;