Show
Ignore:
Timestamp:
11/21/14 21:16:16 (2 days ago)
Author:
robert
Message:

From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in
a way that when CMAKE_INSTALL_PREFIX contains something along the lines
of

/usr/x86_64-linux-gnu/

it gets substituted as

/usr/x86_64-1-gnu/

that is, the string is preprocessed again, thereby making changes to
anything that matches any defined symbol, as "linux" in this example
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763816).

Quoting that path directly in CMake scripts solves that problem.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgQt/GraphicsWindowQt.cpp

    r14009 r14044  
    249249    const QSize& size = event->size(); 
    250250 
    251     _gw->resized( x(), y(), size.width()*_devicePixelRatio, size.height()*_devicePixelRatio ); 
    252     _gw->getEventQueue()->windowResize( x(), y(), size.width()*_devicePixelRatio, size.height()*_devicePixelRatio ); 
     251    int scaled_width = static_cast<int>(size.width()*_devicePixelRatio); 
     252    int scaled_height = static_cast<int>(size.height()*_devicePixelRatio); 
     253    _gw->resized( x(), y(), scaled_width,  scaled_height); 
     254    _gw->getEventQueue()->windowResize( x(), y(), scaled_width, scaled_height ); 
    253255    _gw->requestRedraw(); 
    254256} 
     
    257259{ 
    258260    const QPoint& pos = event->pos(); 
    259     _gw->resized( pos.x(), pos.y(), width()*_devicePixelRatio, height()*_devicePixelRatio ); 
    260     _gw->getEventQueue()->windowResize( pos.x(), pos.y(), width()*_devicePixelRatio, height()*_devicePixelRatio ); 
     261    int scaled_width = static_cast<int>(width()*_devicePixelRatio); 
     262    int scaled_height = static_cast<int>(height()*_devicePixelRatio); 
     263    _gw->resized( pos.x(), pos.y(), scaled_width,  scaled_height ); 
     264    _gw->getEventQueue()->windowResize( pos.x(), pos.y(), scaled_width,  scaled_height ); 
    261265} 
    262266