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

Use auto for unique pointers

Browse Source
This commit is contained in:
Luis Díaz Más 2022-03-07 22:21:20 +01:00
parent f156af46f3
commit bbc99ae581
26 changed files with 44 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/addmoddel.cpp
View File

@ -103,9 +103,7 @@ try {
// *************************************************************************
// Finally, write the remaining Exif data to the image file
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->setExifData(exifData);
image->writeMetadata();

3
samples/convert-test.cpp
View File

@ -19,8 +19,7 @@ try {
return 1;
}
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(argv[1]);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(argv[1]);
image->readMetadata();
Exiv2::XmpData xmpData;

3
samples/easyaccess-test.cpp
View File

@ -63,8 +63,7 @@ try {
return 1;
}
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(argv[1]);
assert (image.get() != 0);
auto image = Exiv2::ImageFactory::open(argv[1]);
image->readMetadata();
Exiv2::ExifData& ed = image->exifData();

15
samples/exifcomment.cpp
View File

@ -20,8 +20,7 @@ try {
return 1;
}
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(argv[1]);
assert (image.get() != 0);
auto image = Exiv2::ImageFactory::open(argv[1]);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
@ -37,14 +36,10 @@ try {
Following are a few examples of valid comments. The last one is written to
the file.
*/
exifData["Exif.Photo.UserComment"]
= "charset=Unicode A Unicode Exif comment added with Exiv2";
exifData["Exif.Photo.UserComment"]
= "charset=Undefined An undefined Exif comment added with Exiv2";
exifData["Exif.Photo.UserComment"]
= "Another undefined Exif comment added with Exiv2";
exifData["Exif.Photo.UserComment"]
= "charset=Ascii An ASCII Exif comment added with Exiv2";
exifData["Exif.Photo.UserComment"] = "charset=Unicode A Unicode Exif comment added with Exiv2";
exifData["Exif.Photo.UserComment"] = "charset=Undefined An undefined Exif comment added with Exiv2";
exifData["Exif.Photo.UserComment"] = "Another undefined Exif comment added with Exiv2";
exifData["Exif.Photo.UserComment"] = "charset=Ascii An ASCII Exif comment added with Exiv2";
std::cout << "Writing user comment '"
<< exifData["Exif.Photo.UserComment"]

10
samples/exifdata-test.cpp
View File

@ -23,8 +23,8 @@ try {
}
std::string file(argv[1]);
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert (image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
assert (image);
image->readMetadata();
Exiv2::ExifData &ed = image->exifData();
@ -96,16 +96,14 @@ catch (Exiv2::AnyError& e) {
void write(const std::string& file, Exiv2::ExifData& ed)
{
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert (image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->setExifData(ed);
image->writeMetadata();
}
void print(const std::string& file)
{
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert (image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->readMetadata();
Exiv2::ExifData &ed = image->exifData();

3
samples/exifdata.cpp
View File

@ -184,8 +184,7 @@ int main(int argc,const char* argv[])
}
if ( !result ) try {
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();

3
samples/exifprint.cpp
View File

@ -63,8 +63,7 @@ try {
return rc;
}
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();

3
samples/exifvalue.cpp
View File

@ -21,8 +21,7 @@ int main(int argc, char* const argv[])
const char* file = argv[1];
const char* key = argv[2];
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();

3
samples/geotag.cpp
View File

@ -391,14 +391,13 @@ time_t parseTime(const char* arg,bool bAdjust)
// West of GMT is negative (PDT = Pacific Daylight = -07:00 == -25200 seconds
int timeZoneAdjust()
{
time_t now = time(nullptr);
[[maybe_unused]] time_t now = time(nullptr);
int offset;
#if defined(_MSC_VER) || defined(__MINGW__)
TIME_ZONE_INFORMATION TimeZoneInfo;
GetTimeZoneInformation( &TimeZoneInfo );
offset = - (((int)TimeZoneInfo.Bias + (int)TimeZoneInfo.DaylightBias) * 60);
UNUSED(now);
#elif defined(__CYGWIN__)
struct tm lcopy = *localtime(&now);
time_t gmt = timegm(&lcopy) ; // timegm modifies lcopy

2
samples/iotest.cpp
View File

@ -49,7 +49,7 @@ int main(int argc, char* const argv[])
std::vector<Exiv2::byte> bytes (blocksize);
// copy fileIn from a remote location.
BasicIo::UniquePtr io = Exiv2::ImageFactory::createIo(fr);
auto io = Exiv2::ImageFactory::createIo(fr);
if ( io->open() != 0 ) {
Error(Exiv2::kerFileOpenFailed, io->path(), "rb", strError());
}

4
samples/iptceasy.cpp
View File

@ -37,9 +37,7 @@ try {
std::cout << "Time sent: " << iptcData["Iptc.Envelope.TimeSent"] << "\n";
// Open image file
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert (image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
// Set IPTC data and write it to the file
image->setIptcData(iptcData);
image->writeMetadata();

3
samples/iptcprint.cpp
View File

@ -18,8 +18,7 @@ try {
return 1;
}
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(argv[1]);
assert (image.get() != 0);
auto image = Exiv2::ImageFactory::open(argv[1]);
image->readMetadata();
Exiv2::IptcData &iptcData = image->iptcData();

3
samples/iptctest.cpp
View File

@ -29,8 +29,7 @@ int main(int argc, char* const argv[])
return 1;
}
Image::UniquePtr image = ImageFactory::open(argv[1]);
assert (image.get() != 0);
auto image = ImageFactory::open(argv[1]);
image->readMetadata();
// Process commands

6
samples/largeiptc-test.cpp
View File

@ -28,7 +28,8 @@ int main(int argc, char* const argv[])
if (io.open() != 0) {
throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError());
}
Exiv2::DataBuf buf(static_cast<long>(io.size()));
Exiv2::DataBuf buf(io.size());
std::cout << "Reading " << buf.size() << " bytes from " << data << "\n";
const size_t readBytes = io.read(buf.data(), buf.size());
if (readBytes != buf.size() || io.error() || io.eof()) {
@ -36,8 +37,7 @@ int main(int argc, char* const argv[])
}
// Read metadata from file
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->readMetadata();
// Set Preview field to the content of the data file

6
samples/metacopy.cpp
View File

@ -34,12 +34,10 @@ try {
auto memIo = std::make_unique<Exiv2::MemIo>();
memIo->transfer(fileIo);
Exiv2::Image::UniquePtr readImg = Exiv2::ImageFactory::open(std::move(memIo));
assert(readImg.get() != 0);
auto readImg = Exiv2::ImageFactory::open(std::move(memIo));
readImg->readMetadata();
Exiv2::Image::UniquePtr writeImg = Exiv2::ImageFactory::open(params.write_);
assert(writeImg.get() != 0);
auto writeImg = Exiv2::ImageFactory::open(params.write_);
if (params.preserve_) {
writeImg->readMetadata();
}

3
samples/mmap-test.cpp
View File

@ -28,8 +28,7 @@ try {
}
// Map it to memory
const Exiv2::byte* pData = file.mmap();
auto size = static_cast<long>(file.size());
DataBuf buf(size);
DataBuf buf(file.size());
// Read from the memory mapped region
buf.copyBytes(0, pData, buf.size());
// Reopen file in write mode and write to it

3
samples/mrwthumb.cpp
View File

@ -19,8 +19,7 @@ int main(int argc, char* const argv[])
return 1;
}
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(argv[1]);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(argv[1]);
image->readMetadata();
Exiv2::ExifData& exifData = image->exifData();

3
samples/prevtest.cpp
View File

@ -19,8 +19,7 @@ try {
}
std::string filename(argv[1]);
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(filename);
image->readMetadata();
Exiv2::PreviewManager loader(*image);

6
samples/remotetest.cpp
View File

@ -44,15 +44,13 @@ try {
Exiv2::ExifKey key("Exif.Image.DateTime");
exifData.add(key, v.get());
Exiv2::Image::UniquePtr writeTest = Exiv2::ImageFactory::open(file, useCurlFromExiv2TestApps);
assert(writeTest.get() != 0);
auto writeTest = Exiv2::ImageFactory::open(file, useCurlFromExiv2TestApps);
writeTest->setExifData(exifData);
writeTest->writeMetadata();
// read the result to make sure everything fine
std::cout << "Print out the new metadata ...\n";
Exiv2::Image::UniquePtr readTest = Exiv2::ImageFactory::open(file, useCurlFromExiv2TestApps);
assert(readTest.get() != 0);
auto readTest = Exiv2::ImageFactory::open(file, useCurlFromExiv2TestApps);
readTest->readMetadata();
Exiv2::ExifData &exifReadData = readTest->exifData();
if (exifReadData.empty()) {

6
samples/write-test.cpp
View File

@ -148,8 +148,7 @@ void testCase(const std::string& file1,
ExifKey ek(key);
//Open first image
Image::UniquePtr image1 = ImageFactory::open(file1);
assert(image1.get() != 0);
auto image1 = ImageFactory::open(file1);
// Load existing metadata
std::cerr << "---> Reading file " << file1 << "\n";
@ -164,8 +163,7 @@ void testCase(const std::string& file1,
pos->setValue(value);
// Open second image
Image::UniquePtr image2 = ImageFactory::open(file2);
assert(image2.get() != 0);
auto image2 = ImageFactory::open(file2);
image2->setExifData(image1->exifData());

17
samples/write2-test.cpp
View File

@ -27,19 +27,19 @@ int main(int argc, char* const argv[])
Exiv2::ExifData ed1;
ed1["Exif.Image.Model"] = "Test 1";
Exiv2::Value::UniquePtr v1 = Exiv2::Value::create(Exiv2::unsignedShort);
auto v1 = Exiv2::Value::create(Exiv2::unsignedShort);
v1->read("160 161 162 163");
ed1.add(Exiv2::ExifKey("Exif.Image.SamplesPerPixel"), v1.get());
Exiv2::Value::UniquePtr v2 = Exiv2::Value::create(Exiv2::signedLong);
auto v2 = Exiv2::Value::create(Exiv2::signedLong);
v2->read("-2 -1 0 1");
ed1.add(Exiv2::ExifKey("Exif.Image.XResolution"), v2.get());
Exiv2::Value::UniquePtr v3 = Exiv2::Value::create(Exiv2::signedRational);
auto v3 = Exiv2::Value::create(Exiv2::signedRational);
v3->read("-2/3 -1/3 0/3 1/3");
ed1.add(Exiv2::ExifKey("Exif.Image.YResolution"), v3.get());
Exiv2::Value::UniquePtr v4 = Exiv2::Value::create(Exiv2::undefined);
auto v4 = Exiv2::Value::create(Exiv2::undefined);
v4->read("255 254 253 252");
ed1.add(Exiv2::ExifKey("Exif.Image.WhitePoint"), v4.get());
@ -66,8 +66,7 @@ int main(int argc, char* const argv[])
print(file);
std::cout <<"\n----- Non-intrusive writing of special Canon MakerNote tags\n";
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->readMetadata();
Exiv2::ExifData& rEd = image->exifData();
@ -198,8 +197,7 @@ catch (Exiv2::AnyError& e) {
void write(const std::string& file, Exiv2::ExifData& ed)
{
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->setExifData(ed);
image->writeMetadata();
@ -207,8 +205,7 @@ void write(const std::string& file, Exiv2::ExifData& ed)
void print(const std::string& file)
{
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(file);
image->readMetadata();
Exiv2::ExifData &ed = image->exifData();

3
samples/xmpdump.cpp
View File

@ -18,8 +18,7 @@ int main(int argc, char* const argv[])
return 1;
}
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(argv[1]);
assert(image.get() != 0);
auto image = Exiv2::ImageFactory::open(argv[1]);
image->readMetadata();
const std::string& xmpPacket = image->xmpPacket();

1
samples/xmpparse.cpp
View File

@ -16,6 +16,7 @@ try {
std::cout << "Usage: " << argv[0] << " file\n";
return 1;
}
Exiv2::DataBuf buf = Exiv2::readFile(argv[1]);
std::string xmpPacket;
xmpPacket.assign(buf.c_str(), buf.size());

3
samples/xmpprint.cpp
View File

@ -23,8 +23,7 @@ int main(int argc, char** argv)
return 1;
}
Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(argv[1]);
assert (image.get() != 0);
auto image = Exiv2::ImageFactory::open(argv[1]);
image->readMetadata();
Exiv2::XmpData &xmpData = image->xmpData();

2
samples/xmpsample.cpp
View File

@ -107,7 +107,7 @@ try {
// properties and language alternatives.
// Add a simple XMP property in a known namespace
Exiv2::Value::UniquePtr v = Exiv2::Value::create(Exiv2::xmpText);
auto v = Exiv2::Value::create(Exiv2::xmpText);
v->read("image/jpeg");
xmpData.add(Exiv2::XmpKey("Xmp.dc.format"), v.get());

1
src/futils.cpp
View File

@ -4,6 +4,7 @@
#include "futils.hpp"
#include "config.h"
#include "error.hpp"
// + standard includes
#include <algorithm>