Hi Kristofer,
Thanks for the warning fixes. I have merged the changes as is except for
the Image.cpp and Text header. The Image.cpp change had a mistake in the
one of the indices - I guess you accidentally changed a [0] to [1], and the
Text change wasn't actually the correct fix - the better way to fix the
problem is simply remove the virtual usage as it's not need for this helper
class thus:
Index: include/osgText/Text
===================================================================
--- include/osgText/Text (revision 15025)
+++ include/osgText/Text (working copy)
@@ -338,12 +338,12 @@
const LineNumbers& getLineNumbers() const { return _lineNumbers; }
/** Resize any per context GLObject buffers to specified size. */
- virtual void resizeGLObjectBuffers(unsigned int maxSize);
+ void resizeGLObjectBuffers(unsigned int maxSize);
/** If State is non-zero, this function releases OpenGL objects for
* the specified graphics context. Otherwise, releases OpenGL
objexts
* for all graphics contexts. */
- virtual void releaseGLObjects(osg::State* state=0) const;
+ void releaseGLObjects(osg::State* state=0) const;
private:
Changes now checked into svn/trunk and OSG-3.4 branch. Could you let me
know if with these changes the warnings are all gone.
Thanks,
Robert.
On 29 July 2015 at 11:03, Kristofer Tingdahl <[email protected]>
wrote:
> Dear Robert,
>
>
> I started our first build of the 3.4 branch, and I got a number of
> compiler warnings which are fixed by attached diff.
>
> Apart from the casts that are made explicit, I added a virtual destructor
> in the TextGlyph class. Since it has virtual functions, I think it should
> have a virtual destructor as you cannot control what will happen in
> inheriting implementations of the virtual functions, and you need to give
> the developer of inheriting classes the freedom to implement a destructor.
> Another solution would be to make all functions non-virtual.
>
> This patch is also directly applicable in the trunk without modifications.
>
> With this patch, I get a flawless compile of the code.
>
>
> Cheers,
>
> Kristofer
>
> --
> *Dr. Kristofer Tingdahl**Chief Executive Officer*
> *______________________________*
>
> *dGB Earth Sciences*Phone:+31 53 4315155Skype:dgbtingdahlE-mail:
> [email protected]:dgbes.com & opendtect.org
> *______________________________*
>
>
> _______________________________________________
> osg-submissions mailing list
> [email protected]
>
> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
>
>
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
