diff -Nru luminance-hdr-2.5.0/build/linux/find_demosaicing_gpl2.sh luminance-hdr-2.5.1/build/linux/find_demosaicing_gpl2.sh
--- luminance-hdr-2.5.0/build/linux/find_demosaicing_gpl2.sh 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/build/linux/find_demosaicing_gpl2.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-readelf -a $1 | grep lmms
-
diff -Nru luminance-hdr-2.5.0/build/linux/find_demosaicing_gpl3.sh luminance-hdr-2.5.1/build/linux/find_demosaicing_gpl3.sh
--- luminance-hdr-2.5.0/build/linux/find_demosaicing_gpl3.sh 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/build/linux/find_demosaicing_gpl3.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-readelf -a $1 | grep amaze
-
diff -Nru luminance-hdr-2.5.0/build/linux/sanitize_translations.sh luminance-hdr-2.5.1/build/linux/sanitize_translations.sh
--- luminance-hdr-2.5.0/build/linux/sanitize_translations.sh 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/build/linux/sanitize_translations.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/bash
-echo `pwd`
-sed -i '/\-I\/usr\/include/d' CMakeFiles/lang_*
-sed -i '/\-I\/usr\/include/d' CMakeFiles/source_lst_file
diff -Nru luminance-hdr-2.5.0/build/msvc/build.cmd luminance-hdr-2.5.1/build/msvc/build.cmd
--- luminance-hdr-2.5.0/build/msvc/build.cmd 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/build/msvc/build.cmd 1970-01-01 00:00:00.000000000 +0000
@@ -1,806 +0,0 @@
-@echo off
-SETLOCAL
-
-REM http://dev.exiv2.org/projects/exiv2/repository/
-SET EXIV2_COMMIT=4753
-
-REM http://github.com/libjpeg-turbo/libjpeg-turbo
-SET LIBJPEG_COMMIT_LONG=da2a27ef056a0179cbd80f9146e58b89403d9933
-
-rem https://github.com/madler/zlib/commits
-SET ZLIB_COMMIT_LONG=cacf7f1d4e3d44d871b605da3b647f07d718623f
-
-rem https://github.com/openexr/openexr
-SET OPENEXR_COMMIT_LONG=20d043d017d4b752356bb76946ffdffaa9c15c72
-SET OPENEXR_CMAKE_VERSION=2.2
-
-rem http://www.boost.org/
-SET BOOST_MINOR=63
-
-REM ftp://ftp.fftw.org/pub/fftw/
-SET FFTW_VER=3.3.5
-
-rem https://github.com/mm2/Little-CMS
-SET LCMS_COMMIT_LONG=f9d75ccef0b54c9f4167d95088d4727985133c52
-
-rem https://github.com/ampl/gsl
-SET GSL_COMMIT_LONG=48e0194da0d8921aff57c293b4f5083877d3f55b
-
-rem https://github.com/LibRaw/LibRaw
-SET LIBRAW_COMMIT_LONG=d7c3d2cb460be10a3ea7b32e9443a83c243b2251
-SET LIBRAW_DEMOS2_COMMIT_LONG=194f592e205990ea8fce72b6c571c14350aca716
-SET LIBRAW_DEMOS3_COMMIT_LONG=f0895891fdaa775255af02275fce426a5bf5c9fc
-
-rem ftp://sourceware.org/pub/pthreads-win32/
-SET PTHREADS_DIR=prebuilt-dll-2-9-1-release
-
-rem http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c
-SET CFITSIO_VER=3360
-rem broken 3370
-
-rem Internal version number for http://qtpfsgui.sourceforge.net/win/hugin-*
-SET HUGIN_VER=201600
-
-http://download.osgeo.org/libtiff/
-SET TIFF_VER=4.0.7
-
-IF EXIST .settings\vsexpress.txt (
- SET VSCOMMAND=vcexpress
-) ELSE IF EXIST .settings\devent.txt (
- SET VSCOMMAND=devenv
-) ELSE (
- vcexpress XXXXXXXXXXXXX 2>NUL >NUL
- IF ERRORLEVEL 1 (
- devenv /? 2>NUL >NUL
- IF ERRORLEVEL 1 (
- wdexpress /? 2>NUL >NUL
- IF ERRORLEVEL 1 (
- echo.
- echo.ERROR: This file must be run inside a VS command prompt!
- echo.
- goto error_end
- ) ELSE (
- SET VSCOMMAND=msbuild
- )
- ) ELSE (
- SET VSCOMMAND=devenv
- )
- ) ELSE (
- SET VSCOMMAND=vcexpress
- )
- mkdir .settings 2>NUL >NUL
- echo x>.settings\%VSCOMMAND%.txt
-)
-
-IF EXIST ..\msvc (
- echo.
- echo.ERROR: This file should NOT be executed within the LuminanceHDR source directory,
- echo. but in a new empty folder!
- echo.
- goto error_end
-)
-
-ml64.exe > NUL
-IF ERRORLEVEL 1 (
- set Platform=Win32
- set RawPlatform=x86
- set CpuPlatform=ia32
-) ELSE (
- set Platform=x64
- set RawPlatform=x64
- set CpuPlatform=intel64
-)
-
-SET VISUAL_STUDIO_VC_REDIST=%VCINSTALLDIR%\redist\%RawPlatform%
-
-IF DEFINED VS140COMNTOOLS (
- REM Visual Studio 2015
- set VS_SHORT=vc14
- set VS_CMAKE=Visual Studio 14
- set VS_PROG_FILES=Microsoft Visual Studio 14.0
- set VS_LCMS=VC2013
-) ELSE IF DEFINED VS120COMNTOOLS (
- REM Visual Studio 2013
- set VS_SHORT=vc12
- set VS_CMAKE=Visual Studio 12
- set VS_PROG_FILES=Microsoft Visual Studio 12.0
- set VS_LCMS=VC2013
-
-) ELSE IF DEFINED VS110COMNTOOLS (
- REM Visual Studio 2012
- set VS_SHORT=vc11
- set VS_CMAKE=Visual Studio 11
- set VS_PROG_FILES=Microsoft Visual Studio 11.0
- set VS_LCMS=VC2012
-
-) ELSE IF DEFINED VS100COMNTOOLS (
- REM Visual Studio 2010
- set VS_SHORT=vc10
- set VS_CMAKE=Visual Studio 10
- set VS_PROG_FILES=Microsoft Visual Studio 10.0
- set VS_LCMS=VC2010
-
-) ELSE (
- REM Visual Studio 2008
- set VS_SHORT=vc9
- set VS_CMAKE=Visual Studio 9 2008
- set VS_PROG_FILES=Microsoft Visual Studio 9.0
- set VS_LCMS=VC2008
-)
-IF %Platform% EQU x64 (
- set VS_CMAKE=%VS_CMAKE% Win64
-)
-
-call setenv.cmd
-
-IF NOT EXIST %CMAKE_DIR%\bin\cmake.exe (
- echo.
- echo.ERROR: CMake not found: %CMAKE_DIR%\bin\cmake.exe
- echo.
- goto error_end
-)
-
-IF NOT EXIST %CYGWIN_DIR%\bin\cp.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\git.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\gzip.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\mv.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\nasm.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\sed.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\ssh.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\svn.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\tar.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\unzip.exe GOTO cygwin_error
-IF NOT EXIST %CYGWIN_DIR%\bin\wget.exe GOTO cygwin_error
-GOTO cygwin_ok
-
-:cygwin_error
-echo ERROR: Cygwin with
-echo cp
-echo git
-echo gzip
-echo mv
-echo nasm
-echo sed
-echo ssh
-echo svn
-echo tar
-echo unzip
-echo wget
-echo is required
-GOTO error_end
-
-:cygwin_ok
-
-SET INSTALL_DIR=dist
-IF NOT EXIST %INSTALL_DIR% (
- mkdir %INSTALL_DIR%
-)
-
-IF NOT DEFINED Configuration (
- set Configuration=Release
-)
-IF NOT DEFINED ConfigurationLuminance (
- set ConfigurationLuminance=RelWithDebInfo
-)
-
-cls
-echo.
-echo.--- %VS_CMAKE% ---
-echo.Configuration = %Configuration%
-echo.ConfigurationLuminance = %ConfigurationLuminance%
-echo.Platform = %Platform% (%RawPlatform%)
-echo.
-
-IF NOT EXIST %TEMP_DIR% (
- mkdir %TEMP_DIR%
-)
-
-
-IF NOT EXIST vcDlls (
- mkdir vcDlls
- robocopy "%vcinstalldir%redist\%RawPlatform%" vcDlls /MIR >nul
-)
-
-IF NOT EXIST vcDlls\selected (
- mkdir vcDlls\selected
-
- %CYGWIN_DIR%\bin\cp.exe vcDlls/**/vcomp* vcDlls/selected
- %CYGWIN_DIR%\bin\cp.exe vcDlls/**/msv* vcDlls/selected
-)
-
-IF NOT EXIST %TEMP_DIR%\hugin-%HUGIN_VER%-%RawPlatform%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/hugin-%HUGIN_VER%-%RawPlatform%.zip qtpfsgui.sourceforge.net/win/hugin-%HUGIN_VER%-%RawPlatform%.zip
-)
-IF NOT EXIST hugin-%HUGIN_VER%-%RawPlatform% (
- %CYGWIN_DIR%\bin\unzip.exe -o -q -d hugin-%HUGIN_VER%-%RawPlatform% %TEMP_DIR%\hugin-%HUGIN_VER%-%RawPlatform%.zip
-)
-
-SET ZLIB_COMMIT=%ZLIB_COMMIT_LONG:~0,7%
-IF NOT EXIST %TEMP_DIR%\zlib-%ZLIB_COMMIT%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/zlib-%ZLIB_COMMIT%.zip https://github.com/madler/zlib/archive/%ZLIB_COMMIT_LONG%.zip
-)
-
-IF NOT EXIST zlib-%ZLIB_COMMIT% (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/zlib-%ZLIB_COMMIT%.zip
- %CYGWIN_DIR%\bin\mv.exe zlib-* zlib-%ZLIB_COMMIT%
-)
-
-IF NOT EXIST zlib-%ZLIB_COMMIT%.build (
- mkdir zlib-%ZLIB_COMMIT%.build
-
- pushd zlib-%ZLIB_COMMIT%.build
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ..\zlib-%ZLIB_COMMIT%
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
-
- popd
-)
-
-
-IF NOT EXIST %TEMP_DIR%\lpng170b75.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/lpng170b75.zip http://sourceforge.net/projects/libpng/files/libpng17/1.7.0beta75/lp170b75.zip/download
- IF errorlevel 1 goto error_end
-)
-IF NOT EXIST lp170b75 (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/lpng170b75.zip
- pushd lp170b75
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" . -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR%
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
- popd
-)
-
-IF NOT EXIST %TEMP_DIR%\expat-2.1.0.tar (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/expat-2.1.0.tar.gz http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
- %CYGWIN_DIR%\bin\gzip.exe -d %TEMP_DIR%/expat-2.1.0.tar.gz
-)
-IF NOT EXIST expat-2.1.0 (
- %CYGWIN_DIR%\bin\tar.exe -xf %TEMP_DIR%/expat-2.1.0.tar
-)
-
-IF NOT EXIST expat-2.1.0.build (
- mkdir expat-2.1.0.build
-
- pushd expat-2.1.0.build
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ..\expat-2.1.0
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
- popd
-)
-
-IF NOT EXIST exiv2-%EXIV2_COMMIT% (
- %CYGWIN_DIR%\bin\svn.exe co -r %EXIV2_COMMIT% svn://dev.exiv2.org/svn/trunk exiv2-%EXIV2_COMMIT%
-)
-
-IF NOT EXIST exiv2-%EXIV2_COMMIT%.build (
- mkdir exiv2-%EXIV2_COMMIT%.build
-
- pushd exiv2-%EXIV2_COMMIT%
- SET EXIV2_CMAKE=
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_PROGRAM_PATH=%SVN_DIR% -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% -DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_SSH=OFF
-
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
- popd
-)
-
-
-SET LIBJPEG_COMMIT=%LIBJPEG_COMMIT_LONG:~0,7%
-IF NOT EXIST %TEMP_DIR%\libjpeg-%LIBJPEG_COMMIT%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/libjpeg-%LIBJPEG_COMMIT%.zip https://github.com/libjpeg-turbo/libjpeg-turbo/archive/%LIBJPEG_COMMIT_LONG%.zip
-)
-
-IF NOT EXIST libjpeg-turbo-%LIBJPEG_COMMIT% (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/libjpeg-%LIBJPEG_COMMIT%.zip
- %CYGWIN_DIR%\bin\mv.exe libjpeg-* libjpeg-turbo-%LIBJPEG_COMMIT%
-)
-
-
-IF NOT EXIST libjpeg-turbo-%LIBJPEG_COMMIT%.build (
- mkdir libjpeg-turbo-%LIBJPEG_COMMIT%.build
-
-
- pushd libjpeg-turbo-%LIBJPEG_COMMIT%.build
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% -DCMAKE_BUILD_TYPE=%Configuration% -DNASM="%CYGWIN_DIR%\bin\nasm.exe" -DWITH_JPEG8=TRUE ..\libjpeg-turbo-%LIBJPEG_COMMIT%
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
- copy jconfig.h ..\libjpeg-turbo-%LIBJPEG_COMMIT%
- popd
-)
-
-SET LCMS_COMMIT=%LCMS_COMMIT_LONG:~0,7%
-IF NOT EXIST %TEMP_DIR%\lcms2-%LCMS_COMMIT%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/lcms2-%LCMS_COMMIT%.zip https://github.com/mm2/Little-CMS/archive/%LCMS_COMMIT_LONG%.zip
-)
-
-
-IF NOT EXIST lcms2-%LCMS_COMMIT% (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/lcms2-%LCMS_COMMIT%.zip
- %CYGWIN_DIR%\bin\mv.exe Little-CMS-* lcms2-%LCMS_COMMIT%
-
- pushd lcms2-%LCMS_COMMIT%
- REM %VSCOMMAND% Projects\%VS_LCMS%\lcms2.sln /Upgrade
- rem devenv Projects\VC2013\lcms2.sln /build Release /project lcms2_DLL
- %VSCOMMAND% Projects\%VS_LCMS%\lcms2.sln /Rebuild "%Configuration%|%Platform%" /project lcms2_DLL
- IF errorlevel 1 goto error_end
- popd
-)
-
-IF NOT EXIST %TEMP_DIR%\tiff-%TIFF_VER%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/tiff-%TIFF_VER%.zip http://download.osgeo.org/libtiff/tiff-%TIFF_VER%.zip
-)
-
-
-IF NOT EXIST tiff-%TIFF_VER% (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/tiff-%TIFF_VER%.zip
-
- pushd tiff-%TIFF_VER%
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% -DCMAKE_BUILD_TYPE=%Configuration% .
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
- popd
-)
-
-SET LIBRAW_COMMIT=%LIBRAW_COMMIT_LONG:~0,7%
-SET LIBRAW_DEMOS2_COMMIT=%LIBRAW_DEMOS2_COMMIT_LONG:~0,7%
-SET LIBRAW_DEMOS3_COMMIT=%LIBRAW_DEMOS3_COMMIT_LONG:~0,7%
-
-IF NOT EXIST %TEMP_DIR%\LibRaw-%LIBRAW_COMMIT%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/LibRaw-%LIBRAW_COMMIT%.zip https://github.com/LibRaw/LibRaw/archive/%LIBRAW_COMMIT_LONG%.zip
-)
-
-IF NOT EXIST %TEMP_DIR%\LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%.zip https://github.com/LibRaw/LibRaw-demosaic-pack-GPL2/archive/%LIBRAW_DEMOS2_COMMIT_LONG%.zip
-)
-
-IF NOT EXIST LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT% (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%.zip
- %CYGWIN_DIR%\bin\mv.exe LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%* LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%
-)
-
-IF NOT EXIST %TEMP_DIR%\LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%.zip https://github.com/LibRaw/LibRaw-demosaic-pack-GPL3/archive/%LIBRAW_DEMOS3_COMMIT_LONG%.zip
-)
-
-IF NOT EXIST LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT% (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%.zip
- %CYGWIN_DIR%\bin\mv.exe LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%* LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%
-)
-
-IF NOT EXIST LibRaw-%LIBRAW_COMMIT% (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/LibRaw-%LIBRAW_COMMIT%.zip
- %CYGWIN_DIR%\bin\mv.exe LibRaw-%LIBRAW_COMMIT%* LibRaw-%LIBRAW_COMMIT%
-
-
- pushd LibRaw-%LIBRAW_COMMIT%
-
- rem /openmp
- echo.COPT_OPT="/arch:SSE2"> qtpfsgui_commands.in
- echo.CFLAGS_DP2=/I..\LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%>> qtpfsgui_commands.in
- echo.CFLAGSG2=/DLIBRAW_DEMOSAIC_PACK_GPL2>> qtpfsgui_commands.in
- echo.CFLAGS_DP3=/I..\LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%>> qtpfsgui_commands.in
- echo.CFLAGSG3=/DLIBRAW_DEMOSAIC_PACK_GPL3>> qtpfsgui_commands.in
- echo.LCMS_DEF="/DUSE_LCMS2 /DCMS_DLL /I..\lcms2-%LCMS_COMMIT%\include">> qtpfsgui_commands.in
- echo.LCMS_LIB="..\lcms2-%LCMS_COMMIT%\bin\lcms2.lib">> qtpfsgui_commands.in
- echo.JPEG_DEF="/DUSE_JPEG8 /DUSE_JPEG /I..\libjpeg-turbo-%LIBJPEG_COMMIT%">> qtpfsgui_commands.in
- echo.JPEG_LIB="..\libjpeg-turbo-%LIBJPEG_COMMIT%.build\sharedlib\%Configuration%\jpeg.lib">> qtpfsgui_commands.in
-
- nmake /f Makefile.msvc @qtpfsgui_commands.in clean > nul
- nmake /f Makefile.msvc @qtpfsgui_commands.in bin\libraw.dll
- popd
-)
-
-SET PTHREADS_CURRENT_DIR=pthreads_%PTHREADS_DIR%_%RawPlatform%
-IF NOT EXIST %TEMP_DIR%\%PTHREADS_CURRENT_DIR% (
- mkdir %TEMP_DIR%\%PTHREADS_CURRENT_DIR%
- pushd %TEMP_DIR%\%PTHREADS_CURRENT_DIR%
- %CYGWIN_DIR%\bin\wget.exe -O pthread.h --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/include/pthread.h
- %CYGWIN_DIR%\bin\wget.exe -O sched.h --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/include/sched.h
- %CYGWIN_DIR%\bin\wget.exe -O semaphore.h --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/include/semaphore.h
- %CYGWIN_DIR%\bin\wget.exe -O pthreadVC2.dll --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/dll/%RawPlatform%/pthreadVC2.dll
- %CYGWIN_DIR%\bin\wget.exe -O pthreadVC2.lib --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/lib/%RawPlatform%/pthreadVC2.lib
- popd
-)
-IF NOT EXIST %PTHREADS_CURRENT_DIR% (
- mkdir %PTHREADS_CURRENT_DIR%
- robocopy %TEMP_DIR%\%PTHREADS_CURRENT_DIR% %PTHREADS_CURRENT_DIR% >nul
-)
-
-IF NOT EXIST %TEMP_DIR%\cfit%CFITSIO_VER%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/cfit%CFITSIO_VER%.zip ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfit%CFITSIO_VER%.zip
-)
-
-IF NOT EXIST cfit%CFITSIO_VER% (
- %CYGWIN_DIR%\bin\unzip.exe -o -q -d cfit%CFITSIO_VER% %TEMP_DIR%/cfit%CFITSIO_VER%.zip
-)
-
-IF NOT EXIST cfit%CFITSIO_VER%.build (
- mkdir cfit%CFITSIO_VER%.build
- pushd cfit%CFITSIO_VER%.build
-
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" ..\cfit%CFITSIO_VER% -DUSE_PTHREADS=0 -DCMAKE_INCLUDE_PATH=..\%PTHREADS_CURRENT_DIR% -DCMAKE_LIBRARY_PATH=..\%PTHREADS_CURRENT_DIR%
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target cfitsio
- IF errorlevel 1 goto error_end
- popd
-)
-
-
-pushd cfit%CFITSIO_VER%
-SET CFITSIO=%CD%
-popd
-pushd cfit%CFITSIO_VER%.build\%Configuration%
-SET CFITSIO=%CFITSIO%;%CD%
-popd
-
-rem IF NOT EXIST %TEMP_DIR%\CCfits-2.4.tar (
-rem %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/CCfits-2.4.tar.gz http://heasarc.gsfc.nasa.gov/docs/software/fitsio/CCfits/CCfits-2.4.tar.gz
-rem %CYGWIN_DIR%\bin\gzip.exe -d %TEMP_DIR%/CCfits-2.4.tar.gz
-rem %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/CCfits2.4patch.zip http://qtpfsgui.sourceforge.net/win/CCfits2.4patch.zip
-rem )
-rem IF NOT EXIST CCfits2.4 (
-rem %CYGWIN_DIR%\bin\tar.exe -xf %TEMP_DIR%/CCfits-2.4.tar
-rem ren CCfits CCfits2.4
-rem %CYGWIN_DIR%\bin\unzip.exe -o -q -d CCfits2.4 %TEMP_DIR%/CCfits2.4patch.zip
-rem )
-rem IF NOT EXIST CCfits2.4.build (
-rem mkdir CCfits2.4.build
-rem
-rem pushd CCfits2.4.build
-rem %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" ..\CCfits2.4 -DCMAKE_INCLUDE_PATH=..\cfit%CFITSIO_VER% -DCMAKE_LIBRARY_PATH=..\cfit%CFITSIO_VER%.build\%Configuration%
-rem IF errorlevel 1 goto error_end
-rem %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target CCfits
-rem IF errorlevel 1 goto error_end
-rem popd
-rem )
-rem pushd CCfits2.4.build\%Configuration%
-rem SET CCFITS_ROOT_DIR=%CD%
-rem popd
-
-SET GSL_COMMIT=%GSL_COMMIT_LONG:~0,7%
-IF NOT EXIST %TEMP_DIR%\gsl-ampl-%GSL_COMMIT%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/gsl-ampl-%GSL_COMMIT%.zip https://github.com/ampl/gsl/archive/%GSL_COMMIT_LONG%.zip
-)
-
-IF NOT EXIST gsl-1.16 (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/gsl-ampl-%GSL_COMMIT%.zip
- %CYGWIN_DIR%\bin\mv.exe gsl-* gsl-1.16
-)
-IF NOT EXIST gsl-1.16.build (
- mkdir gsl-1.16.build
- pushd gsl-1.16.build
-
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_BUILD_TYPE=%Configuration% -DCMAKE_INSTALL_PREFIX=..\dist ..\gsl-1.16
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
- popd
-)
-
-
-SET OPENEXR_COMMIT=%OPENEXR_COMMIT_LONG:~0,7%
-IF NOT EXIST %TEMP_DIR%\OpenEXR-dk-%OPENEXR_COMMIT%.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/OpenEXR-dk-%OPENEXR_COMMIT%.zip https://github.com/openexr/openexr/archive/%OPENEXR_COMMIT_LONG%.zip
-)
-
-IF NOT EXIST OpenEXR-dk-%OPENEXR_COMMIT% (
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/OpenEXR-dk-%OPENEXR_COMMIT%.zip
- %CYGWIN_DIR%\bin\mv.exe openexr-* OpenEXR-dk-%OPENEXR_COMMIT%
-)
-IF NOT EXIST OpenEXR-dk-%OPENEXR_COMMIT%\IlmBase.build (
- mkdir OpenEXR-dk-%OPENEXR_COMMIT%\IlmBase.build
- pushd OpenEXR-dk-%OPENEXR_COMMIT%\IlmBase.build
-
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_BUILD_TYPE=%Configuration% -DCMAKE_INSTALL_PREFIX=..\..\dist -DBUILD_SHARED_LIBS=OFF ../IlmBase
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
- popd
-)
-IF NOT EXIST OpenEXR-dk-%OPENEXR_COMMIT%\OpenEXR.build (
- mkdir OpenEXR-dk-%OPENEXR_COMMIT%\OpenEXR.build
- pushd OpenEXR-dk-%OPENEXR_COMMIT%\OpenEXR.build
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_BUILD_TYPE=%Configuration% ^
- -DILMBASE_PACKAGE_PREFIX=%CD%\dist -DBUILD_SHARED_LIBS=OFF ^
- -DCMAKE_INSTALL_PREFIX=..\..\dist ^
- ../OpenEXR
- IF errorlevel 1 goto error_end
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
- IF errorlevel 1 goto error_end
- popd
-)
-
-IF %Platform% EQU Win32 (
- IF NOT EXIST %TEMP_DIR%\fftw-%FFTW_VER%-dll32.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/fftw-%FFTW_VER%-dll32.zip ftp://ftp.fftw.org/pub/fftw/fftw-%FFTW_VER%-dll32.zip
- )
-) ELSE (
- IF NOT EXIST %TEMP_DIR%\fftw-%FFTW_VER%-dll64.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/fftw-%FFTW_VER%-dll64.zip ftp://ftp.fftw.org/pub/fftw/fftw-%FFTW_VER%-dll64.zip
- )
-)
-
-IF NOT EXIST fftw-%FFTW_VER%-dll (
- IF %Platform% EQU Win32 (
- %CYGWIN_DIR%\bin\unzip.exe -q -d fftw-%FFTW_VER%-dll %TEMP_DIR%/fftw-%FFTW_VER%-dll32.zip
- ) ELSE (
- %CYGWIN_DIR%\bin\unzip.exe -q -d fftw-%FFTW_VER%-dll %TEMP_DIR%/fftw-%FFTW_VER%-dll64.zip
- )
-
- pushd fftw-%FFTW_VER%-dll
- lib /def:libfftw3-3.def /machine:%RawPlatform%
- lib /def:libfftw3f-3.def /machine:%RawPlatform%
- lib /def:libfftw3l-3.def /machine:%RawPlatform%
- popd
-)
-
-REM IF NOT EXIST %TEMP_DIR%\tbb40_20120613oss_win.zip (
-REM %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/tbb40_20120613oss_win.zip "http://threadingbuildingblocks.org/uploads/77/187/4.0 update 5/tbb40_20120613oss_win.zip"
-REM )
-REM
-REM IF NOT EXIST tbb40_20120613oss (
-REM %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/tbb40_20120613oss_win.zip
-REM REM Everthing is already compiled, nothing to do!
-REM )
-
-REM IF NOT EXIST %TEMP_DIR%\gtest-1.6.0.zip (
-SET GTEST_DIR=gtest-r680
-IF NOT EXIST %GTEST_DIR% (
- REM %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/gtest-1.6.0.zip http://googletest.googlecode.com/files/gtest-1.6.0.zip
- %CYGWIN_DIR%\bin\svn.exe co -r 680 http://googletest.googlecode.com/svn/trunk/ %GTEST_DIR%
-
- pushd %GTEST_DIR%
- %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" . -DBUILD_SHARED_LIBS=1
- %CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
- REN Release lib
- popd
-)
-SET GTEST_ROOT=%CD%\%GTEST_DIR%
-
-REM IF NOT EXIST %GTEST_DIR%.build (
-REM mkdir %GTEST_DIR%.build
-REM pushd %GTEST_DIR%.build
-REM %CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" ..\%GTEST_DIR% -DBUILD_SHARED_LIBS=1
-REM %VSCOMMAND% gtest.sln /t:Build /projectconfig=%Configuration%;Platform=%Platform%
-REM popd
-REM )
-REM IF NOT EXIST gtest-1.6.0 (
-REM %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/gtest-1.6.0.zip
-REM )
-
-IF NOT DEFINED L_BOOST_DIR (
- set L_BOOST_DIR=.
-)
-
-IF NOT EXIST %TEMP_DIR%\boost_1_%BOOST_MINOR%_0.zip (
- %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/boost_1_%BOOST_MINOR%_0.zip http://sourceforge.net/projects/boost/files/boost/1.%BOOST_MINOR%.0/boost_1_%BOOST_MINOR%_0.zip/download
-)
-
-IF NOT EXIST %L_BOOST_DIR%\boost_1_%BOOST_MINOR%_0 (
- echo.Extracting boost. Be patient!
-
- pushd %L_BOOST_DIR%
- %CYGWIN_DIR%\bin\unzip.exe -q %TEMP_DIR%/boost_1_%BOOST_MINOR%_0.zip
- popd
-
-
- pushd %L_BOOST_DIR%\boost_1_%BOOST_MINOR%_0
- bootstrap.bat
- popd
-
- pushd %L_BOOST_DIR%\boost_1_%BOOST_MINOR%_0
- IF %Platform% EQU Win32 (
- IF %Configuration% EQU Release (
- cmd.exe /C b2.exe toolset=msvc variant=release
- ) ELSE (
- cmd.exe /C b2.exe toolset=msvc variant=debug
- )
- ) ELSE (
- IF %Configuration% EQU Release (
- cmd.exe /C b2.exe toolset=msvc variant=release address-model=64
- ) ELSE (
- cmd.exe /C b2.exe toolset=msvc variant=debug address-model=64
- )
- )
- popd
-)
-
-REM Set Boost-directory as ENV variable (needed for CMake)
-pushd %L_BOOST_DIR%\boost_1_%BOOST_MINOR%_0
-rem SET Boost_DIR=%CD%
-REM SET BOOST_ROOT=%CD%
-popd
-
-
-IF NOT EXIST LuminanceHdrStuff (
- mkdir LuminanceHdrStuff
-)
-IF NOT EXIST LuminanceHdrStuff\qtpfsgui (
- pushd LuminanceHdrStuff
- git clone https://github.com/LuminanceHDR/LuminanceHDR.git qtpfsgui
- popd
-) ELSE (
- pushd LuminanceHdrStuff\qtpfsgui
- IF %UPDATE_REPO_LUMINANCE% EQU 1 (
- git pull
- )
- popd
-)
-
-
-IF NOT EXIST LuminanceHdrStuff\DEPs (
- pushd LuminanceHdrStuff
- mkdir DEPs
- cd DEPs
- mkdir include
- mkdir lib
- mkdir bin
- popd
-
- for %%v in ("libpng", "lcms2", "libraw", "fftw3", "gsl", "CCfits") do (
- mkdir LuminanceHdrStuff\DEPs\include\%%v
- mkdir LuminanceHdrStuff\DEPs\lib\%%v
- mkdir LuminanceHdrStuff\DEPs\bin\%%v
- )
-
- mkdir LuminanceHdrStuff\DEPs\include\libraw\libraw
-
- rem mkdir LuminanceHdrStuff\DEPs\include\gsl\gsl
- rem copy gsl-1.15\gsl\*.h LuminanceHdrStuff\DEPs\include\gsl\gsl
- rem copy gsl-1.15\build.vc10\lib\%Platform%\%Configuration%\*.lib LuminanceHdrStuff\DEPs\lib\gsl
- rem copy gsl-1.15\build.vc10\dll\*.dll LuminanceHdrStuff\DEPs\bin\gsl
-)
-
-robocopy fftw-%FFTW_VER%-dll LuminanceHdrStuff\DEPs\include\fftw3 *.h /MIR >nul
-robocopy fftw-%FFTW_VER%-dll LuminanceHdrStuff\DEPs\lib\fftw3 *.lib /MIR /NJS >nul
-robocopy fftw-%FFTW_VER%-dll LuminanceHdrStuff\DEPs\bin\fftw3 *.dll /MIR /NJS >nul
-
-
-robocopy LibRaw-%LIBRAW_COMMIT%\libraw LuminanceHdrStuff\DEPs\include\libraw\libraw /MIR >nul
-robocopy LibRaw-%LIBRAW_COMMIT%\lib LuminanceHdrStuff\DEPs\lib\libraw *.lib /MIR >nul
-robocopy LibRaw-%LIBRAW_COMMIT%\bin LuminanceHdrStuff\DEPs\bin\libraw *.dll /MIR >nul
-
-robocopy lcms2-%LCMS_COMMIT%\include LuminanceHdrStuff\DEPs\include\lcms2 *.h /MIR >nul
-robocopy lcms2-%LCMS_COMMIT%\bin LuminanceHdrStuff\DEPs\lib\lcms2 *.lib /MIR /NJS >nul
-rem robocopy lcms2-%LCMS_COMMIT%\bin LuminanceHdrStuff\DEPs\bin\lcms2 *.dll /MIR /NJS >nul
-
-REM robocopy tbb40_20120613oss\include LuminanceHdrStuff\DEPs\include\tbb /MIR >nul
-REM robocopy tbb40_20120613oss\lib\%CpuPlatform%\%VS_SHORT% LuminanceHdrStuff\DEPs\lib\tbb /MIR >nul
-REM robocopy tbb40_20120613oss\bin\%CpuPlatform%\%VS_SHORT% LuminanceHdrStuff\DEPs\bin\tbb /MIR >nul
-
-robocopy CCfits2.4 LuminanceHdrStuff\DEPs\include\CCfits *.h CCfits /MIR >nul
-pushd LuminanceHdrStuff\DEPs\include
-SET CCFITS_ROOT_DIR=%CCFITS_ROOT_DIR%;%CD%
-popd
-
-IF NOT EXIST LuminanceHdrStuff\qtpfsgui.build (
- mkdir LuminanceHdrStuff\qtpfsgui.build
-)
-pushd LuminanceHdrStuff\qtpfsgui.build
-
-
-IF %OPTION_LUMINANCE_UPDATE_TRANSLATIONS% EQU 1 (
- set CMAKE_OPTIONS=-DUPDATE_TRANSLATIONS=1
-) ELSE (
- set CMAKE_OPTIONS=-UUPDATE_TRANSLATIONS
-)
-IF %OPTION_LUPDATE_NOOBSOLETE% EQU 1 (
- set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLUPDATE_NOOBSOLETE=1
-) ELSE (
- set CMAKE_OPTIONS=%CMAKE_OPTIONS% -ULUPDATE_NOOBSOLETE
-)
-
-set L_CMAKE_INCLUDE=..\..\boost_1_%BOOST_MINOR%_0
-set L_CMAKE_LIB=..\..\boost_1_%BOOST_MINOR%_0\stage\lib
-set L_CMAKE_PROGRAM_PATH=%CYGWIN_DIR%\bin
-set L_CMAKE_PREFIX_PATH=%QTDIR%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INCLUDE_PATH=%L_CMAKE_INCLUDE% -DCMAKE_LIBRARY_PATH=%L_CMAKE_LIB% -DCMAKE_PROGRAM_PATH=%L_CMAKE_PROGRAM_PATH% -DCMAKE_INSTALL_PREFIX=..\..\dist -DCMAKE_PREFIX_PATH=%L_CMAKE_PREFIX_PATH% -DPNG_NAMES=libpng16;libpng17 -DOPENEXR_VERSION=%OPENEXR_CMAKE_VERSION%
-
-echo CMake command line options ------------------------------------
-echo %CMAKE_OPTIONS%
-echo ---------------------------------------------------------------
-
-REM Eclipse CDT4 - NMake Makefiles
-
-%CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" ..\qtpfsgui %CMAKE_OPTIONS%
-REM %CMAKE_DIR%\bin\cmake.exe -G "Eclipse CDT4 - NMake Makefiles" ..\qtpfsgui %CMAKE_OPTIONS%
-REM goto end
-IF errorlevel 1 goto error_end
-popd
-
-IF EXIST LuminanceHdrStuff\qtpfsgui.build\Luminance HDR.sln (
- pushd LuminanceHdrStuff\qtpfsgui.build
- rem %VSCOMMAND% luminance-hdr.sln /Upgrade
- %CMAKE_DIR%\bin\cmake.exe --build . --config %ConfigurationLuminance% %LuminanceTarget%
-
- IF errorlevel 1 goto error_end
- popd
-)
-
-IF EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\luminance-hdr.exe (
- IF EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% (
-
- robocopy LuminanceHdrStuff\qtpfsgui LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% LICENSE >nul
-
- IF NOT EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\align_image_stack.exe (
- copy vcDlls\selected\* LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\
- )
-
- pushd LuminanceHdrStuff\DEPs\bin
- robocopy exiv2 ..\..\qtpfsgui.build\%ConfigurationLuminance% expat.dll >nul
- robocopy libraw ..\..\qtpfsgui.build\%ConfigurationLuminance% libraw.dll >nul
- robocopy fftw3 ..\..\qtpfsgui.build\%ConfigurationLuminance% libfftw3f-3.dll >nul
- popd
-
- pushd %INSTALL_DIR%
- robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% exiv2.dll >nul
- robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% jpeg8.dll >nul
- robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% libpng17.dll >nul
- robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% zlib.dll >nul
- robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% expat.dll >nul
- robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% tiff.dll >nul
- popd
-
- robocopy cfit%CFITSIO_VER%.build\%Configuration% LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% cfitsio.dll >nul
- robocopy %PTHREADS_CURRENT_DIR% LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% pthreadVC2.dll >nul
-
- robocopy lcms2-%LCMS_COMMIT%\bin LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% lcms2.dll >nul
-
- IF NOT EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\i18n\ (
- mkdir LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\i18n
- )
- robocopy LuminanceHdrStuff\qtpfsgui.build LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\i18n lang_*.qm >nul
-
- for %%v in ("help", "hdrhtml", "icons") do (
- IF NOT EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\%%v\ (
- mkdir LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\%%v
- )
- )
- robocopy LuminanceHdrStuff\qtpfsgui\help LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\help /MIR >nul
- robocopy LuminanceHdrStuff\qtpfsgui\hdrhtml LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\hdrhtml /MIR >nul
- robocopy LuminanceHdrStuff\qtpfsgui\icons LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\icons /MIR >nul
-
-
- REM ----- QT Stuff (Dlls, translations) --------------------------------------------
- pushd LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%
-
- for %%v in ( "Qt5Concurrent.dll", "Qt5Core.dll", "Qt5Gui.dll", "Qt5Multimedia.dll", "Qt5MultimediaWidgets.dll", "Qt5Network.dll", "Qt5Positioning.dll", "Qt5WinExtras.dll", "Qt5OpenGL.dll", "Qt5PrintSupport.dll", "Qt5Qml.dll", "Qt5Quick.dll", "Qt5Sensors.dll", "Qt5Sql.dll", "Qt5V8.dll", "Qt5WebEngine.dll", "Qt5WebEngineCore.dll", "Qt5WebEngineWidgets.dll", "Qt5Svg.dll", "Qt5WebKitWidgets.dll", "Qt5Widgets.dll", "Qt5Xml.dll", "Qt5WebChannel.dll", "Qt5QuickWidgets.dll", "icudt53.dll", "icuin53.dll", "icuuc53.dll" ) do (
- robocopy %QTDIR%\bin . %%v >nul
- )
- for %%v in ("imageformats", "sqldrivers", "platforms") do (
- IF NOT EXIST %%v (
- mkdir %%v
- )
- )
- robocopy %QTDIR%\plugins\imageformats imageformats qjpeg.dll >nul
- robocopy %QTDIR%\plugins\imageformats imageformats qsvg.dll >nul
- robocopy %QTDIR%\plugins\sqldrivers sqldrivers qsqlite.dll >nul
- robocopy %QTDIR%\plugins\platforms platforms qwindows.dll >nul
- robocopy %QTDIR%\translations i18n qt_??.qm >nul
- robocopy %QTDIR%\translations i18n qt_??_*.qm >nul
- popd
-
- robocopy hugin-%HUGIN_VER%-%RawPlatform% LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\hugin /MIR >nul
- )
-)
-
-goto end
-
-:error_end
-pause
-
-:end
-
-endlocal
\ No newline at end of file
diff -Nru luminance-hdr-2.5.0/build/msvc/README.txt luminance-hdr-2.5.1/build/msvc/README.txt
--- luminance-hdr-2.5.0/build/msvc/README.txt 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/build/msvc/README.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-This is the README file for Luminance
--------------------------------------------------------------------
-Webpage: http://qtpfsgui.sourceforge.net
-Sourceforge: http://sourceforge.net/projects/qtpfsgui
-
-Contents
----------
-1. Requirements
-2. Compilation
-3. Output
-
-
-1. Requirements
----------------------------------------------------------------------
-This build process works for 32 and 64 bit compilation.
-
-This build process requires:
-* Windows
-* MS Visual Studio 2010 or higher, ExpressEditions should work (currently testing with VS2012)
-* Qt for MSVC installed
- - either official 32 bit Qt from: http://qt-project.org/downloads
- - or Qt self compiled
- ATTENTION: Do not mix the compilation with different versions of MSVC. If you
- compile Luminance with VC2012 you should also have Qt compiled
- with VC2010. If you don't find any precompiled Qt with a
- specific MSVC or platform version, you can just download the
- latest version of a precompiled Qt with any VC compiler (or just the Qt source version),
- open the VC command prompt in the Qt main directory and then:
-
- First open this solution and build all projects for your configuration (ex. Release/x64)
- > icu\source\allinone\allinone.sln
-
- And then run: (change your paths to match the installation
- > set include=%include%;C:\Data\Develop\Qt\icu\include
- > set lib=%lib%;C:\Data\Develop\Qt\icu\lib64
- (Change lib64 to lib for the x32 build)
-
- > set path=%path%;C:\Data\Programs\ruby-1.9.3-p385-i386-mingw32\bin
- > configure -release -opengl desktop -no-compile-examples -mp -nomake tests -nomake examples -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx -no-avx2
- > nmake
- > cd qtwebkit
- > nmake
- > cd ..
- > nmake install_subtargets
- > nmake -f Makefile confclean
- > del /S /Q *.obj
- This recompiles the whole Qt and takes from 30 minutes to several hours...
- This reconfiguration can also be applied for generating x64 Qt versions!
- ATTENTION: If you move the Qt folder AFTER the compilation you have to redo the
- > configure ... step
- (without doing the actual compilation with nmake)
- Moreover you need to manually adapt the paths in qtbase\lib\cmake\Qt5LinguistTools\Qt5LinguistToolsConfig.cmake
-
- Afterwards copy the icu-dlls into the qtbase/bin folder, along with the platforms folder from the plugins directory.
- Don't forget the d3dcompiler_46.dll from the local VS-folder!
- At the end programs like linguist.exe, designer.exe must be able to run!!!
-
-
-* CMake
-* Cygwin installed with: cvs, git, gzip, sed, ssh, svn, tar, unzip, wget
-
-
-2. Compilation
----------------------------------------------------------------------
-Copy the .cmd files into a new EMPTY folder. Open the Visual Studio
-command prompt (x64 or Win32) and change (cd) to that directory. If
-there are some problems the batch script should tell you!
-
-Open the setenv.cmd file and adjust the variables paths and options for your needs.
-
-Start the compilation with
-> build.cmd
-
-Wait, wait, wait....
-
-
-3. Output
----------------------------------------------------------------------
-The build process should download and build all the required libraries.
-
-In 'LuminanceHdrStuff\DEPs' you should find all the compilated DLLs,
-librarys and include header files.
-
-In 'LuminanceHdrStuff\qtpfsgui.build' you should find all the binary
-related files.
-
-In 'LuminanceHdrStuff\qtpfsgui' you find the LuminanceHdr SVN directory.
-
-
diff -Nru luminance-hdr-2.5.0/build/msvc/setenv.cmd luminance-hdr-2.5.1/build/msvc/setenv.cmd
--- luminance-hdr-2.5.0/build/msvc/setenv.cmd 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/build/msvc/setenv.cmd 1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-@echo off
-SET CYGWIN_DIR=C:\cygwin64
-SET TEMP_DIR=.downloaddir
-rem SET CMAKE_DIR=C:\Data\Programs\cmake-2.8.12.1-win32-x86
-SET CMAKE_DIR=C:\Data\Programs\cmake-3.4.1-win32-x86
-
-SET VISUAL_STUDIO_VC_REDIST=C:\Program Files (x86)\%VS_PROG_FILES%\VC\redist\%RawPlatform%
-rem SET QTDIR=C:\Data\Develop\Qt\5.0.1-x64\qtbase
-SET QTDIR=C:\Data\Dev\Qt5.8.0\5.8\msvc2015_64
-SET SVN_DIR=C:\Data\Programs\Apache-Subversion-1.8.13\bin
-
-REM Options: -------------------------------------------
-
-REM enable another configuration (defaulting to Release, RelWithDebInfo)
-REM SET Configuration=Debug
-REM SET ConfigurationLuminance=Release
-
-SET LuminanceTarget=
-rem --target luminance-hdr
-
-REM updates/overwrites the original .ts files doing a Qt lupdate
-SET OPTION_LUMINANCE_UPDATE_TRANSLATIONS=0
-SET OPTION_LUPDATE_NOOBSOLETE=0
-
-REM Optional variables
-REM SET L_BOOST_DIR=C:\Data\Develop\libhdrStuff
-
-REM should the Luminance git repo be updated (defaulting to true for read-only git download)
-SET UPDATE_REPO_LUMINANCE=0
\ No newline at end of file
diff -Nru luminance-hdr-2.5.0/build/PackagingApple.cmake luminance-hdr-2.5.1/build/PackagingApple.cmake
--- luminance-hdr-2.5.0/build/PackagingApple.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/build/PackagingApple.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "Davide Anastasia ")
-# set(CPACK_GENERATOR "DragNDrop")
-# set(CPACK_DMG_FORMAT "UDBZ")
-# set(CPACK_DMG_VOLUME_NAME "${LHDR_NAME} ${LHDR_VERSION}")
-# set(CPACK_SYSTEM_NAME "OSX")
-# set(CPACK_PACKAGE_FILE_NAME "${LHDR_NAME}-${LHDR_VERSION}")
-# set(CPACK_PACKAGE_ICON "${ICONS_DIR}/DMG.icns")
-# set(CPACK_DMG_DS_STORE "${ICONS_DIR}/DMGDSStore")
-# set(CPACK_DMG_BACKGROUND_IMAGE "${ICONS_DIR}/DMGBackground.png")
-
-SET(plugin_dest_dir ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/PlugIns)
-SET(qtconf_dest_dir ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
-SET(APPS "\${CMAKE_INSTALL_PREFIX}/${LHDR_OSX_EXECUTABLE_NAME}.app")
-
-#--------------------------------------------------------------------------------
-# Install needed Qt plugins by copying directories from the qt installation
-# One can cull what gets copied by using 'REGEX "..." EXCLUDE'
-#install(DIRECTORY "${QT_PLUGINS_DIR}/sqldrivers"
-# DESTINATION ${plugin_dest_dir} COMPONENT Runtime)
-#install(FILES ${LIBS}
-# DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS)
-
-# install align_image_stack
-install(FILES ${CMAKE_SOURCE_DIR}/build/macosx/align_image_stack
- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS)
-
-# install help
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/help
- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/html
- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
-
-# install a qt.conf file
-install(FILES ${CMAKE_SOURCE_DIR}/build/macosx/qt.conf
- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
-
-# install README and other files
-install(FILES
- ${CMAKE_SOURCE_DIR}/AUTHORS
- ${CMAKE_SOURCE_DIR}/README.md
- ${CMAKE_SOURCE_DIR}/LICENSE
- ${CMAKE_SOURCE_DIR}/Changelog
-# ${CMAKE_SOURCE_DIR}/BUGS
-# ${CMAKE_SOURCE_DIR}/INSTALL
-# ${CMAKE_SOURCE_DIR}/TODO
- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app)
-
-# directories to look for dependencies
-set(DIRS ${QT_LIBRARY_DIRS})
-
-#INSTALL(CODE "
-# file(GLOB_RECURSE QTPLUGINS
-# \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
-# include(BundleUtilities)
-# fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
-# " COMPONENT Runtime)
-
-# create drag and drop installer
-#set(CPACK_BINARY_DRAGNDROP ON)
-#include(CPack)
diff -Nru luminance-hdr-2.5.0/build/Packaging.cmake luminance-hdr-2.5.1/build/Packaging.cmake
--- luminance-hdr-2.5.0/build/Packaging.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/build/Packaging.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-MESSAGE(STATUS "Installation of ${LHDR_NAME} ${LHDR_VERSION} in ${CMAKE_INSTALL_PREFIX}")
-
-# Shared CPack Variables
-set(CPACK_PACKAGE_NAME "${LHDR_NAME}")
-set(CPACK_PACKAGE_DESCRIPTION "${LHDR_NAME} ${LHDR_VERSION}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${LHDR_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${LHDR_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${LHDR_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${LHDR_VERSION}")
-set(CPACK_PACKAGE_VENDOR "${LHDR_VENDOR}")
-
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
-set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/README.md")
-
-if(APPLE)
-include(${CMAKE_SOURCE_DIR}/build/PackagingApple.cmake)
-endif()
diff -Nru luminance-hdr-2.5.0/build_files/Modules/CompilerSettings.cmake luminance-hdr-2.5.1/build_files/Modules/CompilerSettings.cmake
--- luminance-hdr-2.5.0/build_files/Modules/CompilerSettings.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/CompilerSettings.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,60 @@
+IF(UNIX)
+ADD_DEFINITIONS(-Wall -Wno-unknown-pragmas)
+ADD_DEFINITIONS(-ffast-math)
+
+IF(APPLE)
+# optimize for 64-bit core 2 architecture on Apple
+ADD_DEFINITIONS(-march=core2)
+ENDIF()
+ENDIF()
+
+#Activate C++11 support, when available
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ add_definitions(-DBRANCH_PREDICTION)
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+ if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
+ message(STATUS "C++11 activated for GCC ${GCC_VERSION}")
+ set(CMAKE_CXX_STANDARD 11)
+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # add_definitions("-std=gnu++11")
+ add_definitions(-DLHDR_CXX11_ENABLED)
+ elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
+ message(WARNING "C++0x activated for GCC ${GCC_VERSION}. If you get any errors update to a compiler that fully supports C++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") # add_definitions("-std=gnu++0x")
+ add_definitions(-DLHDR_CXX11_ENABLED)
+ else()
+ message(WARNING "C++11 NOT available. GCC >= 4.3 is needed.")
+ endif()
+elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+ message(STATUS "C++11 activated for Clang")
+ set(CMAKE_CXX_STANDARD 11)
+ if (APPLE)
+ set(CMAKE_EXE_LINKER_FLAGS "-lc++abi -stdlib=libc++")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+ # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+ add_definitions(-DLHDR_CXX11_ENABLED)
+ add_definitions(-DBRANCH_PREDICTION)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference -Wdelete-non-virtual-dtor -Wsign-compare -Wswitch")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wreturn-type -Wself-assign -Wunused-argument -Wunused-function -Wtautological-compare")
+ # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32 -Wconversion -Wsystem-headers")
+elseif(MSVC)
+ message(STATUS "C++11 is active by default on Microsoft Visual Studio")
+ # add_definitions("-std=c++0x")
+ add_definitions(-DLHDR_CXX11_ENABLED)
+else()
+ message(WARNING "Your C++ compiler does not support C++11.")
+endif()
+#OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3
+IF(MSVC)
+ FIND_PACKAGE(OpenMP REQUIRED)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+ IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
+ MESSAGE(STATUS "GCC >= 4.3")
+ FIND_PACKAGE(OpenMP REQUIRED)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+ ENDIF()
+ENDIF()
diff -Nru luminance-hdr-2.5.0/build_files/Modules/FindCFITSIO.cmake luminance-hdr-2.5.1/build_files/Modules/FindCFITSIO.cmake
--- luminance-hdr-2.5.0/build_files/Modules/FindCFITSIO.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/FindCFITSIO.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,44 @@
+# - Try to find CFITSIO
+# Once done this will define
+#
+# CFITSIO_FOUND - system has CFITSIO
+# CFITSIO_INCLUDE_DIR - the CFITSIO include directory
+# CFITSIO_LIBRARIES - Link these to use CFITSIO
+# CFITSIO_VERSION_STRING - Human readable version number of cfitsio
+# CFITSIO_VERSION_MAJOR - Major version number of cfitsio
+# CFITSIO_VERSION_MINOR - Minor version number of cfitsio
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+find_path(CFITSIO_INCLUDE_DIR fitsio.h
+ PATH_SUFFIXES libcfitsio3 libcfitsio0 cfitsio
+ PATHS
+ $ENV{CFITSIO}
+ ${_obIncDir}
+ ${GNUWIN32_DIR}/include
+ /opt/local/include
+)
+
+find_library(CFITSIO_LIBRARIES NAMES cfitsio
+ PATHS
+ $ENV{CFITSIO}
+ ${_obLinkDir}
+ ${GNUWIN32_DIR}/lib
+ /opt/local/lib
+)
+
+if(CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
+ # Find the version of the cfitsio header
+ FILE(READ "${CFITSIO_INCLUDE_DIR}/fitsio.h" FITSIO_H)
+ STRING(REGEX REPLACE ".*#define CFITSIO_VERSION[^0-9]*([0-9]+)\\.([0-9]+).*" "\\1.\\2" CFITSIO_VERSION_STRING "${FITSIO_H}")
+ STRING(REGEX REPLACE "^([0-9]+)[.]([0-9]+)" "\\1" CFITSIO_VERSION_MAJOR ${CFITSIO_VERSION_STRING})
+ STRING(REGEX REPLACE "^([0-9]+)[.]([0-9]+)" "\\2" CFITSIO_VERSION_MINOR ${CFITSIO_VERSION_STRING})
+
+ SET(CFITSIO_VERSION_STRING "${CFITSIO_VERSION_MAJOR}.${CFITSIO_VERSION_MINOR}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(CFITSIO
+ REQUIRED_VARS CFITSIO_LIBRARIES CFITSIO_INCLUDE_DIR CFITSIO_VERSION_STRING)
+mark_as_advanced(CFITSIO_INCLUDE_DIR CFITSIO_LIBRARIES)
diff -Nru luminance-hdr-2.5.0/build_files/Modules/Findexiv2.cmake luminance-hdr-2.5.1/build_files/Modules/Findexiv2.cmake
--- luminance-hdr-2.5.0/build_files/Modules/Findexiv2.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/Findexiv2.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,82 @@
+# - Try to find the Exiv2 library
+#
+# EXIV2_MIN_VERSION - You can set this variable to the minimum version you need
+# before doing FIND_PACKAGE(Exiv2). The default is 0.12.
+#
+# Once done this will define
+#
+# EXIV2_FOUND - system has libexiv2
+# EXIV2_INCLUDE_DIR - the libexiv2 include directory
+# EXIV2_LIBRARIES - Link these to use libexiv2
+# EXIV2_DEFINITIONS - Compiler switches required for using libexiv2
+#
+# The minimum required version of Exiv2 can be specified using the
+# standard syntax, e.g. find_package(Exiv2 0.17)
+#
+# For compatiblity, also the variable EXIV2_MIN_VERSION can be set to the minimum version
+# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
+
+# Copyright (c) 2010, Alexander Neundorf,
+# Copyright (c) 2008, Gilles Caulier,
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# Support EXIV2_MIN_VERSION for compatibility:
+if(NOT Exiv2_FIND_VERSION)
+ set(Exiv2_FIND_VERSION "${EXIV2_MIN_VERSION}")
+endif(NOT Exiv2_FIND_VERSION)
+
+# the minimum version of exiv2 we require
+if(NOT Exiv2_FIND_VERSION)
+ set(Exiv2_FIND_VERSION "0.21")
+endif(NOT Exiv2_FIND_VERSION)
+
+
+if (NOT WIN32)
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+ pkg_check_modules(PC_EXIV2 exiv2)
+ set(EXIV2_DEFINITIONS ${PC_EXIV2_CFLAGS_OTHER})
+endif (NOT WIN32)
+
+
+find_path(EXIV2_INCLUDE_DIR NAMES exiv2/exif.hpp
+ HINTS
+ ${PC_EXIV2_INCLUDEDIR}
+ ${PC_EXIV2_INCLUDE_DIRS}
+ )
+
+find_library(EXIV2_LIBRARY NAMES exiv2 libexiv2
+ HINTS
+ ${PC_EXIV2_LIBDIR}
+ ${PC_EXIV2_LIBRARY_DIRS}
+ )
+
+
+# Get the version number from exiv2/version.hpp and store it in the cache:
+if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
+ file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
+ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
+ set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
+
+ string(REGEX MATCH "#define EXIV2_MINOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
+ set(EXIV2_VERSION_MINOR "${CMAKE_MATCH_1}")
+
+ string(REGEX MATCH "#define EXIV2_PATCH_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
+ set(EXIV2_VERSION_PATCH "${CMAKE_MATCH_1}")
+
+ set(EXIV2_VERSION "${EXIV2_VERSION_MAJOR}.${EXIV2_VERSION_MINOR}.${EXIV2_VERSION_PATCH}" CACHE STRING "Version number of Exiv2" FORCE)
+endif(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
+
+set(EXIV2_LIBRARIES "${EXIV2_LIBRARY}")
+
+include(FindPackageHandleStandardArgs)
+#find_package_handle_standard_args(Exiv2 REQUIRED_VARS EXIV2_LIBRARY EXIV2_INCLUDE_DIR
+# VERSION_VAR EXIV2_VERSION)
+
+find_package_handle_standard_args(Exiv2 REQUIRED_VARS EXIV2_LIBRARY EXIV2_INCLUDE_DIR
+ EXIV2_VERSION)
+mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARY)
+
diff -Nru luminance-hdr-2.5.0/build_files/Modules/Findfftwf.cmake luminance-hdr-2.5.1/build_files/Modules/Findfftwf.cmake
--- luminance-hdr-2.5.0/build_files/Modules/Findfftwf.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/Findfftwf.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,51 @@
+# FFTWF_INCLUDE_DIR = fftw3.h
+# FFTWF_LIBRARIES = libfftw3.a
+# FFTWF_FOUND = true if FFTW3 is found
+
+IF(FFTWF_INCLUDE_DIRS)
+ FIND_PATH(FFTWF_INCLUDE_DIR fftw3.h ${FFTWF_INCLUDE_DIRS})
+ FIND_LIBRARY(FFTWF_LIBRARY fftw3f ${FFTWF_LIBRARY_DIRS})
+ FIND_LIBRARY(FFTWF_THREADS_LIBRARY fftw3f_threads ${FFTWF_LIBRARY_DIRS})
+ELSE(FFTWF_INCLUDE_DIRS)
+ SET(TRIAL_PATHS
+ $ENV{FFTWF_HOME}/include
+ /usr/include
+ /usr/local/include
+ /opt/include
+ /usr/apps/include
+ )
+
+ SET(TRIAL_LIBRARY_PATHS
+ $ENV{FFTWF_HOME}/lib
+ /usr/lib
+ /usr/local/lib
+ /opt/lib
+ /sw/lib
+ )
+
+ FIND_PATH(FFTWF_INCLUDE_DIR fftw3.h ${TRIAL_PATHS})
+ FIND_LIBRARY(FFTWF_LIBRARIES fftw3f ${TRIAL_LIBRARY_PATHS})
+ FIND_LIBRARY(FFTWF_THREADS_LIBRARIES fftw3f_threads ${TRIAL_LIBRARY_PATHS})
+ENDIF(FFTWF_INCLUDE_DIRS)
+
+
+IF(FFTWF_INCLUDE_DIR AND FFTWF_LIBRARIES AND FFTWF_THREADS_LIBRARIES)
+ SET(FFTWF_FOUND TRUE)
+ELSE()
+ SET(FFTWF_FOUND FALSE)
+ENDIF()
+
+IF(FFTWF_FOUND)
+ SET(FFTWF_LIBRARIES ${FFTWF_LIBRARIES} ${FFTWF_THREADS_LIBRARIES})
+
+ MESSAGE(STATUS "Found FFTW3F (FFTWF_INCLUDE_DIR = ${FFTWF_INCLUDE_DIR})")
+ MESSAGE(STATUS "Found FFTW3F (FFTWF_LIBRARIES = ${FFTWF_LIBRARIES})")
+ELSE()
+ MESSAGE(FATAL_ERROR "Could not find FFTW3F")
+ENDIF()
+
+MARK_AS_ADVANCED(
+ FFTWF_INCLUDE_DIR
+ FFTWF_LIBRARIES
+ FFTWF_FOUND
+)
diff -Nru luminance-hdr-2.5.0/build_files/Modules/FindGSL.cmake luminance-hdr-2.5.1/build_files/Modules/FindGSL.cmake
--- luminance-hdr-2.5.0/build_files/Modules/FindGSL.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/FindGSL.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,64 @@
+# - Find GSL
+# Find the GNU Scientific Library (GSL) includes and library
+#
+# This module defines
+# GSL_FOUND
+# GSL_LIBRARIES for GSL only
+# GSLCBLAS_LIBRARIES for GSL CBLAS
+# GSL_INCLUDE_DIR
+# GSLCBLAS_INCLUDE_DIR (not yet defined)
+#
+
+FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_rng.h
+ /usr/local/include
+ /usr/include
+ /opt/local/include
+)
+
+FIND_PATH(GSLCBLAS_INCLUDE_DIR gsl/gsl_cblas.h
+ /usr/local/include
+ /usr/include
+ /opt/local/include
+)
+
+IF(GSL_USE_STATIC_LIBS)
+ SET( _GSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF(WIN32)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ ELSE(WIN32)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ ENDIF(WIN32)
+ENDIF(GSL_USE_STATIC_LIBS)
+
+FIND_LIBRARY(GSL_LIBRARY NAMES gsl)
+FIND_LIBRARY(GSL_CBLAS_LIBRARY NAMES gslcblas)
+
+IF(GSL_USE_STATIC_LIBS)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_GSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+ENDIF(GSL_USE_STATIC_LIBS)
+
+IF(GSL_LIBRARY AND GSL_CBLAS_LIBRARY AND GSL_INCLUDE_DIR AND GSLCBLAS_INCLUDE_DIR)
+ SET(GSL_LIBRARIES ${GSL_LIBRARY})
+ SET(GSLCBLAS_LIBRARIES ${GSL_CBLAS_LIBRARY})
+ SET(GSL_FOUND "YES")
+ELSE()
+ SET(GSL_FOUND "NO")
+ENDIF()
+
+IF(GSL_FOUND)
+ IF(NOT GSL_FIND_QUIETLY)
+ MESSAGE(STATUS "Found GNU Scientific Library (GSL_LIBRARY = ${GSL_LIBRARY})")
+ MESSAGE(STATUS "Found GNU Scientific Library: (GSL_CBLAS_LIBRARY = ${GSL_CBLAS_LIBRARY})")
+ MESSAGE(STATUS "Found GNU Scientific Library: (GSL_INCLUDE_DIR = ${GSL_INCLUDE_DIR})")
+ ENDIF(NOT GSL_FIND_QUIETLY)
+ELSE(GSL_FOUND)
+ IF(GSL_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find GNU Scientific Library")
+ ENDIF(GSL_FIND_REQUIRED)
+ENDIF(GSL_FOUND)
+
+MARK_AS_ADVANCED(
+ GSL_LIBRARY
+ GSL_CBLAS_LIBRARY
+ GSL_INCLUDE_DIR
+)
diff -Nru luminance-hdr-2.5.0/build_files/Modules/Findlcms2.cmake luminance-hdr-2.5.1/build_files/Modules/Findlcms2.cmake
--- luminance-hdr-2.5.0/build_files/Modules/Findlcms2.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/Findlcms2.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,27 @@
+FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h
+ /usr/local/include
+ /usr/include
+ /opt/local/include
+)
+
+SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2)
+FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
+
+# handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS2 DEFAULT_MSG LCMS2_LIBRARY LCMS2_INCLUDE_DIR)
+
+IF(LCMS2_FOUND)
+ SET( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
+ IF(NOT LCMS2_FIND_QUIETLY)
+ MESSAGE(STATUS "Found LCMS2 (LCMS2_LIBRARIES = ${LCMS2_LIBRARIES})")
+ MESSAGE(STATUS "Found LCMS2 (LCMS2_INCLUDE_DIR = ${LCMS2_INCLUDE_DIR})")
+ ENDIF(NOT LCMS2_FIND_QUIETLY)
+ELSE(LCMS2_FOUND)
+ IF(LCMS2_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find LCMS2")
+ ENDIF(LCMS2_FIND_REQUIRED)
+ENDIF(LCMS2_FOUND)
+
+MARK_AS_ADVANCED(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)
diff -Nru luminance-hdr-2.5.0/build_files/Modules/FindLibRAW.cmake luminance-hdr-2.5.1/build_files/Modules/FindLibRAW.cmake
--- luminance-hdr-2.5.0/build_files/Modules/FindLibRAW.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/FindLibRAW.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,61 @@
+# - Find LibRAW library
+# Find the native LibRAW includes and library
+# This module defines
+# LIBRAW_INCLUDE_DIR, where to find libraw.h, etc.
+# LIBRAW_LIBRARIES, libraries to link against to use LibRAW.
+# LIBRAW_FOUND, If false, do not try to use LibRAW.
+# also defined, but not for general use are
+# LIBRAW_LIBRARY, where to find the LibRAW library.
+
+FIND_PATH(LIBRAW_INCLUDE_DIR libraw/libraw.h)
+
+SET(LIBRAW_NAMES ${LIBRAW_NAMES} raw_r)
+FIND_LIBRARY(LIBRAW_LIBRARY NAMES ${LIBRAW_NAMES} )
+
+# handle the QUIETLY and REQUIRED arguments and set LIBRAW_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBRAW DEFAULT_MSG LIBRAW_LIBRARY LIBRAW_INCLUDE_DIR)
+
+IF(LIBRAW_FOUND)
+ SET( LIBRAW_LIBRARIES ${LIBRAW_LIBRARY} )
+ MESSAGE(STATUS "Found LibRAW (LIBRAW_INCLUDE_DIR = ${LIBRAW_INCLUDE_DIR})")
+ MESSAGE(STATUS "Found LibRAW (LIBRAW_LIBRARIES = ${LIBRAW_LIBRARIES})")
+ IF(UNIX)
+ IF(APPLE)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/find_demosaicing_gpl2.sh
+ ${LIBRAW_LIBRARY} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ OUTPUT_VARIABLE _output OUTPUT_STRIP_TRAILING_WHITESPACE)
+ ELSE()
+ EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build_files/platforms/linux/find_demosaicing_gpl2.sh
+ ${LIBRAW_LIBRARY} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ OUTPUT_VARIABLE _output OUTPUT_STRIP_TRAILING_WHITESPACE)
+ ENDIF()
+ IF(_output)
+ MESSAGE(STATUS "Found demosaicing pack GPL2")
+ ADD_DEFINITIONS("-DDEMOSAICING_GPL2")
+ ELSE(_output)
+ MESSAGE(STATUS "Demosaicing pack GPL2 not found")
+ ENDIF(_output)
+
+ IF(APPLE)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/find_demosaicing_gpl3.sh
+ ${LIBRAW_LIBRARY} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ OUTPUT_VARIABLE _output OUTPUT_STRIP_TRAILING_WHITESPACE)
+ ELSE()
+ EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build_files/platforms/linux/find_demosaicing_gpl3.sh
+ ${LIBRAW_LIBRARY} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ OUTPUT_VARIABLE _output OUTPUT_STRIP_TRAILING_WHITESPACE)
+ ENDIF()
+ IF(_output)
+ MESSAGE(STATUS "Found demosaicing pack GPL3")
+ ADD_DEFINITIONS("-DDEMOSAICING_GPL3")
+ ELSE(_output)
+ MESSAGE(STATUS "Demosaicing pack GPL3 not found")
+ ENDIF(_output)
+ ENDIF(UNIX)
+ELSE(LIBRAW_FOUND)
+ MESSAGE(FATAL_ERROR "Could not find LibRAW")
+ENDIF(LIBRAW_FOUND)
+
+MARK_AS_ADVANCED(LIBRAW_INCLUDE_DIR LIBRAW_LIBRARIES)
diff -Nru luminance-hdr-2.5.0/build_files/Modules/FindOpenEXR.cmake luminance-hdr-2.5.1/build_files/Modules/FindOpenEXR.cmake
--- luminance-hdr-2.5.0/build_files/Modules/FindOpenEXR.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/FindOpenEXR.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,108 @@
+# - Find OpenEXR library
+# Find the native OpenEXR includes and library
+# This module defines
+# OPENEXR_INCLUDE_DIRS, where to find ImfXdr.h, etc. Set when
+# OPENEXR_INCLUDE_DIR is found.
+# OPENEXR_LIBRARIES, libraries to link against to use OpenEXR.
+# OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
+# This can also be an environment variable.
+# OPENEXR_FOUND, If false, do not try to use OpenEXR.
+#
+# For individual library access these advanced settings are available
+# OPENEXR_HALF_LIBRARY, Path to Half library
+# OPENEXR_IEX_LIBRARY, Path to Half library
+# OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
+# OPENEXR_ILMTHREAD_LIBRARY, Path to IlmThread library
+# OPENEXR_IMATH_LIBRARY, Path to Imath library
+#
+# also defined, but not for general use are
+# OPENEXR_LIBRARY, where to find the OpenEXR library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+# If OPENEXR_ROOT_DIR was defined in the environment, use it.
+IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
+ SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
+ENDIF()
+
+if (NOT OPENEXR_VERSION)
+ SET(OPENEXR_VERSION "2.0.1")
+endif()
+if (${OPENEXR_VERSION} VERSION_LESS "2.1")
+ SET(_openexr_FIND_COMPONENTS
+ Half
+ Iex
+ IlmImf
+ IlmThread
+ Imath
+ )
+else ()
+ string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
+ SET(_openexr_FIND_COMPONENTS
+ Half
+ Iex-${_openexr_libs_ver}
+ IlmImf-${_openexr_libs_ver}
+ IlmThread-${_openexr_libs_ver}
+ Imath-${_openexr_libs_ver}
+ )
+endif ()
+
+SET(_openexr_SEARCH_DIRS
+ ${OPENEXR_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
+
+FIND_PATH(OPENEXR_INCLUDE_DIR
+ NAMES
+ OpenEXR/ImfXdr.h
+ HINTS
+ ${_openexr_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include
+)
+
+SET(_openexr_LIBRARIES)
+FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+ FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
+ NAMES
+ ${COMPONENT}
+ HINTS
+ ${_openexr_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
+ LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
+ENDFOREACH()
+
+# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
+ _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
+
+IF(OPENEXR_FOUND)
+ SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
+ # Both include paths are needed because of dummy OSL headers mixing #include and #include :(
+ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
+ message(STATUS "OpenEXR found")
+ENDIF()
+
+MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)
+FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
+ENDFOREACH()
diff -Nru luminance-hdr-2.5.0/build_files/Modules/GetGitRevisionDescription.cmake luminance-hdr-2.5.1/build_files/Modules/GetGitRevisionDescription.cmake
--- luminance-hdr-2.5.0/build_files/Modules/GetGitRevisionDescription.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/GetGitRevisionDescription.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,104 @@
+# - Returns a version string from Git
+#
+# These functions force a re-configure on each git commit so that you can
+# trust the values of the variables in your build system.
+#
+# get_git_head_revision( [ ...])
+#
+# Returns the refspec and sha hash of the current head revision
+#
+# git_describe( [ ...])
+#
+# Returns the results of git describe on the source tree, and adjusting
+# the output so that it tests false if an error occurs.
+#
+# git_get_exact_tag( [ ...])
+#
+# Returns the results of git describe --exact-match on the source tree,
+# and adjusting the output so that it tests false if there was no exact
+# matching tag.
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__get_git_revision_description)
+ return()
+endif()
+set(__get_git_revision_description YES)
+
+# We must run the following at "include" time, not at function call time,
+# to find the path to this module rather than the path to a calling list file
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+function(get_git_head_revision _refspecvar _hashvar)
+ set(GIT_DIR "${CMAKE_SOURCE_DIR}/.git")
+ if(NOT EXISTS "${GIT_DIR}")
+ # not in git
+ set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+ set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+ return()
+ endif()
+ set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+ if(NOT EXISTS "${GIT_DATA}")
+ file(MAKE_DIRECTORY "${GIT_DATA}")
+ endif()
+ set(HEAD_FILE "${GIT_DATA}/HEAD")
+ configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
+
+ configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" "${GIT_DATA}/grabRef.cmake" @ONLY)
+ include("${GIT_DATA}/grabRef.cmake")
+
+ set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
+ set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
+endfunction()
+
+function(git_describe _var)
+ if(NOT GIT_FOUND)
+ find_package(Git QUIET)
+ endif()
+ get_git_head_revision(refspec hash)
+ if(NOT GIT_FOUND)
+ set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+ return()
+ endif()
+ if(NOT hash)
+ set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+ return()
+ endif()
+
+ # TODO sanitize
+ #if((${ARGN}" MATCHES "&&") OR
+ # (ARGN MATCHES "||") OR
+ # (ARGN MATCHES "\\;"))
+ # message("Please report the following error to the project!")
+ # message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+ #endif()
+
+ #message(STATUS "Arguments to execute_process: ${ARGN}")
+
+ execute_process(COMMAND "${GIT_EXECUTABLE}" describe ${hash} ${ARGN}
+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+ RESULT_VARIABLE res
+ OUTPUT_VARIABLE out
+ ERROR_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT res EQUAL 0)
+ set(out "${out}-${res}-NOTFOUND")
+ endif()
+
+ set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
+
+function(git_get_exact_tag _var)
+ git_describe(out --exact-match ${ARGN})
+ set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
diff -Nru luminance-hdr-2.5.0/build_files/Modules/GetGitRevisionDescription.cmake.in luminance-hdr-2.5.1/build_files/Modules/GetGitRevisionDescription.cmake.in
--- luminance-hdr-2.5.0/build_files/Modules/GetGitRevisionDescription.cmake.in 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/GetGitRevisionDescription.cmake.in 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,38 @@
+#
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(HEAD_HASH)
+
+file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
+string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
+if(HEAD_CONTENTS MATCHES "ref")
+ # named branch
+ string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+ if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+ configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+ elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
+ configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+ set(HEAD_HASH "${HEAD_REF}")
+ endif()
+else()
+ # detached HEAD
+ configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+endif()
+
+if(NOT HEAD_HASH)
+file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+string(STRIP "${HEAD_HASH}" HEAD_HASH)
+endif()
diff -Nru luminance-hdr-2.5.0/build_files/Modules/GlobalSettings.cmake luminance-hdr-2.5.1/build_files/Modules/GlobalSettings.cmake
--- luminance-hdr-2.5.0/build_files/Modules/GlobalSettings.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/GlobalSettings.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,14 @@
+IF(NOT CMAKE_BUILD_TYPE)
+SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)
+ENDIF()
+
+# MESSAGE(${CMAKE_BUILD_TYPE})
+
+IF(${CMAKE_BUILD_TYPE} STREQUAL "Release" OR ${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+ADD_DEFINITIONS("-DQT_NO_DEBUG_OUTPUT")
+ENDIF()
+
+SET(LUMINANCE_MODULES_CLI )
+SET(LUMINANCE_MODULES_GUI )
+
+
diff -Nru luminance-hdr-2.5.0/build_files/Modules/Internationalization.cmake luminance-hdr-2.5.1/build_files/Modules/Internationalization.cmake
--- luminance-hdr-2.5.0/build_files/Modules/Internationalization.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/Internationalization.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,26 @@
+IF(APPLE)
+# ADD_DEFINITIONS(-DI18NDIR=QCoreApplication::applicationDirPath\(\)+"/../Resources/i18n")
+SET(I18NDIR QCoreApplication::applicationDirPath\(\)+"/../Resources/i18n")
+SET(HELPDIR QCoreApplication::applicationDirPath\(\)+"/../Resources/help")
+SET(HDRHTMLDIR QCoreApplication::applicationDirPath\(\)+"/../Resources/hdrhtml")
+ELSEIF(UNIX)
+# ADD_DEFINITIONS(-DPREFIX=${CMAKE_INSTALL_PREFIX})
+# ADD_DEFINITIONS(-DI18NDIR="${CMAKE_INSTALL_PREFIX}/share/luminance-hdr/i18n")
+SET(BASEDIR "\"${CMAKE_INSTALL_PREFIX}\"")
+SET(I18NDIR "\"${CMAKE_INSTALL_PREFIX}/share/luminance-hdr/i18n\"")
+SET(HELPDIR "\"${CMAKE_INSTALL_PREFIX}/share/luminance-hdr/help\"")
+SET(HDRHTMLDIR "\"${CMAKE_INSTALL_PREFIX}/share/luminance-hdr/hdrhtml\"")
+ELSEIF(WIN32)
+# ADD_DEFINITIONS(-DI18NDIR=QCoreApplication::applicationDirPath\(\)+"/i18n")
+SET(I18NDIR QCoreApplication::applicationDirPath\(\)+"/i18n")
+SET(HELPDIR QCoreApplication::applicationDirPath\(\)+"/help")
+SET(HDRHTMLDIR QCoreApplication::applicationDirPath\(\)+"/hdrhtml")
+ENDIF()
+
+OPTION(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files (WARNING: make clean will delete the source .ts files! Danger!)")
+OPTION(LUPDATE_NOOBSOLETE "While doing an lupdate, remove obsolete entries.")
+
+# Holds al the file that will be translated
+SET(FILES_TO_TRANSLATE )
+
+# add a function here that creates the translation when necessary
diff -Nru luminance-hdr-2.5.0/build_files/Modules/Version.cmake luminance-hdr-2.5.1/build_files/Modules/Version.cmake
--- luminance-hdr-2.5.0/build_files/Modules/Version.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Modules/Version.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,18 @@
+SET(LHDR_NAME "Luminance HDR")
+
+# Numeric version values
+SET(LHDR_VERSION_MAJOR "2")
+SET(LHDR_VERSION_MINOR "5")
+SET(LHDR_VERSION_PATCH "1")
+SET(LHDR_VERSION_STR_SUFFIX "")
+
+SET(LHDR_VERSION "${LHDR_VERSION_MAJOR}.${LHDR_VERSION_MINOR}.${LHDR_VERSION_PATCH}${LHDR_VERSION_STR_SUFFIX}")
+SET(LHDR_VENDOR "Luminance HDR Development Team")
+SET(LHDR_COPYRIGHT_YEAR "2006-2017")
+
+SET(LHDR_OSX_EXECUTABLE_NAME "${LHDR_NAME} ${LHDR_VERSION}")
+SET(LHDR_OSX_EXECUTABLE_TARGET "Luminance_HDR_${LHDR_VERSION}")
+
+SET(LHDR_DOMAIN_FIRST "luminance-hdr")
+SET(LHDR_DOMAIN_SECOND "com")
+SET(LHDR_DOMAIN "${LHDR_DOMAIN_FIRST}.${LHDR_DOMAIN_SECOND}")
diff -Nru luminance-hdr-2.5.0/build_files/PackagingApple.cmake luminance-hdr-2.5.1/build_files/PackagingApple.cmake
--- luminance-hdr-2.5.0/build_files/PackagingApple.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/PackagingApple.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,68 @@
+set(CPACK_PACKAGE_CONTACT "Davide Anastasia ")
+# set(CPACK_GENERATOR "DragNDrop")
+# set(CPACK_DMG_FORMAT "UDBZ")
+# set(CPACK_DMG_VOLUME_NAME "${LHDR_NAME} ${LHDR_VERSION}")
+# set(CPACK_SYSTEM_NAME "OSX")
+# set(CPACK_PACKAGE_FILE_NAME "${LHDR_NAME}-${LHDR_VERSION}")
+# set(CPACK_PACKAGE_ICON "${ICONS_DIR}/DMG.icns")
+# set(CPACK_DMG_DS_STORE "${ICONS_DIR}/DMGDSStore")
+# set(CPACK_DMG_BACKGROUND_IMAGE "${ICONS_DIR}/DMGBackground.png")
+
+SET(plugin_dest_dir ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/PlugIns)
+SET(qtconf_dest_dir ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
+SET(APPS "\${CMAKE_INSTALL_PREFIX}/${LHDR_OSX_EXECUTABLE_NAME}.app")
+
+#--------------------------------------------------------------------------------
+# Install needed Qt plugins by copying directories from the qt installation
+# One can cull what gets copied by using 'REGEX "..." EXCLUDE'
+#install(DIRECTORY "${QT_PLUGINS_DIR}/sqldrivers"
+# DESTINATION ${plugin_dest_dir} COMPONENT Runtime)
+#install(FILES ${LIBS}
+# DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS)
+
+# install align_image_stack
+install(FILES ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/align_image_stack
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS)
+
+# install help
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/help
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
+#install(DIRECTORY ${CMAKE_SOURCE_DIR}/html
+# DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
+
+#install icons theme
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/icons
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
+
+#install HdrHTML stuff
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
+
+# install a qt.conf file
+install(FILES ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/qt.conf
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
+
+# install README and other files
+install(FILES
+ ${CMAKE_SOURCE_DIR}/AUTHORS
+ ${CMAKE_SOURCE_DIR}/README.md
+ ${CMAKE_SOURCE_DIR}/LICENSE
+ ${CMAKE_SOURCE_DIR}/Changelog
+# ${CMAKE_SOURCE_DIR}/BUGS
+# ${CMAKE_SOURCE_DIR}/INSTALL
+# ${CMAKE_SOURCE_DIR}/TODO
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app)
+
+# directories to look for dependencies
+set(DIRS ${QT_LIBRARY_DIRS})
+
+#INSTALL(CODE "
+# file(GLOB_RECURSE QTPLUGINS
+# \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+# include(BundleUtilities)
+# fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
+# " COMPONENT Runtime)
+
+# create drag and drop installer
+#set(CPACK_BINARY_DRAGNDROP ON)
+#include(CPack)
diff -Nru luminance-hdr-2.5.0/build_files/Packaging.cmake luminance-hdr-2.5.1/build_files/Packaging.cmake
--- luminance-hdr-2.5.0/build_files/Packaging.cmake 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/Packaging.cmake 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,18 @@
+MESSAGE(STATUS "Installation of ${LHDR_NAME} ${LHDR_VERSION} in ${CMAKE_INSTALL_PREFIX}")
+
+# Shared CPack Variables
+set(CPACK_PACKAGE_NAME "${LHDR_NAME}")
+set(CPACK_PACKAGE_DESCRIPTION "${LHDR_NAME} ${LHDR_VERSION}")
+set(CPACK_PACKAGE_VERSION_MAJOR "${LHDR_VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${LHDR_VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${LHDR_VERSION_PATCH}")
+set(CPACK_PACKAGE_VERSION "${LHDR_VERSION}")
+set(CPACK_PACKAGE_VENDOR "${LHDR_VENDOR}")
+
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
+set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/README.md")
+
+if(APPLE)
+include(${CMAKE_SOURCE_DIR}/build_files/PackagingApple.cmake)
+endif()
diff -Nru luminance-hdr-2.5.0/build_files/platforms/linux/find_demosaicing_gpl2.sh luminance-hdr-2.5.1/build_files/platforms/linux/find_demosaicing_gpl2.sh
--- luminance-hdr-2.5.0/build_files/platforms/linux/find_demosaicing_gpl2.sh 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/platforms/linux/find_demosaicing_gpl2.sh 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+readelf -a $1 | grep lmms
+
diff -Nru luminance-hdr-2.5.0/build_files/platforms/linux/find_demosaicing_gpl3.sh luminance-hdr-2.5.1/build_files/platforms/linux/find_demosaicing_gpl3.sh
--- luminance-hdr-2.5.0/build_files/platforms/linux/find_demosaicing_gpl3.sh 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/platforms/linux/find_demosaicing_gpl3.sh 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+readelf -a $1 | grep amaze
+
diff -Nru luminance-hdr-2.5.0/build_files/platforms/linux/sanitize_translations.sh luminance-hdr-2.5.1/build_files/platforms/linux/sanitize_translations.sh
--- luminance-hdr-2.5.0/build_files/platforms/linux/sanitize_translations.sh 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/platforms/linux/sanitize_translations.sh 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+echo `pwd`
+sed -i '/\-I\/usr\/include/d' CMakeFiles/lang_*
+sed -i '/\-I\/usr\/include/d' CMakeFiles/source_lst_file
diff -Nru luminance-hdr-2.5.0/build_files/platforms/msvc/build.cmd luminance-hdr-2.5.1/build_files/platforms/msvc/build.cmd
--- luminance-hdr-2.5.0/build_files/platforms/msvc/build.cmd 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/platforms/msvc/build.cmd 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,851 @@
+@echo off
+SETLOCAL
+
+REM SANITY CHECKS
+
+where /Q cmake
+IF %ERRORLEVEL% NEQ 0 (
+ echo Error: "cmake" command not in the PATH.
+ echo You must have CMake installed and added to your PATH, aborting!
+ goto error_end
+)
+
+where /Q svn
+IF %ERRORLEVEL% NEQ 0 (
+ echo Error: "svn" command not in the PATH.
+ echo You must have SVN installed and added to your PATH, aborting!
+ goto error_end
+)
+
+REM where /Q git
+REM IF %ERRORLEVEL% NEQ 0 (
+REM echo Error: "git" command not in the PATH.
+REM echo You must have GIT installed and added to your PATH, aborting!
+REM goto error_end
+REM )
+
+call setenv.cmd
+
+IF NOT EXIST %CYGWIN_DIR%\bin\nasm.exe GOTO cygwin_error
+IF NOT EXIST %CYGWIN_DIR%\bin\ssh.exe GOTO cygwin_error
+IF NOT EXIST %CYGWIN_DIR%\bin\wget.exe GOTO cygwin_error
+
+IF EXIST ..\msvc (
+ echo.
+ echo.ERROR: This file should NOT be executed within the LuminanceHDR source directory,
+ echo. but in a new empty folder!
+ echo.
+ goto error_end
+)
+
+REM End SANITY CHECKS
+
+REM Start Lib Versions
+
+REM http://dev.exiv2.org/projects/exiv2/repository/
+SET EXIV2_COMMIT=4753
+
+REM http://github.com/libjpeg-turbo/libjpeg-turbo
+SET LIBJPEG_COMMIT_LONG=da2a27ef056a0179cbd80f9146e58b89403d9933
+
+REM https://github.com/madler/zlib/commits
+SET ZLIB_COMMIT_LONG=cacf7f1d4e3d44d871b605da3b647f07d718623f
+
+REM https://github.com/openexr/openexr
+SET OPENEXR_COMMIT_LONG=20d043d017d4b752356bb76946ffdffaa9c15c72
+SET OPENEXR_CMAKE_VERSION=2.2
+
+REM http://www.boost.org/
+SET BOOST_MINOR=63
+
+REM ftp://ftp.fftw.org/pub/fftw/
+SET FFTW_VER=3.3.5
+
+REM https://github.com/mm2/Little-CMS
+SET LCMS_COMMIT_LONG=f9d75ccef0b54c9f4167d95088d4727985133c52
+
+REM https://github.com/ampl/gsl
+SET GSL_COMMIT_LONG=48e0194da0d8921aff57c293b4f5083877d3f55b
+
+REM https://github.com/LibRaw/LibRaw
+SET LIBRAW_COMMIT_LONG=d7c3d2cb460be10a3ea7b32e9443a83c243b2251
+SET LIBRAW_DEMOS2_COMMIT_LONG=194f592e205990ea8fce72b6c571c14350aca716
+SET LIBRAW_DEMOS3_COMMIT_LONG=f0895891fdaa775255af02275fce426a5bf5c9fc
+
+REM ftp://sourceware.org/pub/pthreads-win32/
+SET PTHREADS_DIR=prebuilt-dll-2-9-1-release
+
+REM http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c
+SET CFITSIO_VER=3360
+REM broken 3370
+
+REM Internal version number for http://qtpfsgui.sourceforge.net/win/hugin-*
+SET HUGIN_VER=201600
+
+REM http://download.osgeo.org/libtiff/
+SET TIFF_VER=4.0.7
+
+REM End Lib Versions
+
+IF EXIST .settings\vsexpress.txt (
+ SET VSCOMMAND=vcexpress
+) ELSE IF EXIST .settings\devent.txt (
+ SET VSCOMMAND=devenv
+) ELSE (
+ vcexpress XXXXXXXXXXXXX 2>NUL >NUL
+ IF ERRORLEVEL 1 (
+ devenv /? 2>NUL >NUL
+ IF ERRORLEVEL 1 (
+ wdexpress /? 2>NUL >NUL
+ IF ERRORLEVEL 1 (
+ echo.
+ echo.ERROR: This file must be run inside a VS command prompt!
+ echo.
+ goto error_end
+ ) ELSE (
+ SET VSCOMMAND=msbuild
+ )
+ ) ELSE (
+ SET VSCOMMAND=devenv
+ )
+ ) ELSE (
+ SET VSCOMMAND=vcexpress
+ )
+ mkdir .settings 2>NUL >NUL
+ echo x>.settings\%VSCOMMAND%.txt
+)
+
+ml64.exe > NUL
+IF ERRORLEVEL 1 (
+ set Platform=Win32
+ set RawPlatform=x86
+ set CpuPlatform=ia32
+) ELSE (
+ set Platform=x64
+ set RawPlatform=x64
+ set CpuPlatform=intel64
+)
+
+SET VISUAL_STUDIO_VC_REDIST=%VCINSTALLDIR%\redist\%RawPlatform%
+
+IF DEFINED VS140COMNTOOLS (
+ REM Visual Studio 2015
+ set VS_SHORT=vc14
+ set VS_CMAKE=Visual Studio 14
+ set VS_PROG_FILES=Microsoft Visual Studio 14.0
+ set VS_LCMS=VC2015
+
+) ELSE IF DEFINED VS120COMNTOOLS (
+ REM Visual Studio 2013
+ set VS_SHORT=vc12
+ set VS_CMAKE=Visual Studio 12
+ set VS_PROG_FILES=Microsoft Visual Studio 12.0
+ set VS_LCMS=VC2013
+
+) ELSE IF DEFINED VS110COMNTOOLS (
+ REM Visual Studio 2012
+ set VS_SHORT=vc11
+ set VS_CMAKE=Visual Studio 11
+ set VS_PROG_FILES=Microsoft Visual Studio 11.0
+ set VS_LCMS=VC2012
+
+) ELSE IF DEFINED VS100COMNTOOLS (
+ REM Visual Studio 2010
+ set VS_SHORT=vc10
+ set VS_CMAKE=Visual Studio 10
+ set VS_PROG_FILES=Microsoft Visual Studio 10.0
+ set VS_LCMS=VC2010
+
+) ELSE (
+ REM Visual Studio 2008
+ set VS_SHORT=vc9
+ set VS_CMAKE=Visual Studio 9 2008
+ set VS_PROG_FILES=Microsoft Visual Studio 9.0
+ set VS_LCMS=VC2008
+)
+IF %Platform% EQU x64 (
+ set VS_CMAKE=%VS_CMAKE% Win64
+)
+
+SET INSTALL_DIR=dist
+IF NOT EXIST %INSTALL_DIR% (
+ mkdir %INSTALL_DIR%
+)
+
+IF NOT DEFINED Configuration (
+ set Configuration=Release
+)
+IF NOT DEFINED ConfigurationLuminance (
+ set ConfigurationLuminance=RelWithDebInfo
+)
+
+cls
+echo.
+echo.--- %VS_CMAKE% ---
+echo.Configuration = %Configuration%
+echo.ConfigurationLuminance = %ConfigurationLuminance%
+echo.Platform = %Platform% (%RawPlatform%)
+echo.
+
+IF NOT EXIST %TEMP_DIR% (
+ mkdir %TEMP_DIR%
+)
+
+
+IF NOT EXIST vcDlls (
+ mkdir vcDlls
+ robocopy "%vcinstalldir%redist\%RawPlatform%" vcDlls /MIR >nul
+)
+
+IF NOT EXIST vcDlls\selected (
+ mkdir vcDlls\selected
+
+ copy vcDlls\**\vcomp* vcDlls\selected
+ copy vcDlls\**\msv* vcDlls\selected
+)
+
+IF NOT EXIST %TEMP_DIR%\hugin-%HUGIN_VER%-%RawPlatform%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/hugin-%HUGIN_VER%-%RawPlatform%.zip ^
+ qtpfsgui.sourceforge.net/win/hugin-%HUGIN_VER%-%RawPlatform%.zip
+)
+IF NOT EXIST hugin-%HUGIN_VER%-%RawPlatform% (
+ mkdir hugin-%HUGIN_VER%-%RawPlatform%
+ pushd hugin-%HUGIN_VER%-%RawPlatform%
+ cmake -E tar x ..\%TEMP_DIR%\hugin-%HUGIN_VER%-%RawPlatform%.zip
+ popd
+)
+
+SET ZLIB_COMMIT=%ZLIB_COMMIT_LONG:~0,7%
+IF NOT EXIST %TEMP_DIR%\zlib-%ZLIB_COMMIT%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/zlib-%ZLIB_COMMIT%.zip ^
+ https://github.com/madler/zlib/archive/%ZLIB_COMMIT_LONG%.zip
+)
+
+IF NOT EXIST zlib-%ZLIB_COMMIT% (
+ cmake -E tar x %TEMP_DIR%/zlib-%ZLIB_COMMIT%.zip
+ move zlib-* zlib-%ZLIB_COMMIT%
+)
+
+IF NOT EXIST zlib-%ZLIB_COMMIT%.build (
+ mkdir zlib-%ZLIB_COMMIT%.build
+
+ pushd zlib-%ZLIB_COMMIT%.build
+ cmake -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ..\zlib-%ZLIB_COMMIT%
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration%
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+
+ popd
+)
+
+
+IF NOT EXIST %TEMP_DIR%\lpng170b75.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/lpng170b75.zip ^
+ https://sourceforge.net/projects/libpng/files/libpng17/1.7.0beta87/lp170b87.zip/download
+ IF errorlevel 1 goto error_end
+)
+IF NOT EXIST lp170b75 (
+ cmake -E tar x %TEMP_DIR%/lpng170b75.zip
+ pushd lp170b75
+ cmake -G "%VS_CMAKE%" . -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR%
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+IF NOT EXIST %TEMP_DIR%\expat-2.1.0.tar (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/expat-2.1.0.tar.gz ^
+ http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+ cmake -E tar x %TEMP_DIR%/expat-2.1.0.tar.gz
+)
+IF NOT EXIST expat-2.1.0 (
+ cmake -E tar x %TEMP_DIR%/expat-2.1.0.tar
+)
+
+IF NOT EXIST expat-2.1.0.build (
+ mkdir expat-2.1.0.build
+
+ pushd expat-2.1.0.build
+ cmake -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ..\expat-2.1.0
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration%
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+IF NOT EXIST exiv2-%EXIV2_COMMIT% (
+ svn co -r %EXIV2_COMMIT% svn://dev.exiv2.org/svn/trunk exiv2-%EXIV2_COMMIT%
+)
+
+IF NOT EXIST exiv2-%EXIV2_COMMIT%.build (
+ mkdir exiv2-%EXIV2_COMMIT%.build
+
+ pushd exiv2-%EXIV2_COMMIT%
+ SET EXIV2_CMAKE=
+ cmake -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ^
+ -DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_SSH=OFF
+
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+
+SET LIBJPEG_COMMIT=%LIBJPEG_COMMIT_LONG:~0,7%
+IF NOT EXIST %TEMP_DIR%\libjpeg-%LIBJPEG_COMMIT%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/libjpeg-%LIBJPEG_COMMIT%.zip ^
+ https://github.com/libjpeg-turbo/libjpeg-turbo/archive/%LIBJPEG_COMMIT_LONG%.zip
+)
+
+IF NOT EXIST libjpeg-turbo-%LIBJPEG_COMMIT% (
+ cmake -E tar x %TEMP_DIR%/libjpeg-%LIBJPEG_COMMIT%.zip
+ move libjpeg-* libjpeg-turbo-%LIBJPEG_COMMIT%
+)
+
+
+IF NOT EXIST libjpeg-turbo-%LIBJPEG_COMMIT%.build (
+ mkdir libjpeg-turbo-%LIBJPEG_COMMIT%.build
+
+
+ pushd libjpeg-turbo-%LIBJPEG_COMMIT%.build
+ cmake -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ^
+ -DCMAKE_BUILD_TYPE=%Configuration% ^
+ -DNASM="%CYGWIN_DIR%\bin\nasm.exe" ^
+ -DWITH_JPEG8=TRUE ..\libjpeg-turbo-%LIBJPEG_COMMIT%
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+ copy jconfig.h ..\libjpeg-turbo-%LIBJPEG_COMMIT%
+ popd
+)
+
+SET LCMS_COMMIT=%LCMS_COMMIT_LONG:~0,7%
+IF NOT EXIST %TEMP_DIR%\lcms2-%LCMS_COMMIT%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/lcms2-%LCMS_COMMIT%.zip ^
+ https://github.com/mm2/Little-CMS/archive/%LCMS_COMMIT_LONG%.zip
+)
+
+
+IF NOT EXIST lcms2-%LCMS_COMMIT% (
+ cmake -E tar x %TEMP_DIR%/lcms2-%LCMS_COMMIT%.zip
+ move Little-CMS-* lcms2-%LCMS_COMMIT%
+
+ pushd lcms2-%LCMS_COMMIT%
+ REM %VSCOMMAND% Projects\%VS_LCMS%\lcms2.sln /Upgrade
+ REM devenv Projects\VC2013\lcms2.sln /build Release /project lcms2_DLL
+ %VSCOMMAND% Projects\%VS_LCMS%\lcms2.sln /Rebuild "%Configuration%|%Platform%" /project lcms2_DLL
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+IF NOT EXIST %TEMP_DIR%\tiff-%TIFF_VER%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/tiff-%TIFF_VER%.zip http://download.osgeo.org/libtiff/tiff-%TIFF_VER%.zip
+)
+
+
+IF NOT EXIST tiff-%TIFF_VER% (
+ cmake -E tar x %TEMP_DIR%/tiff-%TIFF_VER%.zip
+
+ pushd tiff-%TIFF_VER%
+ cmake -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% -DCMAKE_BUILD_TYPE=%Configuration% .
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+SET LIBRAW_COMMIT=%LIBRAW_COMMIT_LONG:~0,7%
+SET LIBRAW_DEMOS2_COMMIT=%LIBRAW_DEMOS2_COMMIT_LONG:~0,7%
+SET LIBRAW_DEMOS3_COMMIT=%LIBRAW_DEMOS3_COMMIT_LONG:~0,7%
+
+IF NOT EXIST %TEMP_DIR%\LibRaw-%LIBRAW_COMMIT%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/LibRaw-%LIBRAW_COMMIT%.zip ^
+ https://github.com/LibRaw/LibRaw/archive/%LIBRAW_COMMIT_LONG%.zip
+)
+
+IF NOT EXIST %TEMP_DIR%\LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%.zip ^
+ https://github.com/LibRaw/LibRaw-demosaic-pack-GPL2/archive/%LIBRAW_DEMOS2_COMMIT_LONG%.zip
+)
+
+IF NOT EXIST LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT% (
+ cmake -E tar x %TEMP_DIR%/LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%.zip
+ move LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%* LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%
+)
+
+IF NOT EXIST %TEMP_DIR%\LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%.zip ^
+ https://github.com/LibRaw/LibRaw-demosaic-pack-GPL3/archive/%LIBRAW_DEMOS3_COMMIT_LONG%.zip
+)
+
+IF NOT EXIST LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT% (
+ cmake -E tar x %TEMP_DIR%/LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%.zip
+ move LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%* LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%
+)
+
+IF NOT EXIST LibRaw-%LIBRAW_COMMIT% (
+ cmake -E tar x %TEMP_DIR%/LibRaw-%LIBRAW_COMMIT%.zip
+ move LibRaw-%LIBRAW_COMMIT%* LibRaw-%LIBRAW_COMMIT%
+
+
+ pushd LibRaw-%LIBRAW_COMMIT%
+
+ REM /openmp
+ echo.COPT_OPT="/arch:SSE2"> qtpfsgui_commands.in
+ echo.CFLAGS_DP2=/I..\LibRaw-demosaic-pack-GPL2-%LIBRAW_DEMOS2_COMMIT%>> qtpfsgui_commands.in
+ echo.CFLAGSG2=/DLIBRAW_DEMOSAIC_PACK_GPL2>> qtpfsgui_commands.in
+ echo.CFLAGS_DP3=/I..\LibRaw-demosaic-pack-GPL3-%LIBRAW_DEMOS3_COMMIT%>> qtpfsgui_commands.in
+ echo.CFLAGSG3=/DLIBRAW_DEMOSAIC_PACK_GPL3>> qtpfsgui_commands.in
+ echo.LCMS_DEF="/DUSE_LCMS2 /DCMS_DLL /I..\lcms2-%LCMS_COMMIT%\include">> qtpfsgui_commands.in
+ echo.LCMS_LIB="..\lcms2-%LCMS_COMMIT%\bin\lcms2.lib">> qtpfsgui_commands.in
+ echo.JPEG_DEF="/DUSE_JPEG8 /DUSE_JPEG /I..\libjpeg-turbo-%LIBJPEG_COMMIT%">> qtpfsgui_commands.in
+ echo.JPEG_LIB="..\libjpeg-turbo-%LIBJPEG_COMMIT%.build\sharedlib\%Configuration%\jpeg.lib">> qtpfsgui_commands.in
+
+ nmake /f Makefile.msvc @qtpfsgui_commands.in clean > nul
+ nmake /f Makefile.msvc @qtpfsgui_commands.in bin\libraw.dll
+ popd
+)
+
+SET PTHREADS_CURRENT_DIR=pthreads_%PTHREADS_DIR%_%RawPlatform%
+IF NOT EXIST %TEMP_DIR%\%PTHREADS_CURRENT_DIR% (
+ mkdir %TEMP_DIR%\%PTHREADS_CURRENT_DIR%
+ pushd %TEMP_DIR%\%PTHREADS_CURRENT_DIR%
+ %CYGWIN_DIR%\bin\wget.exe -O pthread.h --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/include/pthread.h
+ %CYGWIN_DIR%\bin\wget.exe -O sched.h --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/include/sched.h
+ %CYGWIN_DIR%\bin\wget.exe -O semaphore.h --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/include/semaphore.h
+ %CYGWIN_DIR%\bin\wget.exe -O pthreadVC2.dll --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/dll/%RawPlatform%/pthreadVC2.dll
+ %CYGWIN_DIR%\bin\wget.exe -O pthreadVC2.lib --retry-connrefused --tries=5 ftp://sourceware.org/pub/pthreads-win32/%PTHREADS_DIR%/lib/%RawPlatform%/pthreadVC2.lib
+ popd
+)
+IF NOT EXIST %PTHREADS_CURRENT_DIR% (
+ mkdir %PTHREADS_CURRENT_DIR%
+ robocopy %TEMP_DIR%\%PTHREADS_CURRENT_DIR% %PTHREADS_CURRENT_DIR% >nul
+)
+
+IF NOT EXIST %TEMP_DIR%\cfit%CFITSIO_VER%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/cfit%CFITSIO_VER%.zip ^
+ ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfit%CFITSIO_VER%.zip
+)
+
+IF NOT EXIST cfit%CFITSIO_VER% (
+ mkdir cfit%CFITSIO_VER%
+ pushd cfit%CFITSIO_VER%
+ cmake -E tar x ../%TEMP_DIR%/cfit%CFITSIO_VER%.zip
+ popd
+)
+
+IF NOT EXIST cfit%CFITSIO_VER%.build (
+ mkdir cfit%CFITSIO_VER%.build
+ pushd cfit%CFITSIO_VER%.build
+
+ cmake -G "%VS_CMAKE%" ..\cfit%CFITSIO_VER% -DUSE_PTHREADS=0 ^
+ -DCMAKE_INCLUDE_PATH=..\%PTHREADS_CURRENT_DIR% ^
+ -DCMAKE_LIBRARY_PATH=..\%PTHREADS_CURRENT_DIR%
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target cfitsio
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+
+pushd cfit%CFITSIO_VER%
+SET CFITSIO=%CD%
+popd
+pushd cfit%CFITSIO_VER%.build\%Configuration%
+SET CFITSIO=%CFITSIO%;%CD%
+popd
+
+REM IF NOT EXIST %TEMP_DIR%\CCfits-2.4.tar (
+REM %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/CCfits-2.4.tar.gz ^
+REM http://heasarc.gsfc.nasa.gov/docs/software/fitsio/CCfits/CCfits-2.4.tar.gz
+REM %CYGWIN_DIR%\bin\cmake -E tar.exe -d %TEMP_DIR%/CCfits-2.4.tar.gz
+REM %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/CCfits2.4patch.zip ^
+REM http://qtpfsgui.sourceforge.net/win/CCfits2.4patch.zip
+REM )
+REM IF NOT EXIST CCfits2.4 (
+REM cmake -E tar %TEMP_DIR%/CCfits-2.4.tar
+REM ren CCfits CCfits2.4
+REM cmake -E tar CCfits2.4 %TEMP_DIR%/CCfits2.4patch.zip
+REM )
+REM IF NOT EXIST CCfits2.4.build (
+REM mkdir CCfits2.4.build
+REM
+REM pushd CCfits2.4.build
+REM cmake -G "%VS_CMAKE%" ..\CCfits2.4 -DCMAKE_INCLUDE_PATH=..\cfit%CFITSIO_VER% ^
+REM -DCMAKE_LIBRARY_PATH=..\cfit%CFITSIO_VER%.build\%Configuration%
+REM IF errorlevel 1 goto error_end
+REM cmake --build . --config %Configuration% --target CCfits
+REM IF errorlevel 1 goto error_end
+REM popd
+REM )
+REM pushd CCfits2.4.build\%Configuration%
+REM SET CCFITS_ROOT_DIR=%CD%
+REM popd
+
+SET GSL_COMMIT=%GSL_COMMIT_LONG:~0,7%
+IF NOT EXIST %TEMP_DIR%\gsl-ampl-%GSL_COMMIT%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/gsl-ampl-%GSL_COMMIT%.zip ^
+ https://github.com/ampl/gsl/archive/%GSL_COMMIT_LONG%.zip
+)
+
+IF NOT EXIST gsl-1.16 (
+ cmake -E tar x %TEMP_DIR%/gsl-ampl-%GSL_COMMIT%.zip
+ move gsl-* gsl-1.16
+)
+IF NOT EXIST gsl-1.16.build (
+ mkdir gsl-1.16.build
+ pushd gsl-1.16.build
+
+ cmake -G "%VS_CMAKE%" -DCMAKE_BUILD_TYPE=%Configuration% -DCMAKE_INSTALL_PREFIX=..\dist ..\gsl-1.16
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration%
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+
+SET OPENEXR_COMMIT=%OPENEXR_COMMIT_LONG:~0,7%
+IF NOT EXIST %TEMP_DIR%\OpenEXR-dk-%OPENEXR_COMMIT%.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/OpenEXR-dk-%OPENEXR_COMMIT%.zip ^
+ https://github.com/openexr/openexr/archive/%OPENEXR_COMMIT_LONG%.zip
+)
+
+IF NOT EXIST OpenEXR-dk-%OPENEXR_COMMIT% (
+ cmake -E tar x %TEMP_DIR%/OpenEXR-dk-%OPENEXR_COMMIT%.zip
+ move openexr-* OpenEXR-dk-%OPENEXR_COMMIT%
+)
+IF NOT EXIST OpenEXR-dk-%OPENEXR_COMMIT%\IlmBase.build (
+ mkdir OpenEXR-dk-%OPENEXR_COMMIT%\IlmBase.build
+ pushd OpenEXR-dk-%OPENEXR_COMMIT%\IlmBase.build
+
+ cmake -G "%VS_CMAKE%" -DCMAKE_BUILD_TYPE=%Configuration% ^
+ -DCMAKE_INSTALL_PREFIX=..\..\dist -DBUILD_SHARED_LIBS=OFF ../IlmBase
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+ popd
+)
+IF NOT EXIST OpenEXR-dk-%OPENEXR_COMMIT%\OpenEXR.build (
+ mkdir OpenEXR-dk-%OPENEXR_COMMIT%\OpenEXR.build
+ pushd OpenEXR-dk-%OPENEXR_COMMIT%\OpenEXR.build
+ cmake -G "%VS_CMAKE%" -DCMAKE_BUILD_TYPE=%Configuration% ^
+ -DILMBASE_PACKAGE_PREFIX=%CD%\dist -DBUILD_SHARED_LIBS=OFF ^
+ -DCMAKE_INSTALL_PREFIX=..\..\dist ^
+ ../OpenEXR
+ IF errorlevel 1 goto error_end
+ cmake --build . --config %Configuration% --target install
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+IF %Platform% EQU Win32 (
+ IF NOT EXIST %TEMP_DIR%\fftw-%FFTW_VER%-dll32.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/fftw-%FFTW_VER%-dll32.zip ^
+ ftp://ftp.fftw.org/pub/fftw/fftw-%FFTW_VER%-dll32.zip
+ )
+) ELSE (
+ IF NOT EXIST %TEMP_DIR%\fftw-%FFTW_VER%-dll64.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/fftw-%FFTW_VER%-dll64.zip ^
+ ftp://ftp.fftw.org/pub/fftw/fftw-%FFTW_VER%-dll64.zip
+ )
+)
+
+IF NOT EXIST fftw-%FFTW_VER%-dll (
+ mkdir fftw-%FFTW_VER%-dll
+ pushd fftw-%FFTW_VER%-dll
+
+ IF %Platform% EQU Win32 (
+ cmake -E tar x ../%TEMP_DIR%/fftw-%FFTW_VER%-dll32.zip
+ ) ELSE (
+ cmake -E tar x ../%TEMP_DIR%/fftw-%FFTW_VER%-dll64.zip
+ )
+
+ lib /def:libfftw3-3.def /machine:%RawPlatform%
+ lib /def:libfftw3f-3.def /machine:%RawPlatform%
+ lib /def:libfftw3l-3.def /machine:%RawPlatform%
+ popd
+)
+
+REM IF NOT EXIST %TEMP_DIR%\tbb40_20120613oss_win.zip (
+REM %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/tbb40_20120613oss_win.zip ^
+REM "http://threadingbuildingblocks.org/uploads/77/187/4.0 update 5/tbb40_20120613oss_win.zip"
+REM )
+REM
+REM IF NOT EXIST tbb40_20120613oss (
+REM cmake -E tar %TEMP_DIR%/tbb40_20120613oss_win.zip
+REM REM Everthing is already compiled, nothing to do!
+REM )
+
+REM IF NOT EXIST %TEMP_DIR%\gtest-1.6.0.zip (
+SET GTEST_DIR=gtest-r680
+IF NOT EXIST %GTEST_DIR% (
+ REM %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/gtest-1.6.0.zip http://googletest.googlecode.com/files/gtest-1.6.0.zip
+ svn co -r 680 http://googletest.googlecode.com/svn/trunk/ %GTEST_DIR%
+
+ pushd %GTEST_DIR%
+ cmake -G "%VS_CMAKE%" . -DBUILD_SHARED_LIBS=1
+ cmake --build . --config %Configuration%
+ REN Release lib
+ popd
+)
+SET GTEST_ROOT=%CD%\%GTEST_DIR%
+
+REM IF NOT EXIST %GTEST_DIR%.build (
+REM mkdir %GTEST_DIR%.build
+REM pushd %GTEST_DIR%.build
+REM cmake -G "%VS_CMAKE%" ..\%GTEST_DIR% -DBUILD_SHARED_LIBS=1
+REM %VSCOMMAND% gtest.sln /t:Build /projectconfig=%Configuration%;Platform=%Platform%
+REM popd
+REM )
+REM IF NOT EXIST gtest-1.6.0 (
+REM cmake -E tar %TEMP_DIR%/gtest-1.6.0.zip
+REM )
+
+IF NOT DEFINED L_BOOST_DIR (
+ set L_BOOST_DIR=.
+)
+
+IF NOT EXIST %TEMP_DIR%\boost_1_%BOOST_MINOR%_0.zip (
+ %CYGWIN_DIR%\bin\wget.exe -O %TEMP_DIR%/boost_1_%BOOST_MINOR%_0.zip ^
+ http://sourceforge.net/projects/boost/files/boost/1.%BOOST_MINOR%.0/boost_1_%BOOST_MINOR%_0.zip/download
+)
+
+IF NOT EXIST %L_BOOST_DIR%\boost_1_%BOOST_MINOR%_0 (
+ echo.Extracting boost. Be patient!
+
+ pushd %L_BOOST_DIR%
+ cmake -E tar x %TEMP_DIR%/boost_1_%BOOST_MINOR%_0.zip
+ popd
+
+
+ pushd %L_BOOST_DIR%\boost_1_%BOOST_MINOR%_0
+ bootstrap.bat
+ popd
+
+ pushd %L_BOOST_DIR%\boost_1_%BOOST_MINOR%_0
+ IF %Platform% EQU Win32 (
+ IF %Configuration% EQU Release (
+ cmd.exe /C b2.exe toolset=msvc variant=release
+ ) ELSE (
+ cmd.exe /C b2.exe toolset=msvc variant=debug
+ )
+ ) ELSE (
+ IF %Configuration% EQU Release (
+ cmd.exe /C b2.exe toolset=msvc variant=release address-model=64
+ ) ELSE (
+ cmd.exe /C b2.exe toolset=msvc variant=debug address-model=64
+ )
+ )
+ popd
+)
+
+REM Set Boost-directory as ENV variable (needed for CMake)
+pushd %L_BOOST_DIR%\boost_1_%BOOST_MINOR%_0
+REM SET Boost_DIR=%CD%
+REM SET BOOST_ROOT=%CD%
+popd
+
+
+IF NOT EXIST LuminanceHdrStuff (
+ mkdir LuminanceHdrStuff
+)
+IF NOT EXIST LuminanceHdrStuff\qtpfsgui (
+ pushd LuminanceHdrStuff
+ git clone https://github.com/LuminanceHDR/LuminanceHDR.git qtpfsgui
+ popd
+) ELSE (
+ pushd LuminanceHdrStuff\qtpfsgui
+ IF %UPDATE_REPO_LUMINANCE% EQU 1 (
+ git pull
+ )
+ popd
+)
+
+
+IF NOT EXIST LuminanceHdrStuff\DEPs (
+ pushd LuminanceHdrStuff
+ mkdir DEPs
+ cd DEPs
+ mkdir include
+ mkdir lib
+ mkdir bin
+ popd
+
+ for %%v in ("libpng", "lcms2", "libraw", "fftw3", "gsl", "CCfits") do (
+ mkdir LuminanceHdrStuff\DEPs\include\%%v
+ mkdir LuminanceHdrStuff\DEPs\lib\%%v
+ mkdir LuminanceHdrStuff\DEPs\bin\%%v
+ )
+
+ mkdir LuminanceHdrStuff\DEPs\include\libraw\libraw
+
+ REM mkdir LuminanceHdrStuff\DEPs\include\gsl\gsl
+ REM copy gsl-1.15\gsl\*.h LuminanceHdrStuff\DEPs\include\gsl\gsl
+ REM copy gsl-1.15\build.vc10\lib\%Platform%\%Configuration%\*.lib LuminanceHdrStuff\DEPs\lib\gsl
+ REM copy gsl-1.15\build.vc10\dll\*.dll LuminanceHdrStuff\DEPs\bin\gsl
+)
+
+robocopy fftw-%FFTW_VER%-dll LuminanceHdrStuff\DEPs\include\fftw3 *.h /MIR >nul
+robocopy fftw-%FFTW_VER%-dll LuminanceHdrStuff\DEPs\lib\fftw3 *.lib /MIR /NJS >nul
+robocopy fftw-%FFTW_VER%-dll LuminanceHdrStuff\DEPs\bin\fftw3 *.dll /MIR /NJS >nul
+
+
+robocopy LibRaw-%LIBRAW_COMMIT%\libraw LuminanceHdrStuff\DEPs\include\libraw\libraw /MIR >nul
+robocopy LibRaw-%LIBRAW_COMMIT%\lib LuminanceHdrStuff\DEPs\lib\libraw *.lib /MIR >nul
+robocopy LibRaw-%LIBRAW_COMMIT%\bin LuminanceHdrStuff\DEPs\bin\libraw *.dll /MIR >nul
+
+robocopy lcms2-%LCMS_COMMIT%\include LuminanceHdrStuff\DEPs\include\lcms2 *.h /MIR >nul
+robocopy lcms2-%LCMS_COMMIT%\bin LuminanceHdrStuff\DEPs\lib\lcms2 *.lib /MIR /NJS >nul
+REM robocopy lcms2-%LCMS_COMMIT%\bin LuminanceHdrStuff\DEPs\bin\lcms2 *.dll /MIR /NJS >nul
+
+REM robocopy tbb40_20120613oss\include LuminanceHdrStuff\DEPs\include\tbb /MIR >nul
+REM robocopy tbb40_20120613oss\lib\%CpuPlatform%\%VS_SHORT% LuminanceHdrStuff\DEPs\lib\tbb /MIR >nul
+REM robocopy tbb40_20120613oss\bin\%CpuPlatform%\%VS_SHORT% LuminanceHdrStuff\DEPs\bin\tbb /MIR >nul
+
+robocopy CCfits2.4 LuminanceHdrStuff\DEPs\include\CCfits *.h CCfits /MIR >nul
+pushd LuminanceHdrStuff\DEPs\include
+SET CCFITS_ROOT_DIR=%CCFITS_ROOT_DIR%;%CD%
+popd
+
+IF NOT EXIST LuminanceHdrStuff\qtpfsgui.build (
+ mkdir LuminanceHdrStuff\qtpfsgui.build
+)
+pushd LuminanceHdrStuff\qtpfsgui.build
+
+
+IF %OPTION_LUMINANCE_UPDATE_TRANSLATIONS% EQU 1 (
+ set CMAKE_OPTIONS=-DUPDATE_TRANSLATIONS=1
+) ELSE (
+ set CMAKE_OPTIONS=-UUPDATE_TRANSLATIONS
+)
+IF %OPTION_LUPDATE_NOOBSOLETE% EQU 1 (
+ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLUPDATE_NOOBSOLETE=1
+) ELSE (
+ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -ULUPDATE_NOOBSOLETE
+)
+
+set L_CMAKE_INCLUDE=..\..\boost_1_%BOOST_MINOR%_0
+set L_CMAKE_LIB=..\..\boost_1_%BOOST_MINOR%_0\stage\lib
+set L_CMAKE_PROGRAM_PATH=%CYGWIN_DIR%\bin
+set L_CMAKE_PREFIX_PATH=%QTDIR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INCLUDE_PATH=%L_CMAKE_INCLUDE% ^
+ -DCMAKE_LIBRARY_PATH=%L_CMAKE_LIB% -DCMAKE_PROGRAM_PATH=%L_CMAKE_PROGRAM_PATH% ^
+ -DCMAKE_INSTALL_PREFIX=..\..\dist -DCMAKE_PREFIX_PATH=%L_CMAKE_PREFIX_PATH% ^
+ -DPNG_NAMES=libpng16;libpng17 -DOPENEXR_VERSION=%OPENEXR_CMAKE_VERSION%
+
+echo CMake command line options ------------------------------------
+echo %CMAKE_OPTIONS%
+echo ---------------------------------------------------------------
+
+REM Eclipse CDT4 - NMake Makefiles
+
+cmake -G "%VS_CMAKE%" ..\qtpfsgui %CMAKE_OPTIONS%
+REM cmake -G "Eclipse CDT4 - NMake Makefiles" ..\qtpfsgui %CMAKE_OPTIONS%
+REM goto end
+IF errorlevel 1 goto error_end
+popd
+
+IF EXIST LuminanceHdrStuff\qtpfsgui.build\Luminance HDR.sln (
+ pushd LuminanceHdrStuff\qtpfsgui.build
+ REM %VSCOMMAND% luminance-hdr.sln /Upgrade
+ cmake --build . --config %ConfigurationLuminance% %LuminanceTarget%
+
+ IF errorlevel 1 goto error_end
+ popd
+)
+
+IF EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\luminance-hdr.exe (
+ IF EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% (
+
+ robocopy LuminanceHdrStuff\qtpfsgui LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% LICENSE >nul
+
+ IF NOT EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\align_image_stack.exe (
+ copy vcDlls\selected\* LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\
+ )
+
+ pushd LuminanceHdrStuff\DEPs\bin
+ robocopy exiv2 ..\..\qtpfsgui.build\%ConfigurationLuminance% expat.dll >nul
+ robocopy libraw ..\..\qtpfsgui.build\%ConfigurationLuminance% libraw.dll >nul
+ robocopy fftw3 ..\..\qtpfsgui.build\%ConfigurationLuminance% libfftw3f-3.dll >nul
+ popd
+
+ pushd %INSTALL_DIR%
+ robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% exiv2.dll >nul
+ robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% jpeg8.dll >nul
+ robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% libpng17.dll >nul
+ robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% zlib.dll >nul
+ robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% expat.dll >nul
+ robocopy bin ..\LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% tiff.dll >nul
+ popd
+
+ robocopy cfit%CFITSIO_VER%.build\%Configuration% LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% cfitsio.dll >nul
+ robocopy %PTHREADS_CURRENT_DIR% LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% pthreadVC2.dll >nul
+
+ robocopy lcms2-%LCMS_COMMIT%\bin LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance% lcms2.dll >nul
+
+ IF NOT EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\i18n\ (
+ mkdir LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\i18n
+ )
+ robocopy LuminanceHdrStuff\qtpfsgui.build LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\i18n lang_*.qm >nul
+
+ for %%v in ("help", "hdrhtml", "icons") do (
+ IF NOT EXIST LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\%%v\ (
+ mkdir LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\%%v
+ )
+ )
+ robocopy LuminanceHdrStuff\qtpfsgui\help LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\help /MIR >nul
+ robocopy LuminanceHdrStuff\qtpfsgui\hdrhtml LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\hdrhtml /MIR >nul
+ robocopy LuminanceHdrStuff\qtpfsgui\icons LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\icons /MIR >nul
+
+
+ REM ----- QT Stuff (Dlls, translations) --------------------------------------------
+ pushd LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%
+
+ for %%v in ( "Qt5Concurrent.dll", "Qt5Core.dll", "Qt5Gui.dll", "Qt5Multimedia.dll", ^
+ "Qt5MultimediaWidgets.dll", "Qt5Network.dll", "Qt5Positioning.dll", "Qt5WinExtras.dll", ^
+ "Qt5OpenGL.dll", "Qt5PrintSupport.dll", "Qt5Qml.dll", "Qt5Quick.dll", "Qt5Sensors.dll", ^
+ "Qt5Sql.dll", "Qt5V8.dll", "Qt5WebEngine.dll", "Qt5WebEngineCore.dll", "Qt5WebEngineWidgets.dll", ^
+ "Qt5Svg.dll", "Qt5WebKitWidgets.dll", "Qt5Widgets.dll", "Qt5Xml.dll", "Qt5WebChannel.dll", ^
+ "Qt5QuickWidgets.dll", "icudt53.dll", "icuin53.dll", "icuuc53.dll" ) do (
+ robocopy %QTDIR%\bin . %%v >nul
+ )
+ for %%v in ("imageformats", "sqldrivers", "platforms") do (
+ IF NOT EXIST %%v (
+ mkdir %%v
+ )
+ )
+ robocopy %QTDIR%\plugins\imageformats imageformats qjpeg.dll >nul
+ robocopy %QTDIR%\plugins\imageformats imageformats qsvg.dll >nul
+ robocopy %QTDIR%\plugins\sqldrivers sqldrivers qsqlite.dll >nul
+ robocopy %QTDIR%\plugins\platforms platforms qwindows.dll >nul
+ robocopy %QTDIR%\translations i18n qt_??.qm >nul
+ robocopy %QTDIR%\translations i18n qt_??_*.qm >nul
+ popd
+
+ robocopy hugin-%HUGIN_VER%-%RawPlatform% LuminanceHdrStuff\qtpfsgui.build\%ConfigurationLuminance%\hugin /MIR >nul
+ )
+)
+
+goto end
+
+:cygwin_error
+echo ERROR: Cygwin with
+echo nasm
+echo ssh
+echo wget
+echo is required
+
+:error_end
+pause
+
+:end
+
+endlocal
\ No newline at end of file
diff -Nru luminance-hdr-2.5.0/build_files/platforms/msvc/README.txt luminance-hdr-2.5.1/build_files/platforms/msvc/README.txt
--- luminance-hdr-2.5.0/build_files/platforms/msvc/README.txt 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/platforms/msvc/README.txt 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,89 @@
+This is the README file for Luminance
+-------------------------------------------------------------------
+Webpage: http://qtpfsgui.sourceforge.net
+Sourceforge: http://sourceforge.net/projects/qtpfsgui
+
+Contents
+---------
+1. Requirements
+2. Compilation
+3. Output
+
+
+1. Requirements
+---------------------------------------------------------------------
+This build process works for 32 and 64 bit compilation.
+
+This build process requires:
+* Windows
+* MS Visual Studio 2010 or higher, ExpressEditions should work (currently testing with VS2012)
+* Qt for MSVC installed
+ - either official 32 bit Qt from: http://qt-project.org/downloads
+ - or Qt self compiled
+ ATTENTION: Do not mix the compilation with different versions of MSVC. If you
+ compile Luminance with VC2012 you should also have Qt compiled
+ with VC2010. If you don't find any precompiled Qt with a
+ specific MSVC or platform version, you can just download the
+ latest version of a precompiled Qt with any VC compiler (or just the Qt source version),
+ open the VC command prompt in the Qt main directory and then:
+
+ First open this solution and build all projects for your configuration (ex. Release/x64)
+ > icu\source\allinone\allinone.sln
+
+ And then run: (change your paths to match the installation
+ > set include=%include%;C:\Data\Develop\Qt\icu\include
+ > set lib=%lib%;C:\Data\Develop\Qt\icu\lib64
+ (Change lib64 to lib for the x32 build)
+
+ > set path=%path%;C:\Data\Programs\ruby-1.9.3-p385-i386-mingw32\bin
+ > configure -release -opengl desktop -no-compile-examples -mp -nomake tests -nomake examples -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx -no-avx2
+ > nmake
+ > cd qtwebkit
+ > nmake
+ > cd ..
+ > nmake install_subtargets
+ > nmake -f Makefile confclean
+ > del /S /Q *.obj
+ This recompiles the whole Qt and takes from 30 minutes to several hours...
+ This reconfiguration can also be applied for generating x64 Qt versions!
+ ATTENTION: If you move the Qt folder AFTER the compilation you have to redo the
+ > configure ... step
+ (without doing the actual compilation with nmake)
+ Moreover you need to manually adapt the paths in qtbase\lib\cmake\Qt5LinguistTools\Qt5LinguistToolsConfig.cmake
+
+ Afterwards copy the icu-dlls into the qtbase/bin folder, along with the platforms folder from the plugins directory.
+ Don't forget the d3dcompiler_46.dll from the local VS-folder!
+ At the end programs like linguist.exe, designer.exe must be able to run!!!
+
+
+* CMake
+* Cygwin installed with: cvs, git, gzip, sed, ssh, svn, tar, unzip, wget
+
+
+2. Compilation
+---------------------------------------------------------------------
+Copy the .cmd files into a new EMPTY folder. Open the Visual Studio
+command prompt (x64 or Win32) and change (cd) to that directory. If
+there are some problems the batch script should tell you!
+
+Open the setenv.cmd file and adjust the variables paths and options for your needs.
+
+Start the compilation with
+> build.cmd
+
+Wait, wait, wait....
+
+
+3. Output
+---------------------------------------------------------------------
+The build process should download and build all the required libraries.
+
+In 'LuminanceHdrStuff\DEPs' you should find all the compilated DLLs,
+librarys and include header files.
+
+In 'LuminanceHdrStuff\qtpfsgui.build' you should find all the binary
+related files.
+
+In 'LuminanceHdrStuff\qtpfsgui' you find the LuminanceHdr SVN directory.
+
+
diff -Nru luminance-hdr-2.5.0/build_files/platforms/msvc/setenv.cmd luminance-hdr-2.5.1/build_files/platforms/msvc/setenv.cmd
--- luminance-hdr-2.5.0/build_files/platforms/msvc/setenv.cmd 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/platforms/msvc/setenv.cmd 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1,26 @@
+@echo off
+SET CYGWIN_DIR=C:\cygwin64
+SET TEMP_DIR=.downloaddir
+
+SET VISUAL_STUDIO_VC_REDIST=C:\Program Files (x86)\%VS_PROG_FILES%\VC\redist\%RawPlatform%
+rem SET QTDIR=C:\Data\Develop\Qt\5.0.1-x64\qtbase
+SET QTDIR=C:\Data\Dev\Qt5.8.0\5.8\msvc2015_64
+
+REM Options: -------------------------------------------
+
+REM enable another configuration (defaulting to Release, RelWithDebInfo)
+REM SET Configuration=Debug
+REM SET ConfigurationLuminance=Release
+
+SET LuminanceTarget=
+rem --target luminance-hdr
+
+REM updates/overwrites the original .ts files doing a Qt lupdate
+SET OPTION_LUMINANCE_UPDATE_TRANSLATIONS=0
+SET OPTION_LUPDATE_NOOBSOLETE=0
+
+REM Optional variables
+REM SET L_BOOST_DIR=C:\Data\Develop\libhdrStuff
+
+REM should the Luminance git repo be updated (defaulting to true for read-only git download)
+SET UPDATE_REPO_LUMINANCE=0
diff -Nru luminance-hdr-2.5.0/build_files/platforms/msvc/.settings/.txt luminance-hdr-2.5.1/build_files/platforms/msvc/.settings/.txt
--- luminance-hdr-2.5.0/build_files/platforms/msvc/.settings/.txt 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/build_files/platforms/msvc/.settings/.txt 2017-05-10 19:14:06.000000000 +0000
@@ -0,0 +1 @@
+x
diff -Nru luminance-hdr-2.5.0/Changelog luminance-hdr-2.5.1/Changelog
--- luminance-hdr-2.5.0/Changelog 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/Changelog 2017-05-10 19:14:06.000000000 +0000
@@ -1,3 +1,12 @@
+Changes 2.5.1
+NEW: Selectable threshold for adjusting levels
+NEW: Optional Lanczos interpolation
+NEW: Antialiased display of images
+NEW: Navigation of images in fullscreen
+NEW: Online documentation
+* many fixes in HDR creation for all profiles
+* minor cosmetic fixes to the UI
+
Changes 2.5.0
NEW: New tonemapping operator ferradans11
NEW: New tonemapping operator mai11
diff -Nru luminance-hdr-2.5.0/cmake/CompilerSettings.cmake luminance-hdr-2.5.1/cmake/CompilerSettings.cmake
--- luminance-hdr-2.5.0/cmake/CompilerSettings.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/CompilerSettings.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-IF(UNIX)
-ADD_DEFINITIONS(-Wall -Wno-unknown-pragmas)
-ADD_DEFINITIONS(-ffast-math)
-
-IF(APPLE)
-# optimize for 64-bit core 2 architecture on Apple
-ADD_DEFINITIONS(-march=core2)
-ENDIF()
-ENDIF()
-
-#Activate C++11 support, when available
-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- add_definitions(-DBRANCH_PREDICTION)
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
- if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
- message(STATUS "C++11 activated for GCC ${GCC_VERSION}")
- set(CMAKE_CXX_STANDARD 11)
- #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # add_definitions("-std=gnu++11")
- add_definitions(-DLHDR_CXX11_ENABLED)
- elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
- message(WARNING "C++0x activated for GCC ${GCC_VERSION}. If you get any errors update to a compiler that fully supports C++11")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") # add_definitions("-std=gnu++0x")
- add_definitions(-DLHDR_CXX11_ENABLED)
- else()
- message(WARNING "C++11 NOT available. GCC >= 4.3 is needed.")
- endif()
-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- message(STATUS "C++11 activated for Clang")
- set(CMAKE_CXX_STANDARD 11)
- #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
- add_definitions(-DLHDR_CXX11_ENABLED)
- add_definitions(-DBRANCH_PREDICTION)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference -Wdelete-non-virtual-dtor -Wsign-compare -Wswitch")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wreturn-type -Wself-assign -Wunused-argument -Wunused-function -Wtautological-compare")
- # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32 -Wconversion -Wsystem-headers")
-elseif(MSVC)
- message(STATUS "C++11 is active by default on Microsoft Visual Studio")
- # add_definitions("-std=c++0x")
- add_definitions(-DLHDR_CXX11_ENABLED)
-else()
- message(WARNING "Your C++ compiler does not support C++11.")
-endif()
-#OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3
-IF(MSVC)
- FIND_PACKAGE(OpenMP REQUIRED)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)
- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
- MESSAGE(STATUS "GCC >= 4.3")
- FIND_PACKAGE(OpenMP REQUIRED)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
- ENDIF()
-ENDIF()
diff -Nru luminance-hdr-2.5.0/cmake/FindCFITSIO.cmake luminance-hdr-2.5.1/cmake/FindCFITSIO.cmake
--- luminance-hdr-2.5.0/cmake/FindCFITSIO.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/FindCFITSIO.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-# - Try to find CFITSIO
-# Once done this will define
-#
-# CFITSIO_FOUND - system has CFITSIO
-# CFITSIO_INCLUDE_DIR - the CFITSIO include directory
-# CFITSIO_LIBRARIES - Link these to use CFITSIO
-# CFITSIO_VERSION_STRING - Human readable version number of cfitsio
-# CFITSIO_VERSION_MAJOR - Major version number of cfitsio
-# CFITSIO_VERSION_MINOR - Minor version number of cfitsio
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-
-find_path(CFITSIO_INCLUDE_DIR fitsio.h
- PATH_SUFFIXES libcfitsio3 libcfitsio0 cfitsio
- PATHS
- $ENV{CFITSIO}
- ${_obIncDir}
- ${GNUWIN32_DIR}/include
- /opt/local/include
-)
-
-find_library(CFITSIO_LIBRARIES NAMES cfitsio
- PATHS
- $ENV{CFITSIO}
- ${_obLinkDir}
- ${GNUWIN32_DIR}/lib
- /opt/local/lib
-)
-
-if(CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
- # Find the version of the cfitsio header
- FILE(READ "${CFITSIO_INCLUDE_DIR}/fitsio.h" FITSIO_H)
- STRING(REGEX REPLACE ".*#define CFITSIO_VERSION[^0-9]*([0-9]+)\\.([0-9]+).*" "\\1.\\2" CFITSIO_VERSION_STRING "${FITSIO_H}")
- STRING(REGEX REPLACE "^([0-9]+)[.]([0-9]+)" "\\1" CFITSIO_VERSION_MAJOR ${CFITSIO_VERSION_STRING})
- STRING(REGEX REPLACE "^([0-9]+)[.]([0-9]+)" "\\2" CFITSIO_VERSION_MINOR ${CFITSIO_VERSION_STRING})
-
- SET(CFITSIO_VERSION_STRING "${CFITSIO_VERSION_MAJOR}.${CFITSIO_VERSION_MINOR}")
-endif()
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(CFITSIO
- REQUIRED_VARS CFITSIO_LIBRARIES CFITSIO_INCLUDE_DIR CFITSIO_VERSION_STRING)
-mark_as_advanced(CFITSIO_INCLUDE_DIR CFITSIO_LIBRARIES)
diff -Nru luminance-hdr-2.5.0/cmake/Findexiv2.cmake luminance-hdr-2.5.1/cmake/Findexiv2.cmake
--- luminance-hdr-2.5.0/cmake/Findexiv2.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/Findexiv2.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-# - Try to find the Exiv2 library
-#
-# EXIV2_MIN_VERSION - You can set this variable to the minimum version you need
-# before doing FIND_PACKAGE(Exiv2). The default is 0.12.
-#
-# Once done this will define
-#
-# EXIV2_FOUND - system has libexiv2
-# EXIV2_INCLUDE_DIR - the libexiv2 include directory
-# EXIV2_LIBRARIES - Link these to use libexiv2
-# EXIV2_DEFINITIONS - Compiler switches required for using libexiv2
-#
-# The minimum required version of Exiv2 can be specified using the
-# standard syntax, e.g. find_package(Exiv2 0.17)
-#
-# For compatiblity, also the variable EXIV2_MIN_VERSION can be set to the minimum version
-# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
-
-# Copyright (c) 2010, Alexander Neundorf,
-# Copyright (c) 2008, Gilles Caulier,
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# Support EXIV2_MIN_VERSION for compatibility:
-if(NOT Exiv2_FIND_VERSION)
- set(Exiv2_FIND_VERSION "${EXIV2_MIN_VERSION}")
-endif(NOT Exiv2_FIND_VERSION)
-
-# the minimum version of exiv2 we require
-if(NOT Exiv2_FIND_VERSION)
- set(Exiv2_FIND_VERSION "0.21")
-endif(NOT Exiv2_FIND_VERSION)
-
-
-if (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_EXIV2 exiv2)
- set(EXIV2_DEFINITIONS ${PC_EXIV2_CFLAGS_OTHER})
-endif (NOT WIN32)
-
-
-find_path(EXIV2_INCLUDE_DIR NAMES exiv2/exif.hpp
- HINTS
- ${PC_EXIV2_INCLUDEDIR}
- ${PC_EXIV2_INCLUDE_DIRS}
- )
-
-find_library(EXIV2_LIBRARY NAMES exiv2 libexiv2
- HINTS
- ${PC_EXIV2_LIBDIR}
- ${PC_EXIV2_LIBRARY_DIRS}
- )
-
-
-# Get the version number from exiv2/version.hpp and store it in the cache:
-if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
- file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
- string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define EXIV2_MINOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_MINOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define EXIV2_PATCH_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_PATCH "${CMAKE_MATCH_1}")
-
- set(EXIV2_VERSION "${EXIV2_VERSION_MAJOR}.${EXIV2_VERSION_MINOR}.${EXIV2_VERSION_PATCH}" CACHE STRING "Version number of Exiv2" FORCE)
-endif(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
-
-set(EXIV2_LIBRARIES "${EXIV2_LIBRARY}")
-
-include(FindPackageHandleStandardArgs)
-#find_package_handle_standard_args(Exiv2 REQUIRED_VARS EXIV2_LIBRARY EXIV2_INCLUDE_DIR
-# VERSION_VAR EXIV2_VERSION)
-
-find_package_handle_standard_args(Exiv2 REQUIRED_VARS EXIV2_LIBRARY EXIV2_INCLUDE_DIR
- EXIV2_VERSION)
-mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARY)
-
diff -Nru luminance-hdr-2.5.0/cmake/Findfftwf.cmake luminance-hdr-2.5.1/cmake/Findfftwf.cmake
--- luminance-hdr-2.5.0/cmake/Findfftwf.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/Findfftwf.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-# FFTWF_INCLUDE_DIR = fftw3.h
-# FFTWF_LIBRARIES = libfftw3.a
-# FFTWF_FOUND = true if FFTW3 is found
-
-IF(FFTWF_INCLUDE_DIRS)
- FIND_PATH(FFTWF_INCLUDE_DIR fftw3.h ${FFTWF_INCLUDE_DIRS})
- FIND_LIBRARY(FFTWF_LIBRARY fftw3f ${FFTWF_LIBRARY_DIRS})
- FIND_LIBRARY(FFTWF_THREADS_LIBRARY fftw3f_threads ${FFTWF_LIBRARY_DIRS})
-ELSE(FFTWF_INCLUDE_DIRS)
- SET(TRIAL_PATHS
- $ENV{FFTWF_HOME}/include
- /usr/include
- /usr/local/include
- /opt/include
- /usr/apps/include
- )
-
- SET(TRIAL_LIBRARY_PATHS
- $ENV{FFTWF_HOME}/lib
- /usr/lib
- /usr/local/lib
- /opt/lib
- /sw/lib
- )
-
- FIND_PATH(FFTWF_INCLUDE_DIR fftw3.h ${TRIAL_PATHS})
- FIND_LIBRARY(FFTWF_LIBRARIES fftw3f ${TRIAL_LIBRARY_PATHS})
- FIND_LIBRARY(FFTWF_THREADS_LIBRARIES fftw3f_threads ${TRIAL_LIBRARY_PATHS})
-ENDIF(FFTWF_INCLUDE_DIRS)
-
-
-IF(FFTWF_INCLUDE_DIR AND FFTWF_LIBRARIES AND FFTWF_THREADS_LIBRARIES)
- SET(FFTWF_FOUND TRUE)
-ELSE()
- SET(FFTWF_FOUND FALSE)
-ENDIF()
-
-IF(FFTWF_FOUND)
- SET(FFTWF_LIBRARIES ${FFTWF_LIBRARIES} ${FFTWF_THREADS_LIBRARIES})
-
- MESSAGE(STATUS "Found FFTW3F (FFTWF_INCLUDE_DIR = ${FFTWF_INCLUDE_DIR})")
- MESSAGE(STATUS "Found FFTW3F (FFTWF_LIBRARIES = ${FFTWF_LIBRARIES})")
-ELSE()
- MESSAGE(FATAL_ERROR "Could not find FFTW3F")
-ENDIF()
-
-MARK_AS_ADVANCED(
- FFTWF_INCLUDE_DIR
- FFTWF_LIBRARIES
- FFTWF_FOUND
-)
diff -Nru luminance-hdr-2.5.0/cmake/FindGSL.cmake luminance-hdr-2.5.1/cmake/FindGSL.cmake
--- luminance-hdr-2.5.0/cmake/FindGSL.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/FindGSL.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-# - Find GSL
-# Find the GNU Scientific Library (GSL) includes and library
-#
-# This module defines
-# GSL_FOUND
-# GSL_LIBRARIES for GSL only
-# GSLCBLAS_LIBRARIES for GSL CBLAS
-# GSL_INCLUDE_DIR
-# GSLCBLAS_INCLUDE_DIR (not yet defined)
-#
-
-FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_rng.h
- /usr/local/include
- /usr/include
- /opt/local/include
-)
-
-FIND_PATH(GSLCBLAS_INCLUDE_DIR gsl/gsl_cblas.h
- /usr/local/include
- /usr/include
- /opt/local/include
-)
-
-IF(GSL_USE_STATIC_LIBS)
- SET( _GSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ELSE(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF(WIN32)
-ENDIF(GSL_USE_STATIC_LIBS)
-
-FIND_LIBRARY(GSL_LIBRARY NAMES gsl)
-FIND_LIBRARY(GSL_CBLAS_LIBRARY NAMES gslcblas)
-
-IF(GSL_USE_STATIC_LIBS)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_GSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-ENDIF(GSL_USE_STATIC_LIBS)
-
-IF(GSL_LIBRARY AND GSL_CBLAS_LIBRARY AND GSL_INCLUDE_DIR AND GSLCBLAS_INCLUDE_DIR)
- SET(GSL_LIBRARIES ${GSL_LIBRARY})
- SET(GSLCBLAS_LIBRARIES ${GSL_CBLAS_LIBRARY})
- SET(GSL_FOUND "YES")
-ELSE()
- SET(GSL_FOUND "NO")
-ENDIF()
-
-IF(GSL_FOUND)
- IF(NOT GSL_FIND_QUIETLY)
- MESSAGE(STATUS "Found GNU Scientific Library (GSL_LIBRARY = ${GSL_LIBRARY})")
- MESSAGE(STATUS "Found GNU Scientific Library: (GSL_CBLAS_LIBRARY = ${GSL_CBLAS_LIBRARY})")
- MESSAGE(STATUS "Found GNU Scientific Library: (GSL_INCLUDE_DIR = ${GSL_INCLUDE_DIR})")
- ENDIF(NOT GSL_FIND_QUIETLY)
-ELSE(GSL_FOUND)
- IF(GSL_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find GNU Scientific Library")
- ENDIF(GSL_FIND_REQUIRED)
-ENDIF(GSL_FOUND)
-
-MARK_AS_ADVANCED(
- GSL_LIBRARY
- GSL_CBLAS_LIBRARY
- GSL_INCLUDE_DIR
-)
diff -Nru luminance-hdr-2.5.0/cmake/Findlcms2.cmake luminance-hdr-2.5.1/cmake/Findlcms2.cmake
--- luminance-hdr-2.5.0/cmake/Findlcms2.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/Findlcms2.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h
- /usr/local/include
- /usr/include
- /opt/local/include
-)
-
-SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2)
-FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
-
-# handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS2 DEFAULT_MSG LCMS2_LIBRARY LCMS2_INCLUDE_DIR)
-
-IF(LCMS2_FOUND)
- SET( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
- IF(NOT LCMS2_FIND_QUIETLY)
- MESSAGE(STATUS "Found LCMS2 (LCMS2_LIBRARIES = ${LCMS2_LIBRARIES})")
- MESSAGE(STATUS "Found LCMS2 (LCMS2_INCLUDE_DIR = ${LCMS2_INCLUDE_DIR})")
- ENDIF(NOT LCMS2_FIND_QUIETLY)
-ELSE(LCMS2_FOUND)
- IF(LCMS2_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find LCMS2")
- ENDIF(LCMS2_FIND_REQUIRED)
-ENDIF(LCMS2_FOUND)
-
-MARK_AS_ADVANCED(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)
diff -Nru luminance-hdr-2.5.0/cmake/FindLibRAW.cmake luminance-hdr-2.5.1/cmake/FindLibRAW.cmake
--- luminance-hdr-2.5.0/cmake/FindLibRAW.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/FindLibRAW.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-# - Find LibRAW library
-# Find the native LibRAW includes and library
-# This module defines
-# LIBRAW_INCLUDE_DIR, where to find libraw.h, etc.
-# LIBRAW_LIBRARIES, libraries to link against to use LibRAW.
-# LIBRAW_FOUND, If false, do not try to use LibRAW.
-# also defined, but not for general use are
-# LIBRAW_LIBRARY, where to find the LibRAW library.
-
-FIND_PATH(LIBRAW_INCLUDE_DIR libraw/libraw.h)
-
-SET(LIBRAW_NAMES ${LIBRAW_NAMES} raw_r)
-FIND_LIBRARY(LIBRAW_LIBRARY NAMES ${LIBRAW_NAMES} )
-
-# handle the QUIETLY and REQUIRED arguments and set LIBRAW_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBRAW DEFAULT_MSG LIBRAW_LIBRARY LIBRAW_INCLUDE_DIR)
-
-IF(LIBRAW_FOUND)
- SET( LIBRAW_LIBRARIES ${LIBRAW_LIBRARY} )
- MESSAGE(STATUS "Found LibRAW (LIBRAW_INCLUDE_DIR = ${LIBRAW_INCLUDE_DIR})")
- MESSAGE(STATUS "Found LibRAW (LIBRAW_LIBRARIES = ${LIBRAW_LIBRARIES})")
- IF(UNIX)
- IF(APPLE)
- EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build/macosx/find_demosaicing_gpl2.sh
- ${LIBRAW_LIBRARY} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- OUTPUT_VARIABLE _output OUTPUT_STRIP_TRAILING_WHITESPACE)
- ELSE()
- EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build/linux/find_demosaicing_gpl2.sh
- ${LIBRAW_LIBRARY} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- OUTPUT_VARIABLE _output OUTPUT_STRIP_TRAILING_WHITESPACE)
- ENDIF()
- IF(_output)
- MESSAGE(STATUS "Found demosaicing pack GPL2")
- ADD_DEFINITIONS("-DDEMOSAICING_GPL2")
- ELSE(_output)
- MESSAGE(STATUS "Demosaicing pack GPL2 not found")
- ENDIF(_output)
-
- IF(APPLE)
- EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build/macosx/find_demosaicing_gpl3.sh
- ${LIBRAW_LIBRARY} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- OUTPUT_VARIABLE _output OUTPUT_STRIP_TRAILING_WHITESPACE)
- ELSE()
- EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build/linux//find_demosaicing_gpl3.sh
- ${LIBRAW_LIBRARY} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- OUTPUT_VARIABLE _output OUTPUT_STRIP_TRAILING_WHITESPACE)
- ENDIF()
- IF(_output)
- MESSAGE(STATUS "Found demosaicing pack GPL3")
- ADD_DEFINITIONS("-DDEMOSAICING_GPL3")
- ELSE(_output)
- MESSAGE(STATUS "Demosaicing pack GPL3 not found")
- ENDIF(_output)
- ENDIF(UNIX)
-ELSE(LIBRAW_FOUND)
- MESSAGE(FATAL_ERROR "Could not find LibRAW")
-ENDIF(LIBRAW_FOUND)
-
-MARK_AS_ADVANCED(LIBRAW_INCLUDE_DIR LIBRAW_LIBRARIES)
diff -Nru luminance-hdr-2.5.0/cmake/FindOpenEXR.cmake luminance-hdr-2.5.1/cmake/FindOpenEXR.cmake
--- luminance-hdr-2.5.0/cmake/FindOpenEXR.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/FindOpenEXR.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-# - Find OpenEXR library
-# Find the native OpenEXR includes and library
-# This module defines
-# OPENEXR_INCLUDE_DIRS, where to find ImfXdr.h, etc. Set when
-# OPENEXR_INCLUDE_DIR is found.
-# OPENEXR_LIBRARIES, libraries to link against to use OpenEXR.
-# OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
-# This can also be an environment variable.
-# OPENEXR_FOUND, If false, do not try to use OpenEXR.
-#
-# For individual library access these advanced settings are available
-# OPENEXR_HALF_LIBRARY, Path to Half library
-# OPENEXR_IEX_LIBRARY, Path to Half library
-# OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
-# OPENEXR_ILMTHREAD_LIBRARY, Path to IlmThread library
-# OPENEXR_IMATH_LIBRARY, Path to Imath library
-#
-# also defined, but not for general use are
-# OPENEXR_LIBRARY, where to find the OpenEXR library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If OPENEXR_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
- SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
-ENDIF()
-
-if (NOT OPENEXR_VERSION)
- SET(OPENEXR_VERSION "2.0.1")
-endif()
-if (${OPENEXR_VERSION} VERSION_LESS "2.1")
- SET(_openexr_FIND_COMPONENTS
- Half
- Iex
- IlmImf
- IlmThread
- Imath
- )
-else ()
- string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
- SET(_openexr_FIND_COMPONENTS
- Half
- Iex-${_openexr_libs_ver}
- IlmImf-${_openexr_libs_ver}
- IlmThread-${_openexr_libs_ver}
- Imath-${_openexr_libs_ver}
- )
-endif ()
-
-SET(_openexr_SEARCH_DIRS
- ${OPENEXR_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
- /opt/csw # Blastwave
-)
-
-FIND_PATH(OPENEXR_INCLUDE_DIR
- NAMES
- OpenEXR/ImfXdr.h
- HINTS
- ${_openexr_SEARCH_DIRS}
- PATH_SUFFIXES
- include
-)
-
-SET(_openexr_LIBRARIES)
-FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
- FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
- NAMES
- ${COMPONENT}
- HINTS
- ${_openexr_SEARCH_DIRS}
- PATH_SUFFIXES
- lib64 lib
- )
- LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
- _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
-
-IF(OPENEXR_FOUND)
- SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
- # Both include paths are needed because of dummy OSL headers mixing #include and #include :(
- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
- message(STATUS "OpenEXR found")
-ENDIF()
-
-MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)
-FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
-ENDFOREACH()
diff -Nru luminance-hdr-2.5.0/cmake/GetGitRevisionDescription.cmake luminance-hdr-2.5.1/cmake/GetGitRevisionDescription.cmake
--- luminance-hdr-2.5.0/cmake/GetGitRevisionDescription.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/GetGitRevisionDescription.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-# - Returns a version string from Git
-#
-# These functions force a re-configure on each git commit so that you can
-# trust the values of the variables in your build system.
-#
-# get_git_head_revision( [ ...])
-#
-# Returns the refspec and sha hash of the current head revision
-#
-# git_describe( [ ...])
-#
-# Returns the results of git describe on the source tree, and adjusting
-# the output so that it tests false if an error occurs.
-#
-# git_get_exact_tag( [ ...])
-#
-# Returns the results of git describe --exact-match on the source tree,
-# and adjusting the output so that it tests false if there was no exact
-# matching tag.
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__get_git_revision_description)
- return()
-endif()
-set(__get_git_revision_description YES)
-
-# We must run the following at "include" time, not at function call time,
-# to find the path to this module rather than the path to a calling list file
-get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
-
-function(get_git_head_revision _refspecvar _hashvar)
- set(GIT_DIR "${CMAKE_SOURCE_DIR}/.git")
- if(NOT EXISTS "${GIT_DIR}")
- # not in git
- set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
- set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
- return()
- endif()
- set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
- if(NOT EXISTS "${GIT_DATA}")
- file(MAKE_DIRECTORY "${GIT_DATA}")
- endif()
- set(HEAD_FILE "${GIT_DATA}/HEAD")
- configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
-
- configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" "${GIT_DATA}/grabRef.cmake" @ONLY)
- include("${GIT_DATA}/grabRef.cmake")
-
- set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
- set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
-endfunction()
-
-function(git_describe _var)
- if(NOT GIT_FOUND)
- find_package(Git QUIET)
- endif()
- get_git_head_revision(refspec hash)
- if(NOT GIT_FOUND)
- set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
- return()
- endif()
- if(NOT hash)
- set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
- return()
- endif()
-
- # TODO sanitize
- #if((${ARGN}" MATCHES "&&") OR
- # (ARGN MATCHES "||") OR
- # (ARGN MATCHES "\\;"))
- # message("Please report the following error to the project!")
- # message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
- #endif()
-
- #message(STATUS "Arguments to execute_process: ${ARGN}")
-
- execute_process(COMMAND "${GIT_EXECUTABLE}" describe ${hash} ${ARGN}
- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
- RESULT_VARIABLE res
- OUTPUT_VARIABLE out
- ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(NOT res EQUAL 0)
- set(out "${out}-${res}-NOTFOUND")
- endif()
-
- set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
-
-function(git_get_exact_tag _var)
- git_describe(out --exact-match ${ARGN})
- set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
diff -Nru luminance-hdr-2.5.0/cmake/GetGitRevisionDescription.cmake.in luminance-hdr-2.5.1/cmake/GetGitRevisionDescription.cmake.in
--- luminance-hdr-2.5.0/cmake/GetGitRevisionDescription.cmake.in 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/GetGitRevisionDescription.cmake.in 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#
-# Internal file for GetGitRevisionDescription.cmake
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-set(HEAD_HASH)
-
-file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
-
-string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
-if(HEAD_CONTENTS MATCHES "ref")
- # named branch
- string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
- if(EXISTS "@GIT_DIR@/${HEAD_REF}")
- configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
- elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
- configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
- set(HEAD_HASH "${HEAD_REF}")
- endif()
-else()
- # detached HEAD
- configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
-endif()
-
-if(NOT HEAD_HASH)
-file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
-string(STRIP "${HEAD_HASH}" HEAD_HASH)
-endif()
diff -Nru luminance-hdr-2.5.0/cmake/GlobalSettings.cmake luminance-hdr-2.5.1/cmake/GlobalSettings.cmake
--- luminance-hdr-2.5.0/cmake/GlobalSettings.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/GlobalSettings.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-IF(NOT CMAKE_BUILD_TYPE)
-SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)
-ENDIF()
-
-# MESSAGE(${CMAKE_BUILD_TYPE})
-
-IF(${CMAKE_BUILD_TYPE} STREQUAL "Release" OR ${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
-ADD_DEFINITIONS("-DQT_NO_DEBUG_OUTPUT")
-ENDIF()
-
-SET(LUMINANCE_MODULES_CLI )
-SET(LUMINANCE_MODULES_GUI )
-
-
diff -Nru luminance-hdr-2.5.0/cmake/Internationalization.cmake luminance-hdr-2.5.1/cmake/Internationalization.cmake
--- luminance-hdr-2.5.0/cmake/Internationalization.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/Internationalization.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-IF(APPLE)
-# ADD_DEFINITIONS(-DI18NDIR=QCoreApplication::applicationDirPath\(\)+"/../Resources/i18n")
-SET(I18NDIR QCoreApplication::applicationDirPath\(\)+"/../Resources/i18n")
-SET(HELPDIR QCoreApplication::applicationDirPath\(\)+"/../Resources/help")
-SET(HDRHTMLDIR QCoreApplication::applicationDirPath\(\)+"/../Resources/hdrhtml")
-ELSEIF(UNIX)
-# ADD_DEFINITIONS(-DPREFIX=${CMAKE_INSTALL_PREFIX})
-# ADD_DEFINITIONS(-DI18NDIR="${CMAKE_INSTALL_PREFIX}/share/luminance-hdr/i18n")
-SET(BASEDIR "\"${CMAKE_INSTALL_PREFIX}\"")
-SET(I18NDIR "\"${CMAKE_INSTALL_PREFIX}/share/luminance-hdr/i18n\"")
-SET(HELPDIR "\"${CMAKE_INSTALL_PREFIX}/share/luminance-hdr/help\"")
-SET(HDRHTMLDIR "\"${CMAKE_INSTALL_PREFIX}/share/luminance-hdr/hdrhtml\"")
-ELSEIF(WIN32)
-# ADD_DEFINITIONS(-DI18NDIR=QCoreApplication::applicationDirPath\(\)+"/i18n")
-SET(I18NDIR QCoreApplication::applicationDirPath\(\)+"/i18n")
-SET(HELPDIR QCoreApplication::applicationDirPath\(\)+"/help")
-SET(HDRHTMLDIR QCoreApplication::applicationDirPath\(\)+"/hdrhtml")
-ENDIF()
-
-OPTION(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files (WARNING: make clean will delete the source .ts files! Danger!)")
-OPTION(LUPDATE_NOOBSOLETE "While doing an lupdate, remove obsolete entries.")
-
-# Holds al the file that will be translated
-SET(FILES_TO_TRANSLATE )
-
-# add a function here that creates the translation when necessary
diff -Nru luminance-hdr-2.5.0/cmake/Version.cmake luminance-hdr-2.5.1/cmake/Version.cmake
--- luminance-hdr-2.5.0/cmake/Version.cmake 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/cmake/Version.cmake 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-SET(LHDR_NAME "Luminance HDR")
-
-# Numeric version values
-SET(LHDR_VERSION_MAJOR "2")
-SET(LHDR_VERSION_MINOR "5")
-SET(LHDR_VERSION_PATCH "0")
-SET(LHDR_VERSION_STR_SUFFIX "")
-
-SET(LHDR_VERSION "${LHDR_VERSION_MAJOR}.${LHDR_VERSION_MINOR}.${LHDR_VERSION_PATCH}${LHDR_VERSION_STR_SUFFIX}")
-SET(LHDR_VENDOR "Luminance HDR Development Team")
-SET(LHDR_COPYRIGHT_YEAR "2006-2017")
-
-SET(LHDR_OSX_EXECUTABLE_NAME "${LHDR_NAME} ${LHDR_VERSION}")
-SET(LHDR_OSX_EXECUTABLE_TARGET "Luminance_HDR_${LHDR_VERSION}")
-
-SET(LHDR_DOMAIN_FIRST "luminance-hdr")
-SET(LHDR_DOMAIN_SECOND "com")
-SET(LHDR_DOMAIN "${LHDR_DOMAIN_FIRST}.${LHDR_DOMAIN_SECOND}")
diff -Nru luminance-hdr-2.5.0/CMakeLists.txt luminance-hdr-2.5.1/CMakeLists.txt
--- luminance-hdr-2.5.0/CMakeLists.txt 2017-04-18 18:27:46.000000000 +0000
+++ luminance-hdr-2.5.1/CMakeLists.txt 2017-05-10 19:14:06.000000000 +0000
@@ -3,18 +3,22 @@
CMAKE_POLICY(SET CMP0043 OLD)
# set include path for FindXXX.cmake files
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build_files/Modules")
# Global variables for CMake
-include(cmake/Version.cmake)
-include(cmake/GlobalSettings.cmake)
-include(cmake/CompilerSettings.cmake)
-include(cmake/Internationalization.cmake)
+include(build_files/Modules/Version.cmake)
+include(build_files/Modules/GlobalSettings.cmake)
+include(build_files/Modules/CompilerSettings.cmake)
+include(build_files/Modules/Internationalization.cmake)
+
+IF(TIMER_PROFILING)
+ ADD_DEFINITIONS(-DTIMER_PROFILING)
+ENDIF()
# ======== Has branch prediction =======
include( CheckCXXSourceCompiles )
-check_cxx_source_compiles( "int main() { int x = 0; if( __builtin_expect((x),0) ) x = 1; return 0; }" HAS_BRANCH_PEDICTION )
+check_cxx_source_compiles( "int main() { int x = 0; if( __builtin_expect((x),0) ) x = 1; return 0; }" HAS_BRANCH_PREDICTION )
if( HAS_BRANCH_PREDICTION )
set( BRANCH_PREDICTION 1 )
@@ -34,8 +38,8 @@
find_package(Qt5Concurrent REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
-find_package(Qt5WebKit REQUIRED)
-find_package(Qt5WebKitWidgets REQUIRED)
+find_package(Qt5WebEngineCore REQUIRED)
+find_package(Qt5WebEngineWidgets REQUIRED)
find_package(Qt5Xml REQUIRED)
find_package(Qt5Sql REQUIRED)
find_package(Qt5Svg REQUIRED)
@@ -53,7 +57,7 @@
set(LIBS ${LIBS}
${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
- ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
+ ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
FIND_PACKAGE(Git)
IF(GIT_FOUND)
@@ -190,7 +194,7 @@
ENDIF()
IF(UNIX)
IF(NOT APPLE) # Sadly on Linux Qt5 add global include paths in list of translation files, let's get rid of them
- EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build/linux/sanitize_translations.sh
+ EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/build_files/platforms/linux/sanitize_translations.sh
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
ENDIF(NOT APPLE)
ENDIF(UNIX)
@@ -216,22 +220,19 @@
set(MACOSX_BUNDLE_LONG_VERSION_STRING "${LHDR_NAME} ${LHDR_VERSION}")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${LHDR_VERSION}")
set(MACOSX_BUNDLE_VERSION "${LHDR_VERSION}")
- set(MACOSX_BUNDLE_ICON_FILE "${CMAKE_SOURCE_DIR}/images/luminance.icns")
- set(MACOSX_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/images/luminance.icns")
+ set(MACOSX_BUNDLE_ICON_FILE "${CMAKE_SOURCE_DIR}/program-icons/luminance.icns")
+ set(MACOSX_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/program-icons/luminance.icns")
set(MACOSX_BUNDLE_RESOURCES "${CMAKE_CURRENT_BINARY_DIR}/${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "${LHDR_DOMAIN_SECOND}.${LHDR_DOMAIN_FIRST}")
set(MACOSX_BUNDLE_BUNDLE_NAME "${LHDR_NAME}")
- configure_file( ${CMAKE_SOURCE_DIR}/build/macosx/Info.plist.in
+ configure_file( ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/Info.plist.in
${CMAKE_BINARY_DIR}/Info.plist )
- configure_file( ${CMAKE_SOURCE_DIR}/build/macosx/create-dmg.sh.in
+ configure_file( ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/create-dmg.sh.in
${CMAKE_BINARY_DIR}/create-dmg.sh )
- FILE(GLOB LUMINANCE_QT_QM i18n-qt/*.qm) # ${QT_TRANSLATIONS_DIR}/qt_*.qm)
- SET(LUMINANCE_FILES ${LUMINANCE_FILES} ${LUMINANCE_QT_QM})
-
# icon files to copy in the bundle
- SET(OSX_ICON_FILES "${CMAKE_SOURCE_DIR}/images/luminance.icns")
+ SET(OSX_ICON_FILES "${CMAKE_SOURCE_DIR}/program-icons/luminance.icns")
# include the icns files in the target
SET(LUMINANCE_FILES ${LUMINANCE_FILES} ${OSX_ICON_FILES})
@@ -263,8 +264,6 @@
TARGET_LINK_LIBRARIES(luminance-hdr-cli ${LUMINANCE_MODULES_CLI} ${LIBS})
# Unix
ELSEIF(UNIX)
- #FILE(GLOB LUMINANCE_QT_QM i18n-qt/*.qm) Qt5 translations now shipped by upstream
- #SET(LUMINANCE_FILES ${LUMINANCE_FILES} ${LUMINANCE_QT_QM})
SET(LUMINANCE_FILES ${LUMINANCE_FILES})
ADD_EXECUTABLE(luminance-hdr ${LUMINANCE_FILES})
@@ -315,4 +314,4 @@
ENDIF()
# Packaging must go at the bottom
-include(${CMAKE_SOURCE_DIR}/build/Packaging.cmake)
+include(${CMAKE_SOURCE_DIR}/build_files/Packaging.cmake)
diff -Nru luminance-hdr-2.5.0/debian/changelog luminance-hdr-2.5.1/debian/changelog
--- luminance-hdr-2.5.0/debian/changelog 2017-04-24 04:30:37.000000000 +0000
+++ luminance-hdr-2.5.1/debian/changelog 2017-05-12 06:35:24.000000000 +0000
@@ -1,3 +1,15 @@
+luminance-hdr (2.5.1-1dhor~zesty) zesty; urgency=medium
+
+ * NEW: Selectable threshold for adjusting levels
+ * NEW: Optional Lanczos interpolation
+ * NEW: Antialiased display of images
+ * NEW: Navigation of images in fullscreen
+ * NEW: Online documentation
+ * many fixes in HDR creation for all profiles
+ * minor cosmetic fixes to the UI
+
+ -- Dariusz Duma Wed, 10 May 2017 18:00:49 +0200
+
luminance-hdr (2.5.0-1dhor~zesty) zesty; urgency=medium
* NEW: New tonemapping operator ferradans11
diff -Nru luminance-hdr-2.5.0/debian/patches/hdpi_off luminance-hdr-2.5.1/debian/patches/hdpi_off
--- luminance-hdr-2.5.0/debian/patches/hdpi_off 2017-04-23 22:09:20.000000000 +0000
+++ luminance-hdr-2.5.1/debian/patches/hdpi_off 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
---- luminance-hdr-2.5.0.orig/src/MainGui/main.cpp
-+++ luminance-hdr-2.5.0/src/MainGui/main.cpp
-@@ -90,9 +90,13 @@ int main( int argc, char ** argv )
- QCoreApplication::setApplicationName(LUMINANCEAPPLICATION);
- QCoreApplication::setOrganizationName(LUMINANCEORGANIZATION);
-
-- QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
--
-+// QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-+// QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+#ifdef WIN32 //TODO: there are problems with HiDPI on X11, let's enable this only on Windows by now
-+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+#endif
-+
- Q_INIT_RESOURCE(icons);
- QApplication application( argc, argv );
-
diff -Nru luminance-hdr-2.5.0/debian/patches/luminance-qtwebkit.patch luminance-hdr-2.5.1/debian/patches/luminance-qtwebkit.patch
--- luminance-hdr-2.5.0/debian/patches/luminance-qtwebkit.patch 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/debian/patches/luminance-qtwebkit.patch 2017-05-12 05:56:03.000000000 +0000
@@ -0,0 +1,332 @@
+--- luminance-hdr-2.5.1.orig/CMakeLists.txt
++++ luminance-hdr-2.5.1/CMakeLists.txt
+@@ -38,8 +38,8 @@ find_package(Qt5Core REQUIRED)
+ find_package(Qt5Concurrent REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5Gui REQUIRED)
+-find_package(Qt5WebEngineCore REQUIRED)
+-find_package(Qt5WebEngineWidgets REQUIRED)
++find_package(Qt5WebKit REQUIRED)
++find_package(Qt5WebKitWidgets REQUIRED)
+ find_package(Qt5Xml REQUIRED)
+ find_package(Qt5Sql REQUIRED)
+ find_package(Qt5Svg REQUIRED)
+@@ -57,7 +57,7 @@ ENDIF(WIN32)
+
+ set(LIBS ${LIBS}
+ ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
+- ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
++ ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
+
+ FIND_PACKAGE(Git)
+ IF(GIT_FOUND)
+--- /dev/null
++++ luminance-hdr-2.5.1/luminance-hdr-2.5.0-qtwebkit.patch
+@@ -0,0 +1,171 @@
++diff -rupN luminance-hdr-2.5.0/CMakeLists.txt luminance-hdr-2.5.0-new/CMakeLists.txt
++--- luminance-hdr-2.5.0/CMakeLists.txt 2017-04-09 12:25:01.000000000 +0200
+++++ luminance-hdr-2.5.0-new/CMakeLists.txt 2017-04-09 12:45:59.162231357 +0200
++@@ -34,8 +34,8 @@ find_package(Qt5Core REQUIRED)
++ find_package(Qt5Concurrent REQUIRED)
++ find_package(Qt5Widgets REQUIRED)
++ find_package(Qt5Gui REQUIRED)
++-find_package(Qt5WebEngineCore REQUIRED)
++-find_package(Qt5WebEngineWidgets REQUIRED)
+++find_package(Qt5WebKit REQUIRED)
+++find_package(Qt5WebKitWidgets REQUIRED)
++ find_package(Qt5Xml REQUIRED)
++ find_package(Qt5Sql REQUIRED)
++ find_package(Qt5Svg REQUIRED)
++@@ -53,7 +53,7 @@ ENDIF(WIN32)
++
++ set(LIBS ${LIBS}
++ ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
++- ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
+++ ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
++
++ FIND_PACKAGE(Git)
++ IF(GIT_FOUND)
++I file binari luminance-hdr-2.5.0/.git/index e luminance-hdr-2.5.0-new/.git/index sono diversi
++diff -rupN luminance-hdr-2.5.0/src/HelpBrowser/CMakeLists.txt luminance-hdr-2.5.0-new/src/HelpBrowser/CMakeLists.txt
++--- luminance-hdr-2.5.0/src/HelpBrowser/CMakeLists.txt 2017-04-09 12:25:01.000000000 +0200
+++++ luminance-hdr-2.5.0-new/src/HelpBrowser/CMakeLists.txt 2017-04-09 12:45:59.181231204 +0200
++@@ -28,7 +28,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
++ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
++
++ ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
++-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebEngineCore WebEngineWidgets PrintSupport)
+++qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
++
++ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
++ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)
++diff -rupN luminance-hdr-2.5.0/src/HelpBrowser/helpbrowser.cpp luminance-hdr-2.5.0-new/src/HelpBrowser/helpbrowser.cpp
++--- luminance-hdr-2.5.0/src/HelpBrowser/helpbrowser.cpp 2017-04-09 12:25:01.000000000 +0200
+++++ luminance-hdr-2.5.0-new/src/HelpBrowser/helpbrowser.cpp 2017-04-09 12:57:33.073960371 +0200
++@@ -166,8 +166,6 @@ HelpBrowser::HelpBrowser(QWidget* parent
++ HelpBrowser::HelpBrowser( QWidget* parent, const QString& /*caption*/, const QString& guiLanguage, const QString& jumpToSection, const QString& jumpToFile):
++ QMainWindow( parent ),
++ zoomFactor(1.0),
++- //m_textBrowser(new QTextDocument),
++- m_textBrowser(new QTextBrowser),
++ m_Ui(new Ui::HelpBrowser)
++ {
++ m_Ui->setupUi(this);
++@@ -347,13 +345,6 @@ void HelpBrowser::languageChange()
++
++ void HelpBrowser::print()
++ {
++- /* TODO With this method images aren't loaded so I'm passing the html page to a QTextBrowser
++- m_Ui->htmlPage->page()->toHtml([this](const QString &result){
++- this->m_textBrowser->setHtml(result);
++- this->printAvailable();
++- });
++- */
++- m_textBrowser->setSource(m_Ui->htmlPage->page()->url());
++ this->printAvailable();
++ }
++
++@@ -365,19 +356,12 @@ void HelpBrowser::printAvailable()
++ if (dialog.exec())
++ {
++
++- m_textBrowser->print(&printer);
+++ m_Ui->htmlPage->print(&printer);
++ }
++ }
++
++ void HelpBrowser::printPreview()
++ {
++- /* TODO With this method images aren't loaded so I'm passing the html page to a QTextBrowser
++- m_Ui->htmlPage->page()->toHtml([this](const QString &result){
++- this->m_textBrowser->setHtml(result);
++- this->printPreviewAvailable();
++- });
++- */
++- m_textBrowser->setSource(m_Ui->htmlPage->page()->url());
++ this->printPreviewAvailable();
++ }
++
++@@ -392,7 +376,7 @@ void HelpBrowser::printPreviewAvailable(
++
++ void HelpBrowser::paintRequested(QPrinter *printer)
++ {
++- m_textBrowser->print(printer);
+++ m_Ui->htmlPage->print(printer);
++ }
++
++ void HelpBrowser::searchingButton_clicked()
++@@ -789,6 +773,6 @@ void HelpBrowser::loadFinished(bool) {
++ statusBar()->showMessage("");
++ }
++
++-void HelpBrowser::linkHovered (const QString &url) {
+++void HelpBrowser::linkHovered (const QString &url, const QString &, const QString &) {
++ statusBar()->showMessage(url);
++ }
++diff -rupN luminance-hdr-2.5.0/src/HelpBrowser/helpbrowser.h luminance-hdr-2.5.0-new/src/HelpBrowser/helpbrowser.h
++--- luminance-hdr-2.5.0/src/HelpBrowser/helpbrowser.h 2017-04-09 12:25:01.000000000 +0200
+++++ luminance-hdr-2.5.0-new/src/HelpBrowser/helpbrowser.h 2017-04-09 12:55:41.611767473 +0200
++@@ -64,8 +64,6 @@
++ #include
++ #include
++ #include
++-//#include
++-#include
++
++ class ScHelpTreeModel;
++ class QPrinter;
++@@ -132,10 +130,6 @@ protected:
++ QMap quickHelpIndex;
++ QMap > bookmarkIndex;
++
++- // I need to keep this around because page()->toHtml( ) is asynchronous
++- //QSharedPointer m_textDocument;
++- QSharedPointer m_textBrowser;
++-
++ protected slots:
++ virtual void languageChange();
++ void histChosen(QAction* i);
++@@ -215,7 +209,7 @@ protected slots:
++
++ /*! \brief Restore Default Cursor */
++ void loadFinished(bool);
++- void linkHovered (const QString &);
+++ void linkHovered (const QString &, const QString &, const QString &);
++ signals:
++ void closed();
++
++diff -rupN luminance-hdr-2.5.0/src/HelpBrowser/sctextbrowser.cpp luminance-hdr-2.5.0-new/src/HelpBrowser/sctextbrowser.cpp
++--- luminance-hdr-2.5.0/src/HelpBrowser/sctextbrowser.cpp 2017-04-09 12:25:01.000000000 +0200
+++++ luminance-hdr-2.5.0-new/src/HelpBrowser/sctextbrowser.cpp 2017-04-09 12:45:59.183231188 +0200
++@@ -57,7 +57,7 @@ for which a new license (GPL+exception)
++ #include "sctextbrowser.h"
++
++ ScTextBrowser::ScTextBrowser( QWidget * parent )
++- : QWebEngineView(parent)
+++ : QWebView(parent)
++ {
++ }
++
++diff -rupN luminance-hdr-2.5.0/src/HelpBrowser/sctextbrowser.h luminance-hdr-2.5.0-new/src/HelpBrowser/sctextbrowser.h
++--- luminance-hdr-2.5.0/src/HelpBrowser/sctextbrowser.h 2017-04-09 12:25:01.000000000 +0200
+++++ luminance-hdr-2.5.0-new/src/HelpBrowser/sctextbrowser.h 2017-04-09 12:45:59.184231179 +0200
++@@ -45,9 +45,9 @@ for which a new license (GPL+exception)
++ #define SCTEXTBROWSER_H
++
++ #include
++-#include
+++#include
++
++-class ScTextBrowser : public QWebEngineView
+++class ScTextBrowser : public QWebView
++ {
++ Q_OBJECT
++ QUrl m_home;
++diff -rupN luminance-hdr-2.5.0/src/UI/CMakeLists.txt luminance-hdr-2.5.0-new/src/UI/CMakeLists.txt
++--- luminance-hdr-2.5.0/src/UI/CMakeLists.txt 2017-04-09 12:25:01.000000000 +0200
+++++ luminance-hdr-2.5.0-new/src/UI/CMakeLists.txt 2017-04-09 12:45:59.184231179 +0200
++@@ -41,7 +41,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
++ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
++
++ ADD_LIBRARY(ui ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H})
++-qt5_use_modules(ui Core Concurrent Gui Widgets WebEngineWidgets)
+++qt5_use_modules(ui Core Concurrent Gui Widgets WebKitWidgets)
++
++ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE)
++ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} ui PARENT_SCOPE)
+--- luminance-hdr-2.5.1.orig/src/HelpBrowser/CMakeLists.txt
++++ luminance-hdr-2.5.1/src/HelpBrowser/CMakeLists.txt
+@@ -28,7 +28,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
+ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
+
+ ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
+-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebEngineCore WebEngineWidgets PrintSupport)
++qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
+
+ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)
+--- luminance-hdr-2.5.1.orig/src/HelpBrowser/helpbrowser.cpp
++++ luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.cpp
+@@ -167,7 +167,7 @@ HelpBrowser::HelpBrowser( QWidget* paren
+ QMainWindow( parent ),
+ zoomFactor(1.0),
+ //m_textBrowser(new QTextDocument),
+- m_textBrowser(new QTextBrowser),
++// m_textBrowser(new QTextBrowser),
+ m_Ui(new Ui::HelpBrowser)
+ {
+ m_Ui->setupUi(this);
+@@ -347,13 +347,7 @@ void HelpBrowser::languageChange()
+
+ void HelpBrowser::print()
+ {
+- /* TODO With this method images aren't loaded so I'm passing the html page to a QTextBrowser
+- m_Ui->htmlPage->page()->toHtml([this](const QString &result){
+- this->m_textBrowser->setHtml(result);
+- this->printAvailable();
+- });
+- */
+- m_textBrowser->setSource(m_Ui->htmlPage->page()->url());
++// m_textBrowser->setSource(m_Ui->htmlPage->page()->url());
+ this->printAvailable();
+ }
+
+@@ -365,19 +359,14 @@ void HelpBrowser::printAvailable()
+ if (dialog.exec())
+ {
+
+- m_textBrowser->print(&printer);
++ // m_textBrowser->print(&printer);
++ m_Ui->htmlPage->print(&printer);
+ }
+ }
+
+ void HelpBrowser::printPreview()
+ {
+- /* TODO With this method images aren't loaded so I'm passing the html page to a QTextBrowser
+- m_Ui->htmlPage->page()->toHtml([this](const QString &result){
+- this->m_textBrowser->setHtml(result);
+- this->printPreviewAvailable();
+- });
+- */
+- m_textBrowser->setSource(m_Ui->htmlPage->page()->url());
++// m_textBrowser->setSource(m_Ui->htmlPage->page()->url());
+ this->printPreviewAvailable();
+ }
+
+@@ -789,6 +778,7 @@ void HelpBrowser::loadFinished(bool) {
+ statusBar()->showMessage("");
+ }
+
+-void HelpBrowser::linkHovered (const QString &url) {
++// void HelpBrowser::linkHovered (const QString &url) {
++void HelpBrowser::linkHovered (const QString &url, const QString &, const QString &) {
+ statusBar()->showMessage(url);
+ }
+--- luminance-hdr-2.5.1.orig/src/HelpBrowser/helpbrowser.h
++++ luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.h
+@@ -64,8 +64,6 @@
+ #include
+ #include
+ #include
+-//#include
+-#include
+
+ class ScHelpTreeModel;
+ class QPrinter;
+@@ -134,7 +132,7 @@ protected:
+
+ // I need to keep this around because page()->toHtml( ) is asynchronous
+ //QSharedPointer m_textDocument;
+- QSharedPointer m_textBrowser;
++// QSharedPointer m_textBrowser;
+
+ protected slots:
+ virtual void languageChange();
+@@ -215,7 +213,8 @@ protected slots:
+
+ /*! \brief Restore Default Cursor */
+ void loadFinished(bool);
+- void linkHovered (const QString &);
++// void linkHovered (const QString &);
++ void linkHovered (const QString &, const QString &, const QString &);
+ signals:
+ void closed();
+
+--- luminance-hdr-2.5.1.orig/src/HelpBrowser/sctextbrowser.cpp
++++ luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.cpp
+@@ -57,7 +57,8 @@ for which a new license (GPL+exception)
+ #include "sctextbrowser.h"
+
+ ScTextBrowser::ScTextBrowser( QWidget * parent )
+- : QWebEngineView(parent)
++// : QWebEngineView(parent)
++ : QWebView(parent)
+ {
+ }
+
+--- luminance-hdr-2.5.1.orig/src/HelpBrowser/sctextbrowser.h
++++ luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.h
+@@ -45,9 +45,9 @@ for which a new license (GPL+exception)
+ #define SCTEXTBROWSER_H
+
+ #include
+-#include
++#include
+
+-class ScTextBrowser : public QWebEngineView
++class ScTextBrowser : public QWebView
+ {
+ Q_OBJECT
+ QUrl m_home;
+--- luminance-hdr-2.5.1.orig/src/UI/CMakeLists.txt
++++ luminance-hdr-2.5.1/src/UI/CMakeLists.txt
+@@ -47,7 +47,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
+ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
+
+ ADD_LIBRARY(ui ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H})
+-qt5_use_modules(ui Core Concurrent Gui Widgets WebEngineWidgets)
++qt5_use_modules(ui Core Concurrent Gui Widgets WebKitWidgets)
+
+ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} ui PARENT_SCOPE)
diff -Nru luminance-hdr-2.5.0/debian/patches/qtwebkit2 luminance-hdr-2.5.1/debian/patches/qtwebkit2
--- luminance-hdr-2.5.0/debian/patches/qtwebkit2 1970-01-01 00:00:00.000000000 +0000
+++ luminance-hdr-2.5.1/debian/patches/qtwebkit2 2017-05-12 06:19:07.000000000 +0000
@@ -0,0 +1,12 @@
+--- luminance-hdr-2.5.1.orig/src/HelpBrowser/helpbrowser.cpp
++++ luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.cpp
+@@ -381,7 +381,8 @@ void HelpBrowser::printPreviewAvailable(
+
+ void HelpBrowser::paintRequested(QPrinter *printer)
+ {
+- m_textBrowser->print(printer);
++ // m_textBrowser->print(printer);
++ m_Ui->htmlPage->print(printer);
+ }
+
+ void HelpBrowser::searchingButton_clicked()
diff -Nru luminance-hdr-2.5.0/debian/patches/series luminance-hdr-2.5.1/debian/patches/series
--- luminance-hdr-2.5.0/debian/patches/series 2017-04-23 22:09:12.000000000 +0000
+++ luminance-hdr-2.5.1/debian/patches/series 2017-05-12 06:19:02.000000000 +0000
@@ -1 +1,2 @@
-hdpi_off
+luminance-qtwebkit.patch
+qtwebkit2
diff -Nru luminance-hdr-2.5.0/html/dcraw.html luminance-hdr-2.5.1/html/dcraw.html
--- luminance-hdr-2.5.0/html/dcraw.html 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/html/dcraw.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-
-
-
-
- Raw convertion parameters
-
-
-
-Raw convertion parameters
-This page gives some details about the raw image format conversion process that takes place in LuminanceHDR.
-
-- Introduction
-- Tweaking the conversion process
-- Dcraw manual page excerpt
-- Links
-
-
-Introduction
-
-Each time the user:
-
-- loads a single raw file in the main workspace
-- specifies a set of raw files in the "File -> New Hdr..." wizard
-
-a RAW->TIFF conversion transparently takes place by calling the dcraw [1] executable (by Dave Coffin).
-LuminanceHDR calls dcraw to convert a raw file [2] to a (either 8 bit or 16 bit) TIFF file.
-
-Tweaking the conversion process
-You can tweak the way dcraw operates by setting specific command line switches (aka options or parameters) in the Tools -> Preferences... -> Raw Import section (here's a screenshot).
-
-The -T switch (TIFF output, see below) is the only required parameter.
-In this particular case we have also specified the optional -4 parameter to ask dcraw to obtain a 16 bit (TIFF) file.
-Starting with LuminanceHDR 1.9.3 the default options for calling dcraw are -T -4 -q 3.
-The dcraw's manual page lists all the available options.
-An excerpt is available below, for the latest manual page follow this reference [3].
-
-
-Dcraw manual page excerpt
-Here's an excerpt from dcraw's man page (Retrieved: October 30, 2007).
-
-OPTIONS
--v
- Print verbose messages, not just warnings and errors.
--c
- Write decoded images or thumbnails to standard output.
--e
- Extract the camera-generated thumbnail, not the raw image. You'll get either a JPEG or a PPM file, depending on the camera.
--z
- Change the access and modification times of an AVI, JPEG, TIFF or raw file to when the photo was taken, assuming that the camera clock was set to Universal Time.
--i
- Identify files but don't decode them. Exit status is 0 if dcraw can decode the last file, 1 if it can't. -i -v shows metadata.
- dcraw cannot decode JPEG files!!
--d
- Show the raw data as a grayscale image with no interpolation. Good for photographing black-and-white documents.
--D
- Same as -d, but totally raw (no color scaling).
--h
- Output a half-size color image. Twice as fast as -q 0.
--q 0
- Use high-speed, low-quality bilinear interpolation.
--q 1
- Use Variable Number of Gradients (VNG) interpolation.
--q 2
- Use Patterned Pixel Grouping (PPG) interpolation.
--q 3
- Use Adaptive Homogeneity-Directed (AHD) interpolation.
--f
- Interpolate RGB as four colors. Use this if the output shows false 2x2 meshes with VNG or mazes with AHD.
--m number_of_passes
- After interpolation, clean up color artifacts by repeatedly applying a 3x3 median filter to the R-G and B-G channels.
--n noise_threshold
- Use wavelets to erase noise while preserving real detail. The best threshold should be somewhere between 100 and 1000.
--b brightness
- By default, dcraw writes 8-bit PGM/PPM/PAM with a BT.709 gamma curve and a 99th-percentile white point. If the result is too light or too dark, -b lets you adjust it. Default is 1.0.
--4
- Write 16-bit linear pseudo-PGM/PPM/PAM with no gamma curve, no white point, and no -b option.
--T
- Write TIFF output (with metadata) instead of PGM/PPM/PAM.
--k black
- Set the black point. Default depends on the camera.
--K darkframe.pgm
- Subtract a dark frame from the raw data. To generate a dark frame, shoot a raw photo with no light and do dcraw -D -4 -j -t 0.
--w
- Use the white balance specified by the camera. If this is not found, print a warning and use another method.
--a
- Calculate the white balance by averaging the entire image.
--A left top width height
- Calculate the white balance by averaging a rectangular area. First do dcraw -j -t 0 and select an area of neutral grey color.
--r mul0 mul1 mul2 mul3
- Specify your own raw white balance. These multipliers can be cut and pasted from the output of dcraw -v.
-no white balance option
- Use a fixed white balance based on a color chart illuminated with a standard D65 lamp.
-+M or -M
- Use (or don't use) any color matrix from the camera metadata. The default is +M if -w is set, -M otherwise. This option only affects Olympus, Leaf, and Phase One cameras.
--C red_mag blue_mag
- Enlarge the raw red and blue layers by the given factors, typically 0.999 to 1.001, to correct chromatic aberration.
--H 0
- Clip all highlights to solid white (default).
--H 1
- Leave highlights unclipped in various shades of pink.
--H 2
- Blend clipped and unclipped values together for a gradual fade to white.
--H 3-9
- Reconstruct highlights. Low numbers favor whites; high numbers favor colors. Try -H 5 as a compromise. If that's not good enough, do -H 9, cut out the non-white highlights, and paste them into an image generated with -H 3.
--o [0-5]
- Select the output colorspace when the -p option is not used:
- 0 Raw color (unique to each camera)
- 1 sRGB D65 (default)
- 2 Adobe RGB (1998) D65
- 3 Wide Gamut RGB D65
- 4 Kodak ProPhoto RGB D65
- 5 XYZ
--p camera.icm [ -o output.icm ]
- Use ICC profiles to define the camera's raw colorspace and the desired output colorspace (sRGB by default).
--p embed
- Use the ICC profile embedded in the raw photo.
--t [0-7,90,180,270]
- Flip the output image. By default, dcraw applies the flip specified by the camera. -t 0 disables all flipping.
--s [0..N-1] or -s all
- If a file contains N raw images, choose one or "all" to decode. For example, Fuji Super CCD SR cameras generate a second image underexposed four stops to show detail in the highlights.
--j
- For Fuji Super CCD cameras, show the image tilted 45 degrees. For cameras with non-square pixels, do not stretch the image to its correct aspect ratio. In any case, this option guarantees that each output pixel corresponds to one raw pixel.
-
-
-Links
-
-[1]http://cybercom.net/~dcoffin/dcraw/
-[2]http://en.wikipedia.org/wiki/Raw_image_format
-[3]http://cybercom.net/~dcoffin/dcraw/dcraw.1.html
-
-
-
-
diff -Nru luminance-hdr-2.5.0/html/faq.html luminance-hdr-2.5.1/html/faq.html
--- luminance-hdr-2.5.0/html/faq.html 2017-04-16 18:33:50.000000000 +0000
+++ luminance-hdr-2.5.1/html/faq.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-
-
-
- LuminanceHDR FAQ
-
-
-
-FAQ for LuminanceHDR
-
-
-
-- Q: What is the meaning of the name LuminanceHDR?
-- A: The name can be decomposed in 3 parts: Qt-pfs-gui.
-
- - Qt: the program uses Qt4 (www.trolltech.com) to show its graphical widgets.
- - pfs: the main backend library and original sourcecode base.
- - gui: this stands simply for graphical user interface.
-
-
-
-- Q: What is the meaning of the various settings for tone mapping operator X?
-- A: To answer precisely this question one would have to explain the inner workings of the tone mapping operator X, in terms of the original research paper.
-At the end of the day all that matters (to some people, at least) is to fiddle with the settings until you obtain a nice result.
-
-
-
-- Q: Why can't LuminanceHDR transfer the exif tags to TIFF files?
-- A: Because the library LuminanceHDR uses to perform this task (exiv2) doesn't support writing to tiff files yet. It's in the working, though.
-
-
-- Q: Should I store JPEG or RAW files for HDR?
-- A: Both give the same result, provided you capture all the dynamic range in the scene. This means that with RAW files you may need to capture less files than with JPEGs. On the other hand creating an HDR with JPEG files is more "lightweight" process (reduced memory footprint).
-
-
-- Q: Where can I get information about all the various HDR formats?
-- A: An overview (rather technical) can be found at http://www.anyhere.com/gward/hdrenc/hdr_encodings.html.
-
- - OpenEXR: Industrial Light and Magic format, widespread use, best compression ratios. www.openexr.com
- - LogLuv TIFF: see http://en.wikipedia.org/wiki/Logluv_TIFF and http://www.anyhere.com/gward/pixformat/tiffluv.html
- - Radiance RGBE: see http://en.wikipedia.org/wiki/Radiance_%28software%29#HDR_image_format
- - PFS: This format stores the binary internal (float) representation of images. It is very size demanding, and it supported only by pfstools/pfscalibration/pfstmo, LuminanceHDR and a few other applications. On the other hand it is a lossless format and supports metadata (tags).
- - Float TIFF (aka 32 bit TIFF): very size demanding (similar to pfs above).
-
-
-
-
-- Q: Can we have the tonemapping dialog apply its settings as soon as the user changes a value? In other words, can we avoid having an "apply" button?
-- A: Given how the tone mapping panel is implemented right now, this possibility has been discarded.
-
-
-
-