Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_rarchive.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/txp/trpage_rarchive.cpp (modified) (19 diffs)

OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_rarchive.cpp

@@ -136 +136 @@
     trpgHeader blockHeader;
     trpgr_Parser bparser;
-    
+
     char blockpath[1024];
     //open the block archive
@@ -152 +152 @@
     if ( (bmagic != GetMagicNumber()) && (trpg_byteswap_int(bmagic) != GetMagicNumber()) )
         return false;
-    
+
     int32 bheaderSize=0;
-    if (fread(&bheaderSize,sizeof(int32),1,bfp) != 1) 
+    if (fread(&bheaderSize,sizeof(int32),1,bfp) != 1)
         return false;
     if (ness != cpuNess)
         bheaderSize = trpg_byteswap_int(bheaderSize);
     int bheadLen = bheaderSize;
-    if (bheadLen < 0)  
+    if (bheadLen < 0)
         return false;
 
@@ -166 +166 @@
     bbuf.SetLength(bheadLen);
     char *bdata = bbuf.GetDataPtr();
-    if ((ret = GetHeaderData(bdata,bheadLen,bfp)) != bheadLen)  
-        return false;
-    //keep track of where this came from in the master table.        
+    if ((ret = GetHeaderData(bdata,bheadLen,bfp)) != bheadLen)
+        return false;
+    //keep track of where this came from in the master table.
     tileTable.SetCurrentBlock(row,col,true);
     texTable.SetCurrentBlock(row,col);
-    
+
     bparser.AddCallback(TRPGHEADER,&blockHeader);
     bparser.AddCallback(TRPGMATTABLE,&materialTable);    // Went back to oldest style for 2.0
@@ -181 +181 @@
     bparser.AddCallback(TRPGRANGETABLE,&rangeTable);                // Added for 2.0
     bparser.AddCallback(TRPG_TEXT_STYLE_TABLE,&textStyleTable);                // Added for 2.1
-    bparser.AddCallback(TRPG_SUPPORT_STYLE_TABLE,&supportStyleTable);        
-    bparser.AddCallback(TRPG_LABEL_PROPERTY_TABLE,&labelPropertyTable);        
+    bparser.AddCallback(TRPG_SUPPORT_STYLE_TABLE,&supportStyleTable);
+    bparser.AddCallback(TRPG_LABEL_PROPERTY_TABLE,&labelPropertyTable);
     // Don't read the tile table for v1.0 archives
     // It's only really used for 2.0 archives
@@ -217 +217 @@
     trpgEndian cpuNess = trpg_cpu_byte_order();
     int32 headerSize;
-    if (fread(&headerSize,sizeof(int32),1,fp) != 1) 
+    if (fread(&headerSize,sizeof(int32),1,fp) != 1)
         return false;
     if (ness != cpuNess)
         headerSize = trpg_byteswap_int(headerSize);
     int headLen = headerSize;
-    if (headLen < 0)  
+    if (headLen < 0)
         return false;
 
@@ -229 +229 @@
     buf.SetLength(headLen);
     char *data = buf.GetDataPtr();
-    if ((ret = GetHeaderData(data,headLen,fp)) != headLen)  
+    if ((ret = GetHeaderData(data,headLen,fp)) != headLen)
         return false;
 
@@ -246 +246 @@
     parser.AddCallback(TRPGRANGETABLE,&rangeTable);                // Added for 2.0
     parser.AddCallback(TRPG_TEXT_STYLE_TABLE,&textStyleTable);                // Added for 2.1
-    parser.AddCallback(TRPG_SUPPORT_STYLE_TABLE,&supportStyleTable);        
-    parser.AddCallback(TRPG_LABEL_PROPERTY_TABLE,&labelPropertyTable);        
+    parser.AddCallback(TRPG_SUPPORT_STYLE_TABLE,&supportStyleTable);
+    parser.AddCallback(TRPG_LABEL_PROPERTY_TABLE,&labelPropertyTable);
     // Don't read the tile table for v1.0 archives
     // It's only really used for 2.0 archives
@@ -256 +256 @@
         return false;
 
-    if(header.GetIsMaster()) 
+    if(header.GetIsMaster())
     {
         // bool firstBlock = true;
@@ -316 +316 @@
 bool trpgr_Archive::ReadTile(uint32 x,uint32 y,uint32 lod,trpgMemReadBuffer &buf)
 {
-    if (!isValid()) 
+    if (!isValid())
         return false;
 
@@ -322 +322 @@
     int32 numLods;
     header.GetNumLods(numLods);
-    if (static_cast<int>(lod) >= numLods) 
+    if (static_cast<int>(lod) >= numLods)
         return false;
     trpg2iPoint lodSize;
     header.GetLodSize(lod,lodSize);
-    if (static_cast<int>(x) >= lodSize.x || static_cast<int>(y) >= lodSize.y) 
+    if (static_cast<int>(x) >= lodSize.x || static_cast<int>(y) >= lodSize.y)
         return false;
 
@@ -335 +335 @@
     if (tileMode == trpgTileTable::External || tileMode == trpgTileTable::ExternalSaved) {
         status = ReadExternalTile(x, y, lod, buf);
-        
+
     } else {
         // Local tile.  Figure out where it is (which file)
@@ -387 +387 @@
         }
         // Find the file end
-        if (fseek(fp,0,SEEK_END))  
+        if (fseek(fp,0,SEEK_END))
             throw 1;
         // Note: This means tile is capped at 2 gigs
         long pos = ftell(fp);
-        if (fseek(fp,0,SEEK_SET)) 
+        if (fseek(fp,0,SEEK_SET))
             throw 1;
         // Now we know the size.  Read the whole file
         buf.SetLength(pos);
         char *data = buf.GetDataPtr();
-        if (fread(data,pos,1,fp) != 1) 
+        if (fread(data,pos,1,fp) != 1)
             throw 1;
-        fclose(fp); 
+        fclose(fp);
         fp = NULL;
     }
@@ -413 +413 @@
     // Fetch the appendable file from the cache
     trpgrAppFile *tf = tileCache->GetFile(ness,addr.file,addr.col,addr.row);
-    if (!tf)  
+    if (!tf)
         return false;
 
@@ -432 +432 @@
     return &materialTable;
 }
-trpgTexTable *trpgr_Archive::GetTexTable() 
+trpgTexTable *trpgr_Archive::GetTexTable()
 {
     return &texTable;
@@ -532 +532 @@
         geotypCache = texCache;
     }
-        
+
 }
 
@@ -614 +614 @@
     // or overhaul this in some other fashion.
     int numTables;
-    if (!matTable->GetNumTable(numTables)) 
-        return false;
-    if (index>=numTables) 
+    if (!matTable->GetNumTable(numTables))
+        return false;
+    if (index>=numTables)
         return false;
     if (index>0) matSubTable=index; // otherwise, leave it alone - could be nonzero
     const trpgMaterial *mat = matTable->GetMaterialRef(matSubTable,matID);
-    if (!mat)  
+    if (!mat)
         return false;
 
@@ -626 +626 @@
     trpgTextureEnv texEnv;
     int32 texID;
-    if (!mat->GetTexture(0,texID,texEnv)) 
+    if (!mat->GetTexture(0,texID,texEnv))
         return false;
     const trpgTexture *tex = texTable->GetTextureRef(texID);
-    if (!tex)  
+    if (!tex)
         return false;
 
@@ -646 +646 @@
 bool trpgrImageHelper::GetNthImageForLocalMat(const trpgLocalMaterial *locMat,int index, char *data,int dataSize)
 {
-    if (!locMat->isValid()) 
+    if (!locMat->isValid())
         return false;
 
@@ -665 +665 @@
         if (!locMat->GetNthAddr(index,addr)) return false;
         trpgrAppFile *af = texCache->GetFile(ness,addr.file,addr.col,addr.row);
-        if (!af)  
+        if (!af)
             return false;
         if (!af->Read(data,addr.offset,0,dataSize))