Various bug fixes (including negative thumbnail bug and return-to-file-browser-tab bugs) and lens data update

This commit is contained in:
ghorvath
2010-01-31 20:28:04 +00:00
parent e247b37e54
commit 57d9e113b9
9 changed files with 267 additions and 44 deletions

View File

@@ -48,10 +48,13 @@ target_link_libraries (rtengine rtexif ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHRE
#target_link_libraries (rtcmd rtengine)
#target_link_libraries (ppmap rtengine)
SET (INSTALL_SOURCE_PATH "${CMAKE_BINARY_DIR}/rtengine")
IF (WIN32)
install (FILES librtengine.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
install (FILES ${INSTALL_SOURCE_PATH}/librtengine.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ )
ELSE (WIN32)
install (FILES librtengine.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
install (FILES ${INSTALL_SOURCE_PATH}/librtengine.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ )
ENDIF (WIN32)

View File

@@ -195,9 +195,9 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
int rmi, gmi, bmi;
if (!isRaw || !params.hlrecovery.enabled) {
logDefGain = 0.0;
rmi = 16384.0 * rm * defGain / mul_lum;
gmi = 16384.0 * gm * defGain / mul_lum;
bmi = 16384.0 * bm * defGain / mul_lum;
rmi = 1024.0 * rm * defGain / mul_lum;
gmi = 1024.0 * gm * defGain / mul_lum;
bmi = 1024.0 * bm * defGain / mul_lum;
}
else {
rmi = 1024.0 * rm / mul_lum;
@@ -213,7 +213,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
else
rwidth = thumbImg->width * rheight / thumbImg->height;
Image16* baseImg = thumbImg->resize (rwidth, rheight, interp);
Image16* baseImg = thumbImg->resize (rwidth, rheight, interp);
if (params.coarse.rotate) {
Image16* tmp = baseImg->rotate (params.coarse.rotate);