third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace ret variable with return statement

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2022-04-08 19:07:27 -07:00
parent 7bc9861301
commit 25ef5d7e77
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/makernote_int.cpp
+10 -12
View File
@@ -116,7 +116,8 @@ const TiffMnRegistry TiffMnCreator::registry_[] = {
{"-", pentaxId, nullptr, newPentaxMn2},
{"-", pentaxDngId, nullptr, newPentaxDngMn2},
{"-", casioId, nullptr, newIfdMn2},
{"-", casio2Id, nullptr, newCasio2Mn2}};
{"-", casio2Id, nullptr, newCasio2Mn2},
};
bool TiffMnRegistry::operator==(const std::string& key) const {
std::string make(make_);
@@ -131,25 +132,22 @@ bool TiffMnRegistry::operator==(IfdId key) const {
TiffComponent* TiffMnCreator::create(uint16_t tag, IfdId group, const std::string& make, const byte* pData, size_t size,
ByteOrder byteOrder) {
TiffComponent* tc = nullptr;
const TiffMnRegistry* tmr = find(registry_, make);
if (tmr) {
tc = tmr->newMnFct_(tag, group, tmr->mnGroup_, pData, size, byteOrder);
auto tmr = std::find(std::begin(registry_), std::end(registry_), make);
if (tmr != std::end(registry_)) {
return tmr->newMnFct_(tag, group, tmr->mnGroup_, pData, size, byteOrder);
}
return tc;
return nullptr;
} // TiffMnCreator::create
TiffComponent* TiffMnCreator::create(uint16_t tag, IfdId group, IfdId mnGroup) {
TiffComponent* tc = nullptr;
const TiffMnRegistry* tmr = find(registry_, mnGroup);
if (tmr) {
auto tmr = std::find(std::begin(registry_), std::end(registry_), mnGroup);
if (tmr != std::end(registry_)) {
if (!tmr->newMnFct2_) {
std::cout << "mnGroup = " << mnGroup << "\n";
}
tc = tmr->newMnFct2_(tag, group, mnGroup);
return tmr->newMnFct2_(tag, group, mnGroup);
}
return tc;
return nullptr;
} // TiffMnCreator::create
void MnHeader::setByteOrder(ByteOrder /*byteOrder*/) {