Changeset 11274 for OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/plyfile.cpp

Timestamp:

03/22/10 15:55:52 (3 years ago)

Author:

paulmartz

Message:

2.8 branch: Hm, mysteriously, the ply plugin seems to be missing changes that were previously merged. This commit brings them up to date with svn trunk as of r11237.

Files:

• OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/plyfile.cpp (modified) (26 diffs)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/plyfile.cpp

@@ -40 +40 @@
 
 #include "ply.h"
+#include"typedefs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
+
+#include <osg/Math>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
+    #pragma warning( disable : 4996 )
+#endif
 
 #ifdef WIN32
@@ -316 +324 @@
 
   plyfile = ply_write (fp, nelems, elem_names, file_type);
+
+  // If the plyfile could not load return NULL
   if (plyfile == NULL)
     return (NULL);
@@ -354 +364 @@
   elem = find_element (plyfile, elem_name);
   if (elem == NULL) {
-    fprintf(stderr,"ply_describe_element: can't find element '%s'\n",elem_name);
-    exit (-1);
+    char error[100];
+    sprintf (error, "ply_describe_element: can't find element '%s'\n",elem_name);
+    throw ply::MeshException( error );
   }
 
@@ -501 +512 @@
   elem = find_element (plyfile, elem_name);
   if (elem == NULL) {
-    fprintf(stderr,"ply_element_count: can't find element '%s'\n",elem_name);
-    exit (-1);
+    char error[100];
+    sprintf (error, "ply_element_count: can't find element '%s'\n",elem_name);
+    throw ply::MeshException( error );
   }
 
@@ -537 +549 @@
       break;
     default:
-      fprintf (stderr, "ply_header_complete: bad file type = %d\n",
+      char error[100];
+      sprintf (error, "ply_header_complete: bad file type = %d\n",
                plyfile->file_type);
-      exit (-1);
+      throw ply::MeshException( error );
   }
 
@@ -596 +609 @@
   elem = find_element (plyfile, elem_name);
   if (elem == NULL) {
-    fprintf(stderr, "ply_elements_setup: can't find element '%s'\n", elem_name);
-    exit (-1);
+    char error[100];
+    sprintf (error, "ply_elements_setup: can't find element '%s'\n", elem_name);
+    throw ply::MeshException( error );
   }
 
@@ -846 +860 @@
         return (NULL);
         }
-      plyfile->version = atof (words[2]);
+      plyfile->version = osg::asciiToDouble (words[2]);
     }
     else if (equal_strings (words[0], "element"))
@@ -941 +955 @@
   plyfile = ply_read (fp, nelems, elem_names);
 
+  if(!plyfile)
+  {
+    std::cout<<"Ply File Error : Could not read file"<<std::endl;
+    return NULL;
+  }
+
   /* determine the file type and version */
 
@@ -1060 +1080 @@
 void ply_get_property(
   PlyFile *plyfile,
-  char *elem_name,
+  const char *elem_name,
   PlyProperty *prop
 )
@@ -1331 +1351 @@
   elem = find_element (plyfile, elem_name);
   if (elem == NULL) {
-    fprintf (stderr,
-             "ply_get_other_element: can't find element '%s'\n", elem_name);
-    exit (-1);
+    char error[100];
+    sprintf (error, "ply_get_other_element: can't find element '%s'\n", elem_name);
+    throw ply::MeshException( error );
   }
 
@@ -1651 +1671 @@
   words = get_words (plyfile->fp, &nwords, &orig_line);
   if (words == NULL) {
-    fprintf (stderr, "ply_get_element: unexpected end of file\n");
-    exit (-1);
+    char error[100];
+    sprintf (error, "ply_get_element: unexpected end of file\n");
+    throw ply::MeshException( error );
   }
 
@@ -1848 +1869 @@
 
   if (code <= PLY_START_TYPE || code >= PLY_END_TYPE) {
-    fprintf (stderr, "write_scalar_type: bad data code = %d\n", code);
-    exit (-1);
+    char error[100];
+    sprintf (error, "write_scalar_type: bad data code = %d\n", code);
+    throw ply::MeshException( error );
   }
 
@@ -2119 +2141 @@
       break;
     default:
-      fprintf (stderr, "write_binary_item: bad type = %d\n", type);
-      exit (-1);
+      char error[100];
+      sprintf (error, "write_binary_item: bad type = %d\n", type);
+      throw ply::MeshException( error );
   }
 }
@@ -2163 +2186 @@
       break;
     default:
-      fprintf (stderr, "write_ascii_item: bad type = %d\n", type);
-      exit (-1);
+      char error[100];
+      sprintf (error, "write_ascii_item: bad type = %d\n", type);
+      throw ply::MeshException( error );
   }
 }
@@ -2235 +2259 @@
       break;
     default:
-      fprintf (stderr, "get_stored_item: bad type = %d\n", type);
-      exit (-1);
+      char error[100];
+      sprintf (error, "get_stored_item: bad type = %d\n", type);
+      throw ply::MeshException( error );
   }
 }
@@ -2267 +2292 @@
 
   ptr = (void *) c;
+  size_t result = 0;
 
   switch (type) {
     case PLY_CHAR:
-      fread (ptr, 1, 1, plyfile->fp);
+      result = fread (ptr, 1, 1, plyfile->fp);
+      if(result < 1)
+      {
+          throw ply::MeshException( "Error in reading PLY file."
+                                 "fread not succeeded." );
+      }
       *int_val = *((char *) ptr);
       *uint_val = *int_val;
@@ -2277 +2308 @@
       case PLY_UCHAR:
       case PLY_UINT8:
-          fread (ptr, 1, 1, plyfile->fp);
+          result = fread (ptr, 1, 1, plyfile->fp);
+          if(result < 1)
+          {
+              throw ply::MeshException( "Error in reading PLY file."
+                                 "fread not succeeded." );
+          }
           *uint_val = *((unsigned char *) ptr);
           *int_val = *uint_val;
@@ -2283 +2319 @@
           break;
       case PLY_SHORT:
-          fread (ptr, 2, 1, plyfile->fp);
+          result = fread (ptr, 2, 1, plyfile->fp);
+          if(result < 1 )
+          {
+              throw ply::MeshException( "Error in reading PLY file."
+                                 "fread not succeeded." );
+          }
           if( plyfile->file_type == PLY_BINARY_BE )
           {
@@ -2297 +2338 @@
           break;
       case PLY_USHORT:
-          fread (ptr, 2, 1, plyfile->fp);
+          result = fread (ptr, 2, 1, plyfile->fp);
+          if(result < 1)
+          {
+              throw ply::MeshException( "Error in reading PLY file."
+                                 "fread not succeeded." );
+          }
           if( plyfile->file_type == PLY_BINARY_BE )
           {
@@ -2312 +2358 @@
       case PLY_INT:
       case PLY_INT32:
-          fread (ptr, 4, 1, plyfile->fp);
+          result = fread (ptr, 4, 1, plyfile->fp);
+          if(result < 1)
+          {
+              throw ply::MeshException( "Error in reading PLY file."
+                                 "fread not succeeded." );
+          }
           if( plyfile->file_type == PLY_BINARY_BE )
           {
@@ -2326 +2377 @@
           break;
       case PLY_UINT:
-          fread (ptr, 4, 1, plyfile->fp);
+          result = fread (ptr, 4, 1, plyfile->fp);
+          if(result < 1)
+          {
+              throw ply::MeshException( "Error in reading PLY file."
+                                 "fread not succeeded." );
+          }
           if( plyfile->file_type == PLY_BINARY_BE )
           {
@@ -2341 +2397 @@
       case PLY_FLOAT:
       case PLY_FLOAT32:
-          fread (ptr, 4, 1, plyfile->fp);
+          result = fread (ptr, 4, 1, plyfile->fp);
+          if(result < 1)
+          {
+              throw ply::MeshException( "Error in reading PLY file."
+                                 "fread not succeeded." );
+          }
           if( plyfile->file_type == PLY_BINARY_BE )
           {
@@ -2355 +2416 @@
           break;
       case PLY_DOUBLE:
-          fread (ptr, 8, 1, plyfile->fp);
-          if( plyfile->file_type == PLY_BINARY_BE )
-          {
-              swap8BE(ptr);
-          }
-          else
-          {
-              swap8LE(ptr);
-          }
-      *double_val = *((double *) ptr);
-      *int_val = (int) *double_val;
-      *uint_val = (unsigned int) *double_val;
-      break;
+        result = fread (ptr, 8, 1, plyfile->fp);
+        if(result < 1)
+        {
+            throw ply::MeshException( "Error in reading PLY file."
+                                "fread not succeeded." );
+        }
+        if( plyfile->file_type == PLY_BINARY_BE )
+        {
+            swap8BE(ptr);
+        }
+        else
+        {
+            swap8LE(ptr);
+        }
+        *double_val = *((double *) ptr);
+        *int_val = (int) *double_val;
+        *uint_val = (unsigned int) *double_val;
+        break;
     default:
-      fprintf (stderr, "get_binary_item: bad type = %d\n", type);
-      exit (-1);
+      char error[100];
+      sprintf (error, "get_binary_item: bad type = %d\n", type);
+      throw ply::MeshException( error );
   }
 }
@@ -2419 +2486 @@
     case PLY_FLOAT32:
     case PLY_DOUBLE:
-      *double_val = atof (word);
+      *double_val = osg::asciiToDouble(word);
       *int_val = (int) *double_val;
       *uint_val = (unsigned int) *double_val;
@@ -2425 +2492 @@
 
     default:
-      fprintf (stderr, "get_ascii_item: bad type = %d\n", type);
-      exit (-1);
+      char error[100];
+      sprintf (error, "get_ascii_item: bad type = %d\n", type);
+      throw ply::MeshException( error );
   }
 }
@@ -2497 +2565 @@
       break;
     default:
-      fprintf (stderr, "store_item: bad type = %d\n", type);
-      exit (-1);
+      char error[100];
+      sprintf (error, "store_item: bad type = %d\n", type);
+      throw ply::MeshException( error );
   }
 }