Commit dbe26e96 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

further gcc fixes

parent 400c883d
...@@ -47,7 +47,8 @@ namespace campvis { ...@@ -47,7 +47,8 @@ namespace campvis {
} }
bool TextFileParser::TokenGroup::hasKey(const std::string& key) const { bool TextFileParser::TokenGroup::hasKey(const std::string& key) const {
return (_tokens.find(key) != _tokens.end()); auto it = (_caseSensitiveKeys ? _tokens.find(key) : _tokens.find(StringUtils::lowercase(key)));
return (it != _tokens.end());
} }
const std::string& TextFileParser::TokenGroup::getString(const std::string& key) const throw (cgt::Exception) { const std::string& TextFileParser::TokenGroup::getString(const std::string& key) const throw (cgt::Exception) {
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "core/properties/stringproperty.h" #include "core/properties/stringproperty.h"
#include "modules/modulesapi.h" #include "modules/modulesapi.h"
#include "modules/io/processors/abstractimagereader.h"
#ifdef CAMPVIS_HAS_MODULE_DEVIL #ifdef CAMPVIS_HAS_MODULE_DEVIL
#include "modules/devil/processors/devilimagereader.h" #include "modules/devil/processors/devilimagereader.h"
......
...@@ -63,7 +63,7 @@ namespace campvis { ...@@ -63,7 +63,7 @@ namespace campvis {
throw cgt::FileException("Could not open file.", p_url.getValue()); throw cgt::FileException("Could not open file.", p_url.getValue());
// start parsing // start parsing
TextFileParser tfp(file, true, "="); TextFileParser tfp(file, false, "=");
tfp.parse<TextFileParser::ItemSeparatorLines>(); tfp.parse<TextFileParser::ItemSeparatorLines>();
file.close(); file.close();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment