From 65179d49e271d7f0518671a2a43dd4e67f4e2173 Mon Sep 17 00:00:00 2001 From: Michael Nilsson Date: Wed, 6 Apr 2016 15:49:14 -0400 Subject: [PATCH] update ghoul reference and iswamanager remove check for '.jpeg' extension --- ext/ghoul | 2 +- modules/iswa/util/iswamanager.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ext/ghoul b/ext/ghoul index 9657d0e147..d52329363b 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 9657d0e14717400d08170bbc298f55db237fe339 +Subproject commit d52329363b92c9b4e00ea2ecafedd6e7c3be1946 diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index 4fbdc553f5..b48de974d9 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -154,10 +154,6 @@ namespace openspace{ std::getline(ss, token, '/'); std::getline(ss, token); - if(token == "jpeg"){ - token = "jpg"; - } - std::string ext = "."+token; extFuture->extension = ext; extFuture->isFinished = true;