Fix the jpg http server

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 26d595aee0900707fa854cdc98e907d57a37c05f..cfbf94c1fb7d1e6ed5ede17d1d1a8ef3e490f8cf 100644 (file)
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -327,7 +327,7 @@ static GLfloat ground_exp2_punch_through;
 // Sky structures
 SGSky *thesky;
 
-static osg::ref_ptr<osgUtil::SceneView> sceneView = new osgUtil::SceneView;
+osg::ref_ptr<osgUtil::SceneView> sceneView = new osgUtil::SceneView;  // This SceneView is used by class FGJpegHttpd ( jpg-httpd.cxx )
 static osg::ref_ptr<osg::FrameStamp> mFrameStamp = new osg::FrameStamp;
 static osg::ref_ptr<SGUpdateVisitor> mUpdateVisitor= new SGUpdateVisitor;
 

diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx
index f8ec013485a1ab299256d88599a2999218a70a9c..0516dd8189f1f18293bab1982cfe744d0c207ea7 100644 (file)
--- a/src/Network/jpg-httpd.cxx
+++ b/src/Network/jpg-httpd.cxx
@@ -50,8 +50,8 @@
 #define __TIMEOUT_COUNT             5
 #define __HTTP_GET_STRING           "GET "
 
-#include <osg/CameraNode>
-extern osg::ref_ptr<osg::CameraNode> mSceneCamera;
+#include <osgUtil/SceneView>
+extern osg::ref_ptr<osgUtil::SceneView> sceneView;
 
 SG_USING_STD(string);
 
@@ -106,7 +106,7 @@ void HttpdImageChannel :: foundTerminator( void ) {
         SG_LOG( SG_IO, SG_DEBUG, "<<<<<<<<< HTTP Request : " << pRequest );
 
         double left, right, bottom, top, zNear, zFar;
-        mSceneCamera->getProjectionMatrixAsFrustum( left, right, bottom, top, zNear, zFar );
+        sceneView->getCamera()->getProjectionMatrixAsFrustum( left, right, bottom, top, zNear, zFar );
         JpgFactory->setFrustum( left, right, bottom, top, zNear, zFar );
 
         nImageLen  = JpgFactory -> render();