xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #431 from piponazo/removeCrwSamples

Browse Source 
Remove crw samples + Fix build with MinGW
v0.27.3
Robin Mills 7 years ago committed by GitHub
parent 1e23238fa4 2698490584
commit 59e84ed1ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 211 deletions
Show Stats Download Patch File Download Diff File

2
samples/CMakeLists.txt
Unescape Escape View File

@ -30,8 +30,6 @@ set( SAMPLES
xmpprint.cpp
xmpsample.cpp
xmpdump.cpp
crwedit.cpp
crwparse.cpp
)
##

145
samples/crwedit.cpp
Unescape Escape View File

@ -1,145 +0,0 @@
// ***************************************************************** -*- C++ -*-
// crwedit.cpp
// Print the CIFF structure of a CRW file
#include "crwimage.hpp"
#include "crwimage_int.hpp"
#include "futils.hpp"
#include <cstring>
#include <iostream>
#include <string>
void remove(Exiv2::Internal::CiffHeader* pHead);
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;
}
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);
}
// 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_);
// 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::Internal::CiffHeader* pHead)
{
Exiv2::Blob blob;
pHead->write(blob);
Exiv2::FileIo io(filename);
if (io.open("wb") != 0) {
throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError());
}
Exiv2::IoCloser closer(io);
long ret = io.write(&blob[0], (long)blob.size());
if (static_cast<size_t>(ret) != blob.size())
throw Exiv2::Error(Exiv2::kerImageWriteFailed);
io.close();
}
void remove(Exiv2::Internal::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::Internal::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";
}

50
samples/crwparse.cpp
Unescape Escape View File

@ -1,50 +0,0 @@
// ***************************************************************** -*- C++ -*-
// crwparse.cpp
// Print the CIFF structure of a CRW file
#include "crwimage.hpp"
#include "crwimage_int.hpp"
#include "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(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);
// 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;
}
}

16
src/timegm.h
Unescape Escape View File

@ -3,22 +3,10 @@
@brief Declaration of timegm(). The implementation is in localtime.c
*/
#pragma once
#include <time.h>
#ifdef __cplusplus
extern "C" {
#endif
// The UTC version of mktime
/* rmills - timegm is replaced with _mkgmtime on VC 2005 and up */
/* - see localtime.c */
#if !defined(_MSC_VER) || (_MSC_VER < 1400)
time_t timegm(struct tm * const tmp);
#else
/* timegm is replaced with _mkgmtime on Windows (msvc && mingw) */
#if defined(__MINGW__) || defined(_MSC_VER)
#define timegm _mkgmtime
#endif
#ifdef __cplusplus
}
#endif

Write Preview
Loading…
Cancel
Save