|
|
56e28e |
diff -up libkdcraw-4.10.5/libkdcraw/kdcraw_p.cpp.me libkdcraw-4.10.5/libkdcraw/kdcraw_p.cpp
|
|
|
56e28e |
--- libkdcraw-4.10.5/libkdcraw/kdcraw_p.cpp.me 2019-01-30 11:04:48.418841203 +0100
|
|
|
56e28e |
+++ libkdcraw-4.10.5/libkdcraw/kdcraw_p.cpp 2019-01-30 11:07:22.459644933 +0100
|
|
|
56e28e |
@@ -363,6 +363,7 @@ bool KDcraw::Private::loadFromLibraw(con
|
|
|
56e28e |
raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
|
|
|
56e28e |
break;
|
|
|
56e28e |
}
|
|
|
56e28e |
+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
|
|
|
56e28e |
case RawDecodingSettings::LINENR:
|
|
|
56e28e |
{
|
|
|
56e28e |
// (100 - 1000) => (0.001 - 0.02) conversion.
|
|
|
56e28e |
@@ -379,23 +380,28 @@ bool KDcraw::Private::loadFromLibraw(con
|
|
|
56e28e |
raw.imgdata.params.cfa_clean = true;
|
|
|
56e28e |
break;
|
|
|
56e28e |
}
|
|
|
56e28e |
+#endif
|
|
|
56e28e |
default: // No Noise Reduction
|
|
|
56e28e |
{
|
|
|
56e28e |
raw.imgdata.params.threshold = 0;
|
|
|
56e28e |
raw.imgdata.params.fbdd_noiserd = 0;
|
|
|
56e28e |
+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
|
|
|
56e28e |
raw.imgdata.params.linenoise = 0;
|
|
|
56e28e |
raw.imgdata.params.cfaline = false;
|
|
|
56e28e |
raw.imgdata.params.lclean = 0;
|
|
|
56e28e |
raw.imgdata.params.cclean = 0;
|
|
|
56e28e |
raw.imgdata.params.cfa_clean = false;
|
|
|
56e28e |
+#endif
|
|
|
56e28e |
break;
|
|
|
56e28e |
}
|
|
|
56e28e |
}
|
|
|
56e28e |
|
|
|
56e28e |
+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
|
|
|
56e28e |
// Chromatic aberration correction.
|
|
|
56e28e |
raw.imgdata.params.ca_correc = m_parent->m_rawDecodingSettings.enableCACorrection;
|
|
|
56e28e |
raw.imgdata.params.cared = m_parent->m_rawDecodingSettings.caMultiplier[0];
|
|
|
56e28e |
raw.imgdata.params.cablue = m_parent->m_rawDecodingSettings.caMultiplier[1];
|
|
|
56e28e |
+#endif
|
|
|
56e28e |
|
|
|
56e28e |
// Exposure Correction before interpolation.
|
|
|
56e28e |
raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
|
|
|
56e28e |
@@ -446,8 +452,10 @@ bool KDcraw::Private::loadFromLibraw(con
|
|
|
56e28e |
|
|
|
56e28e |
raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
|
|
|
56e28e |
raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
|
|
|
56e28e |
+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
|
|
|
56e28e |
raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine;
|
|
|
56e28e |
raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses;
|
|
|
56e28e |
+#endif
|
|
|
56e28e |
|
|
|
56e28e |
//-------------------------------------------------------------------------------------------
|
|
|
56e28e |
|
|
|
56e28e |
diff -up libkdcraw-4.10.5/libkdcraw/rawdecodingsettings.h.me libkdcraw-4.10.5/libkdcraw/rawdecodingsettings.h
|
|
|
56e28e |
diff -up libkdcraw-4.10.5/CMakeLists.txt.me libkdcraw-4.10.5/CMakeLists.txt
|
|
|
56e28e |
--- libkdcraw-4.10.5/CMakeLists.txt.me 2019-01-30 12:16:24.225742377 +0100
|
|
|
56e28e |
+++ libkdcraw-4.10.5/CMakeLists.txt 2019-01-30 12:17:33.263858390 +0100
|
|
|
56e28e |
@@ -111,6 +111,9 @@ IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
|
|
|
56e28e |
SET(CMAKE_CXX_FLAGS_RELEASE "-O4 -DNDEBUG -DQT_NO_DEBUG")
|
|
|
56e28e |
ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
|
|
56e28e |
|
|
|
56e28e |
+# LibRAW-0.19.2
|
|
|
56e28e |
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -DQT_NO_EXCEPTIONS")
|
|
|
56e28e |
+
|
|
|
56e28e |
# ==================================================================================================
|
|
|
56e28e |
|
|
|
56e28e |
ADD_SUBDIRECTORY(libkdcraw)
|