FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Mathias Froehlich, build fixes for legacy unix systems

Browse Source
This commit is contained in:
Robert Osfield
2011-06-07 14:26:13 +00:00
parent 7f9a6aa49d
commit 4f7903f732
4 changed files with 77 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/zip/ZipArchive.cpp
View File

@@ -473,19 +473,17 @@ osgDB::DirectoryContents ZipArchive::getDirectoryContents(const std::string& dir
for(; iter != iterEnd; ++iter)
{
const ZipEntryMapping& ze = *iter;
std::string searchPath = dirName;
CleanupFileString(searchPath);
if(ze.first.size() > searchPath.size())
if(iter->first.size() > searchPath.size())
{
size_t endSubElement = ze.first.find(searchPath);
size_t endSubElement = iter->first.find(searchPath);
//we match the whole string in the beginning of the path
if(endSubElement == 0)
{
std::string remainingFile = ze.first.substr(searchPath.size() + 1, std::string::npos);
std::string remainingFile = iter->first.substr(searchPath.size() + 1, std::string::npos);
size_t endFileToken = remainingFile.find_first_of('/');
if(endFileToken == std::string::npos)

6
src/osgQt/GraphicsWindowQt.cpp
View File

@@ -342,7 +342,11 @@ bool GraphicsWindowQt::init( QWidget* parent, const QGLWidget* shareWidget, Qt::
// WindowFlags
Qt::WindowFlags flags = f | Qt::Window | Qt::CustomizeWindowHint;
if ( _traits->windowDecoration )
flags |= Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
flags |= Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint
#if (QT_VERSION_CHECK(4, 5, 0) <= QT_VERSION)
| Qt::WindowCloseButtonHint
#endif
;
// create widget
_widget = new GLWidget( traits2qglFormat( _traits.get() ), parent, shareWidget, flags );