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

Removed CIFF classes from published API, doc tweaks.

Browse Source
This commit is contained in:
Andreas Huggel
2008-08-03 15:31:36 +00:00
parent cbb52db524
commit 00a3ef321b
17 changed files with 971 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/Makefile
-2
View File
@@ -56,8 +56,6 @@ include $(top_srcdir)/config/config.mk
# Add source files of sample programs to this list
BINSRC = addmoddel.cpp \
convert-test.cpp \
crwedit.cpp \
crwparse.cpp \
exifcomment.cpp \
exifdata-test.cpp \
exifprint.cpp \
samples/crwedit.cpp
-132
View File
@@ -1,132 +0,0 @@
// ***************************************************************** -*- C++ -*-
// crwedit.cpp, $Rev$
// Print the CIFF structure of a CRW file
#include <exiv2/crwimage.hpp>
#include <exiv2/futils.hpp>
#include <iostream>
#include <string>
#include <cstring>
void remove(Exiv2::CiffHeader* pHead);
void add(Exiv2::CiffHeader* pHead);
void help();
void write(const std::string& filename, const Exiv2::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;
}
std::string filename(argv[1]);
Exiv2::FileIo io(filename);
if(io.open() != 0) {
throw Exiv2::Error(9, 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(14);
throw Exiv2::Error(33);
}
// 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(14);
// Parse the image, starting with a CIFF header component
Exiv2::CiffHeader::AutoPtr parseTree(new Exiv2::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;
}
}
return 0;
}
catch (Exiv2::AnyError& e) {
std::cerr << e << "\n";
return -1;
}
void write(const std::string& filename, const Exiv2::CiffHeader* pHead)
{
Exiv2::Blob blob;
pHead->write(blob);
Exiv2::FileIo io(filename);
if(io.open("wb") != 0) {
throw Exiv2::Error(9, io.path(), Exiv2::strError());
}
Exiv2::IoCloser closer(io);
long ret = io.write(&blob[0], blob.size());
if (static_cast<size_t>(ret) != blob.size()) throw Exiv2::Error(21);
io.close();
}
void remove(Exiv2::CiffHeader* pHead)
{
uint16_t crwTag, crwDir;
std::cout << "crwTag> 0x";
std::cin >> std::hex >> crwTag;
std::cout << "crwDir> 0x";
std::cin >> std::hex >> crwDir;
std::cout << "Deleting tag 0x" << std::hex << crwTag
<< " in dir 0x" << crwDir << ", ok? ";
char cmd;
std::cin >> cmd;
if (cmd != 'n' && cmd != 'N') {
pHead->remove(crwTag, crwDir);
}
else {
std::cout << "Canceled.\n";
}
}
void add(Exiv2::CiffHeader* pHead)
{
uint16_t crwTag, crwDir;
uint32_t size;
std::cout << "crwTag> 0x";
std::cin >> std::hex >> crwTag;
std::cout << "crwDir> 0x";
std::cin >> std::hex >> crwDir;
std::cout << "size> ";
std::cin >> std::dec >> size;
std::cout << "Adding tag 0x" << std::hex << crwTag
<< " in dir 0x" << crwDir << ", " << size << " bytes, ok? ";
char cmd;
std::cin >> cmd;
if (cmd != 'n' && cmd != 'N') {
Exiv2::DataBuf buf(size);
std::memset(buf.pData_, 0xaa, size);
pHead->add(crwTag, crwDir, buf);
}
else {
std::cout << "Canceled.\n";
}
}
void help()
{
std::cout << "a: add tag, d: delete tag, p: print tags, w: write file, q: quit\n";
}
samples/crwparse.cpp
-46
View File
@@ -1,46 +0,0 @@
// ***************************************************************** -*- C++ -*-
// crwparse.cpp, $Rev$
// Print the CIFF structure of a CRW file
#include <exiv2/crwimage.hpp>
#include <exiv2/futils.hpp>
#include <iostream>
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(9, 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(14);
throw Exiv2::Error(33);
}
// 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(14);
// Parse the image, starting with a CIFF header component
Exiv2::CiffHeader::AutoPtr parseTree(new Exiv2::CiffHeader);
parseTree->read(buf.pData_, buf.size_);
parseTree->print(std::cout);
return 0;
}
catch (Exiv2::AnyError& e) {
std::cerr << e << "\n";
return -1;
}