Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/ive/Layer.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/ive/Layer.cpp (modified) (11 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ive/Layer.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield
  *
- * 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.
 */
@@ -38 +38 @@
         out_THROW_EXCEPTION("Layer::write(): Could not cast this osgLayer::Layer to an osg::Object.");
 
- 
+
     if (out->getVersion() >= VERSION_0023)
     {
@@ -58 +58 @@
         helper.writeLocator(out, getLocator());
     }
-    
-    
+
+
 
     out->writeUInt(getMinLevel());
@@ -76 +76 @@
     if (id != IVELAYER)
         in_THROW_EXCEPTION("Layer::read(): Expected Layer identification.");
-    
+
     // Read Layer's identification.
     id = in->readInt();
@@ -118 +118 @@
 void LayerHelper::writeLayer(DataOutputStream* out, osgTerrain::Layer* layer)
 {
-    if (layer) 
+    if (layer)
     {
         out->writeBool(true);
@@ -193 +193 @@
         osg::ref_ptr<osg::Object> object = osgDB::readObjectFile(filename+".gdal");
         osgTerrain::ProxyLayer* proxyLayer = dynamic_cast<osgTerrain::ProxyLayer*>(object.get());
-        
+
         osg::ref_ptr<osgTerrain::Locator> locator = readLocator(in);
         unsigned int minLevel = in->readUInt();
         unsigned int maxLevel = in->readUInt();
-        
+
         if (proxyLayer)
         {
             if (locator.valid()) proxyLayer->setLocator(locator.get());
-            
+
             proxyLayer->setMinLevel(minLevel);
             proxyLayer->setMaxLevel(maxLevel);
         }
-        
+
         return proxyLayer;
     }
-    
+
     return new osgTerrain::ImageLayer;
 }
@@ -214 +214 @@
 void LayerHelper::writeLocator(DataOutputStream* out, osgTerrain::Locator* locator)
 {
-    if (locator) 
+    if (locator)
     {
         out->writeBool(true);
-        
+
         ((ive::Locator*)(locator))->write(out);
     }
@@ -230 +230 @@
     bool locatorExist = in->readBool();
     if (!locatorExist) return 0;
-    
+
     osgTerrain::Locator* locator = new osgTerrain::Locator;
-    
+
     ((ive::Locator*)(locator))->read(in);
-    
+
     return locator;
 }
@@ -250 +250 @@
             out->writeFloat(validRange->getMaxValue());
         }
-        else 
-        {    
+        else
+        {
             osgTerrain::NoDataValue* noDataValue  = dynamic_cast<osgTerrain::NoDataValue*>(validDataOperator);
             if (noDataValue)
@@ -270 +270 @@
     bool hasOperator = in->readBool();
     if (!hasOperator) return 0;
-    
+
     int id = in->peekInt();
     if (id==IVEVALIDRANGE)
@@ -277 +277 @@
         float minValue = in->readFloat();
         float maxValue = in->readFloat();
-        return new osgTerrain::ValidRange(minValue,maxValue);        
+        return new osgTerrain::ValidRange(minValue,maxValue);
     }
     else if (id==IVENODATAVALUE)