diff --git a/CMakeLists.txt b/CMakeLists.txt index f73cf77be..d57e18275 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,8 +339,13 @@ if(WITH_LTO) execute_process(COMMAND ar --version OUTPUT_VARIABLE BINUTILS_VERSION_DETECTED) string(REGEX REPLACE ".* ([0-9.]+)\n.*" "\\1" BINUTILS_VERSION_DETECTED "${BINUTILS_VERSION_DETECTED}") if("${BINUTILS_VERSION_DETECTED}" VERSION_LESS "${BINUTILS_VERSION_MININUM}") - SET(CMAKE_AR "/usr/bin/gcc-ar") - SET(CMAKE_RANLIB "/usr/bin/gcc-ranlib") + if(APPLE) + SET(CMAKE_AR "/opt/local/bin/ar") + SET(CMAKE_RANLIB "/opt/local/bin/ranlib") + else() + SET(CMAKE_AR "/usr/bin/gcc-ar") + SET(CMAKE_RANLIB "/usr/bin/gcc-ranlib") + endif() message(STATUS "Binutils version detected as less than " ${BINUTILS_VERSION_MININUM} " - setting CMake parameters to enable LTO linking:\n CMAKE_AR=\"" ${CMAKE_AR} "\"\n CMAKE_RANLIB=\"" ${CMAKE_RANLIB} "\"") endif() diff --git a/rtdata/dcpprofiles/NIKON D750.dcp b/rtdata/dcpprofiles/NIKON D750.dcp index 6dcef8386..86a676b3e 100644 Binary files a/rtdata/dcpprofiles/NIKON D750.dcp and b/rtdata/dcpprofiles/NIKON D750.dcp differ diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index dfde78785..871fcf7c5 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -8302,13 +8302,13 @@ void CLASS adobe_coeff (const char *make, const char *model) { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, { "Sony DSLR-A390", 0, 0, { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, - { "Sony DSLR-A450", 0, 0xfeb, + { "Sony DSLR-A450", 0, 0, { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, - { "Sony DSLR-A580", 0, 0xfeb, + { "Sony DSLR-A580", 0, 0, { 5932,-1492,-411,-4813,12285,2856,-741,1524,6739 } }, - { "Sony DSLR-A500", 0, 0xfeb, + { "Sony DSLR-A500", 0, 0, { 6046,-1127,-278,-5574,13076,2786,-691,1419,7625 } }, - { "Sony DSLR-A5", 0, 0xfeb, + { "Sony DSLR-A5", 0, 0, { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, { "Sony DSLR-A700", 0, 0, { 5775,-805,-359,-8574,16295,2391,-1943,2341,7249 } }, diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index b0bd8334d..4b50c97cc 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -943,7 +943,6 @@ bool ToneCurve::histmatchingComputed() brightness->setValue(0); contrast->setValue(0); black->setValue(0); - hlcompr->setValue(0); if (!black->getAddMode()) { shcompr->set_sensitive(!((int)black->getValue() == 0));