David Rose 16 лет назад
Родитель
Сommit
433a4f2989
1 измененных файлов с 10 добавлено и 2 удалено
  1. 10 2
      panda/src/pnmimagetypes/pnmFileTypePNM.cxx

+ 10 - 2
panda/src/pnmimagetypes/pnmFileTypePNM.cxx

@@ -191,11 +191,19 @@ pm_getuint(istream * const ifP) {
 -----------------------------------------------------------------------------*/
 -----------------------------------------------------------------------------*/
     char ch;
     char ch;
     unsigned int i;
     unsigned int i;
-
+    
+    // skip whitespace
     do {
     do {
         ch = ifP->get();
         ch = ifP->get();
-	} while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
 
 
+        if (ch == '#') {
+          // Skip a comment
+          do {
+            ch = ifP->get();
+          } while (ch != EOF && ch != '\n');
+        }
+    } while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
+      
     if (ch < '0' || ch > '9')
     if (ch < '0' || ch > '9')
         pm_error("junk in file where an unsigned integer should be");
         pm_error("junk in file where an unsigned integer should be");