Show
Ignore:
Timestamp:
03/21/12 18:36:20 (2 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgWidget/Frame.cpp

    r12366 r13041  
    7272 
    7373    parent->update(); 
    74      
     74 
    7575    return true; 
    7676} 
     
    8585Frame::Border::Border(const Border& border, const osg::CopyOp& co): 
    8686Widget  (border, co), 
    87 _border (border._border)  
     87_border (border._border) 
    8888{ 
    8989} 
     
    111111 
    112112    if(_border == BORDER_LEFT) setTexCoordRegion(w * 3, 0.0f, w, h); 
    113      
     113 
    114114    else if(_border == BORDER_RIGHT) setTexCoordRegion(w * 4, 0.0f, w, h); 
    115115 
     
    141141{ 
    142142    Frame* parent = dynamic_cast<Frame*>(getParent()); 
    143      
     143 
    144144    if(!parent) return false; 
    145145 
     
    210210) { 
    211211    Frame* frame = 0; 
    212      
     212 
    213213    // Use an "existing frame" if we have it (for example, if you've in inherited from 
    214214    // Frame and want to use this stuff. 
     
    216216 
    217217    else frame = exFrame; 
    218      
     218 
    219219    frame->addWidget(new Corner(CORNER_LOWER_LEFT,  cw, ch), 0, 0); 
    220220    frame->addWidget(new Border(BORDER_BOTTOM,      w,  ch), 0, 1); 
     
    321321        // frame->getEmbeddedWindow()->setTexCoordRegion(cw, ch, tw - (cw * 2.0f), th - (ch * 2.0f)); 
    322322    } 
    323     else  
     323    else 
    324324    { 
    325325        OSG_WARN << "createSimpleFrameWithSingleTexture with a null image, the frame " << name << " will be use texture" << std::endl; 
     
    340340        left->getWidth() + right->getWidth() + w, 
    341341        top->getHeight() + bottom->getHeight() + h 
    342     );  
     342    ); 
    343343} 
    344344 
     
    360360    frame = createSimpleFrameWithSingleTexture(name, natifImage.get(), width, height, flags, exFrame); 
    361361 
    362     if (frame && image && natifImage.valid())  
     362    if (frame && image && natifImage.valid()) 
    363363    { 
    364364        const unsigned int bpps = image->getPixelSizeInBits() / 8; 
     
    389389                  const unsigned int x1, const unsigned int y1, 
    390390                  const unsigned int x2, const unsigned int y2, 
    391                   osg::Image* destination,  
     391                  osg::Image* destination, 
    392392                  const unsigned int xd = 0, const unsigned int yd = 0) 
    393393{ 
    394     if ((unsigned int)destination->s() >= xd + (x2 - x1) &&  
     394    if ((unsigned int)destination->s() >= xd + (x2 - x1) && 
    395395        (unsigned int)destination->t() >= yd + (y2 - y1)) 
    396396    { 
     
    404404            for (unsigned int x = 0; x < x2 - x1; ++x) 
    405405            { 
    406                 for (unsigned int d = 0; d < bpps; d++)  
     406                for (unsigned int d = 0; d < bpps; d++) 
    407407                { 
    408408                    T v = srcdata[(y + y1) * source->s() * bpps + (x + x1) * bpps + d]; 
     
    416416} 
    417417 
    418 /** Copies a rectangle of corners (x1, y1), (x2, y2) from an image into  
     418/** Copies a rectangle of corners (x1, y1), (x2, y2) from an image into 
    419419    another image starting at position (xd, yd). No scaling is done, the 
    420     pixels are just copied, so the destination image must be at least  
     420    pixels are just copied, so the destination image must be at least 
    421421    (xd + (x2 - x1)) by (yd + (y2 - y1)) pixels. */ 
    422422void copyData(const osg::Image* source, 
    423               const unsigned int x1, const unsigned int y1,  
     423              const unsigned int x1, const unsigned int y1, 
    424424              const unsigned int x2, const unsigned int y2, 
    425               osg::Image* destination,  
     425              osg::Image* destination, 
    426426              const unsigned int xd, const unsigned int yd) 
    427427{ 
     
    430430        if (source->getDataType() == GL_UNSIGNED_BYTE) 
    431431        { 
    432             copyDataImpl<unsigned char>(source, x1, y1, x2, y2,  
     432            copyDataImpl<unsigned char>(source, x1, y1, x2, y2, 
    433433                                        destination, xd, yd); 
    434434        } 
     
    542542        return 0; 
    543543    } 
    544      
     544 
    545545    // check size 
    546546    int ceilvalue = static_cast<int>(ceil(s * 1.0 / 3));