Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(lens): canon lens detecton should be independent of locale #2938

Merged
merged 1 commit into from
Mar 30, 2024
Merged

fix(lens): canon lens detecton should be independent of locale #2938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,14 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose lens_tests
)
# Repeat lens test with a DE locale that uses "," as float delimiter
kmilos marked this conversation as resolved.
Show resolved Hide resolved
# to check that all float conversions are done independently of locale
# See GitHub issue #2746
add_test(
NAME lensTestsLocaleDE
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
COMMAND cmake -E env LC_ALL=de_DE.UTF-8 EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose lens_tests
)
add_test(
NAME tiffTests
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
Expand Down
38 changes: 32 additions & 6 deletions src/canonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <regex>
#include <sstream>
#include <string>

// *****************************************************************************
// class member definitions
namespace Exiv2::Internal {
Expand Down Expand Up @@ -2851,6 +2850,33 @@ std::ostream& printCsLensFFFF(std::ostream& os, const Value& value, const ExifDa
return EXV_PRINT_TAG(canonCsLensType)(os, value, metadata);
}

/**
* @brief convert string to float w/o considering locale
*
* Using std:stof to convert strings to float takes into account the locale
* and thus leads to wrong results when converting e.g. "5.6" with a DE locale
* which expects "," as decimal instead of ".". See GitHub issue #2746
*
* Use std::from_chars once that's properly supported by compilers.
kmilos marked this conversation as resolved.
Show resolved Hide resolved
hassec marked this conversation as resolved.
Show resolved Hide resolved
*
* @param str string to convert
* @return float value of string
*/
float string_to_float(std::string const& str) {
float val{};
std::stringstream ss;
std::locale c_locale("C");
ss.imbue(c_locale);
kmilos marked this conversation as resolved.
Show resolved Hide resolved
ss << str;
ss >> val;

if (ss.fail()) {
throw Error(ErrorCode::kerErrorMessage, std::string("canonmn_int.cpp:string_to_float failed for: ") + str);
}
kmilos marked this conversation as resolved.
Show resolved Hide resolved

return val;
}

std::ostream& printCsLensTypeByMetadata(std::ostream& os, const Value& value, const ExifData* metadata) {
if (!metadata || value.typeId() != unsignedShort || value.count() == 0)
return os << value;
Expand Down Expand Up @@ -2914,13 +2940,13 @@ std::ostream& printCsLensTypeByMetadata(std::ostream& os, const Value& value, co
throw Error(ErrorCode::kerErrorMessage, std::string("Lens regex didn't match for: ") + std::string(label));
}

auto tc = base_match[5].length() > 0 ? std::stof(base_match[5].str()) : 1.f;
auto tc = base_match[5].length() > 0 ? string_to_float(base_match[5].str()) : 1.f;

auto flMax = static_cast<int>(std::stof(base_match[2].str()) * tc);
int flMin = base_match[1].length() > 0 ? static_cast<int>(std::stof(base_match[1].str()) * tc) : flMax;
auto flMax = static_cast<int>(string_to_float(base_match[2].str()) * tc);
int flMin = base_match[1].length() > 0 ? static_cast<int>(string_to_float(base_match[1].str()) * tc) : flMax;

auto aperMaxTele = std::stof(base_match[4].str()) * tc;
auto aperMaxShort = base_match[3].length() > 0 ? std::stof(base_match[3].str()) * tc : aperMaxTele;
auto aperMaxTele = string_to_float(base_match[4].str()) * tc;
auto aperMaxShort = base_match[3].length() > 0 ? string_to_float(base_match[3].str()) * tc : aperMaxTele;

if (flMin != exifFlMin || flMax != exifFlMax || exifAperMax < (aperMaxShort - .1 * tc) ||
exifAperMax > (aperMaxTele + .1 * tc)) {
Expand Down