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

Timestamp:

03/21/12 18:36:20 (15 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

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

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

@@ -1 @@
-/* Copyright (c) 2005-2007, Stefan Eilemann <eile@equalizergraphics.com> 
+/* Copyright (c) 2005-2007, Stefan Eilemann <eile@equalizergraphics.com>
    All rights reserved.
    - Cleaned up code for 64 bit, little and big endian support
@@ -26 +26 @@
 
 Copyright (c) 1994 The Board of Trustees of The Leland Stanford
-Junior University.  All rights reserved.   
-  
-Permission to use, copy, modify and distribute this software and its   
-documentation for any purpose is hereby granted without fee, provided   
-that the above copyright notice and this permission notice appear in   
-all copies of this software and that you do not sell the software.   
-  
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,   
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY   
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.   
+Junior University.  All rights reserved.
+
+Permission to use, copy, modify and distribute this software and its
+documentation for any purpose is hereby granted without fee, provided
+that the above copyright notice and this permission notice appear in
+all copies of this software and that you do not sell the software.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 
 */
@@ -136 +136 @@
     unsigned char* bytes = (unsigned char*)ptr;
     unsigned short* result = (unsigned short*)ptr;
-    
+
     *result = (bytes[0]<<8) | bytes[1];
 }
@@ -146 +146 @@
 
     *result = (bytes[0]<<24) | (bytes[1]<<16) | (bytes[2]<<8) | bytes[3];
-}    
+}
 
 void swap8Bytes( void* ptr )
@@ -152 +152 @@
     unsigned char* bytes = (unsigned char*)ptr;
     unsigned long long* result = (unsigned long long*)ptr;
-    
+
     *result = ((unsigned long long)(bytes[0])) << 56 |
         ((unsigned long long)(bytes[1])) << 48 |
@@ -307 +307 @@
 
   /* tack on the extension .ply, if necessary */
-  name = (char *) myalloc (sizeof (char) * 
+  name = (char *) myalloc (sizeof (char) *
                            (static_cast<int>(strlen (filename)) + 5));
   strcpy (name, filename);
@@ -754 +754 @@
                                            sizeof (char *) * (plyfile->num_comments + 1));
     }
-  
+
   /* add comment to list */
   plyfile->comments[plyfile->num_comments] = strdup (comment);
@@ -782 +782 @@
                                            sizeof (char *) * (plyfile->num_obj_info + 1));
     }
-  
+
   /* add info to list */
   plyfile->obj_info[plyfile->num_obj_info] = strdup (obj_info);
@@ -830 +830 @@
   plyfile = (PlyFile *) myalloc (sizeof (PlyFile));
   if (!plyfile) return (NULL);
-  
+
   plyfile->nelems = 0;
   plyfile->comments = NULL;
@@ -895 +895 @@
     words = get_words (plyfile->fp, &nwords, &orig_line);
   }
-  
+
 
   /* create tags for each property of each element, to be used */
@@ -951 +951 @@
   /* tack on the extension .ply, if necessary */
 
-  name = (char *) myalloc (sizeof (char) * 
+  name = (char *) myalloc (sizeof (char) *
                            (static_cast<int>(strlen (filename) + 5)));
   strcpy (name, filename);
@@ -1056 +1056 @@
 
     /* deposit the property information into the element's description */
-    for (i = 0; i < nprops; i++) 
+    for (i = 0; i < nprops; i++)
     {
         /* look for actual property */
         prop = find_property (elem, prop_list[i].name, &index);
-        if (prop == NULL) 
+        if (prop == NULL)
         {
-            fprintf ( stderr, 
+            fprintf ( stderr,
                       "Warning:  Can't find property '%s' in element '%s'\n",
                       prop_list[i].name, elem_name );
@@ -1304 +1304 @@
   other->size = elem->other_size;
   other->props = (PlyProperty **) myalloc (sizeof(PlyProperty*) * elem->nprops);
-  
+
   /* save descriptions of each "other" property */
   nprops = 0;
@@ -1323 +1323 @@
   }
 #endif
-  
+
   /* return structure */
   return (other);
@@ -1535 +1535 @@
     }
   free (plyfile->comments);
-  
+
   for (i=0; i<plyfile->num_obj_info; i++)
     {
@@ -1541 +1541 @@
     }
   free (plyfile->obj_info);
-  
+
   free (plyfile);
 }
@@ -1602 +1602 @@
         if (equal_strings (element, plyfile->elems[i]->name))
             return (plyfile->elems[i]);
-    
+
     return (NULL);
 }
@@ -1622 +1622 @@
 {
     int i;
-    
+
     for( i = 0; i < elem->nprops; i++)
         if (equal_strings (prop_name, elem->props[i]->name))
@@ -1629 +1629 @@
             return (elem->props[i]);
         }
-    
+
     *index = -1;
     return (NULL);
@@ -1828 +1828 @@
        * so that zipper won't crash reading plies that have additional
        * properties.
-       */ 
+       */
       if (store_it) {
         item_size = ply_type_size[prop->internal_type];
@@ -2761 +2761 @@
   ptr = (char *) malloc (size);
 
-  if (ptr == 0) 
-      fprintf( stderr, "Memory allocation bombed on line %d in %s\n", 
+  if (ptr == 0)
+      fprintf( stderr, "Memory allocation bombed on line %d in %s\n",
                lnum, fname);