openscenegraph:osg.git
6 years agoRelease OpenSceneGraph-3.0.1-rc3 OpenSceneGraph-3.0.1-rc3
Robert OSFIELD [Thu, 28 Jul 2011 17:00:19 +0000 (17:00 +0000)]
Release OpenSceneGraph-3.0.1-rc3

6 years agoUpdated ChangeLog and release candidate number for 3.0.1-rc3
Robert OSFIELD [Thu, 28 Jul 2011 16:59:15 +0000 (16:59 +0000)]
Updated ChangeLog and release candidate number for 3.0.1-rc3

6 years agoImproved the handling of scaling of dicom imagery.
Robert OSFIELD [Thu, 28 Jul 2011 16:41:09 +0000 (16:41 +0000)]
Improved the handling of scaling of dicom imagery.

6 years agoMerged from svn/trunk revision 12722. Refectored the EGL setup so that it's honours...
Robert OSFIELD [Thu, 28 Jul 2011 12:08:40 +0000 (12:08 +0000)]
Merged from svn/trunk revision 12722. Refectored the EGL setup so that it's honours the Traits values.

6 years agoMerged from svn/trunk, revision 12727, Reverted the change to the default setting...
Robert OSFIELD [Thu, 28 Jul 2011 11:05:35 +0000 (11:05 +0000)]
Merged from svn/trunk, revision 12727, Reverted the change to the default setting of _resizeNonPowerOfTwoHint back to true for all platforms to ensure the
same behaivour across platforms, something that can be achieved now thanks to the integrated GLU library.

Corrected the default of the ResizeNonPowerOfTwoHint to true to reflect the actual default setting set by the
Texture default constructor.

6 years agoFrom Johannes Baeuerle, merged from svn/trunk revision 12725, "in the file src/osgDB...
Robert OSFIELD [Thu, 28 Jul 2011 08:19:42 +0000 (08:19 +0000)]
From Johannes Baeuerle, merged from svn/trunk revision 12725, "in the file src/osgDB/ObjectWrapper.cpp, where the GlobalLookupTable for gl enums for serialization purposes is defined, some of the compressed texture formats are missing. I added enums for the pvr and etc formats."

6 years agoFrom Jason Beverage, merged from svn/trunk revision 12723, "Here is a small fix for...
Robert OSFIELD [Thu, 28 Jul 2011 07:47:06 +0000 (07:47 +0000)]
From Jason Beverage, merged from svn/trunk revision 12723, "Here is a small fix for getCameraContainingPosition.  getXMin was
being used in a case where getYMin should be used instead."

6 years agoUpdated ChangeLog and AUTHORS file for 3.0.1-rc2
Robert OSFIELD [Mon, 25 Jul 2011 19:28:54 +0000 (19:28 +0000)]
Updated ChangeLog and AUTHORS file for 3.0.1-rc2

6 years agoUpdated release candidate number
Robert OSFIELD [Mon, 25 Jul 2011 18:39:23 +0000 (18:39 +0000)]
Updated release candidate number

6 years agoMerged from svn/trunk revision 12818, "Fixed stats bug where not all stats fields...
Robert OSFIELD [Mon, 25 Jul 2011 17:08:57 +0000 (17:08 +0000)]
Merged from svn/trunk revision 12818, "Fixed stats bug where not all stats fields were being collected by the cull_draw() method used in the SingleThreaded and CullDrawThreadPerContext threading models."

7 years agoFrom Alexander Irion, merged from svn/trunk revision 12716, "Texture borders are...
Robert OSFIELD [Fri, 22 Jul 2011 09:28:48 +0000 (09:28 +0000)]
From Alexander Irion, merged from svn/trunk revision 12716, "Texture borders are not supported in ES.

_isTextureBorderClampSupported is set to "TRUE" in Texture.cpp, because of the version number check (GL VERSION >= 1.3).

This leads to an invalid enum error, when GL_TEXTURE_BORDER_COLOR is tried to set."

7 years agoMerged from svn/trunk revision 12714, "In the RecordCameraPathhandler fixed the handl...
Robert OSFIELD [Fri, 22 Jul 2011 08:26:36 +0000 (08:26 +0000)]
Merged from svn/trunk revision 12714, "In the RecordCameraPathhandler fixed the handling of pressing 'Z' before 'z' which was causing the view
to be reset to 0,0,0 by AnimationPathManipualtor with an empty AnimationPath."

7 years agoUpdated ChangeLog, Version and AUTHORS file for 3.0.1-rc1
Robert OSFIELD [Thu, 21 Jul 2011 09:54:48 +0000 (09:54 +0000)]
Updated ChangeLog, Version and AUTHORS file for 3.0.1-rc1

7 years agoMerged from svn/trunk, workaround to culling issues assocaited with text that is...
Robert OSFIELD [Thu, 21 Jul 2011 09:19:45 +0000 (09:19 +0000)]
Merged from svn/trunk, workaround to culling issues assocaited with text that is set to scale relative to screen coords or is rotated to the screen.

7 years agoFrom Mathias Froehlich, merged from svn/trunk revision 12708, "I have attached an...
Robert OSFIELD [Thu, 21 Jul 2011 09:10:31 +0000 (09:10 +0000)]
From Mathias Froehlich, merged from svn/trunk revision 12708, "I have attached an updated version of the VRML2 loader.
That change is the result of the '[osgPlugins] VRML plugin - "file" url'
discussion on osg-users.

The attached change avoids rewriting file names into some kind of file urls
and then use the url for opening an fstream. Instead just use the given file
name to open the stream.
Also this change adds some Notify output for the error paths."

7 years agoFrom Wang Rui, merged from svn/trunk revision 12706, "This fixes a small problem...
Robert OSFIELD [Thu, 21 Jul 2011 08:53:08 +0000 (08:53 +0000)]
From Wang Rui, merged from svn/trunk revision 12706, "This fixes a small problem in the FindFBX file.  In CMake scripts,
VS2010 is not marked as MSVC100 but MSVC10. And CMake defines
MSVC_VERSION instead of MSVC_VER to indicate the version number. The
modification can find fbx sdk for VS2010 automatically now.
"

7 years agoFrom Claus Scheiblauer, merged from svn/trunk revision 12704, fixed handling of horiz...
Robert OSFIELD [Wed, 20 Jul 2011 10:18:31 +0000 (10:18 +0000)]
From Claus Scheiblauer, merged from svn/trunk revision 12704, fixed handling of horizontal mouse wheel event

7 years agoMerged from svn/trunk revision 12701. Added doxygen comments explain read file callb...
Robert OSFIELD [Mon, 18 Jul 2011 12:44:43 +0000 (12:44 +0000)]
Merged from svn/trunk revision 12701.  Added doxygen comments explain read file callback functionality.

7 years agoMerged from svn/trunk revision, 12699, build fix for Cygwin/Mingw builds of DCMTK.
Robert OSFIELD [Mon, 18 Jul 2011 09:42:29 +0000 (09:42 +0000)]
Merged from svn/trunk revision, 12699, build fix for Cygwin/Mingw builds of DCMTK.

7 years agoFrom Alberto Luaces, merged from svn/trunk revision 12697, typo fixes
Robert OSFIELD [Sun, 17 Jul 2011 16:26:38 +0000 (16:26 +0000)]
From Alberto Luaces, merged from svn/trunk revision 12697, typo fixes

7 years agoFrom Wang Rui, merged from svn/trunk revision 12695. "improved the handling of the...
Robert OSFIELD [Sun, 17 Jul 2011 10:33:46 +0000 (10:33 +0000)]
From Wang Rui, merged from svn/trunk revision 12695. "improved the handling of the _preReadString within the readWrappedString method by factoring the
reading of the next character into a dedicated getCharacter(..) method."

7 years agoFrom Wang Rui, merged from svn/trunk revision 12693, "I've found that the latest...
Robert OSFIELD [Fri, 15 Jul 2011 10:25:12 +0000 (10:25 +0000)]
From Wang Rui, merged from svn/trunk revision 12693, "I've found that the latest ffmpeg made some functions and macros
deprecated, which led to compilation errors in the OSG plugin. I tried
fixing them and tested with the version ffmpeg-git-5d4fd1d (ffmpeg
version > 0.8, libavcodec = 53.7.0) under Windows."

7 years agoFrom Sukender, merged from svn/trunk revision 12690. Fixed compiler error "public...
Robert OSFIELD [Fri, 15 Jul 2011 09:48:12 +0000 (09:48 +0000)]
From Sukender, merged from svn/trunk revision 12690. Fixed compiler error "public: static char const * const osg::ValueObjectClassNameTrait< xxx >::s_className" already defined in xxx.obj"

7 years agoFrom Wang Rui, merged from svn/trunk revision 12688. "The files attached should be...
Robert OSFIELD [Fri, 15 Jul 2011 09:16:33 +0000 (09:16 +0000)]
From Wang Rui, merged from svn/trunk revision 12688. "The files attached should be separately put into the directories
src/osgPlugins/osg and src/osgWrappers/serializers/osgSim. They fix a
serious infinite loop problem that may be caused by the stream buffer
mechanism under Windows and some osgSim wrapper bugs pointed by
Andreas. I've asked the community to help test them and hope now we
can solve these recent .osgt file reading issues."

7 years agoFrom Ryan Pavlik, Merged from svn/trunk revision 12686. "Fix inventor state copy...
Robert OSFIELD [Fri, 15 Jul 2011 08:45:54 +0000 (08:45 +0000)]
From Ryan Pavlik, Merged from svn/trunk revision 12686. "Fix inventor state copy constructor.

    Clang warning:
    In file included from src/osgPlugins/Inventor/ConvertToInventor.cpp:80:
    src/osgPlugins/Inventor/ConvertToInventor.h:117:71: warning: field is uninitialized when used here [-Wuninitialized]
            osgTexGenS(s.osgTexGenS), osgTexGenT(s.osgTexGenT), osgTexGen(osgTexGen),
                                                                          ^"

7 years agoFrom Philip Lamp, Merged from svn/trunk revision 12683. "Modify the ReaderWriteImageI...
Robert OSFIELD [Fri, 15 Jul 2011 08:37:15 +0000 (08:37 +0000)]
From Philip Lamp, Merged from svn/trunk revision 12683. "Modify the ReaderWriteImageIO_IOS to correctly handle relative paths
when reading from a file. This means that no longer do all image files
have to live at the root of the Resources folder inside the app bundle,
but can now be organized inside folders. Also improved error handling
and fixed a potential leak of a CGColorSpaceRef each once per image load."

7 years agoRemoved redudent lines and changes tabs to four spaces
Robert OSFIELD [Fri, 15 Jul 2011 08:35:44 +0000 (08:35 +0000)]
Removed redudent lines and changes tabs to four spaces

7 years agoUpdated ChangeLog and add fix for typo of name
Robert OSFIELD [Tue, 28 Jun 2011 07:52:55 +0000 (07:52 +0000)]
Updated ChangeLog and add fix for typo of name

7 years agoFixed typo and added entry about osgParticle.
Robert OSFIELD [Tue, 28 Jun 2011 07:37:19 +0000 (07:37 +0000)]
Fixed typo and added entry about osgParticle.

7 years agoFrom Wang Rui, merged from changeset 12674. "I've found a small problem which causes...
Robert OSFIELD [Tue, 28 Jun 2011 07:28:10 +0000 (07:28 +0000)]
From Wang Rui, merged from changeset 12674. "I've found a small problem which causes crashes in the 3ds plugin
while trying to load a model. The fix here will ensure that the
texture map is valid and everything could work well then."

7 years agoMerged from svn/trunk changeset 12675, "Added #if lib curl version check around ...
Robert OSFIELD [Tue, 28 Jun 2011 07:25:43 +0000 (07:25 +0000)]
Merged from svn/trunk changeset 12675, "Added #if lib curl version check around #include <curl/types.h> as this header was deprecated and now
removed entirely from libcurl-7.21.7."

7 years agoUpdated dates in prep for release.
Robert OSFIELD [Mon, 27 Jun 2011 22:04:22 +0000 (22:04 +0000)]
Updated dates in prep for release.

7 years agoFrom Jean-Sebestien Guay, merged from svn/trunk changeset 12669/12670 - fix for windo...
Robert OSFIELD [Mon, 27 Jun 2011 21:36:21 +0000 (21:36 +0000)]
From Jean-Sebestien Guay, merged from svn/trunk changeset 12669/12670 - fix for windows bug when reading ascii files with unix file endings.

7 years agoUpdated NEWS
Robert OSFIELD [Mon, 27 Jun 2011 13:42:56 +0000 (13:42 +0000)]
Updated NEWS

7 years agoUpdated NEWS for 3.0.0
Robert OSFIELD [Mon, 27 Jun 2011 13:16:22 +0000 (13:16 +0000)]
Updated NEWS for 3.0.0

7 years agoUpdate AUTHORS file for 3.0.0.
Robert OSFIELD [Mon, 27 Jun 2011 12:59:45 +0000 (12:59 +0000)]
Update AUTHORS file for 3.0.0.

7 years agoUpdated ChangeLOG, NEWS and READE for 3.0.0 release
Robert OSFIELD [Mon, 27 Jun 2011 12:08:05 +0000 (12:08 +0000)]
Updated ChangeLOG, NEWS and READE for 3.0.0 release

7 years agoUpdated Version number to final 3.0.0 configuration.
Robert OSFIELD [Mon, 27 Jun 2011 10:45:36 +0000 (10:45 +0000)]
Updated Version number to final 3.0.0 configuration.

7 years agoMerged doxygen comment improvement from svn/trunk.
Robert OSFIELD [Mon, 27 Jun 2011 10:22:03 +0000 (10:22 +0000)]
Merged doxygen comment improvement from svn/trunk.

7 years agoMerged from svn/trunk changeset 12656. From Andreas Eskland, "I found that a binary...
Robert OSFIELD [Sat, 25 Jun 2011 20:55:01 +0000 (20:55 +0000)]
Merged from svn/trunk changeset 12656. From Andreas Eskland, "I found that a binary PNM file couldn't be read by the PNM plugin in the 3.0 branch. Attached is a small fix in ReaderWriterPNM.cpp, simply opening the file in binary mode."

7 years agoMerged from svn/trunk changset 12654. Fixed memory growth issue when using Texture2D...
Robert OSFIELD [Sat, 25 Jun 2011 11:02:09 +0000 (11:02 +0000)]
Merged from svn/trunk changset 12654. Fixed memory growth issue when using Texture2D::SubloadCallbacks that don't set the TextureObjects sizes.

7 years agoMerged from svn/trunk changeset 12652, Tighten up float usage
Robert OSFIELD [Sat, 25 Jun 2011 07:07:58 +0000 (07:07 +0000)]
Merged from svn/trunk changeset 12652, Tighten up float usage

7 years agoUpdated ChangeLog and AUTHORS file for 3.0.0-rc5
Robert OSFIELD [Fri, 24 Jun 2011 19:45:21 +0000 (19:45 +0000)]
Updated ChangeLog and AUTHORS file for 3.0.0-rc5

7 years agoMerged from svn/trunk changeset 12648, tightened up float/double usage
Robert OSFIELD [Fri, 24 Jun 2011 19:18:53 +0000 (19:18 +0000)]
Merged from svn/trunk changeset 12648, tightened up float/double usage

7 years agoUpdated ChangeLog, NEWS and READE for 3.0.0-rc5
Robert OSFIELD [Fri, 24 Jun 2011 16:27:42 +0000 (16:27 +0000)]
Updated ChangeLog, NEWS and READE for 3.0.0-rc5

7 years agoMerged from svn/trunk changeset 12645. Removed redundent assert and associated variab...
Robert OSFIELD [Fri, 24 Jun 2011 16:16:04 +0000 (16:16 +0000)]
Merged from svn/trunk changeset 12645. Removed redundent assert and associated variables to fix warnings.

7 years agoUpdated release candidate number to 5 for 3.0.0-rc5
Robert OSFIELD [Fri, 24 Jun 2011 16:05:23 +0000 (16:05 +0000)]
Updated release candidate number to 5 for 3.0.0-rc5

7 years agoMerged from svn/trunk changeset 12642, "Implemented missing writeShader"
Robert OSFIELD [Fri, 24 Jun 2011 15:05:28 +0000 (15:05 +0000)]
Merged from svn/trunk changeset 12642, "Implemented missing writeShader"

7 years agoMerged from svn/trunk changeset 12640, From Martin Innus, fixed erroneous change...
Robert OSFIELD [Fri, 24 Jun 2011 13:36:45 +0000 (13:36 +0000)]
Merged from svn/trunk changeset 12640, From Martin Innus, fixed erroneous change of INTEGER to UNKNOWN, reverting back to INTEGER.

7 years agoMerged from svn/trunk changeset 12638:
Robert OSFIELD [Fri, 24 Jun 2011 12:52:11 +0000 (12:52 +0000)]
Merged from svn/trunk changeset 12638:

Implemented missing Archive::readShader/writeShader, and added searching of the archive list in Registr::read() so that files
that are stored in the archives can be found.

7 years agoMerged from svn/trunk changeset 12636, "While we're on osgSim/ShapeAttribute, here...
Robert OSFIELD [Fri, 24 Jun 2011 08:33:58 +0000 (08:33 +0000)]
Merged from svn/trunk changeset 12636, "While we're on osgSim/ShapeAttribute, here's a fix that fixes the 'UNKNOW' typo and some
doxygen"

7 years agoFrom Wang Rui, Merged from svn/trunk changeset 12633.
Robert OSFIELD [Fri, 24 Jun 2011 08:16:59 +0000 (08:16 +0000)]
From Wang Rui, Merged from svn/trunk changeset 12633.

"I've modified the code to handle -1.#IND and other kinds of infinite
values. Please see the attachments for details"

7 years agoMerged from svn/trunk changeset 12632. Added operator ==, != and < to fix VS build
Robert OSFIELD [Fri, 24 Jun 2011 08:15:51 +0000 (08:15 +0000)]
Merged from svn/trunk changeset 12632.  Added operator ==, != and < to fix VS build

7 years agoMerged from svn/trunk changeset r12628.
Robert OSFIELD [Thu, 23 Jun 2011 20:09:26 +0000 (20:09 +0000)]
Merged from svn/trunk changeset r12628.

Fixed warnings generated by clang,

src/osgAnimation/Skeleton.cpp:25:87: warning: addition of default argument on redeclaration makes this constructor a copy constructor [-Wdefault-arg-special-member]
Skeleton::UpdateSkeleton::UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop= osg::CopyOp::SHALLOW_COPY) : osg::Object(us, copyop), osg::NodeCallback(us, copyop)

/src/OpenThreads/pthreads/PThread.cpp:1024:15: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
    if (cpunum<0) return -1;

src/osgDB/ExternalFileWriter.cpp:221:122: warning: expression result unused [-Wunused-value]
    _objects.insert(ObjectsSet::value_type(&obj, ObjectData(absoluteDestinationPath, relativeDestinationPath, written))).first;

src/osgManipulator/Dragger.cpp:175:18: warning: using the result of an assignment as a condition without parentheses [-Wparentheses]
        if (*itr = constraint) return;

src/osgManipulator/Dragger.cpp:187:18: warning: using the result of an assignment as a condition without parentheses [-Wparentheses]
        if (*itr = constraint)

7 years agoUpdated release candidate number to 4.
Robert OSFIELD [Thu, 23 Jun 2011 20:03:16 +0000 (20:03 +0000)]
Updated release candidate number to 4.

7 years agoMerged from svn/trunk changeset r12573, Added catch for window manager doesn't set...
Robert OSFIELD [Thu, 23 Jun 2011 18:29:35 +0000 (18:29 +0000)]
Merged from svn/trunk changeset r12573, Added catch for window manager doesn't set the window size to full screen.

7 years agoMerged from svn/trunk changeset 12625. Warning fixes for:
Robert OSFIELD [Thu, 23 Jun 2011 18:26:11 +0000 (18:26 +0000)]
Merged from svn/trunk changeset 12625. Warning fixes for:

OpenSceneGraph/src/osgPlugins/Inventor/ConvertFromInventor.cpp: In member function ?virtual SbBool SoVRMLImageTextureOsg::readInstance(SoInput*, short unsigned int)?:
OpenSceneGraph/src/osgPlugins/Inventor/ConvertFromInventor.cpp:1264:16: warning: variable ?retval? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp: In member function ?void ac3d::Geode::ProcessGeometry(std::ostream&, unsigned int)?:
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:806:35: warning: variable ?fRep_s? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:806:43: warning: variable ?fRep_t? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:807:35: warning: variable ?fOffset_s? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:807:46: warning: variable ?fOffset_t? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp: In member function ?virtual void osgViewer::GraphicsWindowX11::checkEvents()?:
OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp:1181:10: warning: variable ?destroyWindowRequested? set but not used [-Wunused-but-set-variable]

7 years agoMerged from svn/trunk changeset 12623.Fixed virtual method mismtaches between subclas...
Robert OSFIELD [Thu, 23 Jun 2011 16:39:25 +0000 (16:39 +0000)]
Merged from svn/trunk changeset 12623.Fixed virtual method mismtaches between subclasses and parent classes.

7 years agoFrom Ulrich Hertlein, build fix for OSX.
Robert OSFIELD [Thu, 23 Jun 2011 15:42:44 +0000 (15:42 +0000)]
From Ulrich Hertlein, build fix for OSX.

7 years agoMerged from svn/trunk, changeset 12619, "Added better handling of archives in ReaderW...
Robert OSFIELD [Thu, 23 Jun 2011 15:39:11 +0000 (15:39 +0000)]
Merged from svn/trunk, changeset 12619, "Added better handling of archives in ReaderWriterZip::readNode() so that if there is no master file definition it
loads all the available nodes in the zip archive and returns an osg::Group containing all the nodes if there is more
than one, or just returns the node if there is just one.  Also implemented this functionality for ReaderWriterZip::readImage()."

7 years agoFixed typo in name
Robert OSFIELD [Thu, 23 Jun 2011 12:25:52 +0000 (12:25 +0000)]
Fixed typo in name

7 years agoUpdated ChangeLog and AUTHORS files
Robert OSFIELD [Thu, 23 Jun 2011 11:32:24 +0000 (11:32 +0000)]
Updated ChangeLog and AUTHORS files

7 years agoFixed name typos
Robert OSFIELD [Thu, 23 Jun 2011 11:32:09 +0000 (11:32 +0000)]
Fixed name typos

7 years agoMerged from svn/trunk changeset r12611.
Robert OSFIELD [Thu, 23 Jun 2011 11:10:54 +0000 (11:10 +0000)]
Merged from svn/trunk changeset r12611.

Fixed warnings.

OpenSceneGraph/src/osgGA/NodeTrackerManipulator.cpp:32:1: warning: base class ?class osg::Object? should be explicitly initialized in the copy constructor
OpenSceneGraph/src/osgGA/TerrainManipulator.cpp:31:1: warning: base class ?class osg::Object? should be explicitly initialized in the copy constructor
OpenSceneGraph/include/osgSim/ShapeAttribute:99:9: warning: base class ?class std::vector<osgSim::ShapeAttribute>? should be explicitly initialized in the copy constructor
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::gi?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::byte_before_the_zipfile?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::num_file?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::pos_in_central_dir?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::current_file_ok?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::central_pos?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::size_central_dir?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::offset_central_dir?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::cur_file_info?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::cur_file_info_internal?
OpenSceneGraph/src/osgPlugins/zip/unzip.cpp:3102:14: warning: missing initializer for member ?unz_s::pfile_in_zip_read?
OpenSceneGraph/src/osgViewer/CompositeViewer.cpp:30:1: warning: base class ?class osg::Object? should be explicitly initialized in the copy constructor
OpenSceneGraph/src/osgViewer/View.cpp:159:1: warning: base class ?class osg::Object? should be explicitly initialized in the copy constructor
OpenSceneGraph/src/osgViewer/Viewer.cpp:196:1: warning: base class ?class osg::Object? should be explicitly initialized in the copy constructor
OpenSceneGraph/src/osgViewer/Viewer.cpp:196:1: warning: base class ?class osgViewer::ViewerBase? should be explicitly initialized in the copy constructor
OpenSceneGraph/include/osgManipulator/Dragger:47:9: warning: base class ?class osg::Object? should be explicitly initialized in the copy constructor

7 years agoFrom Ryan Pavlik, merge from svn/trunk changeset 12608, "I have successfully compiled...
Robert OSFIELD [Thu, 23 Jun 2011 09:39:45 +0000 (09:39 +0000)]
From Ryan Pavlik, merge from svn/trunk changeset 12608, "I have successfully compiled OpenSceneGraph trunk using the Clang compiler (using a recent trunk build of llvm and clang, haven't tested an older release).  The attached files contain the change shown in the diff below, which was required to finish the build with Clang.  It fixes an issue with two-phase name lookup - there's more information here blog.llvm.org/2009/12/dreaded-two-phase-name-lookup.html"

7 years agoConverted tabs to four spaces
Robert OSFIELD [Thu, 23 Jun 2011 09:27:25 +0000 (09:27 +0000)]
Converted tabs to four spaces

7 years agoFrom Dimi Christopoulos, merged from svn/trunk changeset 12606."I attach a fixed...
Robert OSFIELD [Thu, 23 Jun 2011 09:24:38 +0000 (09:24 +0000)]
From Dimi Christopoulos, merged from svn/trunk changeset 12606."I attach a fixed version of mipmap.cpp which produced a lot of warning on my gcc
compiler."

7 years agoUpdate ChangeLog and AUTHORs file for 3.0.0-rc3
Robert OSFIELD [Wed, 22 Jun 2011 16:34:46 +0000 (16:34 +0000)]
Update ChangeLog and AUTHORs file for 3.0.0-rc3

7 years agoFrom Magnus Kessler, "I have recently installed the latest version of collada-dom...
Robert OSFIELD [Wed, 22 Jun 2011 16:18:52 +0000 (16:18 +0000)]
From Magnus Kessler, "I have recently installed the latest version of collada-dom on Linux, and
found that the include path has changed. By default, collada-dom now installs
its header files under /usr/local/include/collada-dom or/usr/include/collada-
dom. The attached FindCollada.cmake has been updated to look for these
locations in addition to the previous candidate locations."

7 years agoUpdated ChangeLog and AUTHORS file for release
Robert OSFIELD [Wed, 22 Jun 2011 15:41:57 +0000 (15:41 +0000)]
Updated ChangeLog and AUTHORS file for release

7 years agoUpdated RC number for the 3.0.0-rc3
Robert OSFIELD [Wed, 22 Jun 2011 12:45:35 +0000 (12:45 +0000)]
Updated RC number for the 3.0.0-rc3

7 years agoMerged from svn/trunk changeset 12597:
Robert OSFIELD [Wed, 22 Jun 2011 12:38:53 +0000 (12:38 +0000)]
Merged from svn/trunk changeset 12597:

Resolved warnings reported by g++ 4.6's -Wunused-but-set-variable.

Warnings were:

src/osg/ShapeDrawable.cpp: In member function ?void PrimitiveShapeVisitor::createHalfSphere(unsigned int, unsigned int, float, int, float, const Matrix&)?:
src/osg/ShapeDrawable.cpp:1409:11: warning: variable ?nzBase? set but not used [-Wunused-but-set-variable]
src/osg/ShapeDrawable.cpp:1410:11: warning: variable ?nRatioBase? set but not used [-Wunused-but-set-variable]
src/osgUtil/DelaunayTriangulator.cpp: In function ?osgUtil::Triangle_list osgUtil::fillHole(osg::Vec3Array*, std::vector<unsigned int, std::allocator<unsigned int> >)?:
src/osgUtil/DelaunayTriangulator.cpp:569:27: warning: variable ?ptest? set but not used [-Wunused-but-set-variable]
src/osgUtil/DelaunayTriangulator.cpp: In member function ?bool osgUtil::DelaunayTriangulator::triangulate()?:
src/osgUtil/DelaunayTriangulator.cpp:979:45: warning: variable ?curp? set but not used [-Wunused-but-set-variable]
src/osgUtil/RenderStage.cpp: In member function ?void osgUtil::RenderStage::runCameraSetUp(osg::RenderInfo&)?:
src/osgUtil/RenderStage.cpp:631:18: warning: variable ?stencilAttached? set but not used [-Wunused-but-set-variable]
src/osgText/FadeText.cpp: In member function ?void FadeTextPolytopeData::buildPolytope()?:
src/osgText/FadeText.cpp:74:20: warning: variable ?edge23? set but not used [-Wunused-but-set-variable]
src/osgText/FadeText.cpp:75:20: warning: variable ?edge30? set but not used [-Wunused-but-set-variable]
src/osgText/Text.cpp: In member function ?void osgText::Text::computeBackdropPositions(unsigned int) const?:
src/osgText/Text.cpp:747:10: warning: variable ?is_valid_size? set but not used [-Wunused-but-set-variable]
src/osgGA/NodeTrackerManipulator.cpp: In member function ?virtual bool osgGA::NodeTrackerManipulator::performMovementLeftMouseButton(double, double, double)?:
src/osgGA/NodeTrackerManipulator.cpp:257:21: warning: variable ?lookVector? set but not used [-Wunused-but-set-variable]
src/osgGA/NodeTrackerManipulator.cpp:259:21: warning: variable ?upVector? set but not used [-Wunused-but-set-variable]
src/osgGA/TerrainManipulator.cpp: In member function ?virtual bool osgGA::TerrainManipulator::performMovementMiddleMouseButton(double, double, double)?:
src/osgGA/TerrainManipulator.cpp:217:11: warning: variable ?lookVector? set but not used [-Wunused-but-set-variable]
src/osgGA/TerrainManipulator.cpp:219:11: warning: variable ?upVector? set but not used [-Wunused-but-set-variable]
src/osgVolume/FixedFunctionTechnique.cpp: In member function ?virtual void osgVolume::FixedFunctionTechnique::init()?:
src/osgVolume/FixedFunctionTechnique.cpp:124:30: warning: variable ?tf? set but not used [-Wunused-but-set-variable]
src/osgParticle/FluidProgram.cpp: In member function ?virtual void osgParticle::FluidProgram::execute(double)?:
src/osgParticle/FluidProgram.cpp:38:23: warning: variable ?velBefore? set but not used [-Wunused-but-set-variable]
src/osgShadow/ParallelSplitShadowMap.cpp: In member function ?virtual void osgShadow::ParallelSplitShadowMap::cull(osgUtil::CullVisitor&)?:
src/osgShadow/ParallelSplitShadowMap.cpp:593:22: warning: variable ?bb? set but not used [-Wunused-but-set-variable]
src/osgTerrain/GeometryTechnique.cpp: In member function ?virtual void osgTerrain::GeometryTechnique::generateGeometry(osgTerrain::GeometryTechnique::BufferData&, osgTerrain::Locator*, const osg::Vec3d&)?:
src/osgTerrain/GeometryTechnique.cpp:777:12: warning: variable ?i_sampleFactor? set but not used [-Wunused-but-set-variable]
src/osgTerrain/GeometryTechnique.cpp:778:12: warning: variable ?j_sampleFactor? set but not used [-Wunused-but-set-variable]
src/osgPlugins/dds/ReaderWriterDDS.cpp: In function ?osg::Image* ReadDDSFile(std::istream&)?:
src/osgPlugins/dds/ReaderWriterDDS.cpp:314:10: warning: variable ?is3dImage? set but not used [-Wunused-but-set-variable]
src/osgPlugins/dds/ReaderWriterDDS.cpp: In function ?bool WriteDDSFile(const osg::Image*, std::ostream&)?:
src/osgPlugins/dds/ReaderWriterDDS.cpp:721:10: warning: variable ?is3dImage? set but not used [-Wunused-but-set-variable]
src/osgPlugins/hdr/hdrloader.cpp: In static member function ?static bool HDRLoader::load(const char*, bool, HDRLoaderResult&)?:
src/osgPlugins/hdr/hdrloader.cpp:101:10: warning: variable ?cmd? set but not used [-Wunused-but-set-variable]
src/osgPlugins/vtf/ReaderWriterVTF.cpp: In function ?osg::Image* ReadVTFFile(std::istream&)?:
src/osgPlugins/vtf/ReaderWriterVTF.cpp:360:23: warning: variable ?base? set but not used [-Wunused-but-set-variable]
src/osgPlugins/jp2/ReaderWriterJP2.cpp: In function ?int putdata(jas_stream_t*, jas_image_t*, int)?:
src/osgPlugins/jp2/ReaderWriterJP2.cpp:41:13: warning: variable ?linelen? set but not used [-Wunused-but-set-variable]
src/osgPlugins/Inventor/ConvertToInventor.cpp: In member function ?void ConvertToInventor::processGeometry(const osg::Geometry*, ConvertToInventor::InventorState*)?:
src/osgPlugins/Inventor/ConvertToInventor.cpp:1639:10: warning: variable ?ok? set but not used [-Wunused-but-set-variable]
src/osgPlugins/Inventor/ConvertFromInventor.cpp: In member function ?virtual SbBool SoVRMLImageTextureOsg::readInstance(SoInput*, short unsigned int)?:
src/osgPlugins/Inventor/ConvertFromInventor.cpp:1264:16: warning: variable ?retval? set but not used [-Wunused-but-set-variable]
src/osgPlugins/OpenFlight/GeometryRecords.cpp: In member function ?virtual void flt::Face::readRecord(flt::RecordInputStream&, flt::Document&)?:
src/osgPlugins/OpenFlight/GeometryRecords.cpp:369:19: warning: variable ?secondaryPackedColor? set but not used [-Wunused-but-set-variable]
src/osgPlugins/OpenFlight/GeometryRecords.cpp: In member function ?virtual void flt::Mesh::readRecord(flt::RecordInputStream&, flt::Document&)?:
src/osgPlugins/OpenFlight/GeometryRecords.cpp:942:19: warning: variable ?secondaryPackedColor? set but not used [-Wunused-but-set-variable]
src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp: In member function ?virtual osgDB::ReaderWriter::ReadResult FLTReaderWriter::readNode(std::istream&, const Options*) const?:
src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp:427:40: warning: variable ?pos? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ive/ShapeAttributeList.cpp: In member function ?void ive::ShapeAttributeList::write(ive::DataOutputStream*)?:
src/osgPlugins/ive/ShapeAttributeList.cpp:31:48: warning: variable ?it? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp: In member function ?void ac3d::Geode::ProcessGeometry(std::ostream&, unsigned int)?:
src/osgPlugins/ac/Geode.cpp:806:35: warning: variable ?fRep_s? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp:806:43: warning: variable ?fRep_t? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp:807:35: warning: variable ?fOffset_s? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp:807:46: warning: variable ?fOffset_t? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp:932:38: warning: variable ?primLength? set but not used [-Wunused-but-set-variable]
src/osgPlugins/txp/trpage_geom.cpp: In member function ?virtual bool trpgGeometry::Write(trpgWriteBuffer&)?:
src/osgPlugins/txp/trpage_geom.cpp:615:19: warning: variable ?u? set but not used [-Wunused-but-set-variable]
src/osgPlugins/txp/trpage_material.cpp: In member function ?int trpgMatTable::AddMaterial(const trpgMaterial&, bool)?:
src/osgPlugins/txp/trpage_material.cpp:103:10: warning: variable ?spaceInTable? set but not used [-Wunused-but-set-variable]
src/osgPlugins/txp/trpage_rarchive.cpp: In member function ?virtual bool trpgr_Archive::ReadHeader(bool)?:
src/osgPlugins/txp/trpage_rarchive.cpp:261:14: warning: variable ?headerHasTexTable? set but not used [-Wunused-but-set-variable]
src/osgPlugins/zip/unzip.cpp: In member function ?ZRESULT TUnzip::Get(int, ZIPENTRY*)?:
src/osgPlugins/zip/unzip.cpp:4055:8: warning: variable ?hidden? set but not used [-Wunused-but-set-variable]
src/osgPlugins/zip/unzip.cpp:4055:22: warning: variable ?system? set but not used [-Wunused-but-set-variable]
src/osgPlugins/zip/unzip.cpp:4055:36: warning: variable ?archive? set but not used [-Wunused-but-set-variable]
src/osgPlugins/zip/ZipArchive.cpp: In member function ?virtual bool ZipArchive::getFileNames(osgDB::Archive::FileNameList&) const?:
src/osgPlugins/zip/ZipArchive.cpp:91:37: warning: variable ?iterEnd? set but not used [-Wunused-but-set-variable]
src/osgPlugins/pvr/ReaderWriterPVR.cpp: In member function ?osgDB::ReaderWriter::ReadResult ReaderWriterPVR::readPVRStream(std::istream&) const?:
src/osgPlugins/pvr/ReaderWriterPVR.cpp:155:14: warning: variable ?hasAlpha? set but not used [-Wunused-but-set-variable]
src/osgViewer/View.cpp: In function ?osg::Geometry* create3DSphericalDisplayDistortionMesh(const Vec3&, const Vec3&, const Vec3&, double, double, osg::Image*, const Matrix&)?:
src/osgViewer/View.cpp:737:15: warning: variable ?cursor? set but not used [-Wunused-but-set-variable]
src/osgViewer/View.cpp: In function ?osg::Geometry* createParoramicSphericalDisplayDistortionMesh(const Vec3&, const Vec3&, const Vec3&, double, double, osg::Image*, const Matrix&)?:
src/osgViewer/View.cpp:1130:19: warning: variable ?cursor? set but not used [-Wunused-but-set-variable]
src/osgViewer/View.cpp:1118:15: warning: variable ?dx? set but not used [-Wunused-but-set-variable]
src/osgViewer/GraphicsWindowX11.cpp: In member function ?virtual void osgViewer::GraphicsWindowX11::checkEvents()?:
src/osgViewer/GraphicsWindowX11.cpp:1181:10: warning: variable ?destroyWindowRequested? set but not used [-Wunused-but-set-variable]
src/osgPlugins/cfg/ConfigParser.cpp: In member function ?bool osgProducer::CameraConfig::parseFile(const string&)?:
src/osgPlugins/cfg/ConfigParser.cpp:2247:13: warning: variable ?result? set but not used [-Wunused-but-set-variable]
src/osgQt/QGraphicsViewAdapter.cpp: In member function ?bool osgQt::QGraphicsViewAdapter::handlePointerEvent(int, int, int)?:
src/osgQt/QGraphicsViewAdapter.cpp:344:17: warning: variable ?viewportGeometry? set but not used [-Wunused-but-set-variable]
examples/osgdistortion/osgdistortion.cpp: In function ?osg::Node* createDistortionSubgraph(osg::Node*, const Vec4&)?:
examples/osgdistortion/osgdistortion.cpp:125:19: warning: variable ?cursor? set but not used [-Wunused-but-set-variable]
examples/osgdistortion/osgdistortion.cpp:126:19: warning: variable ?texcoord? set but not used [-Wunused-but-set-variable]
examples/osgdistortion/osgdistortion.cpp: In function ?osg::Geometry* createDomeDistortionMesh(const Vec3&, const Vec3&, const Vec3&, osg::ArgumentParser&)?:
examples/osgdistortion/osgdistortion.cpp:358:15: warning: variable ?cursor? set but not used [-Wunused-but-set-variable]
examples/osgposter/osgposter.cpp: In function ?int main(int, char**)?:
examples/osgposter/osgposter.cpp:253:31: warning: variable ?outputTiles? set but not used [-Wunused-but-set-variable]
examples/osgthreadedterrain/osgthreadedterrain.cpp: In function ?int main(int, char**)?:
examples/osgthreadedterrain/osgthreadedterrain.cpp:669:10: warning: variable ?readParameter? set but not used [-Wunused-but-set-variable]
examples/osgtext3D/TextNode.cpp: In member function ?virtual void osgText::Layout::layout(osgText::TextNode&) const?:
examples/osgtext3D/TextNode.cpp:80:11: warning: variable ?characterHeightScale? set but not used [-Wunused-but-set-variable]
examples/osgvolume/osgvolume.cpp: In function ?int main(int, char**)?:
examples/osgvolume/osgvolume.cpp:678:38: warning: variable ?internalFormatMode? set but not used [-Wunused-but-set-variable]
examples/osgwidgetcanvas/osgwidgetcanvas.cpp: In function ?bool windowMouseOver(osgWidget::Event&)?:
examples/osgwidgetcanvas/osgwidgetcanvas.cpp:27:24: warning: variable ?xy? set but not used [-Wunused-but-set-variable]
examples/osgwidgetcanvas/osgwidgetcanvas.cpp: In function ?bool widgetMouseOver(osgWidget::Event&)?:
examples/osgwidgetcanvas/osgwidgetcanvas.cpp:35:24: warning: variable ?xy? set but not used [-Wunused-but-set-variable]
src/osgPlugins/p3d/ReaderWriterP3D.cpp: In member function ?osg::Node* ReaderWriterP3DXML::parseXmlGraph(osgDB::XmlNode*, bool, osgDB::Options*) const?:
src/osgPlugins/p3d/ReaderWriterP3D.cpp:2121:10: warning: variable ?readSlide? set but not used [-Wunused-but-set-variable]
applications/present3D/present3D.cpp: In function ?int main(int, char**)?:
applications/present3D/present3D.cpp:639:10: warning: variable ?sizesSpecified? set but not used [-Wunused-but-set-variable]

7 years agoFixed regression in --run-on-demand feature
Robert OSFIELD [Wed, 22 Jun 2011 09:06:51 +0000 (09:06 +0000)]
Fixed regression in --run-on-demand feature

7 years agoMerged from svn/trunk changeset r12593, Removed assert() that always evaluated to...
Robert OSFIELD [Tue, 21 Jun 2011 17:30:07 +0000 (17:30 +0000)]
Merged from svn/trunk changeset r12593, Removed assert() that always evaluated to true.

7 years agoMerged from svn/trunk, changeset 12591, From Torben Dannhauer, "originally I posted...
Robert OSFIELD [Tue, 21 Jun 2011 13:03:24 +0000 (13:03 +0000)]
Merged from svn/trunk, changeset 12591, From Torben Dannhauer, "originally I posted the addendum of 'freetype244MT', but that was wrong.
I updated it to the correct addendum of 'freetype244' yesterday, but supposedly that was not forwarded to you by the forum-to-mail-gateway.

Find attached the corrected CMake module. "

7 years agoUpdated ChangeLog and AUTHORS file for 3.0.0-rc2
Robert OSFIELD [Tue, 21 Jun 2011 10:26:30 +0000 (10:26 +0000)]
Updated ChangeLog and AUTHORS file for 3.0.0-rc2

7 years agoMerged changeset 12581 from svn/trunk to address VisualStudio warning
Robert OSFIELD [Tue, 21 Jun 2011 10:07:59 +0000 (10:07 +0000)]
Merged changeset 12581 from svn/trunk to address VisualStudio warning

7 years agoMerged from svn/trunk warnings fixes provided by Changeset 12582 from Michael Plating...
Robert OSFIELD [Tue, 21 Jun 2011 09:58:31 +0000 (09:58 +0000)]
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.

7 years agoUpdated release candidate number
Robert OSFIELD [Mon, 20 Jun 2011 19:41:39 +0000 (19:41 +0000)]
Updated release candidate number

7 years agoMerged from svn/trunk, r12574.
Robert OSFIELD [Mon, 20 Jun 2011 19:37:40 +0000 (19:37 +0000)]
Merged from svn/trunk, r12574.

From Farshid Lashkari, BGR write support for BMP, PNG and TGA

7 years agoMerged changes to svn/trunk that address cppcheck reported issues:
Robert OSFIELD [Mon, 20 Jun 2011 19:33:47 +0000 (19:33 +0000)]
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

7 years agoMerged following revisions from svn/trunk which address problems with toggling fullsc...
Robert OSFIELD [Mon, 20 Jun 2011 17:54:27 +0000 (17:54 +0000)]
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.

7 years agoMerged from svn/trunk. Added sleep before window resizing to make it less likely...
Robert OSFIELD [Mon, 20 Jun 2011 09:22:05 +0000 (09:22 +0000)]
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.

7 years agoFrom Torben Dannhauer, "Just in time for OSG 3.0 I will present an updated 3rdParty...
Robert OSFIELD [Sun, 19 Jun 2011 19:21:21 +0000 (19:21 +0000)]
From Torben Dannhauer, "Just in time for OSG 3.0 I will present an updated 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."

7 years agoReset OPENSCENEGRAPH_SVN setting to branches to enable the tags to be created on...
Robert OSFIELD [Fri, 17 Jun 2011 16:37:58 +0000 (16:37 +0000)]
Reset OPENSCENEGRAPH_SVN setting to branches to enable the tags to be created on the branches rather svn/trunk.

7 years agoFirst cut of OpenSceneGraph-3.0 branch from svn/trunk.
Robert OSFIELD [Fri, 17 Jun 2011 13:14:49 +0000 (13:14 +0000)]
First cut of OpenSceneGraph-3.0 branch from svn/trunk.

7 years agoAdded extern "C" to fix build issues under OSX
Robert OSFIELD [Fri, 17 Jun 2011 12:57:31 +0000 (12:57 +0000)]
Added extern "C" to fix build issues under OSX

7 years agoUpdated ChangeLog, NEWS and READE for 3.0.0-rc1
Robert OSFIELD [Fri, 17 Jun 2011 12:31:07 +0000 (12:31 +0000)]
Updated ChangeLog, NEWS and READE for 3.0.0-rc1

7 years agoUpdated version number
Robert OSFIELD [Fri, 17 Jun 2011 11:47:47 +0000 (11:47 +0000)]
Updated version number

7 years agoFixed Jorge Izquierdo name.
Robert OSFIELD [Fri, 17 Jun 2011 11:47:33 +0000 (11:47 +0000)]
Fixed Jorge Izquierdo name.

7 years agoUpdated OpenThreads version number for stable release
Robert OSFIELD [Fri, 17 Jun 2011 11:02:40 +0000 (11:02 +0000)]
Updated OpenThreads version number for stable release

7 years agoTempory fix for static build of Present3D which disables the use of ffmpeg when compi...
Robert OSFIELD [Fri, 17 Jun 2011 10:35:00 +0000 (10:35 +0000)]
Tempory fix for static build of Present3D which disables the use of ffmpeg when compiling static, will need to
look into unresolved symbols assoiated with FFMPEG at a later date.

7 years agoUpdated AUTHORS file for 3.0.0-rc1
Robert OSFIELD [Fri, 17 Jun 2011 09:20:57 +0000 (09:20 +0000)]
Updated AUTHORS file for 3.0.0-rc1

7 years agoUpdated ChangeLog
Robert OSFIELD [Fri, 17 Jun 2011 09:19:11 +0000 (09:19 +0000)]
Updated ChangeLog

7 years agoFrom Jan Peciva, "sending updated version of StencilTwoSided.
Robert OSFIELD [Fri, 17 Jun 2011 09:05:48 +0000 (09:05 +0000)]
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."

7 years agoUpdated version number of 3.0.0-rc1
Robert OSFIELD [Fri, 17 Jun 2011 09:02:22 +0000 (09:02 +0000)]
Updated version number of 3.0.0-rc1

7 years agoAdded GLES version checks to prevent build problems under GLES1 and GLES2
Robert OSFIELD [Fri, 17 Jun 2011 08:47:36 +0000 (08:47 +0000)]
Added GLES version checks to prevent build problems under GLES1 and GLES2

7 years agoRefined the version checking
Robert OSFIELD [Fri, 17 Jun 2011 08:42:54 +0000 (08:42 +0000)]
Refined the version checking

7 years agoBuild fix
Robert OSFIELD [Fri, 17 Jun 2011 08:41:56 +0000 (08:41 +0000)]
Build fix

7 years agoFrom Ulrich Hertlein, "the OS X/Cocoa implementation logs some debug junk on every...
Robert OSFIELD [Fri, 17 Jun 2011 08:26:51 +0000 (08:26 +0000)]
From Ulrich Hertlein, "the OS X/Cocoa implementation logs some debug junk on every key stroke.  The attached
patch removes this."