diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp index 339a8f0e..f6f927f5 100644 --- a/taglib/mp4/mp4tag.cpp +++ b/taglib/mp4/mp4tag.cpp @@ -231,7 +231,7 @@ MP4::Tag::parseBool(const MP4::Atom *atom) { ByteVectorList data = parseData(atom); if(!data.isEmpty()) { - bool value = data[0].size() ? data[0][0] != '\0' : false; + bool value = !data[0].isEmpty() && data[0][0] != '\0'; addItem(atom->name, value); } } diff --git a/taglib/ogg/oggpage.cpp b/taglib/ogg/oggpage.cpp index e3d573fb..e6e1f6e6 100644 --- a/taglib/ogg/oggpage.cpp +++ b/taglib/ogg/oggpage.cpp @@ -309,7 +309,7 @@ List Ogg::Page::paginate(const ByteVectorList &packets, streamSerialNumber, pageIndex, continued, - lastSplit && (lastPacketInList ? lastPacketCompleted : true), + lastSplit && (!lastPacketInList || lastPacketCompleted), lastSplit && (containsLastPacket && lastPacketInList))); pageIndex++; continued = true; diff --git a/taglib/tag.cpp b/taglib/tag.cpp index e642c389..19a4fd59 100644 --- a/taglib/tag.cpp +++ b/taglib/tag.cpp @@ -63,9 +63,9 @@ PropertyMap Tag::properties() const map["COMMENT"].append(comment()); if(!(genre().isEmpty())) map["GENRE"].append(genre()); - if(!(year() == 0)) + if(year() != 0) map["DATE"].append(String::number(year())); - if(!(track() == 0)) + if(track() != 0) map["TRACKNUMBER"].append(String::number(track())); return map; }