mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Solve merge conflict and add properties for friction and interaction parameters.

Browse Source
This commit is contained in:
kbladin
2016-06-30 14:07:51 -04:00
parent d4f89448e0 e40d393824
commit a89f474502
238 changed files with 3637 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/CMakeLists.txt
+24 -9
View File
@@ -138,13 +138,28 @@ create_new_module(
${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
)
target_include_directories(
openspace-module-globebrowsing
SYSTEM PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/include
)
if (WIN32)
target_include_directories(
openspace-module-globebrowsing
SYSTEM PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/include
)
target_link_libraries(
openspace-module-globebrowsing
${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal_i.lib
)
target_link_libraries(
openspace-module-globebrowsing
${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal_i.lib
)
else (WIN32)
find_package(GDAL REQUIRED)
target_include_directories(
openspace-module-globebrowsing
SYSTEM PUBLIC
${GDAL_INCLUDE}
)
target_link_libraries(
openspace-module-globebrowsing
${GDAL_LIBRARY}
)
endif ()
modules/globebrowsing/ext/gdal/include/cpl_atomic_ops.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_atomic_ops.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Name: cpl_atomic_ops.h
* Project: CPL - Common Portability Library
modules/globebrowsing/ext/gdal/include/cpl_aws.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_aws.h 33758 2016-03-21 09:06:22Z rouault $
*
* Name: cpl_aws.h
* Project: CPL - Common Portability Library
modules/globebrowsing/ext/gdal/include/cpl_conv.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_conv.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Project: CPL - Common Portability Library
* Purpose: Convenience functions declarations.
modules/globebrowsing/ext/gdal/include/cpl_csv.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_csv.h 33844 2016-04-01 08:42:13Z rouault $
*
* Project: Common Portability Library
* Purpose: Functions for reading and scanning CSV (comma separated,
modules/globebrowsing/ext/gdal/include/cpl_error.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_error.h 33842 2016-04-01 08:37:32Z rouault $
*
* Name: cpl_error.h
* Project: CPL - Common Portability Library
modules/globebrowsing/ext/gdal/include/cpl_hash_set.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_hash_set.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Name: cpl_hash_set.h
* Project: CPL - Common Portability Library
modules/globebrowsing/ext/gdal/include/cpl_http.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_http.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Project: Common Portability Library
* Purpose: Function wrapper for libcurl HTTP access.
modules/globebrowsing/ext/gdal/include/cpl_list.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_list.h 33671 2016-03-07 18:39:06Z goatbar $
*
* Name: cpl_list.h
* Project: CPL - Common Portability Library
modules/globebrowsing/ext/gdal/include/cpl_minixml.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_minixml.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Project: CPL - Common Portability Library
* Purpose: Declarations for MiniXML Handler.
modules/globebrowsing/ext/gdal/include/cpl_minizip_zip.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_minizip_zip.h 31826 2015-11-29 15:39:57Z goatbar $
*
* Project: CPL - Common Portability Library
* Author: Frank Warmerdam, warmerdam@pobox.com
modules/globebrowsing/ext/gdal/include/cpl_multiproc.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_multiproc.h 33817 2016-03-30 17:35:37Z rouault $
*
* Project: CPL - Common Portability Library
* Purpose: CPL Multi-Threading, and process handling portability functions.
modules/globebrowsing/ext/gdal/include/cpl_odbc.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_odbc.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Project: OGR ODBC Driver
* Purpose: Declarations for ODBC Access Cover API.
modules/globebrowsing/ext/gdal/include/cpl_port.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_port.h 33907 2016-04-07 00:37:06Z goatbar $
*
* Project: CPL - Common Portability Library
* Author: Frank Warmerdam, warmerdam@pobox.com
modules/globebrowsing/ext/gdal/include/cpl_quad_tree.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_quad_tree.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Project: CPL - Common Portability Library
* Purpose: Implementation of quadtree building and searching functions.
modules/globebrowsing/ext/gdal/include/cpl_sha256.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id$ */
/* $Id: cpl_sha256.h 31777 2015-11-26 14:14:41Z rouault $ */
/* The MIT License
modules/globebrowsing/ext/gdal/include/cpl_spawn.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_spawn.h 31287 2015-11-01 18:29:27Z goatbar $
*
* Project: CPL - Common Portability Library
* Purpose: Implement CPLSystem().
modules/globebrowsing/ext/gdal/include/cpl_string.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_string.h 33788 2016-03-26 00:45:58Z goatbar $
*
* Name: cpl_string.h
* Project: CPL - Common Portability Library
modules/globebrowsing/ext/gdal/include/cpl_time.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_time.h 33783 2016-03-24 13:45:22Z goatbar $
*
* Name: cpl_time.h
* Project: CPL - Common Portability Library
modules/globebrowsing/ext/gdal/include/cpl_virtualmem.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_virtualmem.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Name: cpl_virtualmem.h
* Project: CPL - Common Portability Library
modules/globebrowsing/ext/gdal/include/cpl_vsi.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_vsi.h 33758 2016-03-21 09:06:22Z rouault $
*
* Project: CPL - Common Portability Library
* Author: Frank Warmerdam, warmerdam@pobox.com
modules/globebrowsing/ext/gdal/include/cpl_vsi_error.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_vsi_error.h 33758 2016-03-21 09:06:22Z rouault $
*
* Project: VSI Virtual File System
* Purpose: Implement an error system for reporting file system errors.
modules/globebrowsing/ext/gdal/include/cpl_vsi_virtual.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_vsi_virtual.h 33759 2016-03-21 09:33:06Z rouault $
*
* Project: VSI Virtual File System
* Purpose: Declarations for classes related to the virtual filesystem.
modules/globebrowsing/ext/gdal/include/cpl_vsil_curl_priv.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cpl_vsil_curl_priv.h 31749 2015-11-25 02:32:55Z goatbar $
*
* Project: CPL - Common Portability Library
* Purpose: Private API for VSICurl
modules/globebrowsing/ext/gdal/include/cpl_worker_thread_pool.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************************************************************
* $Id$
* $Id: cpl_worker_thread_pool.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Project: CPL - Common Portability Library
* Purpose: CPL worker thread pool
modules/globebrowsing/ext/gdal/include/cplkeywordparser.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: cplkeywordparser.h 33666 2016-03-07 05:21:07Z goatbar $
*
* Project: Common Portability Library
* Purpose: Implementation of CPLKeywordParser - a class for parsing
modules/globebrowsing/ext/gdal/include/gdal.h
+3 -3
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal.h 33852 2016-04-01 23:27:53Z goatbar $
*
* Project: GDAL Core
* Purpose: GDAL Core C/Public declarations.
@@ -1102,9 +1102,9 @@ CPLVirtualMem CPL_DLL* GDALGetVirtualMemAuto( GDALRasterBandH hBand,
typedef enum
{
/*! TileAndTransform Interleaved by Pixel: tile (0,0) with internal band interleaved by pixel organization, tile (1, 0), ... */
/*! Tile Interleaved by Pixel: tile (0,0) with internal band interleaved by pixel organization, tile (1, 0), ... */
GTO_TIP,
/*! Band Interleaved by TileAndTransform : tile (0,0) of first band, tile (0,0) of second band, ... tile (1,0) of first band, tile (1,0) of second band, ... */
/*! Band Interleaved by Tile : tile (0,0) of first band, tile (0,0) of second band, ... tile (1,0) of first band, tile (1,0) of second band, ... */
GTO_BIT,
/*! Band SeQuential : all the tiles of first band, all the tiles of following band... */
GTO_BSQ
modules/globebrowsing/ext/gdal/include/gdal_alg.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_alg.h 33715 2016-03-13 08:52:06Z goatbar $
*
* Project: GDAL Image Processing Algorithms
* Purpose: Prototypes, and definitions for various GDAL based algorithms.
modules/globebrowsing/ext/gdal/include/gdal_alg_priv.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_alg_priv.h 33757 2016-03-20 20:22:33Z goatbar $
*
* Project: GDAL Image Processing Algorithms
* Purpose: Prototypes and definitions for various GDAL based algorithms:
modules/globebrowsing/ext/gdal/include/gdal_csv.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_csv.h 33844 2016-04-01 08:42:13Z rouault $
*
* Project: Common Portability Library
* Purpose: Functions for reading and scanning CSV (comma separated,
modules/globebrowsing/ext/gdal/include/gdal_frmts.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_frmts.h 33351 2016-02-03 15:52:38Z goatbar $
*
* Project: GDAL
* Purpose: Prototypes for all format specific driver initialization.
modules/globebrowsing/ext/gdal/include/gdal_mdreader.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_mdreader.h 33694 2016-03-10 17:54:30Z goatbar $
*
* Project: GDAL Core
* Purpose: Read metadata (mainly the remote sensing imagery) from files of
modules/globebrowsing/ext/gdal/include/gdal_pam.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_pam.h 33694 2016-03-10 17:54:30Z goatbar $
*
* Project: GDAL Core
* Purpose: Declaration for Peristable Auxiliary Metadata classes.
modules/globebrowsing/ext/gdal/include/gdal_priv.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_priv.h 33808 2016-03-29 21:15:28Z goatbar $
*
* Name: gdal_priv.h
* Project: GDAL Core
modules/globebrowsing/ext/gdal/include/gdal_proxy.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_proxy.h 33694 2016-03-10 17:54:30Z goatbar $
*
* Project: GDAL Core
* Purpose: GDAL Core C++/Private declarations
modules/globebrowsing/ext/gdal/include/gdal_rat.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_rat.h 33773 2016-03-23 18:39:47Z goatbar $
*
* Project: GDAL Core
* Purpose: GDALRasterAttributeTable class declarations.
modules/globebrowsing/ext/gdal/include/gdal_version.h
+2 -2
View File
@@ -22,8 +22,8 @@
#endif
#ifndef GDAL_RELEASE_DATE
# define GDAL_RELEASE_DATE 20160401
# define GDAL_RELEASE_DATE 20160425
#endif
#ifndef GDAL_RELEASE_NAME
# define GDAL_RELEASE_NAME "2.1.0beta1"
# define GDAL_RELEASE_NAME "2.1.0"
#endif
modules/globebrowsing/ext/gdal/include/gdal_vrt.h
+14 -14
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdal_vrt.h 33720 2016-03-15 00:39:53Z goatbar $
*
* Project: Virtual GDAL Datasets
* Purpose: C/Public declarations of virtual GDAL dataset objects.
@@ -37,9 +37,9 @@
*/
#include "gdal.h"
#include "cpl_port.h"
#include "cpl_error.h"
#include "cpl_minixml.h"
#include "cpl_port.h"
#define VRT_NODATA_UNSET -1234.56
@@ -54,22 +54,22 @@ typedef CPLErr
/* -------------------------------------------------------------------- */
/* Define handle types related to various VRT dataset classes. */
/* -------------------------------------------------------------------- */
typedef void *VRTAveragedSourceH;
typedef void *VRTAverageFilteredSourceH;
typedef void *VRTComplexSourceH;
typedef void *VRTDatasetH;
typedef void *VRTDerivedRasterBandH;
typedef void *VRTDriverH;
typedef void *VRTFilteredSourceH;
typedef void *VRTFuncSourceH;
typedef void *VRTKernelFilteredSourceH;
typedef void *VRTRasterBandH;
typedef void *VRTRawRasterBandH;
typedef void *VRTSimpleSourceH;
typedef void *VRTSourceH;
typedef void *VRTSourcedRasterBandH;
typedef void *VRTSimpleSourceH;
typedef void *VRTAveragedSourceH;
typedef void *VRTComplexSourceH;
typedef void *VRTFilteredSourceH;
typedef void *VRTKernelFilteredSourceH;
typedef void *VRTAverageFilteredSourceH;
typedef void *VRTFuncSourceH;
typedef void *VRTDatasetH;
typedef void *VRTWarpedDatasetH;
typedef void *VRTRasterBandH;
typedef void *VRTSourcedRasterBandH;
typedef void *VRTWarpedRasterBandH;
typedef void *VRTDerivedRasterBandH;
typedef void *VRTRawRasterBandH;
/* ==================================================================== */
/* VRTDataset class. */
modules/globebrowsing/ext/gdal/include/gdalexif.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdalexif.h 33175 2016-01-27 00:37:49Z goatbar $
*
* Project: JPEG JFIF Driver
* Purpose: Implement GDAL JPEG Support based on IJG libjpeg.
modules/globebrowsing/ext/gdal/include/gdalgeorefpamdataset.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdalgeorefpamdataset.h 33794 2016-03-26 13:19:07Z goatbar $
*
* Project: GDAL
* Purpose: GDALPamDataset with internal storage for georeferencing, with
modules/globebrowsing/ext/gdal/include/gdalgrid.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdalgrid.h 29541 2015-07-20 14:03:42Z rouault $
*
* Project: GDAL Gridding API.
* Purpose: Prototypes, and definitions for of GDAL scattered data gridder.
modules/globebrowsing/ext/gdal/include/gdalgrid_priv.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdalgrid_priv.h 33715 2016-03-13 08:52:06Z goatbar $
*
* Project: GDAL Gridding API.
* Purpose: Prototypes, and definitions for of GDAL scattered data gridder.
modules/globebrowsing/ext/gdal/include/gdaljp2abstractdataset.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdaljp2abstractdataset.h 33794 2016-03-26 13:19:07Z goatbar $
*
* Project: GDAL
* Purpose: GDALGeorefPamDataset with helper to read georeferencing and other
modules/globebrowsing/ext/gdal/include/gdaljp2metadata.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdaljp2metadata.h 33694 2016-03-10 17:54:30Z goatbar $
*
* Project: GDAL
* Purpose: JP2 Box Reader (and GMLJP2 Interpreter)
modules/globebrowsing/ext/gdal/include/gdaljp2metadatagenerator.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdaljp2metadatagenerator.h 33694 2016-03-10 17:54:30Z goatbar $
*
* Project: GDAL
* Purpose: GDALJP2Metadata: metadata generator
modules/globebrowsing/ext/gdal/include/gdalpansharpen.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdalpansharpen.h 33715 2016-03-13 08:52:06Z goatbar $
*
* Project: GDAL Pansharpening module
* Purpose: Prototypes, and definitions for pansharpening related work.
modules/globebrowsing/ext/gdal/include/gdalsse_priv.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdalsse_priv.h 32173 2015-12-14 00:04:53Z goatbar $
*
* Project: GDAL
* Purpose: SSE2 helper
modules/globebrowsing/ext/gdal/include/gdalwarper.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdalwarper.h 33717 2016-03-14 06:29:14Z goatbar $
*
* Project: GDAL High Performance Warper
* Purpose: Prototypes, and definitions for warping related work.
modules/globebrowsing/ext/gdal/include/gdalwarpkernel_opencl.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: gdalwarpkernel_opencl.h 33715 2016-03-13 08:52:06Z goatbar $
*
* Project: OpenCL Image Reprojector
* Purpose: Implementation of the GDALWarpKernel reprojector in OpenCL.
modules/globebrowsing/ext/gdal/include/memdataset.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: memdataset.h 33838 2016-03-31 20:42:32Z goatbar $
*
* Project: Memory Array Translator
* Purpose: Declaration of MEMDataset, and MEMRasterBand.
modules/globebrowsing/ext/gdal/include/ogr_api.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_api.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: C API for OGR Geometry, Feature, Layers, DataSource and drivers.
modules/globebrowsing/ext/gdal/include/ogr_attrind.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_attrind.h 32177 2015-12-14 07:25:30Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Classes related to generic implementation of attribute indexing.
modules/globebrowsing/ext/gdal/include/ogr_core.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_core.h 33680 2016-03-08 09:59:03Z rouault $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Define some core portability services for cross-platform OGR code.
modules/globebrowsing/ext/gdal/include/ogr_expat.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_expat.h 27044 2014-03-16 23:41:27Z rouault $
*
* Project: OGR
* Purpose: Convenience function for parsing with Expat library
modules/globebrowsing/ext/gdal/include/ogr_feature.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_feature.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Class for representing a whole feature, and layer schemas.
modules/globebrowsing/ext/gdal/include/ogr_featurestyle.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_featurestyle.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Define of Feature Representation
modules/globebrowsing/ext/gdal/include/ogr_geocoding.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_geocoding.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Client of geocoding service.
modules/globebrowsing/ext/gdal/include/ogr_geometry.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_geometry.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Classes for manipulating simple features that is not specific
modules/globebrowsing/ext/gdal/include/ogr_geos.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_geos.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Definitions related to support for use of GEOS in OGR.
modules/globebrowsing/ext/gdal/include/ogr_p.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_p.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Some private helper functions and stuff for OGR implementation.
modules/globebrowsing/ext/gdal/include/ogr_spatialref.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_spatialref.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Classes for manipulating spatial reference systems in a
modules/globebrowsing/ext/gdal/include/ogr_srs_api.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogr_srs_api.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: C API and constant declarations for OGR Spatial References.
modules/globebrowsing/ext/gdal/include/ograpispy.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ograpispy.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: OGR C API "Spy"
modules/globebrowsing/ext/gdal/include/ogrgeomediageometry.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogrgeomediageometry.h 31777 2015-11-26 14:14:41Z rouault $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Implements decoder of geomedia geometry blobs
modules/globebrowsing/ext/gdal/include/ogrpgeogeometry.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogrpgeogeometry.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Implements decoder of shapebin geometry for PGeo
modules/globebrowsing/ext/gdal/include/ogrsf_frmts.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: ogrsf_frmts.h 33631 2016-03-04 06:28:09Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Classes related to format registration, and file opening.
modules/globebrowsing/ext/gdal/include/osr_cs_wkt.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: osr_cs_wkt.h 31777 2015-11-26 14:14:41Z rouault $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: CS WKT parser
modules/globebrowsing/ext/gdal/include/rawdataset.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: rawdataset.h 33673 2016-03-07 20:40:54Z goatbar $
*
* Project: Raw Translator
* Purpose: Implementation of RawDataset class. Intended to be subclassed
modules/globebrowsing/ext/gdal/include/thinplatespline.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: thinplatespline.h 33715 2016-03-13 08:52:06Z goatbar $
*
* Project: GDAL Warp API
* Purpose: Declarations for 2D Thin Plate Spline transformer.
modules/globebrowsing/ext/gdal/include/vrtdataset.h
+80 -99
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id$
* $Id: vrtdataset.h 33794 2016-03-26 13:19:07Z goatbar $
*
* Project: Virtual GDAL Datasets
* Purpose: Declaration of virtual gdal dataset classes.
@@ -66,7 +66,7 @@ public:
if( poBand == NULL )
/* do nothing */;
else if( poBand->GetDataset()->GetShared() )
GDALClose( /* (GDALDatasetH) */ poBand->GetDataset() );
GDALClose( (GDALDatasetH) poBand->GetDataset() );
else
poBand->GetDataset()->Dereference();
}
@@ -90,20 +90,17 @@ public:
virtual double GetMinimum( int nXSize, int nYSize, int *pbSuccess ) = 0;
virtual double GetMaximum( int nXSize, int nYSize, int *pbSuccess ) = 0;
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK,
double* adfMinMax ) = 0;
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK, double* adfMinMax ) = 0;
virtual CPLErr ComputeStatistics( int nXSize, int nYSize,
int bApproxOK,
double *pdfMin, double *pdfMax,
double *pdfMean, double *pdfStdDev,
GDALProgressFunc pfnProgress,
void *pProgressData ) = 0;
GDALProgressFunc pfnProgress, void *pProgressData ) = 0;
virtual CPLErr GetHistogram( int nXSize, int nYSize,
double dfMin, double dfMax,
int nBuckets, GUIntBig * panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc pfnProgress,
void *pProgressData ) = 0;
GDALProgressFunc pfnProgress, void *pProgressData ) = 0;
virtual CPLErr XMLInit( CPLXMLNode *psTree, const char * ) = 0;
virtual CPLXMLNode *SerializeToXML( const char *pszVRTPath ) = 0;
@@ -134,7 +131,7 @@ class CPL_DLL VRTDataset : public GDALDataset
int m_bGeoTransformSet;
double m_adfGeoTransform[6];
int m_nGCPCount;
int m_nGCPCount;
GDAL_GCP *m_pasGCPList;
char *m_pszGCPProjection;
@@ -210,8 +207,7 @@ class CPL_DLL VRTDataset : public GDALDataset
static int Identify( GDALOpenInfo * );
static GDALDataset *Open( GDALOpenInfo * );
static GDALDataset *OpenXML( const char *, const char * = NULL,
GDALAccess eAccess = GA_ReadOnly );
static GDALDataset *OpenXML( const char *, const char * = NULL, GDALAccess eAccess = GA_ReadOnly );
static GDALDataset *Create( const char * pszName,
int nXSize, int nYSize, int nBands,
GDALDataType eType, char ** papszOptions );
@@ -290,8 +286,7 @@ class VRTPansharpenedDataset : public VRTDataset
GDALPansharpenOperation* m_poPansharpener;
VRTPansharpenedDataset* m_poMainDataset;
std::vector<VRTPansharpenedDataset*> m_apoOverviewDatasets;
// Map from absolute to relative.
std::map<CPLString,CPLString> m_oMapToRelativeFilenames;
std::map<CPLString,CPLString> m_oMapToRelativeFilenames; // map from absolute to relative
int m_bLoadingOtherBands;
@@ -312,15 +307,15 @@ class VRTPansharpenedDataset : public VRTDataset
public:
VRTPansharpenedDataset( int nXSize, int nYSize );
virtual ~VRTPansharpenedDataset();
~VRTPansharpenedDataset();
virtual CPLErr XMLInit( CPLXMLNode *, const char * );
virtual CPLXMLNode * SerializeToXML( const char *pszVRTPath );
CPLErr XMLInit( CPLXMLNode *psTree, const char *pszVRTPath,
GDALRasterBandH hPanchroBandIn,
int nInputSpectralBandsIn,
GDALRasterBandH* pahInputSpectralBandsIn );
GDALRasterBandH hPanchroBandIn,
int nInputSpectralBandsIn,
GDALRasterBandH* pahInputSpectralBandsIn );
virtual CPLErr AddBand( GDALDataType eType,
char **papszOptions=NULL );
@@ -354,8 +349,7 @@ class CPL_DLL VRTRasterBand : public GDALRasterBand
int m_bIsMaskBand;
int m_bNoDataValueSet;
// If set to true, will not report the existence of nodata.
int m_bHideNoDataValue;
int m_bHideNoDataValue; // If set to true, will not report the existence of nodata
double m_dfNoDataValue;
GDALColorTable *m_poColorTable;
@@ -413,9 +407,9 @@ class CPL_DLL VRTRasterBand : public GDALRasterBand
virtual GDALRasterBand *GetOverview(int);
virtual CPLErr GetHistogram( double dfMin, double dfMax,
int nBuckets, GUIntBig * panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc, void *pProgressData );
int nBuckets, GUIntBig * panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc, void *pProgressData );
virtual CPLErr GetDefaultHistogram( double *pdfMin, double *pdfMax,
int *pnBuckets, GUIntBig ** ppanHistogram,
@@ -462,7 +456,9 @@ class CPL_DLL VRTSourcedRasterBand : public VRTRasterBand
CPLString m_osLastLocationInfo;
char **m_papszSourceList;
bool CanUseSourcesMinMaxImplementations();
void Initialize( int nXSize, int nYSize );
int CanUseSourcesMinMaxImplementations();
public:
int nSources;
@@ -501,13 +497,11 @@ class CPL_DLL VRTSourcedRasterBand : public VRTRasterBand
virtual CPLErr ComputeStatistics( int bApproxOK,
double *pdfMin, double *pdfMax,
double *pdfMean, double *pdfStdDev,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
virtual CPLErr GetHistogram( double dfMin, double dfMax,
int nBuckets, GUIntBig * panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
CPLErr AddSource( VRTSource * );
CPLErr AddSimpleSource( GDALRasterBand *poSrcBand,
@@ -529,22 +523,20 @@ class CPL_DLL VRTSourcedRasterBand : public VRTRasterBand
CPLErr AddMaskBandSource( GDALRasterBand *poSrcBand,
double dfSrcXOff=-1, double dfSrcYOff=-1,
double dfSrcXSize=-1,
double dfSrcYSize=-1,
double dfSrcXSize=-1, double dfSrcYSize=-1,
double dfDstXOff=-1, double dfDstYOff=-1,
double dfDstXSize=-1,
double dfDstYSize=-1 );
double dfDstXSize=-1, double dfDstYSize=-1 );
CPLErr AddFuncSource( VRTImageReadFunc pfnReadFunc, void *hCBData,
double dfNoDataValue = VRT_NODATA_UNSET );
void ConfigureSource(VRTSimpleSource *poSimpleSource,
GDALRasterBand *poSrcBand,
int bAddAsMaskBand,
double dfSrcXOff, double dfSrcYOff,
double dfSrcXSize, double dfSrcYSize,
double dfDstXOff, double dfDstYOff,
double dfDstXSize, double dfDstYSize );
GDALRasterBand *poSrcBand,
int bAddAsMaskBand,
double dfSrcXOff, double dfSrcYOff,
double dfSrcXSize, double dfSrcYSize,
double dfDstXOff, double dfDstYOff,
double dfDstXSize, double dfDstYSize);
virtual CPLErr IReadBlock( int, int, void * );
@@ -564,7 +556,7 @@ class CPL_DLL VRTWarpedRasterBand : public VRTRasterBand
{
public:
VRTWarpedRasterBand( GDALDataset *poDS, int nBand,
GDALDataType eType = GDT_Unknown );
GDALDataType eType = GDT_Unknown );
virtual ~VRTWarpedRasterBand();
virtual CPLErr XMLInit( CPLXMLNode *, const char * );
@@ -585,9 +577,8 @@ class VRTPansharpenedRasterBand : public VRTRasterBand
int m_nIndexAsPansharpenedBand;
public:
VRTPansharpenedRasterBand(
GDALDataset *poDS, int nBand,
GDALDataType eDataType = GDT_Unknown );
VRTPansharpenedRasterBand( GDALDataset *poDS, int nBand,
GDALDataType eDataType = GDT_Unknown );
virtual ~VRTPansharpenedRasterBand();
virtual CPLErr XMLInit( CPLXMLNode *, const char * );
@@ -607,10 +598,8 @@ class VRTPansharpenedRasterBand : public VRTRasterBand
virtual int IsPansharpenRasterBand() { return TRUE; }
void SetIndexAsPansharpenedBand( int nIdx )
{ m_nIndexAsPansharpenedBand = nIdx; }
int GetIndexAsPansharpenedBand() const
{ return m_nIndexAsPansharpenedBand; }
void SetIndexAsPansharpenedBand(int nIdx) { m_nIndexAsPansharpenedBand = nIdx; }
int GetIndexAsPansharpenedBand() const { return m_nIndexAsPansharpenedBand; }
};
/************************************************************************/
@@ -619,13 +608,14 @@ class VRTPansharpenedRasterBand : public VRTRasterBand
class CPL_DLL VRTDerivedRasterBand : public VRTSourcedRasterBand
{
public:
char *pszFuncName;
GDALDataType eSourceTransferType;
VRTDerivedRasterBand( GDALDataset *poDS, int nBand );
VRTDerivedRasterBand( GDALDataset *poDS, int nBand,
GDALDataType eType, int nXSize, int nYSize );
VRTDerivedRasterBand(GDALDataset *poDS, int nBand);
VRTDerivedRasterBand(GDALDataset *poDS, int nBand,
GDALDataType eType, int nXSize, int nYSize);
virtual ~VRTDerivedRasterBand();
virtual CPLErr IRasterIO( GDALRWFlag, int, int, int, int,
@@ -633,12 +623,12 @@ class CPL_DLL VRTDerivedRasterBand : public VRTSourcedRasterBand
GSpacing nPixelSpace, GSpacing nLineSpace,
GDALRasterIOExtraArg* psExtraArg );
static CPLErr AddPixelFunction( const char *pszFuncName,
GDALDerivedPixelFunc pfnPixelFunc );
static GDALDerivedPixelFunc GetPixelFunction( const char *pszFuncName );
static CPLErr AddPixelFunction
(const char *pszFuncName, GDALDerivedPixelFunc pfnPixelFunc);
static GDALDerivedPixelFunc GetPixelFunction(const char *pszFuncName);
void SetPixelFunctionName( const char *pszFuncName );
void SetSourceTransferType( GDALDataType eDataType );
void SetPixelFunctionName(const char *pszFuncName);
void SetSourceTransferType(GDALDataType eDataType);
virtual CPLErr XMLInit( CPLXMLNode *, const char * );
virtual CPLXMLNode * SerializeToXML( const char *pszVRTPath );
@@ -683,8 +673,8 @@ class CPL_DLL VRTRawRasterBand : public VRTRasterBand
void ClearRawLink();
virtual void GetFileList( char*** ppapszFileList, int *pnSize,
int *pnMaxSize, CPLHashSet* hSetFiles );
virtual void GetFileList(char*** ppapszFileList, int *pnSize,
int *pnMaxSize, CPLHashSet* hSetFiles);
};
/************************************************************************/
@@ -693,9 +683,11 @@ class CPL_DLL VRTRawRasterBand : public VRTRasterBand
class VRTDriver : public GDALDriver
{
void *m_pDeserializerData;
public:
VRTDriver();
virtual ~VRTDriver();
~VRTDriver();
char **papszSourceParsers;
@@ -718,8 +710,8 @@ class CPL_DLL VRTSimpleSource : public VRTSource
protected:
GDALRasterBand *m_poRasterBand;
// When poRasterBand is a mask band, poMaskBandMainBand is the band
// from which the mask band is taken.
/* when poRasterBand is a mask band, poMaskBandMainBand is the band */
/* from which the mask band is taken */
GDALRasterBand *m_poMaskBandMainBand;
double m_dfSrcXOff;
@@ -745,8 +737,8 @@ protected:
public:
VRTSimpleSource();
VRTSimpleSource( const VRTSimpleSource* poSrcSource,
double dfXDstRatio, double dfYDstRatio );
VRTSimpleSource(const VRTSimpleSource* poSrcSource,
double dfXDstRatio, double dfYDstRatio);
virtual ~VRTSimpleSource();
virtual CPLErr XMLInit( CPLXMLNode *psTree, const char * );
@@ -774,34 +766,31 @@ public:
virtual double GetMinimum( int nXSize, int nYSize, int *pbSuccess );
virtual double GetMaximum( int nXSize, int nYSize, int *pbSuccess );
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK,
double* adfMinMax );
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK, double* adfMinMax );
virtual CPLErr ComputeStatistics( int nXSize, int nYSize,
int bApproxOK,
double *pdfMin, double *pdfMax,
double *pdfMean, double *pdfStdDev,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
virtual CPLErr GetHistogram( int nXSize, int nYSize,
double dfMin, double dfMax,
int nBuckets, GUIntBig * panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
void DstToSrc( double dfX, double dfY,
double &dfXOut, double &dfYOut );
void SrcToDst( double dfX, double dfY,
double &dfXOut, double &dfYOut );
virtual void GetFileList( char*** ppapszFileList, int *pnSize,
int *pnMaxSize, CPLHashSet* hSetFiles );
virtual void GetFileList(char*** ppapszFileList, int *pnSize,
int *pnMaxSize, CPLHashSet* hSetFiles);
virtual int IsSimpleSource() { return TRUE; }
virtual const char* GetType() { return "SimpleSource"; }
GDALRasterBand* GetBand();
int IsSameExceptBandNumber( VRTSimpleSource* poOtherSource );
int IsSameExceptBandNumber(VRTSimpleSource* poOtherSource);
CPLErr DatasetRasterIO(
int nXOff, int nYOff, int nXSize, int nYSize,
void * pData, int nBufXSize, int nBufYSize,
@@ -809,11 +798,11 @@ public:
int nBandCount, int *panBandMap,
GSpacing nPixelSpace, GSpacing nLineSpace,
GSpacing nBandSpace,
GDALRasterIOExtraArg* psExtraArg );
GDALRasterIOExtraArg* psExtraArg);
void UnsetPreservedRelativeFilenames();
void SetMaxValue( int nVal ) { m_nMaxValue = nVal; }
void SetMaxValue(int nVal) { m_nMaxValue = nVal; }
};
/************************************************************************/
@@ -832,20 +821,17 @@ public:
virtual double GetMinimum( int nXSize, int nYSize, int *pbSuccess );
virtual double GetMaximum( int nXSize, int nYSize, int *pbSuccess );
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK,
double* adfMinMax );
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK, double* adfMinMax );
virtual CPLErr ComputeStatistics( int nXSize, int nYSize,
int bApproxOK,
double *pdfMin, double *pdfMax,
double *pdfMean, double *pdfStdDev,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
virtual CPLErr GetHistogram( int nXSize, int nYSize,
double dfMin, double dfMax,
int nBuckets, GUIntBig * panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
virtual CPLXMLNode *SerializeToXML( const char *pszVRTPath );
virtual const char* GetType() { return "AveragedSource"; }
@@ -866,10 +852,10 @@ class CPL_DLL VRTComplexSource : public VRTSimpleSource
{
protected:
VRTComplexSourceScaling m_eScalingType;
double m_dfScaleOff; // For linear scaling.
double m_dfScaleRatio; // For linear scaling.
double m_dfScaleOff; /* for linear scaling */
double m_dfScaleRatio; /* for linear scaling */
// For non-linear scaling with a power function.
/* For non-linear scaling with a power function. */
int m_bSrcMinMaxDefined;
double m_dfSrcMin;
double m_dfSrcMax;
@@ -900,20 +886,17 @@ public:
virtual double GetMinimum( int nXSize, int nYSize, int *pbSuccess );
virtual double GetMaximum( int nXSize, int nYSize, int *pbSuccess );
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK,
double* adfMinMax );
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK, double* adfMinMax );
virtual CPLErr ComputeStatistics( int nXSize, int nYSize,
int bApproxOK,
double *pdfMin, double *pdfMax,
double *pdfMean, double *pdfStdDev,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
virtual CPLErr GetHistogram( int nXSize, int nYSize,
double dfMin, double dfMax,
int nBuckets, GUIntBig * panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
virtual CPLXMLNode *SerializeToXML( const char *pszVRTPath );
virtual CPLErr XMLInit( CPLXMLNode *, const char * );
@@ -921,17 +904,18 @@ public:
double LookupValue( double dfInput );
void SetLinearScaling( double dfOffset, double dfScale );
void SetPowerScaling( double dfExponent,
double dfSrcMin,
double dfSrcMax,
double dfDstMin,
double dfDstMax );
void SetColorTableComponent( int nComponent );
void SetLinearScaling(double dfOffset, double dfScale);
void SetPowerScaling(double dfExponent,
double dfSrcMin,
double dfSrcMax,
double dfDstMin,
double dfDstMax);
void SetColorTableComponent(int nComponent);
double *m_padfLUTInputs;
double *m_padfLUTOutputs;
int m_nLUTItemCount;
};
/************************************************************************/
@@ -1027,20 +1011,17 @@ public:
virtual double GetMinimum( int nXSize, int nYSize, int *pbSuccess );
virtual double GetMaximum( int nXSize, int nYSize, int *pbSuccess );
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK,
double* adfMinMax );
virtual CPLErr ComputeRasterMinMax( int nXSize, int nYSize, int bApproxOK, double* adfMinMax );
virtual CPLErr ComputeStatistics( int nXSize, int nYSize,
int bApproxOK,
double *pdfMin, double *pdfMax,
double *pdfMean, double *pdfStdDev,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
virtual CPLErr GetHistogram( int nXSize, int nYSize,
double dfMin, double dfMax,
int nBuckets, GUIntBig * panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc pfnProgress,
void *pProgressData );
GDALProgressFunc pfnProgress, void *pProgressData );
VRTImageReadFunc pfnReadFunc;
void *pCBData;
modules/globebrowsing/ext/gdal/lib/gdal201.dll
BIN
View File
Binary file not shown.
modules/globebrowsing/ext/gdal/lib/gdal_i.lib
BIN
View File
Binary file not shown.
modules/globebrowsing/include.cmake
-1
View File
@@ -1 +0,0 @@
set(DEFAULT_MODULE ON)
modules/globebrowsing/tile/TileProviderManager.cpp
+3 -3
View File
@@ -154,8 +154,8 @@ namespace openspace {
}
void TileProviderManager::update() {
for each (auto layerCategory in _layerCategories) {
for each (auto tileProviderWithName in layerCategory) {
for (auto layerCategory : _layerCategories) {
for (auto tileProviderWithName : layerCategory) {
if (tileProviderWithName.isActive) {
tileProviderWithName.tileProvider->update();
}
@@ -168,7 +168,7 @@ namespace openspace {
LayeredTextures::TextureCategory textureCategory)
{
std::vector<std::shared_ptr<TileProvider> > tileProviders;
for each (auto tileProviderWithName in _layerCategories[textureCategory]) {
for (auto tileProviderWithName : _layerCategories[textureCategory]) {
if (tileProviderWithName.isActive) {
tileProviders.push_back(tileProviderWithName.tileProvider);
}