From Norman Vine (with small tweaks by Robert Osfield), build fixes for Cygwin

include/osg/AnimationPath

@@ -14,15 +14,15 @@
 #ifndef OSG_ANIMATIONPATH
 #define OSG_ANIMATIONPATH 1
 
+#include <map>
+#include <istream>
+#include <float.h>
+
 #include <osg/Matrixf>
 #include <osg/Matrixd>
 #include <osg/Quat>
 #include <osg/NodeCallback>
 
-#include <map>
-#include <istream>
-#include <float.h>
-
 namespace osg {
 
 /** AnimationPath for specify the time varying transformation pathway to use when update camera and model objects.

include/osg/Array

@@ -14,14 +14,15 @@
 #ifndef OSG_ARRAY
 #define OSG_ARRAY 1
 
-#include <osg/Object>
-#include <osg/GL>
+#include <vector>
+
 #include <osg/Vec2>
 #include <osg/Vec3>
 #include <osg/Vec4>
 #include <osg/UByte4>
 
-#include <vector>
+#include <osg/Object>
+#include <osg/GL>
 
 namespace osg {
 

include/osg/AutoTransform

@@ -14,9 +14,9 @@
 #ifndef OSG_AUTOTRANSFORM
 #define OSG_AUTOTRANSFORM 1
 
+#include <osg/AnimationPath>
 #include <osg/Group>
 #include <osg/Transform>
-#include <osg/AnimationPath>
 #include <osg/Quat>
 
 namespace osg {

include/osg/CoordinateSystemNode

@@ -147,7 +147,7 @@ inline void EllipsoidModel::convertLatLongHeightToXYZ(double latitude, double lo
     double N = _radiusEquator / sqrt( 1.0 - _eccentricitySquared*sin_latitude*sin_latitude);
     X = (N+height)*cos_latitude*cos(longitude);
     Y = (N+height)*cos_latitude*sin(longitude);
-    Z = (N*(1-_eccentricitySquared)+height)*sin(latitude);
+    Z = (N*(1-_eccentricitySquared)+height)*sin_latitude;
 }
 
 

include/osg/Vec2d

@@ -16,8 +16,6 @@
 
 #include <osg/Vec2f>
 
-#include <ostream>
-
 namespace osg {
 
 /** General purpose double pair, uses include representation of

include/osg/Vec2f

@@ -14,10 +14,10 @@
 #ifndef OSG_VEC2F
 #define OSG_VEC2F 1
 
-#include <osg/Math>
-
 #include <ostream>
 
+#include <osg/Math>
+
 namespace osg {
 
 /** General purpose float pair, uses include representation of

include/osg/Vec3d

@@ -16,8 +16,6 @@
 
 #include <osg/Vec3f>
 
-#include <ostream>
-
 namespace osg {
 
 /** General purpose double triple for use as vertices, vectors and normals.

include/osg/Vec3f

@@ -14,10 +14,10 @@
 #ifndef OSG_VEC3F
 #define OSG_VEC3F 1
 
-#include <osg/Math>
-
 #include <ostream>
 
+#include <osg/Math>
+
 namespace osg {
 
 /** General purpose float triple for use as vertices, vectors and normals.

include/osg/Vec4f

@@ -16,8 +16,6 @@
 
 #include <osg/Vec3f>
 
-#include <ostream>
-
 namespace osg {
 
 /** General purpose float quad, uses include representation

include/osgDB/ReadFile

@@ -14,6 +14,8 @@
 #ifndef OSGDB_READFILE
 #define OSGDB_READFILE 1
 
+#include <string>
+
 #include <osg/Node>
 #include <osg/Image>
 #include <osg/ArgumentParser>
@@ -21,8 +23,6 @@
 #include <osgDB/Export>
 #include <osgDB/Registry>
 
-#include <string>
-
 namespace osgDB {
 
 

include/osgText/Font

@@ -14,6 +14,8 @@
 #ifndef OSGTEXT_FONT
 #define OSGTEXT_FONT 1
 
+#include <string>
+
 #include <osg/Vec2>
 #include <osg/Image>
 #include <osg/Texture2D>
@@ -23,8 +25,6 @@
 
 #include <osgText/Export>
 
-#include <string>
-
 namespace osgText {
 
 class Font;

include/osgText/String

@@ -14,13 +14,13 @@
 #ifndef OSGTEXT_STRING
 #define OSGTEXT_STRING 1
 
-#include <osg/Referenced>
-#include <osgText/Export>
-
 #include <vector>
 #include <set>
 #include <string>
 
+#include <osg/Referenced>
+#include <osgText/Export>
+
 namespace osgText {
 
 class Text;

include/osgUtil/CullVisitor

@@ -14,6 +14,9 @@
 #ifndef OSGUTIL_CULLVISITOR
 #define OSGUTIL_CULLVISITOR 1
 
+#include <map>
+#include <vector>
+
 #include <osg/NodeVisitor>
 #include <osg/BoundingSphere>
 #include <osg/BoundingBox>
@@ -24,16 +27,12 @@
 #include <osg/Impostor>
 #include <osg/ClearNode>
 #include <osg/Notify>
-#include <osg/Notify>
 
 #include <osg/CullStack>
 
 #include <osgUtil/RenderGraph>
 #include <osgUtil/RenderStage>
 
-#include <map>
-#include <vector>
-
 #include <osg/Vec3>
 
 namespace osgUtil {

include/osgUtil/SmoothingVisitor

@@ -30,11 +30,9 @@ class OSGUTIL_EXPORT SmoothingVisitor : public osg::NodeVisitor
     public:
 
         /// default to traversing all children.
-        SmoothingVisitor()
-        {
-            setTraversalMode(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN);
-        }
-
+        SmoothingVisitor();
+        virtual ~SmoothingVisitor();
+        
         /// smooth geoset by creating per vertex normals.
         static void smooth(osg::Geometry& geoset);