From 6c6ce56c3cfeb8a09644cb5653a41d075a56a161 Mon Sep 17 00:00:00 2001
From: Isaak Lim <isaak.lim@rwth-aachen.de>
Date: Fri, 15 Apr 2016 14:01:11 +0200
Subject: [PATCH 1/2] don't emit an error message for every face that could not
 be added (due to complex elements)

---
 src/OpenMesh/Core/IO/reader/PLYReader.cc | 26 ++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc
index f86caae0..bb357990 100644
--- a/src/OpenMesh/Core/IO/reader/PLYReader.cc
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc
@@ -304,6 +304,11 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
         return false;
     }
 
+    const bool err_enabled = omerr().is_enabled();
+    size_t complex_faces = 0;
+    if (err_enabled)
+      omerr().disable();
+
     // read vertices:
     for (i = 0; i < vertexCount_ && !_in.eof(); ++i) {
         vh = _bi.add_vertex();
@@ -432,6 +437,8 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
           }
 
           fh = _bi.add_face(vhandles);
+          if (!fh.is_valid())
+            ++complex_faces;
           break;
 
         case CUSTOM_PROP:
@@ -449,6 +456,12 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
 
     }
 
+    if (err_enabled) {
+      omerr().enable();
+      if (complex_faces)
+        omerr() << complex_faces << " invalid faces could not be added.\n";
+    }
+
     // File was successfully parsed.
     return true;
 }
@@ -472,6 +485,11 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
 
     _bi.reserve(vertexCount_, 3* vertexCount_ , faceCount_);
 
+    const bool err_enabled = omerr().is_enabled();
+    size_t complex_faces = 0;
+    if (err_enabled)
+      omerr().disable();
+
     // read vertices:
     for (unsigned int i = 0; i < vertexCount_ && !_in.eof(); ++i) {
         vh = _bi.add_vertex();
@@ -610,6 +628,8 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
           }
 
           fh = _bi.add_face(vhandles);
+          if (!fh.is_valid())
+            ++complex_faces;
           break;
 
         case CUSTOM_PROP:
@@ -626,6 +646,12 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
       }
     }
 
+    if (err_enabled) {
+      omerr().enable();
+      if (complex_faces)
+        omerr() << complex_faces << " invalid faces could not be added.\n";
+    }
+
     return true;
 }
 

From 1c85080a1e912f240159a3ae30e822d37b936c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Fri, 15 Apr 2016 15:57:07 +0200
Subject: [PATCH 2/2] - Updated changelog - Always emit warning

---
 Doc/changelog.docu                       |  1 +
 src/OpenMesh/Core/IO/reader/PLYReader.cc | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index f336bf26..57845d21 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -17,6 +17,7 @@
 <b>IO</b>
 <ul>
 <li>Obj reader: added texCoord3d functions to objloader</li>
+<li>PLY Reader: Don't emit warning for every complex face but warn only once in the end.</li>
 <li>Importer: Integrate non-manifold faces while importing and not at the end. Fixes missing properties on non-manifolds. (Thanks to Max Limper for the patch, Merge Request 51)<li>
 </ul>
 
diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc
index bb357990..2d04f68a 100644
--- a/src/OpenMesh/Core/IO/reader/PLYReader.cc
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc
@@ -456,11 +456,11 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
 
     }
 
-    if (err_enabled) {
+    if (err_enabled) 
       omerr().enable();
-      if (complex_faces)
-        omerr() << complex_faces << " invalid faces could not be added.\n";
-    }
+
+    if (complex_faces)
+      omerr() << complex_faces << "The reader encountered invalid faces, that could not be added.\n";
 
     // File was successfully parsed.
     return true;
@@ -646,11 +646,12 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
       }
     }
 
-    if (err_enabled) {
+    if (err_enabled) 
       omerr().enable();
-      if (complex_faces)
-        omerr() << complex_faces << " invalid faces could not be added.\n";
-    }
+
+   if (complex_faces)
+      omerr() << complex_faces << "The reader encountered invalid faces, that could not be added.\n";
+
 
     return true;
 }