Merge branch 'maint' into next

simgear/debug/logtest.cxx

@@ -1,5 +1,5 @@
 #include <string>
-#include "Debug/logstream.hxx"
+#include <simgear/debug/logstream.hxx>
 
 class Test {
 

simgear/io/tcp_server.cxx

@@ -12,6 +12,7 @@ class TcpServer
 {
 public:
     TcpServer();
+    ~TcpServer();
     bool open();
     bool process();
     bool close();
@@ -25,6 +26,11 @@ TcpServer::TcpServer()
     channel = new SGSocket( "", "5500", "tcp" );
 }
 
+TcpServer::~TcpServer()
+{
+    delete channel;
+}
+
 bool
 TcpServer::open()
 {

simgear/math/interpolater.hxx

@@ -35,7 +35,7 @@
 
 #include <simgear/compiler.h>
 
-#include "simgear/structure/SGReferenced.hxx"
+#include <simgear/structure/SGReferenced.hxx>
 
 #include <map>
 

simgear/misc/tabbed_values.cxx

@@ -21,10 +21,10 @@
 // $Id$
 
 #include <cstdlib>
+#include <assert.h>
 
 #include "tabbed_values.hxx"
 
-#include "assert.h"
 
 SGTabbedValues::SGTabbedValues(const char *line) :
 	_line(line)

simgear/scene/model/SGPagedLOD.cxx

@@ -75,9 +75,7 @@ void SGPagedLOD::forceLoad(osgDB::DatabasePager *dbp)
     setTimeStamp(childNum, 0);
     double priority=1.0;
     dbp->requestNodeFile(getFileName(childNum),this,priority,0,
-#if SG_OSG_VERSION >= 25001
                          getDatabaseRequest(childNum),
-#endif
                          _readerWriterOptions.get());
 }
 

simgear/scene/model/SGPagedLOD.hxx

@@ -17,7 +17,11 @@
 #ifndef SGPAGEDLOD_HXX
 #define SGPAGEDLOD_HXX 1
 
+#include <simgear/structure/OSGVersion.hxx>
 #include <osg/PagedLOD>
+#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
+#include <osgDB/Options>
+#endif
 #include <osgDB/ReaderWriter>
 #include <simgear/props/props.hxx>
 
@@ -44,19 +48,21 @@ public:
     // reimplemented to notify the loading through ModelData
     bool addChild(osg::Node *child);
 
-    void setReaderWriterOptions(osgDB::ReaderWriter::Options *o) {
+    void setReaderWriterOptions(osgDB::ReaderWriter::Options *options) {
-        _readerWriterOptions=o;
+        _readerWriterOptions = options;
-        _readerWriterOptions->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
+        options->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
+#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
+        setDatabaseOptions(options);
+#endif
     }
 
-    osgDB::ReaderWriter::Options * getReaderWriterOptions() {
+    osgDB::ReaderWriter::Options* getReaderWriterOptions() {
         return _readerWriterOptions.get();
     }
 
 protected:
     virtual ~SGPagedLOD();
     osg::ref_ptr<osgDB::ReaderWriter::Options> _readerWriterOptions;
-    SGPropertyNode_ptr _props;
 };
 }
 #endif

simgear/scene/sky/cloud.cxx

@@ -30,6 +30,7 @@
 
 #include <math.h>
 
+#include <simgear/structure/OSGVersion.hxx>
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
 #include <osg/CullFace>
@@ -43,6 +44,9 @@
 #include <osg/TextureCubeMap>
 #include <osg/TexMat>
 #include <osg/Fog>
+#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
+#include <osgDB/Options>
+#endif
 
 #include <simgear/math/sg_random.h>
 #include <simgear/misc/PathOptions.hxx>

simgear/scene/sky/moon.cxx

@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <iostream>
 
+#include <simgear/structure/OSGVersion.hxx>
 #include <osg/Array>
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
@@ -42,6 +43,9 @@
 #include <osg/ShadeModel>
 #include <osg/TexEnv>
 #include <osg/Texture2D>
+#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
+#include <osgDB/Options>
+#endif
 
 #include <simgear/constants.h>
 #include <simgear/screen/colors.hxx>

simgear/screen/screen-dump.cxx

@@ -55,6 +55,7 @@ bool sg_glWritePPMFile(const char *filename, GLubyte *buffer, int win_width, int
     ibuffer = (unsigned char *) malloc(win_width*win_height*RGB3);
 
     if ( (fp = fopen(filename, "wb")) == NULL ) {
+	free(ibuffer);
 	printf("Warning: cannot open %s\n", filename);
 	return false;
     }

simgear/structure/OSGVersion.hxx

@@ -23,4 +23,28 @@
 #define SG_OSG_VERSION \
     ((OPENSCENEGRAPH_MAJOR_VERSION*10000)\
      + (OPENSCENEGRAPH_MINOR_VERSION*1000) + OPENSCENEGRAPH_PATCH_VERSION)
+
+#define SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH) \
+  ((OPENSCENEGRAPH_MAJOR_VERSION > (MAJOR)) ||            \
+   (OPENSCENEGRAPH_MAJOR_VERSION == (MAJOR) &&            \
+    (OPENSCENEGRAPH_MINOR_VERSION > (MINOR) ||            \
+     (OPENSCENEGRAPH_MINOR_VERSION == (MINOR) &&          \
+      OPENSCENEGRAPH_PATCH_VERSION >= (PATCH)))))
+
+#define SG_OSG_VERSION_GREATER_THAN(MAJOR, MINOR, PATCH)  \
+  ((OPENSCENEGRAPH_MAJOR_VERSION > (MAJOR)) ||            \
+   (OPENSCENEGRAPH_MAJOR_VERSION == (MAJOR) &&            \
+    (OPENSCENEGRAPH_MINOR_VERSION > (MINOR) ||            \
+     (OPENSCENEGRAPH_MINOR_VERSION == (MINOR) &&          \
+      OPENSCENEGRAPH_PATCH_VERSION > (PATCH)))))
+
+#define SG_OSG_VERSION_LESS_THAN(MAJOR, MINOR, PATCH)  \
+  (!SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH))
+
+#define SG_OSG_VERSION_LESS_EQUAL(MAJOR, MINOR, PATCH)  \
+  (!SG_OSG_VERSION_GREATER_THAN(MAJOR, MINOR, PATCH))
+
+#define SG_OSG_MIN_VERSION_REQUIRED(MAJOR, MINOR, PATCH) \
+  SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH)
+
 #endif

simgear/threads/SGThread.cxx

@@ -11,7 +11,7 @@
 #  include <sys/time.h>
 #endif
 #if _MSC_VER >= 1300
-#  include "winsock2.h"
+#  include <winsock2.h>
 #endif
 
 #include "SGThread.hxx"

simgear/timing/sg_time.cxx

@@ -122,11 +122,7 @@ SGTime::SGTime() {
 
 SGTime::~SGTime()
 {
-    if ( tzContainer != NULL ) {
+    delete tzContainer;
-        SGTimeZoneContainer *tmp = tzContainer;
-        tzContainer = NULL;
-	delete tmp;
-    }
 }
 
 

simgear/xml/xmldef.h

@@ -53,7 +53,7 @@ particular environments. */
 
 #ifdef MOZILLA
 
-#include "nspr.h"
+#include <nspr.h>
 #define malloc(x) PR_Malloc(x)
 #define realloc(x, y) PR_Realloc((x), (y))
 #define calloc(x, y) PR_Calloc((x),(y))