From 323f36b8e08b36500027b16faa1e02aeeafbad66 Mon Sep 17 00:00:00 2001 From: Oliver Duis Date: Fri, 8 Apr 2011 19:57:11 +0200 Subject: [PATCH] Ported version.h bugfix --- About-Apple.cmake | 2 +- About-Linux.cmake | 2 +- About-Windows.cmake | 2 +- rtengine/rtthumbnail.cc | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/About-Apple.cmake b/About-Apple.cmake index d903d88fc..6e8e77e3b 100644 --- a/About-Apple.cmake +++ b/About-Apple.cmake @@ -20,7 +20,7 @@ execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECT execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE) # build version.h from template -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rtgui/version.h) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h) add_custom_target (AboutFile ALL COMMAND rm -f ${OUT_FILE} diff --git a/About-Linux.cmake b/About-Linux.cmake index fe108b902..f12e2bed4 100644 --- a/About-Linux.cmake +++ b/About-Linux.cmake @@ -19,7 +19,7 @@ execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECT execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE) # build version.h from template -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rtgui/version.h) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h) add_custom_target (AboutFile ALL COMMAND rm -f ${OUT_FILE} diff --git a/About-Windows.cmake b/About-Windows.cmake index c3f17486e..af6df2727 100644 --- a/About-Windows.cmake +++ b/About-Windows.cmake @@ -10,7 +10,7 @@ execute_process(COMMAND hg parents --template={node|short} WORKING_DIRECTORY ${C execute_process(COMMAND hg parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE) # build version.h from template -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rtgui/version.h) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h) add_custom_target (AboutFile ALL COMMAND for /F \"tokens=*\" %%i in \('hg -R \"${CMAKE_CURRENT_SOURCE_DIR}\" branch'\) do echo Branch: %%i >${OUT_FILE} diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc index 8ee0c16f0..214c64ae9 100644 --- a/rtengine/rtthumbnail.cc +++ b/rtengine/rtthumbnail.cc @@ -715,9 +715,8 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei // The RAW exposure is not reflected since it's done in preprocessing. If we only have e.g. the chached thumb, // that is already preprocessed. So we simulate the effect here roughly my modifying the exposure accordingly - if (params.raw.expos!=1) br += (params.raw.expos-1.0); - printf("Param raw.exp: %f real %f\n",params.raw.expos,br); + LUTf curve1 (65536); LUTf curve2 (65536); LUTf curve (65536);