liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dehaze

Browse Source
This commit is contained in:
Morgan Hardwood
2015-09-08 09:40:23 +02:00
parent 60b3341f3a 18fb107f82
commit 5d6f7080b7
76 changed files with 2999 additions and 2247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rtdata/CMakeLists.txt
View File

@@ -19,16 +19,6 @@ else (WIN32)
endif (WIN32)
if (WIN32)
find_file(HG_CMD hg.exe HINTS ENV Path PATH_SUFFIXES ../)
# Fail if Mercurial is not installed
if (HG_CMD STREQUAL HG_CMD-NOTFOUND)
message(FATAL_ERROR "hg command not found!")
else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
message(STATUS "hg command found: ${HG_CMD}")
execute_process(COMMAND ${HG_CMD} -R "${PROJECT_SOURCE_DIR}" parents --template={latesttag} WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${HG_CMD} -R "${PROJECT_SOURCE_DIR}" parents --template={latesttagdistance} WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
if (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(BUILD_BIT_DEPTH 32)
# 32 bits builds has to be installable on 64 bits system, to support WinXP/64.
@@ -46,6 +36,27 @@ if (WIN32)
# set part of the output archive name
set(SYSTEM_NAME "WinVista")
endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
# If we find ReleaseInfo.cmake we use the info from there and don't need Git to be installed
find_file(REL_INFO_FILE ReleaseInfo.cmake PATHS "${PROJECT_SOURCE_DIR}" NO_DEFAULT_PATH)
if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
# we look for the git command in this paths by order of preference
find_file(GIT_CMD git.exe HINTS ENV Path PATH_SUFFIXES ../)
# Fail if Git is not installed
if (GIT_CMD STREQUAL GIT_CMD-NOTFOUND)
message(FATAL_ERROR "git command not found!")
else ()
message(STATUS "git command found: ${GIT_CMD}")
endif ()
execute_process(COMMAND ${GIT_CMD} describe --tags --always OUTPUT_VARIABLE GIT_VERSION_WHOLE OUTPUT_STRIP_TRAILING_WHITESPACE WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}")
string(REGEX REPLACE "-.*" "" GIT_VERSION ${GIT_VERSION_WHOLE})
string(REGEX REPLACE ".*-(.*)-g.*" "\\1" GIT_TAGDISTANCE ${GIT_VERSION_WHOLE})
else (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
include("${PROJECT_SOURCE_DIR}/ReleaseInfo.cmake")
endif (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_CURRENT_BINARY_DIR}/WindowsInnoSetup.iss")
install (FILES "${CMAKE_CURRENT_BINARY_DIR}/WindowsInnoSetup.iss" DESTINATION ${BINDIR})
endif (WIN32)

2
rtdata/languages/Catala
View File

@@ -354,7 +354,7 @@ HISTORY_MSG_163;RGB corbes - R
HISTORY_MSG_164;RGB corbes - G
HISTORY_MSG_165;RGB corbes - B
HISTORY_MSG_166;Nivells neutrals
HISTORY_MSG_167;N&B tons
HISTORY_MSG_167;Mètode demosaicat
HISTORY_MSG_168;Corba 'CC'
HISTORY_MSG_169;Corba 'CH'
HISTORY_MSG_170;Vibrància - corba

2
rtdata/languages/Chinese (Simplified)
View File

@@ -959,7 +959,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Chinese (Traditional)
View File

@@ -683,7 +683,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Czech
View File

@@ -414,7 +414,7 @@ HISTORY_MSG_163;RGB křivky - Červená
HISTORY_MSG_164;RGB křivky - Zelená
HISTORY_MSG_165;RGB křivky - Modrá
HISTORY_MSG_166;Neutrální úrovně
HISTORY_MSG_167;--nepoužito--
HISTORY_MSG_167;Metoda demozajkování
HISTORY_MSG_168;L*a*b* - CC křivka
HISTORY_MSG_169;L*a*b* - CH Křivka
HISTORY_MSG_170;Živost - HH křivka

2
rtdata/languages/Dansk
View File

@@ -679,7 +679,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2453
rtdata/languages/Deutsch
View File

File diff suppressed because it is too large Load Diff

2
rtdata/languages/English (UK)
View File

@@ -487,7 +487,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/English (US)
View File

@@ -397,7 +397,7 @@
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Espanol
View File

@@ -440,7 +440,7 @@ HISTORY_MSG_163;Curvas RGB - Rojo
HISTORY_MSG_164;Curvas RGB - Verde
HISTORY_MSG_165;Curvas RGB - Azul
HISTORY_MSG_166;Niveles neutros
HISTORY_MSG_167;-No se usa--
HISTORY_MSG_167;Método de Interpolación
HISTORY_MSG_168;Curva 'CC'
HISTORY_MSG_169;Curva 'CM'
HISTORY_MSG_170;Vib - Curva

2
rtdata/languages/Euskara
View File

@@ -679,7 +679,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Francais
View File

@@ -385,7 +385,7 @@ HISTORY_MSG_163;Courbes RVB - Rouge
HISTORY_MSG_164;Courbes RVB - Vert
HISTORY_MSG_165;Courbes RVB - Bleu
HISTORY_MSG_166;Niveaux Neutre
HISTORY_MSG_167;--inutilisé--
HISTORY_MSG_167;Algorithme de dématriçage
HISTORY_MSG_168;Courbe 'CC'
HISTORY_MSG_169;Courbe 'CT'
HISTORY_MSG_170;Vib. - Courbe

2
rtdata/languages/Greek
View File

@@ -678,7 +678,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Hebrew
View File

@@ -679,7 +679,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Italiano
View File

@@ -384,7 +384,7 @@ HISTORY_MSG_163;Curve RGB - R (Rosso)
HISTORY_MSG_164;Curve RGB - G (Verde)
HISTORY_MSG_165;Curve RGB - B (Blu)
HISTORY_MSG_166;Livelli Neutrali
HISTORY_MSG_167;--inutilizzato--
HISTORY_MSG_167;Demosaicizzazione - Metodo
HISTORY_MSG_168;Curva 'CC'
HISTORY_MSG_169;Curva 'CH'
HISTORY_MSG_170;Vividezza - Curva

8
rtdata/languages/Japanese
View File

@@ -428,7 +428,7 @@ HISTORY_MSG_163;RGB カーブ - レッド
HISTORY_MSG_164;RGB カーブ - グリーン
HISTORY_MSG_165;RGB カーブ - ブルー
HISTORY_MSG_166;ニュートラル・レベル
HISTORY_MSG_167;--未使用--
HISTORY_MSG_167;デモザイク 方式
HISTORY_MSG_168;L*a*b* CC カーブ
HISTORY_MSG_169;L*a*b* CH カーブ
HISTORY_MSG_170;自然な彩度 - カーブ
@@ -1933,9 +1933,3 @@ ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカッ
ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: <b>+</b>
ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
!!!!!!!!!!!!!!!!!!!!!!!!!
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
!GENERAL_APPLY;Apply
!GENERAL_OPEN;Open

2
rtdata/languages/Latvian
View File

@@ -679,7 +679,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Magyar
View File

@@ -963,7 +963,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!GENERAL_WARNING;Warning
!HISTOGRAM_TOOLTIP_CHRO;Show/Hide chromaticity histogram.
!HISTOGRAM_TOOLTIP_FULL;Toggle full (off) or scaled (on) histogram.
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Nederlands
View File

@@ -393,7 +393,7 @@ HISTORY_MSG_163;RGB-curve - R
HISTORY_MSG_164;RGB-curve - G
HISTORY_MSG_165;RGB-curve - B
HISTORY_MSG_166;Neutrale niveaus
HISTORY_MSG_167;-
HISTORY_MSG_167;Demozaïekmethode
HISTORY_MSG_168;L*a*b* - CC curve
HISTORY_MSG_169;L*a*b* - CH curve
HISTORY_MSG_170;Levendigheid curve

2
rtdata/languages/Norsk BM
View File

@@ -678,7 +678,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Polish
View File

@@ -388,7 +388,7 @@ HISTORY_MSG_163;Krzywe RGB - Czerwona
HISTORY_MSG_164;Krzywe RGB - Zielona
HISTORY_MSG_165;Krzywe RGB - Niebieska
HISTORY_MSG_166;Neutralna ekspozycja
HISTORY_MSG_167;-
HISTORY_MSG_167;Algorytm demozaikowania
HISTORY_MSG_168;L*a*b* - Krzywa CC
HISTORY_MSG_169;L*a*b* - Krzywa CH
HISTORY_MSG_170;Jaskrawość - Krzywa HH

2
rtdata/languages/Polish (Latin Characters)
View File

@@ -388,7 +388,7 @@ HISTORY_MSG_163;Krzywe RGB - Czerwona
HISTORY_MSG_164;Krzywe RGB - Zielona
HISTORY_MSG_165;Krzywe RGB - Niebieska
HISTORY_MSG_166;Neutralna ekspozycja
HISTORY_MSG_167;-
HISTORY_MSG_167;Algorytm demozaikowania
HISTORY_MSG_168;L*a*b* - Krzywa CC
HISTORY_MSG_169;L*a*b* - Krzywa CH
HISTORY_MSG_170;Jaskrawosc - Krzywa HH

2
rtdata/languages/Portugues (Brasil)
View File

@@ -679,7 +679,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Russian
View File

@@ -383,7 +383,7 @@ HISTORY_MSG_163;Кривая RGB: Красный
HISTORY_MSG_164;Кривая RGB: Зелёный
HISTORY_MSG_165;Кривая RGB: Синий
HISTORY_MSG_166;Нейтральные уровни
HISTORY_MSG_167;--неиспользуемый--
HISTORY_MSG_167;Демозаик
HISTORY_MSG_168;Кривая 'ЦЦ'
HISTORY_MSG_169;Кривая 'ЦО'
HISTORY_MSG_170;Рез: кривая

2
rtdata/languages/Serbian (Cyrilic Characters)
View File

@@ -884,7 +884,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Serbian (Latin Characters)
View File

@@ -884,7 +884,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Slovak
View File

@@ -742,7 +742,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Suomi
View File

@@ -680,7 +680,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/Swedish
View File

@@ -393,7 +393,7 @@ HISTORY_MSG_163;RGB-kurvor - Röd
HISTORY_MSG_164;RGB-kurvor - Grön
HISTORY_MSG_165;RGB-kurvor - Blå
HISTORY_MSG_166;Neutrala nivåer
HISTORY_MSG_167;--oanvänd--
HISTORY_MSG_167;Metod för demozaicing
HISTORY_MSG_168;'CC'-kurvan
HISTORY_MSG_169;'CH'-kurvan
HISTORY_MSG_170;Lyster-kurvan

2
rtdata/languages/Turkish
View File

@@ -679,7 +679,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!HISTORY_MSG_164;RGB Curves - Green
!HISTORY_MSG_165;RGB Curves - Blue
!HISTORY_MSG_166;Exposure - Neutral
!HISTORY_MSG_167;--unused--
!HISTORY_MSG_167;Demosaicing method
!HISTORY_MSG_168;L*a*b* - CC curve
!HISTORY_MSG_169;L*a*b* - CH curve
!HISTORY_MSG_170;Vibrance - HH curve

2
rtdata/languages/default
View File

@@ -397,7 +397,7 @@ HISTORY_MSG_163;RGB Curves - Red
HISTORY_MSG_164;RGB Curves - Green
HISTORY_MSG_165;RGB Curves - Blue
HISTORY_MSG_166;Exposure - Neutral
HISTORY_MSG_167;--unused--
HISTORY_MSG_167;Demosaicing method
HISTORY_MSG_168;L*a*b* - CC curve
HISTORY_MSG_169;L*a*b* - CH curve
HISTORY_MSG_170;Vibrance - HH curve

4
rtdata/win/InnoSetup/WindowsInnoSetup.iss.in
View File

@@ -23,8 +23,8 @@
#define MyAppName "RawTherapee"
#define MyAppVersion "${HG_VERSION}"
#define MyAppFullVersion "${HG_VERSION}.${HG_TAGDISTANCE}"
#define MyAppVersion "${GIT_VERSION}"
#define MyAppFullVersion "${GIT_VERSION}.${GIT_TAGDISTANCE}"
#define MyAppPublisher "rawtherapee.com"
#define MyAppURL "http://www.rawtherapee.com/"
#define MyAppExeName "rawtherapee.exe"