Deleted obsolete language pack NSI, fixed cmake filename in buildRT.bat, set lanczos as default in procparams

languagePack.nsi

@@ -1,126 +0,0 @@
-; RawTherapee Language Pack
-;
-; Installes just the language file in an existing RawTherapee installation.
-;
-;------------------------------------------------------------------------------
-; Name, Outputfile and Version information
-;------------------------------------------------------------------------------
-
-; **** start edit section: please adapt below options per language pack release ****
-; The name of the installer
-Name "RT 2.4.1 - language Pack"
-
-; The file to write
-OutFile "RT241-langPack-20091018.exe"
-
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-
-  VIProductVersion "2.4.1.0"
-  VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "RawTherapee Language Pack"
-  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "<EFBFBD> Raw Therapee"
-  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Language Pack RawTherapee 2.4.1"
-  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.4.1-2009-10-18"
-  VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Compatible also for RT2.4 and RT2.3"
-;  VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Fake company"
-;  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company"
-
-; **** end edit section: no changes needed per release below ****
-
-;------------------------------------------------------------------------------
-; Installation Directory, Dialog box for 
-;------------------------------------------------------------------------------
-
-
-; The default installation directory
-InstallDir "$PROGRAMFILES\Raw Therapee\languages"
-DirText "The Language Pack has to be installed into the RawTherapee installation directory, into the language subdirectory." \
-        "RawTherapee Installation Directory" \
-        "" \
-        "Please select the installation Directory of RawTherapee:" 
-
-;PageEx directory
-;   DirVerify leave
-;   PageCallbacks "" "" dirLeave
-;PageExEnd
-
-; Registry key to check for directory (so if you install again, it will 
-; overwrite the old one automatically)
-InstallDirRegKey HKCU "Software\Raw Therapee" ""
-
-;------------------------------------------------------------------------------
-; Installation Rights (Vista only)
-;------------------------------------------------------------------------------
-
-; Request application privileges for Windows Vista
-RequestExecutionLevel admin
-
-
-;------------------------------------------------------------------------------
-; Pages:
-;------------------------------------------------------------------------------
-
-; Pages
-
-;Page components
-Page directory
-Page instfiles
-
-;UninstPage uninstConfirm
-;UninstPage instfiles
-
-;------------------------------------------------------------------------------
-; Sections: stuff to be installed
-;------------------------------------------------------------------------------
-
-; The stuff to install
-Section "RawTherapee Language Pack (required)"
-
-  SectionIn RO
-  
-  ifFileExists $INSTDIR\languages\*.* 0 +3
-  SetOutPath $INSTDIR\languages
-  Goto +2
-  SetOutPath $INSTDIR
-  
-  ; Set output path to the installation directory.
-  ;SetOutPath $INSTDIR
-  
-  ; Put file there
-  File "release\languages\*"
-  
-  ; Write the installation path into the registry
-  ;WriteRegStr HKLM SOFTWARE\NSIS_Example2 "Install_Dir" "$INSTDIR"
-  
-  ; Write the uninstall keys for Windows
-  ;WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "DisplayName" "NSIS Example2"
-  ;WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  ;WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "NoModify" 1
-  ;WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "NoRepair" 1
-  ;WriteUninstaller "uninstall.exe"
-  
-SectionEnd
-
-;------------------------------------------------------------------------------
-; Uninstaller: not needed here
-;------------------------------------------------------------------------------
-
-; Uninstaller
-
-;Section "Uninstall"
-  
-  ; Remove registry keys
-;  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2"
-;  DeleteRegKey HKLM SOFTWARE\NSIS_Example2
-
-  ; Remove files and uninstaller
-;  Delete $INSTDIR\example2.nsi
-;  Delete $INSTDIR\uninstall.exe
-
-  ; Remove shortcuts, if any
-;  Delete "$SMPROGRAMS\Example2\*.*"
-
-  ; Remove directories used
-;  RMDir "$SMPROGRAMS\Example2"
-;  RMDir "$INSTDIR"
-
-;SectionEnd

rtengine/procparams.cc

@@ -358,7 +358,7 @@ void ProcParams::setDefaults () {
     resize.enabled = false;
     resize.scale  = 1.0;
     resize.appliesTo = "Cropped area";
-    resize.method = "Bicubic";
+    resize.method = "Lanczos";
     resize.dataspec = 0;
     resize.width = 800;
     resize.height = 600;

tools/buildRT.bat

@@ -31,7 +31,7 @@ GOTO end
 SET /P sse="Compile with SSE support? (Default is no) [y/n] "
 IF %sse%==y (SET RT_SSE_SUPPORT="-msse")
 ECHO.
-cmake -DCMAKE_BUILD_TYPE=%RT_BUILD_TYPE% -DCMAKE_C_FLAGS="-O2 -m32 %RT_SSE_SUPPORT%" -DCMAKE_SHARED_LINKER_FLAGS="-m32" -DCMAKE_EXE_LINKER_FLAGS="-m32" -DCMAKE_RC_FLAGS="-F pe-i386" -DCMAKE_CXX_FLAGS="%CMAKE_C_FLAGS%" -DBUILD_BUNDLE:BOOL="1" -DCACHE_NAME_SUFFIX:STRING="%RT_CACHE_VER%" -G "MinGW Makefiles" -DPROC_TARGET_NUMBER:STRING=2 -C%RT_SOURCECODE_PATH%\Win32CMakeOptions.cmake %RT_SOURCECODE_PATH%
+cmake -DCMAKE_BUILD_TYPE=%RT_BUILD_TYPE% -DCMAKE_C_FLAGS="-O2 -m32 %RT_SSE_SUPPORT%" -DCMAKE_SHARED_LINKER_FLAGS="-m32" -DCMAKE_EXE_LINKER_FLAGS="-m32" -DCMAKE_RC_FLAGS="-F pe-i386" -DCMAKE_CXX_FLAGS="%CMAKE_C_FLAGS%" -DBUILD_BUNDLE:BOOL="1" -DCACHE_NAME_SUFFIX:STRING="%RT_CACHE_VER%" -G "MinGW Makefiles" -DPROC_TARGET_NUMBER:STRING=2 -C%RT_SOURCECODE_PATH%\win.cmake %RT_SOURCECODE_PATH%
 GOTO compile
 
 :cmake64
@@ -39,7 +39,7 @@ ECHO.
 SET /P sse="Compile with SSE support? (Default is yes) [y/n] "
 IF %sse%==n (SET RT_SSE_SUPPORT="-mno-sse")
 ECHO.
-cmake -DCMAKE_BUILD_TYPE=%RT_BUILD_TYPE% -DCMAKE_C_FLAGS="-O2 %RT_SSE_SUPPORT%" -DCMAKE_CXX_FLAGS="%CMAKE_C_FLAGS%" -DBUILD_BUNDLE:BOOL="1" -DCACHE_NAME_SUFFIX:STRING="%RT_CACHE_VER%" -G "MinGW Makefiles" -DPROC_TARGET_NUMBER:STRING=2 -C%RT_SOURCECODE_PATH%\Win32CMakeOptions.cmake %RT_SOURCECODE_PATH%
+cmake -DCMAKE_BUILD_TYPE=%RT_BUILD_TYPE% -DCMAKE_C_FLAGS="-O2 %RT_SSE_SUPPORT%" -DCMAKE_CXX_FLAGS="%CMAKE_C_FLAGS%" -DBUILD_BUNDLE:BOOL="1" -DCACHE_NAME_SUFFIX:STRING="%RT_CACHE_VER%" -G "MinGW Makefiles" -DPROC_TARGET_NUMBER:STRING=2 -C%RT_SOURCECODE_PATH%\win.cmake %RT_SOURCECODE_PATH%
 GOTO compile
 
 :compile