Commit 84c6c47f authored by Alex Richardson's avatar Alex Richardson
Browse files

Fix building against Exiv2 main branch

The current main branch of Exiv2 has an API change that makes these
fields private: https://github.com/Exiv2/exiv2/commit/c9d0cf36434c351a4dcf289d407ac70252a8ed72
parent a3d60fbf
Pipeline #126746 passed with stage
in 8 minutes and 14 seconds
......@@ -559,7 +559,11 @@ QImage JpegContent::thumbnail() const
#else
Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
#endif
#if (EXIV2_TEST_VERSION(0, 28, 0))
image.loadFromData(thumbnail.data(), thumbnail.size());
#else
image.loadFromData(thumbnail.pData_, thumbnail.size_);
#endif
auto it = d->mExifData.findKey(Exiv2::ExifKey("Exif.Canon.ThumbnailImageValidArea"));
// ensure ThumbnailImageValidArea actually specifies a rectangle, i.e. there must be 4 coordinates
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment