flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 21:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing of X-Plane ACF file headers

Browse Source 
So far the 'version' literal was compared case sensitive. So we did not
parse ACF files which had a capitalized literal. Instead the comparison
should be case insensitive. To do that we convert all strings to lower
case before comparing.

ref T378
This commit is contained in:
Roland Winklmeier
2018-10-18 14:59:57 +02:00
committed by Klaus Basan
parent 92790f1330
commit 1fecf65a40
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackmisc/simulation/xplane/qtfreeutils.h
View File

@@ -15,6 +15,8 @@
#include <string>
#include <fstream>
#include <vector>
#include <cctype>
#include <algorithm>
// Strict header only X-Plane model parser utils shared between BlackMisc and XSwiftBus.
// Header only is necessary to no require XSwiftBus to link against BlackMisc.
@@ -118,6 +120,15 @@ namespace BlackMisc
return getDirName(acfFile) + ' ' + getBaseName(acfFile);
}
std::string toLower(std::string s)
{
std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c)
{
return std::tolower(c);
});
return s;
}
//! Extract ACF properties from an aircraft file
AcfProperties extractAcfProperties(const std::string &filePath)
{
@@ -128,12 +139,15 @@ namespace BlackMisc
std::string version;
std::string acf;
std::getline(fs, i);
i = toLower(i);
std::getline(fs, version);
version = toLower(version);
std::getline(fs, acf);
acf = toLower(acf);
AcfProperties acfProperties;
if (i == "I" && version.find("version") != std::string::npos && acf == "ACF")
if (i == "i" && version.find("version") != std::string::npos && acf == "acf")
{
std::string line;
while (std::getline(fs, line))