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

clang-tidy: simplify boolean expressions

Browse Source 
Found with readability-simplify-boolean-expr

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-04-26 20:41:28 -07:00 committed by Luis Díaz Más
parent 8128716287
commit 1dc1186760
12 changed files with 35 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/metacopy.cpp
View File

@ -147,7 +147,7 @@ int Params::getopt(int argc, char* const argv[])
{
int rc = Util::Getopt::getopt(argc, argv, optstring_);
// Further consistency checks
if (help_==false) {
if (!help_) {
if (rc==0 && read_.empty() ) {
std::cerr << progname() << ": Read and write files must be specified\n";
rc = 1;

4
src/actions.cpp
View File

@ -917,7 +917,7 @@ namespace Action {
path_ = path;
int rc = 0;
bool bStdout = Params::instance().target_ & Params::ctStdInOut ? true : false;
bool bStdout = (Params::instance().target_ & Params::ctStdInOut) != 0;
if (bStdout) {
_setmode(_fileno(stdout), _O_BINARY);
}
@ -1103,7 +1103,7 @@ namespace Action {
int Insert::run(const std::string& path)
try {
// -i{tgt}- reading from stdin?
bool bStdin = (Params::instance().target_ & Params::ctStdInOut)?true:false;
bool bStdin = (Params::instance().target_ & Params::ctStdInOut) != 0;
if (!Exiv2::fileExists(path, true)) {
std::cerr << path

2
src/basicio.cpp
View File

@ -1697,7 +1697,7 @@ namespace Exiv2 {
{
close(); // reset the IO position
bigBlock_ = NULL;
if (p_->isMalloced_ == false) {
if (!p_->isMalloced_) {
long length = p_->getFileLength();
if (length < 0) { // unable to get the length of remote file, get the whole file content.
std::string data;

3
src/crwimage.cpp
View File

@ -204,8 +204,7 @@ namespace Exiv2 {
|| ('M' == tmpBuf[0] && 'M' == tmpBuf[1]))) {
result = false;
}
if ( true == result
&& std::memcmp(tmpBuf + 6, CiffHeader::signature(), 8) != 0) {
if (result && std::memcmp(tmpBuf + 6, CiffHeader::signature(), 8) != 0) {
result = false;
}
if (!advance || !result) iIo.seek(-14, BasicIo::cur);

2
src/image.cpp
View File

@ -227,7 +227,7 @@ namespace Exiv2 {
char c[4];
} e = { 0x01000000 };
return e.c[0]?true:false;
return e.c[0] != 0;
}
bool Image::isLittleEndianPlatform() { return !isBigEndianPlatform(); }

5
src/jp2image.cpp
View File

@ -180,7 +180,7 @@ namespace Exiv2
char c[4];
} e = { 0x01000000 };
return e.c[0]?true:false;
return e.c[0] != 0;
}
static std::string toAscii(long n)
@ -874,8 +874,7 @@ static void boxes_check(size_t b,size_t m)
}
}
if (writeXmpFromPacket() == false)
{
if (!writeXmpFromPacket()) {
if (XmpParser::encode(xmpPacket_, xmpData_) > 1)
{
#ifndef SUPPRESS_WARNINGS

6
src/jpgimage.cpp
View File

@ -1059,9 +1059,9 @@ namespace Exiv2 {
}
if (exifData_.count() > 0)
++search;
if (writeXmpFromPacket() == false && xmpData_.count() > 0)
if (!writeXmpFromPacket() && xmpData_.count() > 0)
++search;
if (writeXmpFromPacket() == true && xmpPacket_.size() > 0)
if (writeXmpFromPacket() && xmpPacket_.size() > 0)
++search;
if (foundCompletePsData || iptcData_.count() > 0)
++search;
@ -1125,7 +1125,7 @@ namespace Exiv2 {
--search;
}
}
if (writeXmpFromPacket() == false) {
if (!writeXmpFromPacket()) {
if (XmpParser::encode(xmpPacket_, xmpData_,
XmpParser::useCompactFormat | XmpParser::omitAllFormatting) > 1) {
#ifndef SUPPRESS_WARNINGS

35
src/makernote_int.cpp
View File

@ -258,11 +258,8 @@ namespace Exiv2 {
if (!pData || size < sizeOfSignature()) return false;
header_.alloc(sizeOfSignature());
std::memcpy(header_.pData_, pData, header_.size_);
if ( static_cast<uint32_t>(header_.size_) < sizeOfSignature()
|| 0 != memcmp(header_.pData_, signature_, 6)) {
return false;
}
return true;
return !(static_cast<uint32_t>(header_.size_) < sizeOfSignature() ||
0 != memcmp(header_.pData_, signature_, 6));
} // OlympusMnHeader::read
uint32_t OlympusMnHeader::write(IoWrapper& ioWrapper,
@ -310,11 +307,8 @@ namespace Exiv2 {
if (!pData || size < sizeOfSignature()) return false;
header_.alloc(sizeOfSignature());
std::memcpy(header_.pData_, pData, header_.size_);
if ( static_cast<uint32_t>(header_.size_) < sizeOfSignature()
|| 0 != memcmp(header_.pData_, signature_, 10)) {
return false;
}
return true;
return !(static_cast<uint32_t>(header_.size_) < sizeOfSignature() ||
0 != memcmp(header_.pData_, signature_, 10));
} // Olympus2MnHeader::read
uint32_t Olympus2MnHeader::write(IoWrapper& ioWrapper,
@ -371,11 +365,8 @@ namespace Exiv2 {
// Read offset to the IFD relative to the start of the makernote
// from the header. Note that we ignore the byteOrder argument
start_ = getULong(header_.pData_ + 8, byteOrder_);
if ( static_cast<uint32_t>(header_.size_) < sizeOfSignature()
|| 0 != memcmp(header_.pData_, signature_, 8)) {
return false;
}
return true;
return !(static_cast<uint32_t>(header_.size_) < sizeOfSignature() ||
0 != memcmp(header_.pData_, signature_, 8));
} // FujiMnHeader::read
uint32_t FujiMnHeader::write(IoWrapper& ioWrapper,
@ -587,11 +578,8 @@ namespace Exiv2 {
if (!pData || size < sizeOfSignature()) return false;
header_.alloc(sizeOfSignature());
std::memcpy(header_.pData_, pData, header_.size_);
if ( static_cast<uint32_t>(header_.size_) < sizeOfSignature()
|| 0 != memcmp(header_.pData_, signature_, 7)) {
return false;
}
return true;
return !(static_cast<uint32_t>(header_.size_) < sizeOfSignature() ||
0 != memcmp(header_.pData_, signature_, 7));
} // PentaxDngMnHeader::read
uint32_t PentaxDngMnHeader::write(IoWrapper& ioWrapper,
@ -634,11 +622,8 @@ namespace Exiv2 {
if (!pData || size < sizeOfSignature()) return false;
header_.alloc(sizeOfSignature());
std::memcpy(header_.pData_, pData, header_.size_);
if ( static_cast<uint32_t>(header_.size_) < sizeOfSignature()
|| 0 != memcmp(header_.pData_, signature_, 3)) {
return false;
}
return true;
return !(static_cast<uint32_t>(header_.size_) < sizeOfSignature() ||
0 != memcmp(header_.pData_, signature_, 3));
} // PentaxMnHeader::read
uint32_t PentaxMnHeader::write(IoWrapper& ioWrapper,

2
src/pngimage.cpp
View File

@ -678,7 +678,7 @@ namespace Exiv2 {
}
}
if (writeXmpFromPacket() == false) {
if (!writeXmpFromPacket()) {
if (XmpParser::encode(xmpPacket_, xmpData_) > 1) {
#ifndef SUPPRESS_WARNINGS
EXV_ERROR << "Failed to encode XMP metadata.\n";

20
src/psdimage.cpp
View File

@ -461,22 +461,22 @@ namespace Exiv2 {
uint32_t curOffset = io_->tell();
// Write IPTC_NAA resource block
if ((resourceId == kPhotoshopResourceID_IPTC_NAA ||
resourceId > kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) {
if ((resourceId == kPhotoshopResourceID_IPTC_NAA || resourceId > kPhotoshopResourceID_IPTC_NAA) &&
!iptcDone) {
newResLength += writeIptcData(iptcData_, outIo);
iptcDone = true;
}
// Write ExifInfo resource block
else if ((resourceId == kPhotoshopResourceID_ExifInfo ||
resourceId > kPhotoshopResourceID_ExifInfo) && exifDone == false) {
else if ((resourceId == kPhotoshopResourceID_ExifInfo || resourceId > kPhotoshopResourceID_ExifInfo) &&
!exifDone) {
newResLength += writeExifData(exifData_, outIo);
exifDone = true;
}
// Write XMPpacket resource block
else if ((resourceId == kPhotoshopResourceID_XMPPacket ||
resourceId > kPhotoshopResourceID_XMPPacket) && xmpDone == false) {
else if ((resourceId == kPhotoshopResourceID_XMPPacket || resourceId > kPhotoshopResourceID_XMPPacket) &&
!xmpDone) {
newResLength += writeXmpData(xmpData_, outIo);
xmpDone = true;
}
@ -525,19 +525,19 @@ namespace Exiv2 {
}
// Append IPTC_NAA resource block, if not yet written
if (iptcDone == false) {
if (!iptcDone) {
newResLength += writeIptcData(iptcData_, outIo);
iptcDone = true;
}
// Append ExifInfo resource block, if not yet written
if (exifDone == false) {
if (!exifDone) {
newResLength += writeExifData(exifData_, outIo);
exifDone = true;
}
// Append XmpPacket resource block, if not yet written
if (xmpDone == false) {
if (!xmpDone) {
newResLength += writeXmpData(xmpData_, outIo);
xmpDone = true;
}
@ -646,7 +646,7 @@ namespace Exiv2 {
std::cerr << "writeXmpFromPacket(): " << writeXmpFromPacket() << "\n";
#endif
// writeXmpFromPacket(true);
if (writeXmpFromPacket() == false) {
if (!writeXmpFromPacket()) {
if (XmpParser::encode(xmpPacket, xmpData) > 1) {
#ifndef SUPPRESS_WARNINGS
EXV_ERROR << "Failed to encode XMP metadata.\n";

8
src/tiffvisitor_int.cpp
View File

@ -705,8 +705,7 @@ namespace Exiv2 {
bool TiffEncoder::dirty() const
{
if (dirty_ || exifData_.count() > 0) return true;
return false;
return dirty_ || exifData_.count() > 0;
}
void TiffEncoder::visitEntry(TiffEntry* object)
@ -869,10 +868,7 @@ namespace Exiv2 {
bool TiffEncoder::isImageTag(uint16_t tag, IfdId group) const
{
if (!isNewImage_ && pHeader_->isImageTag(tag, group, pPrimaryGroups_)) {
return true;
}
return false;
return !isNewImage_ && pHeader_->isImageTag(tag, group, pPrimaryGroups_);
}
void TiffEncoder::encodeTiffComponent(

3
src/xmpsidecar.cpp
View File

@ -131,8 +131,7 @@ namespace Exiv2 {
}
IoCloser closer(*io_);
if (writeXmpFromPacket() == false) {
if (!writeXmpFromPacket()) {
// #589 copy XMP tags
Exiv2::XmpData copy ;
for (auto&& it : xmpData_) {