Permalink
Commits on Jun 21, 2011
  1. @robertosfield
  2. @robertosfield
  3. @robertosfield
  4. @robertosfield

    Merged from svn/trunk warnings fixes provided by Changeset 12582 from…

    … Michael Platings, along with addition
    
    of returns at ends of files and changes to tabs to four spaces.
    robertosfield committed Jun 21, 2011
Commits on Jun 20, 2011
  1. @robertosfield
  2. @robertosfield

    Merged from svn/trunk, r12574.

    From Farshid Lashkari, BGR write support for BMP, PNG and TGA
    robertosfield committed Jun 20, 2011
  3. @robertosfield

    Merged changes to svn/trunk that address cppcheck reported issues:

    [examples/osgphotoalbum/PhotoArchive.cpp:56]: (error) Memory leak: fileIndentifier
    [examples/osgphotoalbum/PhotoArchive.cpp:257]: (error) Deallocating a deallocated pointer: newData
    [examples/osgphotoalbum/PhotoArchive.cpp:318]: (error) Deallocating a deallocated pointer: newData
    [src/osg/ImageUtils.cpp:116]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:307]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:312]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:367]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:399]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:400]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:482]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:483]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:484]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:519]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/ImageUtils.cpp:536]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:71]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:74]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:77]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:82]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:102]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:107]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:599]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:600]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:601]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:602]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:603]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:604]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:605]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osg/OcclusionQueryNode.cpp:606]: (portability) Extra qualification 'osg::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:134]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:135]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:136]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:137]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:139]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:177]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:178]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:195]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:198]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:203]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:205]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/ExternalFileWriter.cpp:253]: (portability) Extra qualification 'osgDB::' unnecessary and considered an error by many compilers.
    [src/osgDB/InputStream.cpp:553]: (error) Memory leak: data
    [src/osgDB/OutputStream.cpp:393]: (error) Memory leak: data
    [src/osgPlugins/Inventor/ConvertToInventor.cpp:656]: (error) Mismatching allocation and deallocation: tmpArray
    [src/osgPlugins/Inventor/ReaderWriterIV.cpp:237]: (error) Common realloc mistake: 'buf' nulled but not freed upon failure
    [src/osgPlugins/OpenFlight/expGeometryRecords.cpp:167]: (portability) Extra qualification 'flt::' unnecessary and considered an error by many compilers.
    [src/osgPlugins/OpenFlight/expGeometryRecords.cpp:373]: (portability) Extra qualification 'flt::' unnecessary and considered an error by many compilers.
    [src/osgPlugins/cfg/CameraConfig.cpp:635]: (error) Unusual pointer arithmetic
    [src/osgPlugins/freetype/FreeTypeLibrary.cpp:122]: (error) Memory leak: buffer
    [src/osgPlugins/geo/ReaderWriterGEO.cpp:210]: (error) Possible null pointer dereference: gfd - otherwise it is redundant to check if gfd is null at line 211
    [src/osgPlugins/geo/ReaderWriterGEO.cpp:227]: (error) Possible null pointer dereference: gfd - otherwise it is redundant to check if gfd is null at line 228
    [src/osgPlugins/geo/ReaderWriterGEO.cpp:903]: (error) Possible null pointer dereference: gfd - otherwise it is redundant to check if gfd is null at line 904
    [src/osgPlugins/geo/osgGeoNodes.h:180]: (error) Memory leak: geoHeaderGeo::intVars
    [src/osgPlugins/geo/osgGeoNodes.h:181]: (error) Memory leak: geoHeaderGeo::useVars
    [src/osgPlugins/geo/osgGeoNodes.h:182]: (error) Memory leak: geoHeaderGeo::extVars
    [src/osgPlugins/md2/ReaderWriterMD2.cpp:180]: (error) Memory leak: mapbase
    [src/osgPlugins/md2/ReaderWriterMD2.cpp:166]: (error) Resource leak: file_fd
    [src/osgPlugins/pic/ReaderWriterPIC.cpp:152]: (error) Mismatching allocation and deallocation: tmpbuf
    [src/osgPlugins/pic/ReaderWriterPIC.cpp:153]: (error) Mismatching allocation and deallocation: buffer
    [src/osgPlugins/ply/plyfile.cpp:843]: (error) Memory leak: plyfile
    [src/osgPlugins/pvr/ReaderWriterPVR.cpp:179]: (error) Memory leak: imageData
    [src/osgPlugins/shp/ESRIShapeParser.cpp:29]: (error) Resource leak: fd
    [src/osgPlugins/shp/XBaseParser.cpp:96]: (error) Resource leak: fd
    [src/osgPlugins/zip/unzip.cpp:3158]: (error) Possible null pointer dereference: s - otherwise it is redundant to check if s is null at line 3159
    [src/osgPlugins/zip/unzip.cpp:4155]: (error) Dangerous usage of 'rd' (strncpy doesn't always 0-terminate it)
    [src/osgShadow/MinimalCullBoundsShadowMap.cpp:334]: (error) Possible null pointer dereference: rl - otherwise it is redundant to check if rl is null at line 331
    [src/osgViewer/ScreenCaptureHandler.cpp:617]: (error) Possible null pointer dereference: camera - otherwise it is redundant to check if camera is null at line 611
    [src/osgViewer/ScreenCaptureHandler.cpp:632]: (error) Possible null pointer dereference: camera - otherwise it is redundant to check if camera is null at line 626
    [src/osgVolume/Locator.cpp:209]: (error) Dangerous iterator usage after erase()-method.
    [src/osgVolume/RayTracedTechnique.cpp:274]: (error) Possible null pointer dereference: imageLayer - otherwise it is redundant to check if imageLayer is null at line 259
    [src/osgVolume/RayTracedTechnique.cpp:275]: (error) Possible null pointer dereference: imageLayer - otherwise it is redundant to check if imageLayer is null at line 259
    [src/osgWrappers/serializers/osg/ShaderBinary.cpp:28]: (error) Mismatching allocation and deallocation: data
    robertosfield committed Jun 20, 2011
  4. @robertosfield

    Merged following revisions from svn/trunk which address problems with…

    … toggling fullscreen on/off under modern X11 window managers
    
    ------------------------------------------------------------------------
    
    r12573 | robert | 2011-06-20 12:25:52 +0100 (Mon, 20 Jun 2011) | 2 lines
    
    Added catch for window manager doesn't set the window size to full screen.
    
    ------------------------------------------------------------------------
    r12572 | robert | 2011-06-20 10:28:39 +0100 (Mon, 20 Jun 2011) | 4 lines
    
    Added check against Traits::overrideRedirct to prevent the fullscreen workaround being run when overrideRedirect
    is on as overrideRedirect switches off the window managers ability to manage the fullscreen so the problem doesn't
    need working around.
    
    ------------------------------------------------------------------------
    r12571 | robert | 2011-06-20 10:22:57 +0100 (Mon, 20 Jun 2011) | 2 lines
    
    Introduced a workaround for fullscreen toggle issues under modern X11 window managers.
    robertosfield committed Jun 20, 2011
  5. @robertosfield

    Merged from svn/trunk. Added sleep before window resizing to make it …

    …less likely that the previous frames rendering traversal is still
    
    running when the window(s) is resized, something that creates what looks like a glitch in rendering.
    robertosfield committed Jun 20, 2011
Commits on Jun 19, 2011
  1. @robertosfield

    From Torben Dannhauer, "Just in time for OSG 3.0 I will present an up…

    …dated 3rdParty package for VS2008 , which includes some updated libraries (libcurl, freetype, jpeg). It also provides now all debug databases (*.pdb), so all the annoying compile warnings about missing .pdb files are gone.
    
    I extended the CMAKE module to find the new library."
    robertosfield committed Jun 19, 2011
Commits on Jun 17, 2011
  1. @robertosfield

    Reset OPENSCENEGRAPH_SVN setting to branches to enable the tags to be…

    … created on the branches rather svn/trunk.
    robertosfield committed Jun 17, 2011
  2. @robertosfield
  3. @robertosfield
  4. @robertosfield
  5. @robertosfield

    Updated version number

    robertosfield committed Jun 17, 2011
  6. @robertosfield
  7. @robertosfield
  8. @robertosfield

    Tempory fix for static build of Present3D which disables the use of f…

    …fmpeg when compiling static, will need to
    
    look into unresolved symbols assoiated with FFMPEG at a later date.
    robertosfield committed Jun 17, 2011
  9. @robertosfield
  10. @robertosfield

    Updated ChangeLog

    robertosfield committed Jun 17, 2011
  11. @robertosfield

    From Jan Peciva, "sending updated version of StencilTwoSided.

    It supports now even GL_ATI_separate_stencil extension and there are more
    OSG_INFOs to see, which API is used."
    robertosfield committed Jun 17, 2011
  12. @robertosfield
  13. @robertosfield
  14. @robertosfield
  15. @robertosfield

    Build fix

    robertosfield committed Jun 17, 2011
  16. @robertosfield

    From Ulrich Hertlein, "the OS X/Cocoa implementation logs some debug …

    …junk on every key stroke. The attached
    
    patch removes this."
    robertosfield committed Jun 17, 2011
  17. @robertosfield

    From Jorge Ciges, "This is one of those bugs that you don't find unti…

    …l you try to compile under another pc that doesn't have Cmake 2.8."
    robertosfield committed Jun 17, 2011
  18. @robertosfield

    Fixed warning

    robertosfield committed Jun 17, 2011
  19. @robertosfield

    Fixed warnings

    robertosfield committed Jun 17, 2011
  20. @robertosfield

    Added disabling of VisualStudio warning C4324 : structure was padded …

    …due to __declspec(align())
    robertosfield committed Jun 17, 2011
Commits on Jun 16, 2011
  1. @robertosfield

    Fixed warnings.

    robertosfield committed Jun 16, 2011
  2. @robertosfield
  3. @robertosfield
  4. @robertosfield

    From Farshid Lashkari, "Attached is a small patch that adds support f…

    …or writing BGR images to the DDS plugin."
    robertosfield committed Jun 16, 2011
  5. @robertosfield

    From John Cummings, "While testing recent OSG developer releases and …

    …the subversion trunk, I
    
    have noticed that on my 64-bit Linux machines, all of the OSG libraries
    get installed into the "lib64" directory as I would expect. However, the
    OpenThreads library gets installed into the "lib" directory when
    selecting "Build OpenThreads with Qt threading support." That is, with
    the BUILD_OPENTHREADS_WITH_QT set to ON.
    
    I am attaching the a fix for this issue in the file:
    
    src/OpenThreads/qt/CMakeLists.txt
    
    It simply adds ${LIB_POSTFIX} to the destination as in done with all
    other CMakeLists.txt with libraries in OSG. I have tested it on both
    32-bit and 64-bit Linux."
    robertosfield committed Jun 16, 2011