Fix invalid eof detection for point clouds

nmellado · May 26, 2016 · 0c74d2a · 0c74d2a
1 parent 84d079e
commit 0c74d2a
Showing 1 changed file with 31 additions and 27 deletions.
diff --git a/super4pcs/io/io_ply.h b/super4pcs/io/io_ply.h
@@ -221,22 +221,24 @@ readBinary1Body (const std::string & filename,
     }
     delete [] v;
 
-    if (feof (in)){
-        cerr << "(PLY) incomplete file" << endl;
-        return false;
-    }
+    if (numOfFaces != 0){
+        if (feof (in)){
+            cerr << "(PLY) incomplete file" << endl;
+            return false;
+        }
 
-    // *****************
-    // Reading topology.
-    // *****************
-    for (unsigned int i = 0; i < numOfFaces && !feof (in); i++) {
-        unsigned int f[4];
-        char polygonSize;
-        /*count = */fread (&polygonSize, 1, 1, in);
-        /*count = */fread (f, 4, 3, in);
-        if (bigEndian == true)
-            bigLittleEndianSwap (f, 3);
-        face.push_back(tripple(f[0],f[1],f[2]));
+        // *****************
+        // Reading topology.
+        // *****************
+        for (unsigned int i = 0; i < numOfFaces && !feof (in); i++) {
+            unsigned int f[4];
+            char polygonSize;
+            /*count = */fread (&polygonSize, 1, 1, in);
+            /*count = */fread (f, 4, 3, in);
+            if (bigEndian == true)
+                bigLittleEndianSwap (f, 3);
+            face.push_back(tripple(f[0],f[1],f[2]));
+        }
     }
 
     return true;
@@ -335,19 +337,21 @@ readASCII1Body (const std::string & filename,
         }
     }
 
-    if (feof (in)){
-        cerr << "(PLY) incomplete file" << endl;
-        return false;
-    }
+    if (numOfFaces != 0){
+        if (feof (in)){
+            cerr << "(PLY) incomplete file" << endl;
+            return false;
+        }
 
-    // *****************
-    // Reading topology.
-    // *****************
-    for (unsigned int i = 0; i < numOfFaces && !feof (in); i++) {
-        int f[3];
-        int polygonSize;
-        /*count = */fscanf (in, "%d %d %d %d", &polygonSize, &f[0], &f[1], &f[2]);
-        face.push_back(tripple(f[0],f[1],f[2]));
+        // *****************
+        // Reading topology.
+        // *****************
+        for (unsigned int i = 0; i < numOfFaces && !feof (in); i++) {
+            int f[3];
+            int polygonSize;
+            /*count = */fscanf (in, "%d %d %d %d", &polygonSize, &f[0], &f[1], &f[2]);
+            face.push_back(tripple(f[0],f[1],f[2]));
+        }
     }
 
     return true;