Changeset 10088 for OpenSceneGraph/trunk/src/osgPlugins/ply/plyfile.cpp

Timestamp:

04/23/09 15:42:24 (4 years ago)

Author:

robert

Message:

Warning fixes

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ply/plyfile.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ply/plyfile.cpp

@@ -47 +47 @@
 #include <string.h>
 
-
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
+    #pragma warning( disable : 4996 )
+#endif
 
 #ifdef WIN32
@@ -2412 +2414 @@
           break;
       case PLY_DOUBLE:
-          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;
+        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:
       char error[100];