rmconvert.patch

Redmine Admin, 07 Jun 2008 02:32

Download (1.3 KB)

View differences:

src/Makefile (working copy)
70 70
CCSRC =  basicio.cpp          \
71 71
	 bmpimage.cpp         \
72 72
	 canonmn.cpp          \
73
	 convert.cpp          \
74 73
	 cr2image.cpp         \
75 74
	 crwimage.cpp         \
76 75
	 datasets.cpp         \
src/xmpsidecar.cpp (working copy)
43 43
#include "error.hpp"
44 44
#include "xmp.hpp"
45 45
#include "futils.hpp"
46
#include "convert.hpp"
47 46

  
48 47
// + standard includes
49 48
#include <string>
......
104 103
            std::cerr << "Warning: Failed to decode XMP metadata.\n";
105 104
#endif
106 105
        }
107
        copyXmpToIptc(xmpData_, iptcData_);
108
        copyXmpToExif(xmpData_, exifData_);
109 106
    } // XmpSidecar::readMetadata
110 107

  
111 108
    void XmpSidecar::writeMetadata()
......
116 113
        IoCloser closer(*io_);
117 114

  
118 115
        if (writeXmpFromPacket() == false) {
119
            copyExifToXmp(exifData_, xmpData_);
120
            copyIptcToXmp(iptcData_, xmpData_);
121 116
            if (XmpParser::encode(xmpPacket_, xmpData_,
122 117
                                  XmpParser::omitPacketWrapper|XmpParser::useCompactFormat)) {
123 118
#ifndef SUPPRESS_WARNINGS
Redmine Appliance - Powered by TurnKey Linux