From c3bd0bf4ee148e1c993a4a75934e69242501bd83 Mon Sep 17 00:00:00 2001
From: Erik Broberg <Erik Broberg>
Date: Sun, 5 Jun 2016 18:55:16 -0400
Subject: [PATCH] merge

---
 modules/globebrowsing/globes/renderableglobe.cpp   | 2 +-
 modules/globebrowsing/other/temporaltileprovider.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp
index a705b393c1..824e5303c6 100644
--- a/modules/globebrowsing/globes/renderableglobe.cpp
+++ b/modules/globebrowsing/globes/renderableglobe.cpp
@@ -114,7 +114,7 @@ namespace openspace {
         // manually add a temporal tile provider for testing
         std::string filename = "map_service_configs/VIIRS_SNPP_CorrectedReflectance_TrueColor_temporal.xml";
         TileProviderInitData initData;
-        initData.minimumPixelSize = minimumTextureSide;
+        initData.minimumPixelSize = minimumTextureSize;
         initData.threads = 1;
         initData.cacheSize = 50;
         initData.framesUntilRequestQueueFlush = 60;
diff --git a/modules/globebrowsing/other/temporaltileprovider.h b/modules/globebrowsing/other/temporaltileprovider.h
index 6992c5c0ba..ace470aa33 100644
--- a/modules/globebrowsing/other/temporaltileprovider.h
+++ b/modules/globebrowsing/other/temporaltileprovider.h
@@ -75,7 +75,6 @@ namespace openspace {
 
 
     struct TimeIdProviderFactory {
-        ~TimeIdProviderFactory();
         static TimeFormat* getProvider(const std::string& format);
         static void init();