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

merge with dev

Browse Source
This commit is contained in:
Desmis 2018-05-07 18:57:05 +02:00
commit 948ab0baf4
11 changed files with 109 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtdata/languages/Francais
View File

@ -1213,7 +1213,9 @@ SAMPLEFORMAT_1;8 bits non signé
SAMPLEFORMAT_2;16 bits non signé SAMPLEFORMAT_2;16 bits non signé
SAMPLEFORMAT_4;LogLuv 24 bits SAMPLEFORMAT_4;LogLuv 24 bits
SAMPLEFORMAT_8;LogLuv 32 bits SAMPLEFORMAT_8;LogLuv 32 bits
SAMPLEFORMAT_16;32 bits à virgule flottante SAMPLEFORMAT_16;16 bits à virgule flottante
SAMPLEFORMAT_32;24 bits à virgule flottante
SAMPLEFORMAT_64;32 bits à virgule flottante
SAVEDLG_AUTOSUFFIX;Ajouter automatiquement un suffixe si le fichier existe déjà SAVEDLG_AUTOSUFFIX;Ajouter automatiquement un suffixe si le fichier existe déjà
SAVEDLG_FILEFORMAT;Format de fichier SAVEDLG_FILEFORMAT;Format de fichier
SAVEDLG_FORCEFORMATOPTS;Forcer les options d'enregistrement SAVEDLG_FORCEFORMATOPTS;Forcer les options d'enregistrement

12
rtdata/languages/default
View File

@ -1350,11 +1350,13 @@ QINFO_ISO;ISO
QINFO_NOEXIF;Exif data not available. QINFO_NOEXIF;Exif data not available.
QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s)
SAMPLEFORMAT_0;Unknown data format SAMPLEFORMAT_0;Unknown data format
SAMPLEFORMAT_1;Unsigned 8 bits SAMPLEFORMAT_1;8-bit unsigned
SAMPLEFORMAT_2;Unsigned 16 bits SAMPLEFORMAT_2;16-bit unsigned
SAMPLEFORMAT_4;LogLuv 24 bits SAMPLEFORMAT_4;24-bit LogLuv
SAMPLEFORMAT_8;LogLuv 32 bits SAMPLEFORMAT_8;32-bit LogLuv
SAMPLEFORMAT_16;32 bits floating point SAMPLEFORMAT_16;16-bit floating-point
SAMPLEFORMAT_32;24-bit floating-point
SAMPLEFORMAT_64;32-bit floating-point
SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists SAVEDLG_AUTOSUFFIX;Automatically add a suffix if the file already exists
SAVEDLG_FILEFORMAT;File format SAVEDLG_FILEFORMAT;File format
SAVEDLG_FORCEFORMATOPTS;Force saving options SAVEDLG_FORCEFORMATOPTS;Force saving options

4
rtengine/curves.h
View File

@ -75,8 +75,8 @@ inline void setLutVal(const LUTf &lut, float &rval, float &gval, float &bval)
{ {
if (!OOG(rval) || !OOG(gval) || !OOG(bval)) { if (!OOG(rval) || !OOG(gval) || !OOG(bval)) {
rval = lut[std::max(rval, 0.f)]; rval = lut[std::max(rval, 0.f)];
gval = lut[std::max(rval, 0.f)]; gval = lut[std::max(gval, 0.f)];
bval = lut[std::max(rval, 0.f)]; bval = lut[std::max(bval, 0.f)];
} else { } else {
setLutVal(lut, rval); setLutVal(lut, rval);
setLutVal(lut, gval); setLutVal(lut, gval);

2
rtengine/image16.cc
View File

@ -76,7 +76,7 @@ void Image16::getScanline (int row, unsigned char* buffer, int bps)
/* /*
* void Image16::setScanline (int row, unsigned char* buffer, int bps, int minValue[3], int maxValue[3]); * void Image16::setScanline (int row, unsigned char* buffer, int bps, int minValue[3], int maxValue[3]);
* has not been implemented yet, because as of now, this method is called for IIOSF_FLOAT sample format only * has not been implemented yet, because as of now, this method is called for IIOSF_FLOATxx sample format only
*/ */
void Image16::setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue, float *maxValue) void Image16::setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue, float *maxValue)
{ {

53
rtengine/imagedata.cc
View File

@ -495,7 +495,7 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
const rtexif::Tag* const hdr = mnote->findTag("HDR"); const rtexif::Tag* const hdr = mnote->findTag("HDR");
if (hdr) { if (hdr) {
if (hdr->toInt() > 0 && hdr->toInt(2) > 0) { if (hdr->toInt() > 0) {
isHDR = true; isHDR = true;
#if PRINT_HDR_PS_DETECTION #if PRINT_HDR_PS_DETECTION
printf("HDR detected ! -> \"HDR\" tag found\n"); printf("HDR detected ! -> \"HDR\" tag found\n");
@ -573,28 +573,51 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
sampleFormat = IIOSF_UNSIGNED_SHORT; sampleFormat = IIOSF_UNSIGNED_SHORT;
} }
} else if (sampleformat == SAMPLEFORMAT_IEEEFP) { } else if (sampleformat == SAMPLEFORMAT_IEEEFP) {
/* if (bitspersample==16) {
* Not yet supported sampleFormat = IIOSF_FLOAT16;
*
if (bitspersample==16) {
sampleFormat = IIOSF_HALF;
isHDR = true;
}*/
if (bitspersample == 32) {
sampleFormat = IIOSF_FLOAT;
isHDR = true; isHDR = true;
#if PRINT_HDR_PS_DETECTION #if PRINT_HDR_PS_DETECTION
printf("HDR detected ! -> sampleFormat = %d\n", sampleFormat); printf("HDR detected ! -> sampleFormat = %d (16-bit)\n", sampleFormat);
#endif
}
else if (bitspersample == 24) {
sampleFormat = IIOSF_FLOAT24;
isHDR = true;
#if PRINT_HDR_PS_DETECTION
printf("HDR detected ! -> sampleFormat = %d (24-bit)\n", sampleFormat);
#endif
}
else if (bitspersample == 32) {
sampleFormat = IIOSF_FLOAT32;
isHDR = true;
#if PRINT_HDR_PS_DETECTION
printf("HDR detected ! -> sampleFormat = %d (32-bit)\n", sampleFormat);
#endif #endif
} }
} }
} else if (photometric == PHOTOMETRIC_CFA) { } else if (photometric == PHOTOMETRIC_CFA) {
if (sampleformat == SAMPLEFORMAT_IEEEFP) { if (sampleformat == SAMPLEFORMAT_IEEEFP) {
sampleFormat = IIOSF_FLOAT; if (bitspersample == 16) {
isHDR = true; sampleFormat = IIOSF_FLOAT16;
isHDR = true;
#if PRINT_HDR_PS_DETECTION #if PRINT_HDR_PS_DETECTION
printf("HDR detected ! -> sampleFormat = %d\n", sampleFormat); printf("HDR detected ! -> sampleFormat = %d (16-bit)\n", sampleFormat);
#endif #endif
}
else if (bitspersample == 24) {
sampleFormat = IIOSF_FLOAT24;
isHDR = true;
#if PRINT_HDR_PS_DETECTION
printf("HDR detected ! -> sampleFormat = %d (24-bit)\n", sampleFormat);
#endif
}
else if (bitspersample == 32) {
sampleFormat = IIOSF_FLOAT32;
isHDR = true;
#if PRINT_HDR_PS_DETECTION
printf("HDR detected ! -> sampleFormat = %d (32-bit)\n", sampleFormat);
#endif
}
} else if (sampleformat == SAMPLEFORMAT_INT || sampleformat == SAMPLEFORMAT_UINT) { } else if (sampleformat == SAMPLEFORMAT_INT || sampleformat == SAMPLEFORMAT_UINT) {
if (bitspersample == 8) { // shouldn't occur... if (bitspersample == 8) { // shouldn't occur...
sampleFormat = IIOSF_UNSIGNED_CHAR; sampleFormat = IIOSF_UNSIGNED_CHAR;
@ -604,7 +627,7 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
} }
} else if (photometric == 34892 || photometric == 32892 /* Linear RAW (see DNG spec ; 32892 seem to be a flaw from Sony's ARQ files) */) { } else if (photometric == 34892 || photometric == 32892 /* Linear RAW (see DNG spec ; 32892 seem to be a flaw from Sony's ARQ files) */) {
if (sampleformat == SAMPLEFORMAT_IEEEFP) { if (sampleformat == SAMPLEFORMAT_IEEEFP) {
sampleFormat = IIOSF_FLOAT; sampleFormat = IIOSF_FLOAT32;
isHDR = true; isHDR = true;
#if PRINT_HDR_PS_DETECTION #if PRINT_HDR_PS_DETECTION
printf("HDR detected ! -> sampleFormat = %d\n", sampleFormat); printf("HDR detected ! -> sampleFormat = %d\n", sampleFormat);

7
rtengine/imagefloat.cc
View File

@ -51,8 +51,13 @@ void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, unsigned
return; return;
} }
// The DNG decoder convert to 32 bits float data even if the file contains 16 or 24 bits data.
// DNG_HalfToFloat and DNG_FP24ToFloat from dcraw.cc can be used to manually convert
// from 16 and 24 bits to 32 bits float respectively
switch (sampleFormat) { switch (sampleFormat) {
case (IIOSF_FLOAT): { case (IIOSF_FLOAT16):
case (IIOSF_FLOAT24):
case (IIOSF_FLOAT32): {
int ix = 0; int ix = 0;
float* sbuffer = (float*) buffer; float* sbuffer = (float*) buffer;

4
rtengine/imageformat.h
View File

@ -32,7 +32,9 @@ typedef enum IIO_Sample_Format {
//IIOSF_HALF , // OpenEXR & NVidia's Half Float, not yet supported //IIOSF_HALF , // OpenEXR & NVidia's Half Float, not yet supported
IIOSF_LOGLUV24 = 1 << 2, IIOSF_LOGLUV24 = 1 << 2,
IIOSF_LOGLUV32 = 1 << 3, IIOSF_LOGLUV32 = 1 << 3,
IIOSF_FLOAT = 1 << 4 IIOSF_FLOAT16 = 1 << 4,
IIOSF_FLOAT24 = 1 << 5,
IIOSF_FLOAT32 = 1 << 6
} IIOSampleFormat; } IIOSampleFormat;
typedef enum IIO_Sample_Arrangement { typedef enum IIO_Sample_Arrangement {

15
rtengine/imageio.cc
View File

@ -705,15 +705,16 @@ int ImageIO::getTIFFSampleFormat (Glib::ustring fname, IIOSampleFormat &sFormat,
return IMIO_SUCCESS; return IMIO_SUCCESS;
} }
} else if (samplesperpixel == 3 && sampleformat == SAMPLEFORMAT_IEEEFP) { } else if (samplesperpixel == 3 && sampleformat == SAMPLEFORMAT_IEEEFP) {
/* if (bitspersample==16) {
* Not yet supported sFormat = IIOSF_FLOAT16;
*
if (bitspersample==16) {
sFormat = IIOSF_HALF;
return IMIO_SUCCESS; return IMIO_SUCCESS;
}*/ }
if (bitspersample == 24) {
sFormat = IIOSF_FLOAT24;
return IMIO_SUCCESS;
}
if (bitspersample == 32) { if (bitspersample == 32) {
sFormat = IIOSF_FLOAT; sFormat = IIOSF_FLOAT32;
return IMIO_SUCCESS; return IMIO_SUCCESS;
} }
} }

8
rtengine/stdimagesource.cc
View File

@ -128,7 +128,9 @@ int StdImageSource::load (const Glib::ustring &fname)
case (IIOSF_LOGLUV24): case (IIOSF_LOGLUV24):
case (IIOSF_LOGLUV32): case (IIOSF_LOGLUV32):
case (IIOSF_FLOAT): { case (IIOSF_FLOAT16):
case (IIOSF_FLOAT24):
case (IIOSF_FLOAT32): {
img = new Imagefloat; img = new Imagefloat;
break; break;
} }
@ -224,7 +226,7 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, const ColorManagement
if (embedded) { if (embedded) {
in = embedded; in = embedded;
} else { } else {
if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT)) { if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT16 | IIOSF_FLOAT24 | IIOSF_FLOAT32)) {
skipTransform = true; skipTransform = true;
} else { } else {
in = ICCStore::getInstance()->getsRGBProfile (); in = ICCStore::getInstance()->getsRGBProfile ();
@ -237,7 +239,7 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, const ColorManagement
if (in == nullptr && embedded) { if (in == nullptr && embedded) {
in = embedded; in = embedded;
} else if (in == nullptr) { } else if (in == nullptr) {
if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT)) { if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT16 | IIOSF_FLOAT24 | IIOSF_FLOAT32)) {
skipTransform = true; skipTransform = true;
} else { } else {
in = ICCStore::getInstance()->getsRGBProfile (); in = ICCStore::getInstance()->getsRGBProfile ();

28
rtexif/rtexif.cc
View File

@ -463,22 +463,34 @@ Tag* TagDirectory::findTag (const char* name, bool lookUpward) const
return t; return t;
} }
Tag* foundTag = nullptr;
int tagDistance = 10000;
for (auto tag : tags) { for (auto tag : tags) {
if (tag->isDirectory()) { if (tag->isDirectory()) {
TagDirectory *dir; TagDirectory *dir;
int i = 0; int i = 0;
// Find the shortest path to that tag
while ((dir = tag->getDirectory(i)) != nullptr) { while ((dir = tag->getDirectory(i)) != nullptr) {
TagDirectory *dir = tag->getDirectory(); TagDirectory *dir = tag->getDirectory();
Tag* t = dir->findTag (name); Tag* t = dir->findTag (name);
if (t) { if (t) {
return t; int currTagDistance = t->getDistanceFrom(this);
if (currTagDistance < tagDistance) {
tagDistance = currTagDistance;
foundTag = t;
}
} }
++i; ++i;
} }
} }
} }
if (foundTag) {
return foundTag;
}
if (lookUpward && parent) { if (lookUpward && parent) {
Tag* t = parent->findTagUpward(name); Tag* t = parent->findTagUpward(name);
@ -1420,6 +1432,20 @@ Tag::~Tag ()
} }
} }
int Tag::getDistanceFrom(const TagDirectory *root)
{
int i = 0;
TagDirectory *currTagDir = parent;
while (currTagDir != nullptr && currTagDir != root) {
++i;
if (parent->getParent() == currTagDir) {
break;
}
currTagDir = parent->getParent();
}
return i;
}
void Tag::setInt (int v, int ofs, TagType astype) void Tag::setInt (int v, int ofs, TagType astype)
{ {

18
rtexif/rtexif.h
View File

@ -281,15 +281,15 @@ public:
} }
// read/write value // read/write value
int toInt (int ofs = 0, TagType astype = INVALID) const; int toInt (int ofs = 0, TagType astype = INVALID) const;
void fromInt (int v); void fromInt (int v);
double toDouble (int ofs = 0) const; double toDouble (int ofs = 0) const;
double* toDoubleArray (int ofs = 0) const; double* toDoubleArray (int ofs = 0) const;
void toRational (int& num, int& denom, int ofs = 0) const; void toRational (int& num, int& denom, int ofs = 0) const;
void toString (char* buffer, int ofs = 0) const; void toString (char* buffer, int ofs = 0) const;
void fromString (const char* v, int size = -1); void fromString (const char* v, int size = -1);
void setInt (int v, int ofs = 0, TagType astype = LONG); void setInt (int v, int ofs = 0, TagType astype = LONG);
int getDistanceFrom (const TagDirectory *root);
// additional getter/setter for more comfortable use // additional getter/setter for more comfortable use
std::string valueToString (); std::string valueToString ();