From d96b619515e39c16f0d563562a6ddc45e9c56e9c Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Sat, 25 Aug 2018 13:42:51 +0200 Subject: [PATCH] Add braces for the main functions in the new source files at samples --- samples/crwedit.cpp | 115 ++++++++++++++++++++++--------------------- samples/crwparse.cpp | 69 +++++++++++++------------- samples/mrwthumb.cpp | 75 ++++++++++++++-------------- samples/xmpdump.cpp | 41 ++++++++------- 4 files changed, 156 insertions(+), 144 deletions(-) diff --git a/samples/crwedit.cpp b/samples/crwedit.cpp index 12c3b774..920477b7 100644 --- a/samples/crwedit.cpp +++ b/samples/crwedit.cpp @@ -15,70 +15,73 @@ void add(Exiv2::Internal::CiffHeader* pHead); void help(); void write(const std::string& filename, const Exiv2::Internal::CiffHeader* pHead); -int main(int argc, char* const argv[]) try { - if (argc != 2) { - std::cout << "Usage: " << argv[0] << " file\n"; - std::cout << "Edit the CIFF structure of a CRW file\n"; - return 1; - } +int main(int argc, char* const argv[]) +{ + try { + if (argc != 2) { + std::cout << "Usage: " << argv[0] << " file\n"; + std::cout << "Edit the CIFF structure of a CRW file\n"; + return 1; + } - std::string filename(argv[1]); - Exiv2::FileIo io(filename); - if (io.open() != 0) { - throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError()); - } - Exiv2::IoCloser closer(io); + std::string filename(argv[1]); + Exiv2::FileIo io(filename); + if (io.open() != 0) { + throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError()); + } + Exiv2::IoCloser closer(io); + + // Ensure that this is a CRW image + if (!Exiv2::isCrwType(io, false)) { + if (io.error() || io.eof()) + throw Exiv2::Error(Exiv2::kerFailedToReadImageData); + throw Exiv2::Error(Exiv2::kerNotACrwImage); + } - // Ensure that this is a CRW image - if (!Exiv2::isCrwType(io, false)) { + // Read the image into a memory buffer + long len = (long)io.size(); + Exiv2::DataBuf buf(len); + io.read(buf.pData_, len); if (io.error() || io.eof()) throw Exiv2::Error(Exiv2::kerFailedToReadImageData); - throw Exiv2::Error(Exiv2::kerNotACrwImage); - } - // Read the image into a memory buffer - long len = (long)io.size(); - Exiv2::DataBuf buf(len); - io.read(buf.pData_, len); - if (io.error() || io.eof()) - throw Exiv2::Error(Exiv2::kerFailedToReadImageData); + // Parse the image, starting with a CIFF header component + Exiv2::Internal::CiffHeader::AutoPtr parseTree(new Exiv2::Internal::CiffHeader); + parseTree->read(buf.pData_, buf.size_); - // Parse the image, starting with a CIFF header component - Exiv2::Internal::CiffHeader::AutoPtr parseTree(new Exiv2::Internal::CiffHeader); - parseTree->read(buf.pData_, buf.size_); - - // Allow user to make changes - bool go = true; - while (go) { - char cmd; - std::cout << "command> "; - std::cin >> cmd; - switch (cmd) { - case 'q': - go = false; - break; - case 'p': - parseTree->print(std::cout); - break; - case 'a': - add(parseTree.get()); - break; - case 'd': - remove(parseTree.get()); - break; - case 'w': - write(filename, parseTree.get()); - break; - case 'h': - help(); - break; + // Allow user to make changes + bool go = true; + while (go) { + char cmd; + std::cout << "command> "; + std::cin >> cmd; + switch (cmd) { + case 'q': + go = false; + break; + case 'p': + parseTree->print(std::cout); + break; + case 'a': + add(parseTree.get()); + break; + case 'd': + remove(parseTree.get()); + break; + case 'w': + write(filename, parseTree.get()); + break; + case 'h': + help(); + break; + } } - } - return 0; -} catch (Exiv2::AnyError& e) { - std::cerr << e << "\n"; - return -1; + return 0; + } catch (Exiv2::AnyError& e) { + std::cerr << e << "\n"; + return -1; + } } void write(const std::string& filename, const Exiv2::Internal::CiffHeader* pHead) diff --git a/samples/crwparse.cpp b/samples/crwparse.cpp index ce3fce15..62a0846d 100644 --- a/samples/crwparse.cpp +++ b/samples/crwparse.cpp @@ -8,40 +8,43 @@ #include -int main(int argc, char* const argv[]) try { - if (argc != 2) { - std::cout << "Usage: " << argv[0] << " file\n"; - std::cout << "Print the CIFF structure of a CRW file\n"; - return 1; - } - - Exiv2::FileIo io(argv[1]); - if (io.open() != 0) { - throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError()); - } - Exiv2::IoCloser closer(io); - - // Ensure that this is a CRW image - if (!Exiv2::isCrwType(io, false)) { +int main(int argc, char* const argv[]) +{ + try { + if (argc != 2) { + std::cout << "Usage: " << argv[0] << " file\n"; + std::cout << "Print the CIFF structure of a CRW file\n"; + return 1; + } + + Exiv2::FileIo io(argv[1]); + if (io.open() != 0) { + throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError()); + } + Exiv2::IoCloser closer(io); + + // Ensure that this is a CRW image + if (!Exiv2::isCrwType(io, false)) { + if (io.error() || io.eof()) + throw Exiv2::Error(Exiv2::kerFailedToReadImageData); + throw Exiv2::Error(Exiv2::kerNotACrwImage); + } + + // Read the image into a memory buffer + long len = io.size(); + Exiv2::DataBuf buf(len); + io.read(buf.pData_, len); if (io.error() || io.eof()) throw Exiv2::Error(Exiv2::kerFailedToReadImageData); - throw Exiv2::Error(Exiv2::kerNotACrwImage); - } - // Read the image into a memory buffer - long len = io.size(); - Exiv2::DataBuf buf(len); - io.read(buf.pData_, len); - if (io.error() || io.eof()) - throw Exiv2::Error(Exiv2::kerFailedToReadImageData); - - // Parse the image, starting with a CIFF header component - Exiv2::Internal::CiffHeader::AutoPtr parseTree(new Exiv2::Internal::CiffHeader); - parseTree->read(buf.pData_, buf.size_); - parseTree->print(std::cout); - - return 0; -} catch (Exiv2::AnyError& e) { - std::cerr << e << "\n"; - return -1; + // Parse the image, starting with a CIFF header component + Exiv2::Internal::CiffHeader::AutoPtr parseTree(new Exiv2::Internal::CiffHeader); + parseTree->read(buf.pData_, buf.size_); + parseTree->print(std::cout); + + return 0; + } catch (Exiv2::AnyError& e) { + std::cerr << e << "\n"; + return -1; + } } diff --git a/samples/mrwthumb.cpp b/samples/mrwthumb.cpp index 1a3d1969..323f61e6 100644 --- a/samples/mrwthumb.cpp +++ b/samples/mrwthumb.cpp @@ -7,41 +7,44 @@ #include "exif.hpp" #include "image.hpp" -int main(int argc, char* const argv[]) try { - if (argc != 2) { - std::cout << "Usage: " << argv[0] << " file\n"; - return 1; +int main(int argc, char* const argv[]) +{ + try { + if (argc != 2) { + std::cout << "Usage: " << argv[0] << " file\n"; + return 1; + } + + Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(argv[1]); + assert(image.get() != 0); + image->readMetadata(); + + Exiv2::ExifData& exifData = image->exifData(); + if (exifData.empty()) { + std::string error(argv[1]); + error += ": No Exif data found in the file"; + throw Exiv2::Error(Exiv2::kerErrorMessage, error); + } + + Exiv2::ExifKey key("Exif.Minolta.ThumbnailOffset"); + Exiv2::ExifData::const_iterator format = exifData.findKey(key); + + if (format != exifData.end()) { + Exiv2::DataBuf buf = format->dataArea(); + + // The first byte of the buffer needs to be patched + buf.pData_[0] = 0xff; + + Exiv2::FileIo file("img_thumb.jpg"); + + file.open("wb"); + file.write(buf.pData_, buf.size_); + file.close(); + } + + return 0; + } catch (Exiv2::AnyError& e) { + std::cout << "Caught Exiv2 exception '" << e << "'\n"; + return -1; } - - Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(argv[1]); - assert(image.get() != 0); - image->readMetadata(); - - Exiv2::ExifData& exifData = image->exifData(); - if (exifData.empty()) { - std::string error(argv[1]); - error += ": No Exif data found in the file"; - throw Exiv2::Error(Exiv2::kerErrorMessage, error); - } - - Exiv2::ExifKey key("Exif.Minolta.ThumbnailOffset"); - Exiv2::ExifData::const_iterator format = exifData.findKey(key); - - if (format != exifData.end()) { - Exiv2::DataBuf buf = format->dataArea(); - - // The first byte of the buffer needs to be patched - buf.pData_[0] = 0xff; - - Exiv2::FileIo file("img_thumb.jpg"); - - file.open("wb"); - file.write(buf.pData_, buf.size_); - file.close(); - } - - return 0; -} catch (Exiv2::AnyError& e) { - std::cout << "Caught Exiv2 exception '" << e << "'\n"; - return -1; } diff --git a/samples/xmpdump.cpp b/samples/xmpdump.cpp index 392d5ab3..6231bad0 100644 --- a/samples/xmpdump.cpp +++ b/samples/xmpdump.cpp @@ -7,26 +7,29 @@ #include #include "image.hpp" -int main(int argc, char* const argv[]) try { - if (argc != 2) { - std::cout << "Usage: " << argv[0] << " file\n"; - return 1; - } +int main(int argc, char* const argv[]) +{ + try { + if (argc != 2) { + std::cout << "Usage: " << argv[0] << " file\n"; + return 1; + } - Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(argv[1]); - assert(image.get() != 0); - image->readMetadata(); + Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(argv[1]); + assert(image.get() != 0); + image->readMetadata(); - const std::string& xmpPacket = image->xmpPacket(); - if (xmpPacket.empty()) { - std::string error(argv[1]); - error += ": No XMP packet found in the file"; - throw Exiv2::Error(Exiv2::kerErrorMessage, error); - } - std::cout << xmpPacket << "\n"; + const std::string& xmpPacket = image->xmpPacket(); + if (xmpPacket.empty()) { + std::string error(argv[1]); + error += ": No XMP packet found in the file"; + throw Exiv2::Error(Exiv2::kerErrorMessage, error); + } + std::cout << xmpPacket << "\n"; - return 0; -} catch (Exiv2::AnyError& e) { - std::cout << "Caught Exiv2 exception '" << e << "'\n"; - return -1; + return 0; + } catch (Exiv2::AnyError& e) { + std::cout << "Caught Exiv2 exception '" << e << "'\n"; + return -1; + } }