liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The EXIFIfd data type produced by libtiff is updated to 0x0004

Browse Source 
which make the Exifs understandable by Windows. (see #4393)
This commit is contained in:
Hombre
2018-03-02 00:12:02 +01:00
parent 34807dc7a9
commit 0b8eb41896
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rtengine/imageio.cc
View File

@@ -1337,6 +1337,8 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed)
pl->setProgress (0.0); pl->setProgress (0.0);
} }
bool applyExifPatch = false;
if (exifRoot) { if (exifRoot) {
rtexif::TagDirectory* cl = (const_cast<rtexif::TagDirectory*> (exifRoot))->clone (nullptr); rtexif::TagDirectory* cl = (const_cast<rtexif::TagDirectory*> (exifRoot))->clone (nullptr);
@@ -1379,6 +1381,7 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed)
// at a different offset: // at a different offset:
TIFFSetWriteOffset (out, exif_size + 8); TIFFSetWriteOffset (out, exif_size + 8);
TIFFSetField (out, TIFFTAG_EXIFIFD, 8); TIFFSetField (out, TIFFTAG_EXIFIFD, 8);
applyExifPatch = true;
} }
} }
@@ -1490,6 +1493,40 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed)
writeOk = false; writeOk = false;
} }
/************************************************************************************************************
*
* Hombre: This is a dirty hack to update the Exif tag data type to 0x0004 so that Windows can understand it.
* libtiff will set this data type to 0x000d and doesn't provide any mechanism to update it before
* dumping to the file.
*
*/
if (applyExifPatch) {
unsigned char b[10];
uint16 tagCount = 0;
lseek(fileno, 4, SEEK_SET);
read(fileno, b, 4);
uint32 ifd0Offset = rtexif::sget4(b, exifRoot->getOrder());
printf("IFD0Offset: %d\n", ifd0Offset);
lseek(fileno, ifd0Offset, SEEK_SET);
read(fileno, b, 2);
tagCount = rtexif::sget2(b, exifRoot->getOrder());
for (size_t i = 0; i < tagCount ; ++i) {
uint16 tagID = 0;
read(fileno, b, 2);
tagID = rtexif::sget2(b, exifRoot->getOrder());
printf("TagID: %d\n", tagID);
if (tagID == 0x8769) {
rtexif::sset2(4, b, exifRoot->getOrder());
write(fileno, b, 4);
break;
} else {
read(fileno, b, 10);
}
}
}
/************************************************************************************************************/
TIFFClose (out); TIFFClose (out);
#ifdef WIN32 #ifdef WIN32
fclose (file); fclose (file);