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

remove + from Error() #2937

Merged
merged 1 commit into from
Mar 29, 2024
Merged

remove + from Error() #2937

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
2 changes: 1 addition & 1 deletion samples/write-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void testCase(const std::string& file1, const std::string& file2, const std::str
std::cerr << "---> Modifying Exif data\n";
auto pos = ed1.findKey(ek);
if (pos == ed1.end()) {
throw Error(ErrorCode::kerErrorMessage, "Metadatum with key = " + ek.key() + " not found");
throw Error(ErrorCode::kerErrorMessage, "Metadatum with key = ", ek.key(), " not found");
}
pos->setValue(value);

Expand Down
2 changes: 1 addition & 1 deletion src/canonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2911,7 +2911,7 @@ std::ostream& printCsLensTypeByMetadata(std::ostream& os, const Value& value, co
if (!std::regex_search(label, base_match, lens_regex)) {
// this should never happen, as it would indicate the lens is specified incorrectly
// in the CanonCsLensType array
throw Error(ErrorCode::kerErrorMessage, std::string("Lens regex didn't match for: ") + std::string(label));
throw Error(ErrorCode::kerErrorMessage, "Lens regex didn't match for: ", label);
}

auto tc = base_match[5].length() > 0 ? std::stof(base_match[5].str()) : 1.f;
Expand Down
2 changes: 1 addition & 1 deletion src/preview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ DataBuf LoaderNative::getData() const {
}
return {record + sizeHdr + 28, sizeData - 28};
}
throw Error(ErrorCode::kerErrorMessage, "Invalid native preview filter: " + nativePreview_.filter_);
throw Error(ErrorCode::kerErrorMessage, "Invalid native preview filter: ", nativePreview_.filter_);
}

bool LoaderNative::readDimensions() {
Expand Down
2 changes: 1 addition & 1 deletion src/tags_int.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ std::ostream& printTagBitmask(std::ostream& os, const Value& value, const ExifDa
template <size_t N, const TagDetailsBitlistSorted (&array)[N]>
std::ostream& printTagBitlistAllLE(std::ostream& os, const Value& value, const ExifData*) {
if constexpr (N == 0)
throw Error(ErrorCode::kerErrorMessage, std::string("Passed zero length TagDetailsBitlistSorted"));
throw Error(ErrorCode::kerErrorMessage, "Passed zero length TagDetailsBitlistSorted");

uint32_t vN = 0;
uint32_t currentVNBit = 0;
Expand Down