|
 |
48c46a |
diff --git a/src/cr2image.cpp b/src/cr2image.cpp
|
|
|
48c46a |
index 516e170..8a752b0 100644
|
|
|
48c46a |
--- a/src/cr2image.cpp
|
|
|
48c46a |
+++ b/src/cr2image.cpp
|
|
|
48c46a |
@@ -107,8 +107,6 @@ namespace Exiv2 {
|
|
|
48c46a |
throw Error(3, "CR2");
|
|
|
48c46a |
}
|
|
|
48c46a |
clearMetadata();
|
|
|
48c46a |
- std::ofstream devnull;
|
|
|
48c46a |
- printStructure(devnull, kpsRecursive, 0);
|
|
|
48c46a |
ByteOrder bo = Cr2Parser::decode(exifData_,
|
|
|
48c46a |
iptcData_,
|
|
|
48c46a |
xmpData_,
|
|
|
48c46a |
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
|
|
|
48c46a |
index 232919c..58240fd 100644
|
|
|
48c46a |
--- a/src/crwimage.cpp
|
|
|
48c46a |
+++ b/src/crwimage.cpp
|
|
|
48c46a |
@@ -131,15 +131,8 @@ namespace Exiv2 {
|
|
|
48c46a |
throw Error(33);
|
|
|
48c46a |
}
|
|
|
48c46a |
clearMetadata();
|
|
|
48c46a |
- // read all metadata into memory
|
|
|
48c46a |
- // we should put this into clearMetadata(), however it breaks the test suite!
|
|
|
48c46a |
- try {
|
|
|
48c46a |
- std::ofstream devnull;
|
|
|
48c46a |
- printStructure(devnull,kpsRecursive,0);
|
|
|
48c46a |
- } catch (Exiv2::Error& /* e */) {
|
|
|
48c46a |
- DataBuf file(io().size());
|
|
|
48c46a |
- io_->read(file.pData_,file.size_);
|
|
|
48c46a |
- }
|
|
|
48c46a |
+ DataBuf file( (long) io().size());
|
|
|
48c46a |
+ io_->read(file.pData_,file.size_);
|
|
|
48c46a |
|
|
|
48c46a |
CrwParser::decode(this, io_->mmap(), io_->size());
|
|
|
48c46a |
|
|
|
48c46a |
diff --git a/src/orfimage.cpp b/src/orfimage.cpp
|
|
|
48c46a |
index 25651bd..9bd7a02 100644
|
|
|
48c46a |
--- a/src/orfimage.cpp
|
|
|
48c46a |
+++ b/src/orfimage.cpp
|
|
|
48c46a |
@@ -119,8 +119,6 @@ namespace Exiv2 {
|
|
|
48c46a |
throw Error(3, "ORF");
|
|
|
48c46a |
}
|
|
|
48c46a |
clearMetadata();
|
|
|
48c46a |
- std::ofstream devnull;
|
|
|
48c46a |
- printStructure(devnull, kpsRecursive, 0);
|
|
|
48c46a |
ByteOrder bo = OrfParser::decode(exifData_,
|
|
|
48c46a |
iptcData_,
|
|
|
48c46a |
xmpData_,
|
|
|
48c46a |
diff --git a/src/rw2image.cpp b/src/rw2image.cpp
|
|
|
48c46a |
index 07de437..5922602 100644
|
|
|
48c46a |
--- a/src/rw2image.cpp
|
|
|
48c46a |
+++ b/src/rw2image.cpp
|
|
|
48c46a |
@@ -130,8 +130,6 @@ namespace Exiv2 {
|
|
|
48c46a |
throw Error(3, "RW2");
|
|
|
48c46a |
}
|
|
|
48c46a |
clearMetadata();
|
|
|
48c46a |
- std::ofstream devnull;
|
|
|
48c46a |
- printStructure(devnull, kpsRecursive, 0);
|
|
|
48c46a |
ByteOrder bo = Rw2Parser::decode(exifData_,
|
|
|
48c46a |
iptcData_,
|
|
|
48c46a |
xmpData_,
|
|
|
48c46a |
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
|
|
|
48c46a |
index de66068..98da12b 100644
|
|
|
48c46a |
--- a/src/tiffimage.cpp
|
|
|
48c46a |
+++ b/src/tiffimage.cpp
|
|
|
48c46a |
@@ -185,10 +185,6 @@ namespace Exiv2 {
|
|
|
48c46a |
}
|
|
|
48c46a |
clearMetadata();
|
|
|
48c46a |
|
|
|
48c46a |
- // recursively print the structure to /dev/null to ensure all metadata is in memory
|
|
|
48c46a |
- // must be recursive to handle NEFs which stores the raw image in a subIFDs
|
|
|
48c46a |
- std::ofstream devnull;
|
|
|
48c46a |
- printStructure(devnull,kpsRecursive,0);
|
|
|
48c46a |
ByteOrder bo = TiffParser::decode(exifData_,
|
|
|
48c46a |
iptcData_,
|
|
|
48c46a |
xmpData_,
|
|
|
48c46a |
@@ -200,7 +196,7 @@ namespace Exiv2 {
|
|
|
48c46a |
Exiv2::ExifKey key("Exif.Image.InterColorProfile");
|
|
|
48c46a |
Exiv2::ExifData::iterator pos = exifData_.findKey(key);
|
|
|
48c46a |
if ( pos != exifData_.end() ) {
|
|
|
48c46a |
- iccProfile_.alloc(pos->count());
|
|
|
48c46a |
+ iccProfile_.alloc(pos->count()*pos->typeSize());
|
|
|
48c46a |
pos->copy(iccProfile_.pData_,bo);
|
|
|
48c46a |
}
|
|
|
48c46a |
|