mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 03:49:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-12-17 18:30:00 +01:00
parent df259f6d02 255f187052
commit d4278f9adc
210 changed files with 5201 additions and 1299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/globebrowsingmodule.cpp
+13 -1
View File
@@ -54,13 +54,25 @@
#ifdef GLOBEBROWSING_USE_GDAL
#include <gdal.h>
#ifdef _MSC_VER
#pragma warning (push)
// CPL throws warning about missing DLL interface
#pragma warning (disable : 4251)
#endif // _MSC_VER
#include <cpl_string.h>
#ifdef _MSC_VER
#pragma warning (pop)
#endif // _MSC_VER
#endif // GLOBEBROWSING_USE_GDAL
#include "globebrowsingmodule_lua.inl"
namespace {
const char* _loggerCat = "GlobeBrowsingModule";
constexpr const char* _loggerCat = "GlobeBrowsingModule";
#ifdef GLOBEBROWSING_USE_GDAL
openspace::GlobeBrowsingModule::Capabilities