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

Change the interface of tiffcomposite_int.hpp to use size_t #2400

Merged
merged 1 commit into from
Oct 31, 2022
Merged

Change the interface of tiffcomposite_int.hpp to use size_t #2400

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 src/convert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ void Converter::cnvXmpValueToIptc(const char* from, const char* to) {
size_t count = pos->count();
bool added = false;
for (size_t i = 0; i < count; ++i) {
std::string value = pos->toString(static_cast<long>(i));
std::string value = pos->toString(i);
if (!pos->value().ok()) {
#ifndef SUPPRESS_WARNINGS
EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
Expand Down
17 changes: 9 additions & 8 deletions src/makernote_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include "ini.hpp"
#include "makernote_int.hpp"
#include "safe_op.hpp"
#include "tiffcomposite_int.hpp"
#include "tiffimage_int.hpp"
#include "tiffvisitor_int.hpp"
Expand Down Expand Up @@ -160,7 +161,7 @@ ByteOrder MnHeader::byteOrder() const {
return invalidByteOrder;
}

uint32_t MnHeader::baseOffset(uint32_t /*mnOffset*/) const {
size_t MnHeader::baseOffset(size_t /*mnOffset*/) const {
return 0;
}

Expand Down Expand Up @@ -213,7 +214,7 @@ size_t Olympus2MnHeader::ifdOffset() const {
return sizeOfSignature();
}

uint32_t Olympus2MnHeader::baseOffset(uint32_t mnOffset) const {
size_t Olympus2MnHeader::baseOffset(size_t mnOffset) const {
return mnOffset;
}

Expand Down Expand Up @@ -249,7 +250,7 @@ size_t OMSystemMnHeader::ifdOffset() const {
return sizeOfSignature();
}

uint32_t OMSystemMnHeader::baseOffset(uint32_t mnOffset) const {
size_t OMSystemMnHeader::baseOffset(size_t mnOffset) const {
return mnOffset;
}

Expand Down Expand Up @@ -289,7 +290,7 @@ ByteOrder FujiMnHeader::byteOrder() const {
return byteOrder_;
}

uint32_t FujiMnHeader::baseOffset(uint32_t mnOffset) const {
size_t FujiMnHeader::baseOffset(size_t mnOffset) const {
return mnOffset;
}

Expand Down Expand Up @@ -367,8 +368,8 @@ ByteOrder Nikon3MnHeader::byteOrder() const {
return byteOrder_;
}

uint32_t Nikon3MnHeader::baseOffset(uint32_t mnOffset) const {
return mnOffset + 10;
size_t Nikon3MnHeader::baseOffset(size_t mnOffset) const {
return Safe::add<size_t>(mnOffset, 10);
}

bool Nikon3MnHeader::read(const byte* pData, size_t size, ByteOrder /*byteOrder*/) {
Expand Down Expand Up @@ -447,7 +448,7 @@ size_t PentaxDngMnHeader::size() const {
return header_.size();
}

uint32_t PentaxDngMnHeader::baseOffset(uint32_t mnOffset) const {
size_t PentaxDngMnHeader::baseOffset(size_t mnOffset) const {
return mnOffset;
}

Expand Down Expand Up @@ -507,7 +508,7 @@ size_t SamsungMnHeader::size() const {
return 0;
}

uint32_t SamsungMnHeader::baseOffset(uint32_t mnOffset) const {
size_t SamsungMnHeader::baseOffset(size_t mnOffset) const {
return mnOffset;
}

Expand Down
16 changes: 8 additions & 8 deletions src/makernote_int.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class MnHeader {
to the start of the TIFF header. \em mnOffset is the offset
to the makernote from the start of the TIFF header.
*/
[[nodiscard]] virtual uint32_t baseOffset(uint32_t mnOffset) const;
[[nodiscard]] virtual size_t baseOffset(size_t mnOffset) const;
//@}

}; // class MnHeader
Expand Down Expand Up @@ -180,7 +180,7 @@ class Olympus2MnHeader : public MnHeader {
[[nodiscard]] size_t size() const override;
size_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const override;
[[nodiscard]] size_t ifdOffset() const override;
[[nodiscard]] uint32_t baseOffset(uint32_t mnOffset) const override;
[[nodiscard]] size_t baseOffset(size_t mnOffset) const override;
//@}
//! Return the size of the makernote header signature
static size_t sizeOfSignature();
Expand Down Expand Up @@ -210,7 +210,7 @@ class OMSystemMnHeader : public MnHeader {
[[nodiscard]] size_t size() const override;
size_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const override;
[[nodiscard]] size_t ifdOffset() const override;
[[nodiscard]] uint32_t baseOffset(uint32_t mnOffset) const override;
[[nodiscard]] size_t baseOffset(size_t mnOffset) const override;
//@}
//! Return the size of the makernote header signature
static size_t sizeOfSignature();
Expand Down Expand Up @@ -242,7 +242,7 @@ class FujiMnHeader : public MnHeader {
size_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const override;
[[nodiscard]] size_t ifdOffset() const override;
[[nodiscard]] ByteOrder byteOrder() const override;
[[nodiscard]] uint32_t baseOffset(uint32_t mnOffset) const override;
[[nodiscard]] size_t baseOffset(size_t mnOffset) const override;
//@}
//! Return the size of the makernote header signature
static size_t sizeOfSignature();
Expand All @@ -251,7 +251,7 @@ class FujiMnHeader : public MnHeader {
DataBuf header_; //!< Data buffer for the makernote header
static const byte signature_[]; //!< Fujifilm makernote header signature
static const ByteOrder byteOrder_; //!< Byteorder for makernote (always II)
uint32_t start_{0}; //!< Start of the mn IFD rel. to mn start
size_t start_{0}; //!< Start of the mn IFD rel. to mn start

}; // class FujiMnHeader

Expand Down Expand Up @@ -306,7 +306,7 @@ class Nikon3MnHeader : public MnHeader {
size_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const override;
[[nodiscard]] size_t ifdOffset() const override;
[[nodiscard]] ByteOrder byteOrder() const override;
[[nodiscard]] uint32_t baseOffset(uint32_t mnOffset) const override;
[[nodiscard]] size_t baseOffset(size_t mnOffset) const override;
//@}
//! Return the size of the makernote header signature
static size_t sizeOfSignature();
Expand Down Expand Up @@ -368,7 +368,7 @@ class PentaxDngMnHeader : public MnHeader {
[[nodiscard]] size_t size() const override;
size_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const override;
[[nodiscard]] size_t ifdOffset() const override;
[[nodiscard]] uint32_t baseOffset(uint32_t mnOffset) const override;
[[nodiscard]] size_t baseOffset(size_t mnOffset) const override;
//@}
//! Return the size of the makernote header signature
static size_t sizeOfSignature();
Expand Down Expand Up @@ -424,7 +424,7 @@ class SamsungMnHeader : public MnHeader {
//@{
[[nodiscard]] size_t size() const override;
size_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const override;
[[nodiscard]] uint32_t baseOffset(uint32_t mnOffset) const override;
[[nodiscard]] size_t baseOffset(size_t mnOffset) const override;
//@}

}; // class SamsungMnHeader
Expand Down
Loading