Merge branch 'main' into fix_exiv2_-pR

Author: kevinbackhouse

conanfile.py

@@ -22,7 +22,9 @@ def configure(self):
 
  def requirements(self):
  self.requires('zlib/1.2.11')
- self.requires('libcurl/7.75.0')
+
+ if self.options.webready:
+ self.requires('libcurl/7.79.0')
 
  if os_info.is_windows and self.options.iconv:
  self.requires('libiconv/1.16')
@@ -35,7 +37,7 @@ def requirements(self):
  if self.options.xmp:
  self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
  else:
- self.requires('expat/2.3.0')
+ self.requires('expat/2.4.1')
 
  def imports(self):
  self.copy('*.dll', dst='bin', src='bin')

doc/templates/Makefile

@@ -76,6 +76,7 @@ TABLES = Exif \
  NikonFl1 \
  NikonFl2 \
  NikonFl3 \
+ NikonFl7 \
  NikonSiD80 \
  NikonSiD40 \
  NikonSiD300a \

doc/templates/tags-nikon.html.in

@@ -91,6 +91,11 @@ __NikonFl2__
 __NikonFl3__
 <br>
 
+<h3>Nikon Flash Info 7 Tags (for version 0107 and 0108)</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFl7__
+<br>
+
 <h3>Nikon Shot Info D80 Tags</h3>
 <p>Click on a column header to sort the table.</p>
 __NikonSiD80__

exiv2.md

@@ -793,19 +793,19 @@ Image CanonCf Nikon2 NikonPc OlympusFe9 SonyMisc3c
 Image2 CanonCs Nikon3 NikonPreview OlympusFi SonyMinolta
 Image3 CanonFi NikonAFT NikonSi01xx OlympusIp SonySInfo1
 Iop CanonPa NikonAf NikonSi02xx OlympusRd
-MakerNote CanonPi NikonAf  NikonSiD300a OlympusRd2 Samsung2
-MpfInfo CanonPr NikonAf2  NikonSiD300b OlympusRi SamsungPictureWizard
-Photo CanonSi NikonAf22 NikonSiD40 SamsungPreview
-SubImage1 CanonTi NikonCb1 NikonSiD80 Sigma
-SubImage2 NikonCb2  NikonVr
-SubImage3 Casio NikonCb2a NikonWt Sony1
-SubImage4 Casio2 NikonCb2b Sony1Cs
-SubImage5 NikonCb3 Olympus Sony1Cs2
-SubImage6 Minolta NikonCb4 Olympus2 Sony1MltCs7D
-SubImage7 MinoltaCs5D NikonFi  OlympusCs Sony1MltCsA100
-SubImage8 MinoltaCs7D NikonFl1 OlympusEq Sony1MltCsNew
-SubImage9 MinoltaCsNew NikonFl2 OlympusFe1 Sony1MltCsOld
-SubThumb1 MinoltaCsOld NikonFl3 OlympusFe2 Sony2
+MakerNote CanonPi NikonAf2 NikonSiD300a OlympusRd2 Samsung2
+MpfInfo CanonPr NikonAf22 NikonSiD300b OlympusRi SamsungPictureWizard
+Photo CanonSi NikonCb1  NikonSiD40 SamsungPreview
+SubImage1 CanonTi NikonCb2 NikonSiD80 Sigma
+SubImage2 NikonCb2a NikonVr
+SubImage3 Casio NikonCb2b NikonWt Sony1
+SubImage4 Casio2 NikonCb3  Sony1Cs
+SubImage5 NikonCb4 Olympus Sony1Cs2
+SubImage6 Minolta NikonFi  Olympus2 Sony1MltCs7D
+SubImage7 MinoltaCs5D NikonFl1 OlympusCs Sony1MltCsA100
+SubImage8 MinoltaCs7D NikonFl2 OlympusEq Sony1MltCsNew
+SubImage9 MinoltaCsNew NikonFl3 OlympusFe1 Sony1MltCsOld
+SubThumb1 MinoltaCsOld NikonFl7 OlympusFe2 Sony2
 Thumbnail NikonIi OlympusFe3 Sony2Cs
  Panasonic NikonLd1 OlympusFe4 Sony2Cs2
 Pentax PanasonicRaw NikonLd2 OlympusFe5 Sony2010e

include/exiv2/basicio.hpp

@@ -27,6 +27,7 @@
 #include "exiv2lib_export.h"
 
 // included header files
+#include "error.hpp"
 #include "types.hpp"
 
 // + standard includes
@@ -142,6 +143,17 @@ namespace Exiv2 {
  0 if failure;
  */
  virtual long read(byte* buf, long rcount) = 0;
+ /*!
+ @brief Safe version of `read()` that checks for errors and throws
+ an exception if the read was unsuccessful.
+ @param buf Pointer to a block of memory into which the read data
+ is stored. The memory block must be at least \em rcount bytes
+ long.
+ @param rcount Maximum number of bytes to read. Fewer bytes may be
+ read if \em rcount bytes are not available.
+ @param err Error code to use if an exception is thrown.
+ */
+ void readOrThrow(byte* buf, long rcount, ErrorCode err);
  /*!
  @brief Read one byte from the IO source. Current IO position is
  advanced by one byte.
@@ -176,6 +188,19 @@ namespace Exiv2 {
 #else
  virtual int seek(long offset, Position pos) = 0;
 #endif
+ /*!
+ @brief Safe version of `seek()` that checks for errors and throws
+ an exception if the seek was unsuccessful.
+ @param offset Number of bytes to move the position relative
+ to the starting position specified by \em pos
+ @param pos Position from which the seek should start
+ @param err Error code to use if an exception is thrown.
+ */
+#if defined(_MSC_VER)
+ void seekOrThrow(int64_t offset, Position pos, ErrorCode err);
+#else
+ void seekOrThrow(long offset, Position pos, ErrorCode err);
+#endif
 
  /*!
  @brief Direct access to the IO data. For files, this is done by

src/basicio.cpp

@@ -28,6 +28,7 @@
 #include "futils.hpp"
 #include "types.hpp"
 #include "error.hpp"
+#include "enforce.hpp"
 #include "http.hpp"
 #include "properties.hpp"
 #include "image_int.hpp"
@@ -77,6 +78,21 @@ using nlink_t = short;
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+ void BasicIo::readOrThrow(byte* buf, long rcount, ErrorCode err) {
+ const long nread = read(buf, rcount);
+ enforce(nread == rcount, err);
+ enforce(!error(), err);
+ }
+
+#if defined(_MSC_VER)
+ void BasicIo::seekOrThrow(int64_t offset, Position pos, ErrorCode err) {
+#else
+ void BasicIo::seekOrThrow(long offset, Position pos, ErrorCode err) {
+#endif
+ const int r = seek(offset, pos);
+ enforce(r == 0, err);
+ }
+
  //! Internal Pimpl structure of class FileIo.
  class FileIo::Impl {
  public:

src/image.cpp

@@ -138,19 +138,6 @@ namespace {
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
- // BasicIo::read() with error checking
- static void readOrThrow(BasicIo& iIo, byte* buf, long rcount, ErrorCode err) {
- const long nread = iIo.read(buf, rcount);
- enforce(nread == rcount, err);
- enforce(!iIo.error(), err);
- }
-
- // BasicIo::seek() with error checking
- static void seekOrThrow(BasicIo& iIo, long offset, BasicIo::Position pos, ErrorCode err) {
- const int r = iIo.seek(offset, pos);
- enforce(r == 0, err);
- }
-
  Image::Image(int imageType, uint16_t supportedMetadata, BasicIo::UniquePtr io)
  : io_(std::move(io)),
  pixelWidth_(0),
@@ -342,8 +329,8 @@ namespace Exiv2 {
 
  do {
  // Read top of directory
- seekOrThrow(io, start, BasicIo::beg, kerCorruptedMetadata);
- readOrThrow(io, dir.data(), 2, kerCorruptedMetadata);
+ io.seekOrThrow(start, BasicIo::beg, kerCorruptedMetadata);
+ io.readOrThrow(dir.data(), 2, kerCorruptedMetadata);
  uint16_t dirLength = byteSwap2(dir,0,bSwap);
  // Prevent infinite loops. (GHSA-m479-7frc-gqqg)
  enforce(dirLength > 0, kerCorruptedMetadata);
@@ -369,7 +356,7 @@ namespace Exiv2 {
  }
  bFirst = false;
 
- readOrThrow(io, dir.data(), 12, kerCorruptedMetadata);
+ io.readOrThrow(dir.data(), 12, kerCorruptedMetadata);
  uint16_t tag = byteSwap2(dir,0,bSwap);
  uint16_t type = byteSwap2(dir,2,bSwap);
  uint32_t count = byteSwap4(dir,4,bSwap);
@@ -420,9 +407,9 @@ namespace Exiv2 {
 
  if ( bOffsetIsPointer ) { // read into buffer
  const long restore = io.tell(); // save
- seekOrThrow(io, offset, BasicIo::beg, kerCorruptedMetadata); // position
- readOrThrow(io, buf.data(), static_cast<long>(count_x_size), kerCorruptedMetadata); // read
- seekOrThrow(io, restore, BasicIo::beg, kerCorruptedMetadata); // restore
+ io.seekOrThrow(offset, BasicIo::beg, kerCorruptedMetadata); // position
+ io.readOrThrow(buf.data(), static_cast<long>(count_x_size), kerCorruptedMetadata); // read
+ io.seekOrThrow(restore, BasicIo::beg, kerCorruptedMetadata); // restore
  }
 
  if ( bPrint ) {
@@ -464,7 +451,7 @@ namespace Exiv2 {
  const long restore = io.tell();
  offset = byteSwap4(buf,k*size,bSwap);
  printIFDStructure(io,out,option,offset,bSwap,c,depth);
- seekOrThrow(io, restore, BasicIo::beg, kerCorruptedMetadata);
+ io.seekOrThrow(restore, BasicIo::beg, kerCorruptedMetadata);
  }
  } else if ( option == kpsRecursive && tag == 0x83bb /* IPTCNAA */ ) {
  if (count > 0) {
@@ -473,11 +460,11 @@ namespace Exiv2 {
  }
 
  const long restore = io.tell();
- seekOrThrow(io, offset, BasicIo::beg, kerCorruptedMetadata); // position
+ io.seekOrThrow(offset, BasicIo::beg, kerCorruptedMetadata); // position
  std::vector<byte> bytes(count) ; // allocate memory
  // TODO: once we have C++11 use bytes.data()
- readOrThrow(io, &bytes[0], count, kerCorruptedMetadata);
- seekOrThrow(io, restore, BasicIo::beg, kerCorruptedMetadata);
+ io.readOrThrow(&bytes[0], count, kerCorruptedMetadata);
+ io.seekOrThrow(restore, BasicIo::beg, kerCorruptedMetadata);
  // TODO: once we have C++11 use bytes.data()
  IptcData::printStructure(out, makeSliceUntil(&bytes[0], count), depth);
  }
@@ -487,8 +474,8 @@ namespace Exiv2 {
  uint32_t jump= 10 ;
  byte bytes[20] ;
  const auto chars = reinterpret_cast<const char*>(&bytes[0]);
- seekOrThrow(io, offset, BasicIo::beg, kerCorruptedMetadata); // position
- readOrThrow(io, bytes, jump, kerCorruptedMetadata) ; // read
+ io.seekOrThrow(offset, BasicIo::beg, kerCorruptedMetadata); // position
+ io.readOrThrow(bytes, jump, kerCorruptedMetadata) ; // read
  bytes[jump]=0 ;
 
  bool bNikon = ::strcmp("Nikon" ,chars) == 0;
@@ -498,17 +485,17 @@ namespace Exiv2 {
  // tag is an embedded tiff
  const long byteslen = count-jump;
  DataBuf bytes(byteslen); // allocate a buffer
- readOrThrow(io, bytes.data(), byteslen, kerCorruptedMetadata); // read
+ io.readOrThrow(bytes.data(), byteslen, kerCorruptedMetadata); // read
  MemIo memIo(bytes.c_data(), byteslen) ; // create a file
  printTiffStructure(memIo,out,option,depth);
  } else {
  // tag is an IFD
  uint32_t punt = bSony ? 12 : 0 ;
- seekOrThrow(io, 0, BasicIo::beg, kerCorruptedMetadata); // position
+ io.seekOrThrow(0, BasicIo::beg, kerCorruptedMetadata); // position
  printIFDStructure(io,out,option,offset+punt,bSwap,c,depth);
  }
 
- seekOrThrow(io, restore, BasicIo::beg, kerCorruptedMetadata); // restore
+ io.seekOrThrow(restore, BasicIo::beg, kerCorruptedMetadata); // restore
  }
  }
 
@@ -521,7 +508,7 @@ namespace Exiv2 {
  }
  }
  if ( start ) {
- readOrThrow(io, dir.data(), 4, kerCorruptedMetadata);
+ io.readOrThrow(dir.data(), 4, kerCorruptedMetadata);
  start = byteSwap4(dir,0,bSwap);
  }
  } while (start) ;
@@ -541,7 +528,7 @@ namespace Exiv2 {
  DataBuf dir(dirSize);
 
  // read header (we already know for certain that we have a Tiff file)
- readOrThrow(io, dir.data(), 8, kerCorruptedMetadata);
+ io.readOrThrow(dir.data(), 8, kerCorruptedMetadata);
  char c = static_cast<char>(dir.read_uint8(0));
  bool bSwap = ( c == 'M' && isLittleEndianPlatform() )
  || ( c == 'I' && isBigEndianPlatform() )

src/jpgimage.cpp

@@ -94,19 +94,6 @@ namespace Exiv2 {
  constexpr uint16_t Photoshop::iptc_ = 0x0404;
  constexpr uint16_t Photoshop::preview_ = 0x040c;
 
- // BasicIo::read() with error checking
- static void readOrThrow(BasicIo& iIo, byte* buf, long rcount, ErrorCode err) {
- const long nread = iIo.read(buf, rcount);
- enforce(nread == rcount, err);
- enforce(!iIo.error(), err);
- }
-
- // BasicIo::seek() with error checking
- static void seekOrThrow(BasicIo& iIo, long offset, BasicIo::Position pos, ErrorCode err) {
- const int r = iIo.seek(offset, pos);
- enforce(r == 0, err);
- }
-
  static inline bool inRange(int lo,int value, int hi)
  {
  return lo<=value && value <= hi;
@@ -389,7 +376,7 @@ namespace Exiv2 {
  byte sizebuf[2];
  uint16_t size = 0;
  if (markerHasLength(marker)) {
- readOrThrow(*io_, sizebuf, 2, kerFailedToReadImageData);
+ io_->readOrThrow(sizebuf, 2, kerFailedToReadImageData);
  size = getUShort(sizebuf, bigEndian);
  // `size` is the size of the segment, including the 2-byte size field
  // that we just read.
@@ -399,7 +386,7 @@ namespace Exiv2 {
  // Read the rest of the segment.
  DataBuf buf(size);
  if (size > 0) {
- readOrThrow(*io_, buf.data(2), size - 2, kerFailedToReadImageData);
+ io_->readOrThrow(buf.data(2), size - 2, kerFailedToReadImageData);
  buf.copyBytes(0, sizebuf, 2);
  }
 
@@ -616,7 +603,7 @@ namespace Exiv2 {
  byte sizebuf[2];
  uint16_t size = 0;
  if (markerHasLength(marker)) {
- readOrThrow(*io_, sizebuf, 2, kerFailedToReadImageData);
+ io_->readOrThrow(sizebuf, 2, kerFailedToReadImageData);
  size = getUShort(sizebuf, bigEndian);
  // `size` is the size of the segment, including the 2-byte size field
  // that we just read.
@@ -627,7 +614,7 @@ namespace Exiv2 {
  DataBuf buf(size);
  if (size > 0) {
  assert(size >= 2); // enforced above
- readOrThrow(*io_, buf.data(2), size - 2, kerFailedToReadImageData);
+ io_->readOrThrow(buf.data(2), size - 2, kerFailedToReadImageData);
  buf.copyBytes(0, sizebuf, 2);
  }
 
@@ -847,16 +834,16 @@ namespace Exiv2 {
 #ifdef EXIV2_DEBUG_MESSAGES
  std::cout << start << ":" << length << std::endl;
 #endif
- seekOrThrow(*io_, start, BasicIo::beg, kerFailedToReadImageData);
+ io_->seekOrThrow(start, BasicIo::beg, kerFailedToReadImageData);
  DataBuf buf(length);
- readOrThrow(*io_, buf.data(), buf.size(), kerFailedToReadImageData);
+ io_->readOrThrow(buf.data(), buf.size(), kerFailedToReadImageData);
  tempIo->write(buf.c_data(), buf.size());
  }
  }
 
- seekOrThrow(*io_, 0, BasicIo::beg, kerFailedToReadImageData);
+ io_->seekOrThrow(0, BasicIo::beg, kerFailedToReadImageData);
  io_->transfer(*tempIo); // may throw
- seekOrThrow(*io_, 0, BasicIo::beg, kerFailedToReadImageData);
+ io_->seekOrThrow(0, BasicIo::beg, kerFailedToReadImageData);
  readMetadata();
  }
  } // JpegBase::printStructure
@@ -923,7 +910,7 @@ namespace Exiv2 {
  byte sizebuf[2];
  uint16_t size = 0;
  if (markerHasLength(marker)) {
- readOrThrow(*io_, sizebuf, 2, kerFailedToReadImageData);
+ io_->readOrThrow(sizebuf, 2, kerFailedToReadImageData);
  size = getUShort(sizebuf, bigEndian);
  // `size` is the size of the segment, including the 2-byte size field
  // that we just read.
@@ -934,7 +921,7 @@ namespace Exiv2 {
  DataBuf buf(size);
  if (size > 0) {
  assert(size >= 2); // enforced above
- readOrThrow(*io_, buf.data(2), size - 2, kerFailedToReadImageData);
+ io_->readOrThrow(buf.data(2), size - 2, kerFailedToReadImageData);
  buf.copyBytes(0, sizebuf, 2);
  }
 
@@ -1024,7 +1011,7 @@ namespace Exiv2 {
  if (!comment_.empty())
  ++search;
 
- seekOrThrow(*io_, seek, BasicIo::beg, kerNoImageInInputData);
+ io_->seekOrThrow(seek, BasicIo::beg, kerNoImageInInputData);
  count = 0;
  marker = advanceToMarker(kerNoImageInInputData);
 
@@ -1037,7 +1024,7 @@ namespace Exiv2 {
  byte sizebuf[2];
  uint16_t size = 0;
  if (markerHasLength(marker)) {
- readOrThrow(*io_, sizebuf, 2, kerFailedToReadImageData);
+ io_->readOrThrow(sizebuf, 2, kerFailedToReadImageData);
  size = getUShort(sizebuf, bigEndian);
  // `size` is the size of the segment, including the 2-byte size field
  // that we just read.
@@ -1048,7 +1035,7 @@ namespace Exiv2 {
  DataBuf buf(size);
  if (size > 0) {
  assert(size >= 2); // enforced above
- readOrThrow(*io_, buf.data(2), size - 2, kerFailedToReadImageData);
+ io_->readOrThrow(buf.data(2), size - 2, kerFailedToReadImageData);
  buf.copyBytes(0, sizebuf, 2);
  }