Changeset 13041 for OpenSceneGraph/trunk/src/osgWidget/Frame.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/osgWidget/Frame.cpp (modified) (14 diffs)

OpenSceneGraph/trunk/src/osgWidget/Frame.cpp

@@ -72 +72 @@
 
     parent->update();
-    
+
     return true;
 }
@@ -85 +85 @@
 Frame::Border::Border(const Border& border, const osg::CopyOp& co):
 Widget  (border, co),
-_border (border._border) 
+_border (border._border)
 {
 }
@@ -111 +111 @@
 
     if(_border == BORDER_LEFT) setTexCoordRegion(w * 3, 0.0f, w, h);
-    
+
     else if(_border == BORDER_RIGHT) setTexCoordRegion(w * 4, 0.0f, w, h);
 
@@ -141 +141 @@
 {
     Frame* parent = dynamic_cast<Frame*>(getParent());
-    
+
     if(!parent) return false;
 
@@ -210 +210 @@
 ) {
     Frame* frame = 0;
-    
+
     // Use an "existing frame" if we have it (for example, if you've in inherited from
     // Frame and want to use this stuff.
@@ -216 +216 @@
 
     else frame = exFrame;
-    
+
     frame->addWidget(new Corner(CORNER_LOWER_LEFT,  cw, ch), 0, 0);
     frame->addWidget(new Border(BORDER_BOTTOM,      w,  ch), 0, 1);
@@ -321 +321 @@
         // frame->getEmbeddedWindow()->setTexCoordRegion(cw, ch, tw - (cw * 2.0f), th - (ch * 2.0f));
     }
-    else 
+    else
     {
         OSG_WARN << "createSimpleFrameWithSingleTexture with a null image, the frame " << name << " will be use texture" << std::endl;
@@ -340 +340 @@
         left->getWidth() + right->getWidth() + w,
         top->getHeight() + bottom->getHeight() + h
-    ); 
+    );
 }
 
@@ -360 +360 @@
     frame = createSimpleFrameWithSingleTexture(name, natifImage.get(), width, height, flags, exFrame);
 
-    if (frame && image && natifImage.valid()) 
+    if (frame && image && natifImage.valid())
     {
         const unsigned int bpps = image->getPixelSizeInBits() / 8;
@@ -389 +389 @@
                   const unsigned int x1, const unsigned int y1,
                   const unsigned int x2, const unsigned int y2,
-                  osg::Image* destination, 
+                  osg::Image* destination,
                   const unsigned int xd = 0, const unsigned int yd = 0)
 {
-    if ((unsigned int)destination->s() >= xd + (x2 - x1) && 
+    if ((unsigned int)destination->s() >= xd + (x2 - x1) &&
         (unsigned int)destination->t() >= yd + (y2 - y1))
     {
@@ -404 +404 @@
             for (unsigned int x = 0; x < x2 - x1; ++x)
             {
-                for (unsigned int d = 0; d < bpps; d++) 
+                for (unsigned int d = 0; d < bpps; d++)
                 {
                     T v = srcdata[(y + y1) * source->s() * bpps + (x + x1) * bpps + d];
@@ -416 +416 @@
 }
 
-/** Copies a rectangle of corners (x1, y1), (x2, y2) from an image into 
+/** Copies a rectangle of corners (x1, y1), (x2, y2) from an image into
     another image starting at position (xd, yd). No scaling is done, the
-    pixels are just copied, so the destination image must be at least 
+    pixels are just copied, so the destination image must be at least
     (xd + (x2 - x1)) by (yd + (y2 - y1)) pixels. */
 void copyData(const osg::Image* source,
-              const unsigned int x1, const unsigned int y1, 
+              const unsigned int x1, const unsigned int y1,
               const unsigned int x2, const unsigned int y2,
-              osg::Image* destination, 
+              osg::Image* destination,
               const unsigned int xd, const unsigned int yd)
 {
@@ -430 +430 @@
         if (source->getDataType() == GL_UNSIGNED_BYTE)
         {
-            copyDataImpl<unsigned char>(source, x1, y1, x2, y2, 
+            copyDataImpl<unsigned char>(source, x1, y1, x2, y2,
                                         destination, xd, yd);
         }
@@ -542 +542 @@
         return 0;
     }
-    
+
     // check size
     int ceilvalue = static_cast<int>(ceil(s * 1.0 / 3));