Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/ogr/ReaderWriterOGR.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ogr/ReaderWriterOGR.cpp (modified) (23 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ogr/ReaderWriterOGR.cpp

@@ -1 @@
-/* -*- mode: c++; c-default-style: k&r; tab-width: 4; c-basic-offset: 4; -*- 
+/* -*- mode: c++; c-default-style: k&r; tab-width: 4; c-basic-offset: 4; -*-
  * Copyright (C) 2007 Cedric Pinson - mornifle@plopbyte.net
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -37 +37 @@
 #include <ogrsf_frmts.h>
 
-#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)  
-
-void CPL_STDCALL CPLOSGErrorHandler( CPLErr eErrClass, int nError, 
+#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)
+
+void CPL_STDCALL CPLOSGErrorHandler( CPLErr eErrClass, int nError,
                              const char * pszErrorMsg )
 {
@@ -67 +67 @@
 }
 
-struct TriangulizeFunctor 
+struct TriangulizeFunctor
 {
     osg::Vec3Array* _vertexes;
@@ -81 +81 @@
 static osg::Vec3Array* triangulizeGeometry(osg::Geometry* src)
 {
-    if (src->getNumPrimitiveSets() == 1 && 
+    if (src->getNumPrimitiveSets() == 1 &&
         src->getPrimitiveSet(0)->getType() == osg::PrimitiveSet::DrawArraysPrimitiveType &&
         src->getVertexArray() &&
@@ -109 +109 @@
     virtual ~ReaderWriterOGR()
     {
-        CPLSetErrorHandler(oldHandler); 
-    }
-    
+        CPLSetErrorHandler(oldHandler);
+    }
+
     virtual const char* className() const { return "OGR file reader"; }
 
@@ -117 +117 @@
     {
         OSG_INFO<<"OGR::readNode("<<file<<")"<<std::endl;
-        
+
         if (file.empty()) return ReadResult::FILE_NOT_FOUND;
-    
+
         if (osgDB::equalCaseInsensitive(osgDB::getFileExtension(file),"ogr"))
         {
@@ -145 +145 @@
         bool useRandomColorByFeature = false;
         bool addGroupPerFeature = false;
-        if (options) 
+        if (options)
         {
             if (options->getOptionString().find("UseRandomColorByFeature") != std::string::npos)
@@ -157 +157 @@
         osg::Group* group = new osg::Group;
 
-        for (int i = 0; i < file->GetLayerCount(); i++) 
+        for (int i = 0; i < file->GetLayerCount(); i++)
         {
             osg::Group* node = readLayer(file->GetLayer(i), file->GetName(), useRandomColorByFeature, addGroupPerFeature);
@@ -177 +177 @@
 
         OGRFeature* ogrFeature = NULL;
-        while ((ogrFeature = ogrLayer->GetNextFeature()) != NULL) 
+        while ((ogrFeature = ogrLayer->GetNextFeature()) != NULL)
         {
             osg::Geode* feature = readFeature(ogrFeature, useRandomColorByFeature);
@@ -228 +228 @@
         osg::Vec3Array* vertices = new osg::Vec3Array();
         OGRPoint point;
-        for(int j = 0; j < lineString->getNumPoints(); j++) 
+        for(int j = 0; j < lineString->getNumPoints(); j++)
         {
             lineString->getPoint(j, &point);
@@ -245 +245 @@
         osg::Geometry* pointGeom = new osg::Geometry();
         osg::Vec3Array* vertices = new osg::Vec3Array();
-        
+
         vertices->reserve(mpoint->getNumGeometries());
-        for (int i = 0; i < mpoint->getNumGeometries(); i++ ) 
+        for (int i = 0; i < mpoint->getNumGeometries(); i++ )
         {
             OGRGeometry* ogrGeom = mpoint->getGeometryRef(i);
@@ -256 +256 @@
 
             OGRPoint* points = static_cast<OGRPoint*>(ogrGeom);
-        
+
             vertices->push_back(osg::Vec3(points->getX(), points->getY(), points->getZ()));
         }
-        
+
         pointGeom->setVertexArray(vertices);
         pointGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::POINTS, 0, vertices->size()));
-        
+
         if (pointGeom->getVertexArray())
         {
@@ -275 +275 @@
         osg::Geometry* geom = new osg::Geometry;
 
-        for (int i = 0; i < mpolygon->getNumGeometries(); i++ ) 
+        for (int i = 0; i < mpolygon->getNumGeometries(); i++ )
         {
             OGRGeometry* ogrGeom = mpolygon->getGeometryRef(i);
@@ -286 +286 @@
             osg::ref_ptr<osg::Drawable> drw = polygonToDrawable(polygon);
             osg::ref_ptr<osg::Geometry> geometry = drw->asGeometry();
-            if (geometry.valid() && geometry->getVertexArray() && 
-                geometry->getVertexArray()->getNumElements() && 
+            if (geometry.valid() && geometry->getVertexArray() &&
+                geometry->getVertexArray()->getNumElements() &&
                 geometry->getNumPrimitiveSets() &&
-                geometry->getVertexArray()->getType() == osg::Array::Vec3ArrayType ) 
-            {
-
-                if (!geom->getVertexArray()) 
+                geometry->getVertexArray()->getType() == osg::Array::Vec3ArrayType )
+            {
+
+                if (!geom->getVertexArray())
                 { // no yet data we put the first in
                     geom->setVertexArray(geometry->getVertexArray());
                     geom->setPrimitiveSetList(geometry->getPrimitiveSetList());
 
-                } 
-                else 
+                }
+                else
                 { // already a polygon then append
                     int size = geom->getVertexArray()->getNumElements();
                     osg::Vec3Array* arrayDst = static_cast<osg::Vec3Array*>(geom->getVertexArray());
                     osg::ref_ptr<osg::Vec3Array> triangulized = triangulizeGeometry(geometry.get());
-                    if (triangulized.valid()) 
+                    if (triangulized.valid())
                     {
                         arrayDst->insert(arrayDst->end(), triangulized->begin(), triangulized->end());
-                        // shift index 
+                        // shift index
                         geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES, size, triangulized->size()));
                     }
                 }
-            } 
+            }
             else
             {
@@ -341 +341 @@
         }
 
-        if (polygon->getNumInteriorRings()) 
+        if (polygon->getNumInteriorRings())
         {
             for (int i = 0; i < polygon->getNumInteriorRings(); i++)
@@ -347 +347 @@
                 OGRLinearRing *ring = polygon->getInteriorRing(i);
                 OGRPoint point;
-                for (int j = 0; j < ring->getNumPoints(); j++) 
+                for (int j = 0; j < ring->getNumPoints(); j++)
                 {
                     ring->getPoint(j, &point);
@@ -364 +364 @@
         geom->removePrimitiveSet(0,geom->getNumPrimitiveSets());
         geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES, 0, array->size()));
-  
+
         return geom;
     }
@@ -371 +371 @@
         osg::Geometry* geom = new osg::Geometry;
 
-        for (int i = 0; i < mlineString->getNumGeometries(); i++ ) 
+        for (int i = 0; i < mlineString->getNumGeometries(); i++ )
         {
             OGRGeometry* ogrGeom = mlineString->getGeometryRef(i);
@@ -381 +381 @@
             OGRLineString* lineString = static_cast<OGRLineString*>(ogrGeom);
             osg::ref_ptr<osg::Geometry> geometry = lineStringToDrawable(lineString);
-            if (geometry.valid() && 
-                geometry->getVertexArray() && 
+            if (geometry.valid() &&
+                geometry->getVertexArray() &&
                 geometry->getNumPrimitiveSets() &&
-                geometry->getVertexArray()->getType() == osg::Array::Vec3ArrayType) 
+                geometry->getVertexArray()->getType() == osg::Array::Vec3ArrayType)
             {
 
@@ -392 +392 @@
                     geom->setPrimitiveSetList(geometry->getPrimitiveSetList());
 
-                } 
-                else 
+                }
+                else
                 {
                     int size = geom->getVertexArray()->getNumElements();
@@ -400 +400 @@
                     osg::Vec3Array* arrayDst = static_cast<osg::Vec3Array*>(geom->getVertexArray());
                     arrayDst->insert(arrayDst->end(), arraySrc->begin(), arraySrc->end());
-                    // shift index 
+                    // shift index
                     geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINE_STRIP, size, arraySrc->size()));
                 }
@@ -413 +413 @@
         if (!ogrFeature || !ogrFeature->GetGeometryRef())
             return 0;
-          
+
         osg::Geometry* drawable = 0;
         bool disableCulling = false;
@@ -424 +424 @@
             drawable = pointsToDrawable(static_cast<OGRPoint *>(ogrFeature->GetGeometryRef()));
             disableCulling = true;
-            break; 
+            break;
 
         case wkbLinearRing: