Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdcraw: fix issue #17

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2019-01-24 20:48:48 +00:00
parent 1e35c73f37
commit c4be351aea
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kdcraw/CMakeLists.txt
View file

@ -47,6 +47,7 @@ ENDIF()
ADD_DEFINITIONS(
${QT_QTDBUS_DEFINITIONS}
${LibRaw_DEFINITIONS}
${LibRaw_r_DEFINITIONS}
-DKDE_DEFAULT_DEBUG_AREA=51002
)

5
kdcraw/libkdcraw/CMakeLists.txt
View file

@ -22,10 +22,7 @@
#
# ============================================================
if("${LibRaw_VERSION_STRING}" VERSION_LESS "0.17.0")
message(STATUS "Building kdcraw with exceptions.")
add_definitions(${KDE4_ENABLE_EXCEPTIONS})
endif()
add_definitions(${KDE4_ENABLE_EXCEPTIONS})
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake

10
kdcraw/libkdcraw/kdcraw_p.cpp
View file

@ -367,6 +367,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
break;
}
#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
case RawDecodingSettings::LINENR:
{
// (100 - 1000) => (0.001 - 0.02) conversion.
@ -374,7 +375,6 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
raw.imgdata.params.cfaline = true;
break;
}
case RawDecodingSettings::IMPULSENR:
{
// (100 - 1000) => (0.005 - 0.05) conversion.
@ -383,23 +383,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
raw.imgdata.params.cfa_clean = true;
break;
}
#endif
default: // No Noise Reduction
{
raw.imgdata.params.threshold = 0;
raw.imgdata.params.fbdd_noiserd = 0;
#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
raw.imgdata.params.linenoise = 0;
raw.imgdata.params.cfaline = false;
raw.imgdata.params.lclean = 0;
raw.imgdata.params.cclean = 0;
raw.imgdata.params.cfa_clean = false;
#endif
break;
}
}
#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
// Chromatic aberration correction.
raw.imgdata.params.ca_correc = m_parent->m_rawDecodingSettings.enableCACorrection;
raw.imgdata.params.cared = m_parent->m_rawDecodingSettings.caMultiplier[0];
raw.imgdata.params.cablue = m_parent->m_rawDecodingSettings.caMultiplier[1];
#endif
// Exposure Correction before interpolation.
raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
@ -450,11 +455,12 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
}
//-- Extended demosaicing settings ----------------------------------------------------------
raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine;
raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses;
#endif
//-------------------------------------------------------------------------------------------

5
kdcraw/libkdcraw/rawdecodingsettings.h
View file

@ -261,6 +261,7 @@ public:
int NRThreshold;
/** Turn on chromatic aberrations correction
* @deprecated does not work with libraw>=0.19
*/
bool enableCACorrection;
@ -268,6 +269,7 @@ public:
* - caMultiplier[0] = amount of correction on red-green axis.
* - caMultiplier[1] = amount of correction on blue-yellow axis.
* - Both values set to 0.0 = automatic CA correction.
* @deprecated does not work with libraw>=0.19
*/
double caMultiplier[2];
@ -344,7 +346,8 @@ public:
int esMedPasses;
/** For IMPULSENR Noise reduction. Set the amount of Chrominance impulse denoise.
Null value disable NR. Range is between 100 and 1000.
* Null value disable NR. Range is between 100 and 1000.
* @deprecated does not work with libraw>=0.19
*/
int NRChroThreshold;