Update Mac configure script for new ALUT scheme; support --with-alut-framework.

[flightgear.git] / src / Network / jpg-httpd.cxx

diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx
index 9c83d3446686a731377e5772bbedef14ca2b8409..abf2911e3893210411f82a2c9d21c0e192d90923 100644 (file)
--- a/src/Network/jpg-httpd.cxx
+++ b/src/Network/jpg-httpd.cxx
@@ -33,7 +33,7 @@
 
 #include <stdlib.h>            // atoi() atof()
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -52,9 +52,10 @@
 #define __HTTP_GET_STRING           "GET "
 
 #include <osgUtil/SceneView>
+#include <osgViewer/Viewer>
 extern osg::ref_ptr<osgUtil::SceneView> sceneView;
 
-SG_USING_STD(string);
+using std::string;
 
 
 bool FGJpegHttpd::open() {
@@ -108,14 +109,9 @@ void HttpdImageChannel :: foundTerminator( void ) {
 
         double left, right, bottom, top, zNear, zFar;
        osgViewer::Viewer* viewer = globals->get_renderer()->getViewer();
-       if (viewer)
-           viewer->getCamera()->getProjectionMatrixAsFrustum(left, right,
-                                                             bottom, top,
-                                                             zNear, zFar);
-       else
-           sceneView->getCamera()->getProjectionMatrixAsFrustum(left, right,
-                                                                bottom, top,
-                                                                zNear, zFar);
+        viewer->getCamera()->getProjectionMatrixAsFrustum(left, right,
+                                                          bottom, top,
+                                                          zNear, zFar);
         JpgFactory->setFrustum( left, right, bottom, top, zNear, zFar );
 
         nImageLen  = JpgFactory -> render();