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

MSVC warning fixes

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-03-09 21:32:35 -08:00
parent 1f3d1f066f
commit 763cfaf2b4
4 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/exiv2/types.hpp
View File

@ -162,16 +162,16 @@ struct EXIV2API DataBuf {
using iterator = std::vector<byte>::iterator; using iterator = std::vector<byte>::iterator;
using const_iterator = std::vector<byte>::const_iterator; using const_iterator = std::vector<byte>::const_iterator;
inline iterator begin() noexcept { iterator begin() noexcept {
return pData_.begin(); return pData_.begin();
} }
[[nodiscard]] inline const_iterator cbegin() const noexcept { [[nodiscard]] const_iterator cbegin() const noexcept {
return pData_.cbegin(); return pData_.cbegin();
} }
inline iterator end() noexcept { iterator end() noexcept {
return pData_.end(); return pData_.end();
} }
[[nodiscard]] inline const_iterator cend() const noexcept { [[nodiscard]] const_iterator cend() const noexcept {
return pData_.end(); return pData_.end();
} }

44
src/tags.cpp
View File

@ -20,28 +20,28 @@ using namespace Internal;
//! List of all defined Exif sections. //! List of all defined Exif sections.
constexpr auto sectionInfo = std::array{ constexpr auto sectionInfo = std::array{
SectionInfo(SectionId::sectionIdNotSet, "(UnknownSection)", N_("Unknown section")), SectionInfo{SectionId::sectionIdNotSet, "(UnknownSection)", N_("Unknown section")},
SectionInfo(SectionId::imgStruct, "ImageStructure", N_("Image data structure")), SectionInfo{SectionId::imgStruct, "ImageStructure", N_("Image data structure")},
SectionInfo(SectionId::recOffset, "RecordingOffset", N_("Recording offset")), SectionInfo{SectionId::recOffset, "RecordingOffset", N_("Recording offset")},
SectionInfo(SectionId::imgCharacter, "ImageCharacteristics", N_("Image data characteristics")), SectionInfo{SectionId::imgCharacter, "ImageCharacteristics", N_("Image data characteristics")},
SectionInfo(SectionId::otherTags, "OtherTags", N_("Other data")), SectionInfo{SectionId::otherTags, "OtherTags", N_("Other data")},
SectionInfo(SectionId::exifFormat, "ExifFormat", N_("Exif data structure")), SectionInfo{SectionId::exifFormat, "ExifFormat", N_("Exif data structure")},
SectionInfo(SectionId::exifVersion, "ExifVersion", N_("Exif version")), SectionInfo{SectionId::exifVersion, "ExifVersion", N_("Exif version")},
SectionInfo(SectionId::imgConfig, "ImageConfig", N_("Image configuration")), SectionInfo{SectionId::imgConfig, "ImageConfig", N_("Image configuration")},
SectionInfo(SectionId::userInfo, "UserInfo", N_("User information")), SectionInfo{SectionId::userInfo, "UserInfo", N_("User information")},
SectionInfo(SectionId::relatedFile, "RelatedFile", N_("Related file")), SectionInfo{SectionId::relatedFile, "RelatedFile", N_("Related file")},
SectionInfo(SectionId::dateTime, "DateTime", N_("Date and time")), SectionInfo{SectionId::dateTime, "DateTime", N_("Date and time")},
SectionInfo(SectionId::captureCond, "CaptureConditions", N_("Picture taking conditions")), SectionInfo{SectionId::captureCond, "CaptureConditions", N_("Picture taking conditions")},
SectionInfo(SectionId::gpsTags, "GPS", N_("GPS information")), SectionInfo{SectionId::gpsTags, "GPS", N_("GPS information")},
SectionInfo(SectionId::iopTags, "Interoperability", N_("Interoperability information")), SectionInfo{SectionId::iopTags, "Interoperability", N_("Interoperability information")},
SectionInfo(SectionId::mpfTags, "MPF", N_("CIPA Multi-Picture Format")), SectionInfo{SectionId::mpfTags, "MPF", N_("CIPA Multi-Picture Format")},
SectionInfo(SectionId::makerTags, "Makernote", N_("Vendor specific information")), SectionInfo{SectionId::makerTags, "Makernote", N_("Vendor specific information")},
SectionInfo(SectionId::dngTags, "DngTags", N_("Adobe DNG tags")), SectionInfo{SectionId::dngTags, "DngTags", N_("Adobe DNG tags")},
SectionInfo(SectionId::panaRaw, "PanasonicRaw", N_("Panasonic RAW tags")), SectionInfo{SectionId::panaRaw, "PanasonicRaw", N_("Panasonic RAW tags")},
SectionInfo(SectionId::tiffEp, "TIFF/EP", N_("TIFF/EP tags")), SectionInfo{SectionId::tiffEp, "TIFF/EP", N_("TIFF/EP tags")},
SectionInfo(SectionId::tiffPm6, "TIFF&PM6", N_("TIFF PageMaker 6.0 tags")), SectionInfo{SectionId::tiffPm6, "TIFF&PM6", N_("TIFF PageMaker 6.0 tags")},
SectionInfo(SectionId::adobeOpi, "AdobeOPI", N_("Adobe OPI tags")), SectionInfo{SectionId::adobeOpi, "AdobeOPI", N_("Adobe OPI tags")},
SectionInfo(SectionId::lastSectionId, "(LastSection)", N_("Last section")), SectionInfo{SectionId::lastSectionId, "(LastSection)", N_("Last section")},
}; };
} // namespace Exiv2 } // namespace Exiv2

6
src/tags_int.hpp
View File

@ -17,9 +17,6 @@ namespace Exiv2::Internal {
//! The details of a section. //! The details of a section.
struct SectionInfo { struct SectionInfo {
constexpr SectionInfo(SectionId sectionId, const char* name, const char* desc) :
sectionId_(sectionId), name_(name), desc_(desc) {
}
SectionId sectionId_; //!< Section id SectionId sectionId_; //!< Section id
const char* name_; //!< Section name (one word) const char* name_; //!< Section name (one word)
const char* desc_; //!< Section description const char* desc_; //!< Section description
@ -48,9 +45,6 @@ struct StringTagDetails {
const char* label_; //!< Translation of the tag value const char* label_; //!< Translation of the tag value
//! Comparison operator for use with the find template //! Comparison operator for use with the find template
bool operator==(const char* key) const {
return (strcmp(val_, key) == 0);
}
bool operator==(const std::string& key) const { bool operator==(const std::string& key) const {
return (key == val_); return (key == val_);
} }

2
src/tiffcomposite_int.hpp
View File

@ -64,7 +64,7 @@ class TiffPathItem {
//! @name Creators //! @name Creators
//@{ //@{
//! Constructor //! Constructor
TiffPathItem(uint32_t extendedTag, IfdId group) : extendedTag_(extendedTag), group_(group) { constexpr TiffPathItem(uint32_t extendedTag, IfdId group) : extendedTag_(extendedTag), group_(group) {
} }
//@} //@}