Ported version.h bugfix
This commit is contained in:
@@ -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)
|
execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE)
|
||||||
|
|
||||||
# build version.h from template
|
# 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
|
add_custom_target (AboutFile ALL
|
||||||
COMMAND rm -f ${OUT_FILE}
|
COMMAND rm -f ${OUT_FILE}
|
||||||
|
@@ -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)
|
execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE)
|
||||||
|
|
||||||
# build version.h from template
|
# 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
|
add_custom_target (AboutFile ALL
|
||||||
COMMAND rm -f ${OUT_FILE}
|
COMMAND rm -f ${OUT_FILE}
|
||||||
|
@@ -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)
|
execute_process(COMMAND hg parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE)
|
||||||
|
|
||||||
# build version.h from template
|
# 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
|
add_custom_target (AboutFile ALL
|
||||||
COMMAND for /F \"tokens=*\" %%i in \('hg -R \"${CMAKE_CURRENT_SOURCE_DIR}\" branch'\) do echo Branch: %%i >${OUT_FILE}
|
COMMAND for /F \"tokens=*\" %%i in \('hg -R \"${CMAKE_CURRENT_SOURCE_DIR}\" branch'\) do echo Branch: %%i >${OUT_FILE}
|
||||||
|
@@ -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,
|
// 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
|
// 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);
|
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 curve1 (65536);
|
||||||
LUTf curve2 (65536);
|
LUTf curve2 (65536);
|
||||||
LUTf curve (65536);
|
LUTf curve (65536);
|
||||||
|
Reference in New Issue
Block a user