[MERGE]

src/dataHandler/io/WLoaderLibeep.cpp

@@ -22,6 +22,8 @@
 //
 //---------------------------------------------------------------------------
 
+#include <locale.h>
+
 #include <string>
 
 extern "C"
@@ -30,9 +32,9 @@ extern "C"
 }
 
 #include "../../common/WLogger.h"
+#include "../WEEG.h"
 #include "../exceptions/WDHNoSuchFile.h"
 #include "WLoaderLibeep.h"
-#include "../WEEG.h"
 
 
 WLoaderLibeep::WLoaderLibeep( std::string fileName )
@@ -45,7 +47,7 @@ boost::shared_ptr< WDataSet > WLoaderLibeep::load()
     wlog::debug( "Libeep Loader" ) << "Opening " << m_fileName;
 
     // libeep needs the standard C locale to load float values from ASCII
-    std::setlocale( LC_NUMERIC, "C" );
+    setlocale( LC_NUMERIC, "C" );
 
     // initialize
     FILE* file = fopen( m_fileName.c_str(), "rb" );

src/graphicsEngine/WPickHandler.cpp

@@ -30,6 +30,12 @@
 #include "WPickHandler.h"
 #include "WPickInfo.h"
 
+WPickHandler::WPickHandler()
+    : m_hitResult( WPickInfo() ),
+      m_startPick( WPickInfo() ),
+      m_shift( false )
+{
+}
 WPickHandler::~WPickHandler()
 {
 }

src/graphicsEngine/WPickHandler.h

@@ -55,6 +55,12 @@
 class WPickHandler: public osgGA::GUIEventHandler
 {
 public:
+
+    /**
+     * Constructor that initalizes members with sensible defaults.
+     */
+    WPickHandler();
+
     /**
      * Deals with the events found by the osg.
      * \param ea Event class for storing Keyboard, mouse and window events.
@@ -92,7 +98,7 @@ protected:
      * a instance of WPickHandler.
      * This follows the philosophy of OSG to avoid problems in multithreaded
      * environments, since these pointers are used deep in the OSG where
-     * an deletion could cause a segfault.
+     * a deletion could cause a segfault.
      */
     virtual ~WPickHandler();