Last fix didn't work, creating new branch.

2011-11-30 12:56:15 -06:00 · 2011-11-30 12:56:15 -06:00 · 83c50037a0
commit 83c50037a0
1306 changed files with 280337 additions and 0 deletions
--- a/.hgignore
+++ b/.hgignore
@ -0,0 +1,21 @@
 syntax: glob
 *~
 CMakeFiles
 Makefile
 cmake_install.cmake
 CMakeCache.txt
 Debug
 RelWithDebInfo
 MinSizeRel
 release
 rtdata/rawtherapee.desktop
 rtengine/librtengine.a
 rtexif/librtexif.a
 rtgui/config.h
 rtgui/version.h
 rtgui/rawtherapee
 install_manifest.txt
 AboutThisBuild.txt
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@ -0,0 +1,35 @@
 Project initiator:
 	Gábor Horváth <hgabor@rawtherapee.com>
 Developement contributors, in last name alphabetical order:
 	Jacques Desmis
 	Oliver Duis
 	Michael Ezra
 	Jean-Christophe Frisch
 	Steve Herrell
 	Philippe Hupé
 	Wolfgang Kuehnel
 	Guokai Ma
 	Emil Martinec
 	Wyatt Olson
 	Jacek Poplawski
 	Ilia Popov
 	Philip Rinn
 	Jan Rinze
 	Andrey Skvortsov
 	Fabio Suprani
 Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name alphabetical order:
 	Thorsten Bartolomäus
 	Patrik Brunner
 	Fernando Carello
 	Maciek Dworak
 	M. Dávid Gyurkó
 	Arturs Jekabsons
 	Karl Loncarek
 	Paul Matthijsse
 	Alberto Righetto
 	Colin Walker
--- a/About-Apple.cmake
+++ b/About-Apple.cmake
@ -0,0 +1,29 @@
 # cmakefile executed within a makefile target
 # we look for the hg command in this paths by order of preference
 find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin")
 find_file(HG_CMD hg)
 # the hg command is looked for again, at build time
 if (HG_CMD STREQUAL HG_CMD-NOTFOUND)
  message(FATAL_ERROR "hg command not found!")
 else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
  message(STATUS "hg command found: ${HG_CMD}")
 endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
 set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt")
 set (SHELL "/bin/bash")
 # there should be a better way of getting the compiler + compiler version, not restrained to Gcc
 execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
 if (CACHE_NAME_SUFFIX STREQUAL "")
  execute_process(COMMAND ${HG_CMD} parents --template={latesttag} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif ()
 # build version.h from template
 configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h)
 # build AboutThisBuild.txt from template
 configure_file (${SRC_DIR}/AboutThisBuild.txt.in ${SRC_DIR}/AboutThisBuild.txt)
--- a/About-Linux.cmake
+++ b/About-Linux.cmake
@ -0,0 +1,29 @@
 # cmakefile executed within a makefile target
 # we look for the hg command in this paths by order of preference
 find_file(HG_CMD hg)
 # the hg command is looked for again, at build time
 if (HG_CMD STREQUAL HG_CMD-NOTFOUND)
  message(FATAL_ERROR "hg command not found!")
 else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
  message(STATUS "hg command found: ${HG_CMD}")
 endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
 set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt")
 set (SHELL "/bin/bash")
 # there should be a better way of getting the compiler + compiler version, not restrained to Gcc
 execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
 if (CACHE_NAME_SUFFIX STREQUAL "")
  execute_process(COMMAND ${HG_CMD} parents --template={latesttag} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif ()
 # build version.h from template
 configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h)
 # build AboutThisBuild.txt from template
 configure_file (${SRC_DIR}/AboutThisBuild.txt.in ${SRC_DIR}/AboutThisBuild.txt)
--- a/About-Windows.cmake
+++ b/About-Windows.cmake
@ -0,0 +1,29 @@
 # cmakefile executed within a makefile target
 # we look for the hg command in this paths by order of preference
 find_file(HG_CMD hg.exe HINTS ENV Path PATH_SUFFIXES ../)
 # the hg command is looked for again, at build time
 if (HG_CMD STREQUAL HG_CMD-NOTFOUND)
  message(FATAL_ERROR "hg command not found!")
 else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
  message(STATUS "hg command found: ${HG_CMD}")
 endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
 set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt")
 # there should be a better way of getting the compiler + compiler version, not restrained to Gcc
 execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
 if (CACHE_NAME_SUFFIX STREQUAL "")
  execute_process(COMMAND ${HG_CMD} parents --template={latesttag} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif ()
 # build version.h from template
 configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h)
 # build AboutThisBuild.txt from template
 configure_file (${SRC_DIR}/AboutThisBuild.txt.in ${SRC_DIR}/AboutThisBuild.txt)
--- a/AboutThisBuild.txt.in
+++ b/AboutThisBuild.txt.in
@ -0,0 +1,14 @@
 Branch: ${HG_BRANCH}
 Version: ${HG_VERSION}
 Changeset: ${HG_CHANGESET}
 Compiler: GCC ${GCC_VERSION}
 Processor: ${PROC_LABEL}
 System: ${SYSTEM}
 Bit depth: ${PROC_BIT_DEPTH}
 Gtkmm: V${GTKMM_VERSION}
 Build type: ${BUILD_TYPE}
 Build flags: ${CXX_FLAGS}
 Link flags: ${LFLAGS}
 OpenMP support: ${OPTION_OMP}
 MMAP support: ${WITH_MYFILE_MMAP}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -0,0 +1,316 @@
 if (WIN32)
  cmake_minimum_required(VERSION 2.8.4)
  cmake_policy(SET CMP0015 OLD)
 else (WIN32)
  cmake_minimum_required(VERSION 2.6)
 endif (WIN32)
 # the default target is 'Debug'
 if (CMAKE_BUILD_TYPE STREQUAL "")
  set (CMAKE_BUILD_TYPE Debug CACHE STRING "One of: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif ()
 string (TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE)
 if (UPPER_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
  add_definitions (-D_DEBUG)
 endif ()
 message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 set (CACHE_NAME_SUFFIX "" CACHE STRING "RawTherapee's cache folder suffix (leave empty to use the default suffix, i.e. latesttag)")
 # By default, we don't use specific processor target, so  PROC_TARGET_NUMBER is set to 0. If can specify other values to select specific
 # processor targets, which list can be found in ProcessorTargets.cmake.
 set (PROC_TARGET_NUMBER 0 CACHE STRING "Selected target processor from the list above (taken from ProcessorTargets.cmake)")
 # The following line set special compilation flags for RTEngine, and will be added to CMAKE_CXX_FLAGS
 # It were moved away from rtengine/CMakefiles.txt, because some users may want to remove -ffast_math :
 # this flag speeds up the floating-point operations, but with a little bite less precisions. This default value
 # gives the same result/behaviour as before.
 set (RTENGINE_CXX_FLAGS "-ffast-math -funroll-loops" CACHE STRING "Special compilation flags for RTEngine")
 #loading the processor targets list
 include (ProcessorTargets.cmake)
 set (PROC_LABEL "undefined" CACHE STRING "Target processor label, unused if PROC_TARGET_NUMBER = 0 or 2")
 set (PROC_FLAGS "" CACHE STRING "Target processor related build/link flags")
 if ((NOT(PROC_TARGET_NUMBER NOT EQUAL 0)) AND (NOT(PROC_TARGET_NUMBER EQUAL 2)))
 	set (PROC_LABEL ${PROC_TARGET_${PROC_TARGET_NUMBER}_LABEL})
 	set (PROC_FLAGS ${PROC_TARGET_${PROC_TARGET_NUMBER}_FLAGS})
 endif ()
 # if it exists, the PROC_FORCED_LABEL value is loaded in PROC_LABEL to override the one of ProcessorTargets
 if (DEFINED PROC_FORCED_LABEL)
  set (PROC_LABEL ${PROC_FORCED_LABEL})
 endif (DEFINED PROC_FORCED_LABEL)
 # adding the proc flags to the build flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PROC_FLAGS}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PROC_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PROC_FLAGS}")
 if (WIN32)
    # we additionnally look in the MinGW path first then in the Gtkmm path,
    # so if you wish to build some dependant library, you have to install them in MinGW to use them
    set(CMAKE_PREFIX_PATH $ENV{MINGW_BASEPATH} $ENV{GTKMM_BASEPATH} CACHE STRING "Additional search paths")
 endif (WIN32)
 if (APPLE)
 #    SET (CMAKE_OSX_ARCHITECTURES "i386;x86_64;" )
 #    SET (CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386;x86_64;" )
    SET (CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk")
    SET (CMAKE_OSX_DEPLOYMENT_TARGET "10.5")
 endif (APPLE)
 option (AUTOMATED_BUILD_SYSTEM "TRUE if built by an automate" OFF)
 option (BUILD_SHARED "Build rawtherapee with shared libraries" OFF)
 option (WITH_BZIP "Build with Bzip2 support" ON)
 option (WITH_MYFILE_MMAP "Build using memory mapped file" ON)
 option (OPTION_OMP "Build with OpenMP support" ON)
 option (BUILD_BUNDLE "Self-contained build" OFF)
 # set install directories
 if (WIN32 OR APPLE)
    set (BUILD_BUNDLE ON FORCE)
 endif(WIN32 OR APPLE)
 if (NOT DEFINED BUNDLE_BASE_INSTALL_DIR)
    set (BUNDLE_BASE_INSTALL_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_BUILD_TYPE})
 endif (NOT DEFINED BUNDLE_BASE_INSTALL_DIR)
 if (BUILD_BUNDLE)
    set (BINDIR .)
    set (CMAKE_INSTALL_PREFIX ${BUNDLE_BASE_INSTALL_DIR})
 endif (BUILD_BUNDLE)
 if (NOT DEFINED BINDIR)
    set (BINDIR  ${CMAKE_INSTALL_PREFIX}/bin)
 endif (NOT DEFINED BINDIR)
 if (NOT DEFINED DATADIR)
    if (BUILD_BUNDLE)
        set (DATADIR .)
    else (BUILD_BUNDLE)
        set (DATADIR ${CMAKE_INSTALL_PREFIX}/share/rawtherapee)
    endif (BUILD_BUNDLE)
 endif (NOT DEFINED DATADIR)
 if (NOT DEFINED LIBDIR)
    if (BUILD_BUNDLE)
        set (LIBDIR .)
    else (BUILD_BUNDLE)
        # Respect CMAKE_INSTALL_LIBDIR if set
        if (DEFINED CMAKE_INSTALL_LIBDIR)
 	    if (IS_ABSOLUTE ${LIBDIR})
            	set (LIBDIR ${CMAKE_INSTALL_LIBDIR})
 	    else (IS_ABSOLUTE ${LIBDIR})
 		set (LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 	    endif (IS_ABSOLUTE ${LIBDIR})
        else (DEFINED CMAKE_INSTALL_LIBDIR)
            set (LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
        endif (DEFINED CMAKE_INSTALL_LIBDIR)
    endif (BUILD_BUNDLE)
 endif (NOT DEFINED LIBDIR)
 if (NOT DEFINED DOCDIR)
    if (BUILD_BUNDLE)
        set (DOCDIR ./doc)
    else (BUILD_BUNDLE)
        set (DOCDIR ${CMAKE_INSTALL_PREFIX}/share/doc/rawtherapee)
    endif (BUILD_BUNDLE)
 endif (NOT DEFINED DOCDIR)
 if (NOT DEFINED CREDITSDIR)
    if (BUILD_BUNDLE)
        set (CREDITSDIR .)
    else (BUILD_BUNDLE)
        set (CREDITSDIR ${CMAKE_INSTALL_PREFIX}/share/doc/rawtherapee)
    endif (BUILD_BUNDLE)
 endif (NOT DEFINED CREDITSDIR)
 if (NOT DEFINED LICENCEDIR)
    if (BUILD_BUNDLE)
        set (LICENCEDIR .)
    else (BUILD_BUNDLE)
        set (LICENCEDIR ${CMAKE_INSTALL_PREFIX}/share/doc/rawtherapee)
    endif (BUILD_BUNDLE)
 endif (NOT DEFINED LICENCEDIR)
 if (NOT DEFINED DESKTOPDIR)
    if (UNIX)
        set (DESKTOPDIR ${CMAKE_INSTALL_PREFIX}/share/applications)
    endif (UNIX)
 endif (NOT DEFINED DESKTOPDIR)
 if (NOT DEFINED ICONSDIR)
    if (UNIX)
        set (ICONSDIR ${CMAKE_INSTALL_PREFIX}/share/icons)
    endif (UNIX)
 endif (NOT DEFINED ICONSDIR)
 # non-bundle builds has to use absolute paths
 if (NOT BUILD_BUNDLE AND
    NOT (IS_ABSOLUTE ${BINDIR} AND IS_ABSOLUTE ${DATADIR} AND IS_ABSOLUTE ${LIBDIR} AND
    IS_ABSOLUTE ${DOCDIR} AND IS_ABSOLUTE ${CREDITSDIR} AND IS_ABSOLUTE ${LICENCEDIR}))
    message (FATAL_ERROR "The paths has to be absolute or use -DBUILD_BUNDLE=ON")
 endif ()
 # check for libraries
 find_package(PkgConfig)
 pkg_check_modules (GTK     REQUIRED gtk+-2.0>=2.12)
 pkg_check_modules (GLIB2   REQUIRED glib-2.0>=2.16)
 pkg_check_modules (GLIBMM  REQUIRED glibmm-2.4>=2.16)
 pkg_check_modules (GTKMM   REQUIRED gtkmm-2.4>=2.12)
 pkg_check_modules (GIO     REQUIRED gio-2.0>=2.16)
 pkg_check_modules (GIOMM   REQUIRED giomm-2.4>=2.12)
 pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.16)
 pkg_check_modules (GOBJECT REQUIRED gobject-2.0>=2.16)
 pkg_check_modules (SIGC    REQUIRED sigc++-2.0)
 # NOTE: The new mechanism has been tested with BUILD_SHARED = OFF
 if (WIN32)
    add_definitions (-DWIN32)
    add_definitions (-D_WIN32)
    if (MINGW)
        add_definitions (-D__MINGW32__)
    endif (MINGW)
    set (EXTRA_LIB "-lws2_32")
 endif (WIN32)
 # you may need lcms v1.xx for older version : pkg_check_modules (LCMS REQUIRED lcms<=1.99)
 pkg_check_modules (LCMS REQUIRED lcms2)
 pkg_check_modules (IPTCDATA REQUIRED libiptcdata)
 find_package (JPEG REQUIRED)
 find_package (PNG REQUIRED)
 find_package (TIFF REQUIRED)
 find_package (ZLIB REQUIRED)
 if (AUTOMATED_BUILD_SYSTEM)
 	message(WARNING "Automated build system mode! You have to make sure that AboutThisBuild.txt and rtgui/version.h are up-to-date by building RT at least one time with AUTOMATED_BUILD_SYSTEM=OFF.")
  # Checking for the presence of AboutThisBuild.txt
  find_file(ABOUT_FILE AboutThisBuild.txt PATHS "${CMAKE_CURRENT_SOURCE_DIR}" NO_DEFAULT_PATH)
  if (ABOUT_FILE STREQUAL ABOUT_FILE-NOTFOUND)
 	  message(FATAL_ERROR "AboutThisBuild.txt not found! You have to build RT at least one time with AUTOMATED_BUILD_SYSTEM=OFF to generate this file.")
  endif (ABOUT_FILE STREQUAL ABOUT_FILE-NOTFOUND)
  # Checking for the presence of version.h
  find_file(VERSION_FILE version.h PATHS "${CMAKE_CURRENT_SOURCE_DIR}/rtgui" NO_DEFAULT_PATH)
  if (VERSION_FILE STREQUAL VERSION_FILE-NOTFOUND)
 	  message(FATAL_ERROR "rtgui/version.h not found! You have to build RT at least one time with AUTOMATED_BUILD_SYSTEM=OFF to generate this file.")
  endif (VERSION_FILE STREQUAL VERSION_FILE-NOTFOUND)
 else (AUTOMATED_BUILD_SYSTEM)
  # set the bit number information of the platform
  if (CMAKE_SIZEOF_VOID_P EQUAL 4)
    set(PROC_BIT_DEPTH 32 bits)
  elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
    set(PROC_BIT_DEPTH 64 bits)
  endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
  #generating AboutThisBuild.txt
  if (WIN32)
    add_custom_target (AboutFile ALL
      COMMAND ${CMAKE_COMMAND}
              -DSRC_DIR:STRING=${CMAKE_CURRENT_SOURCE_DIR}
              -DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX}
              -DSYSTEM:STRING=Windows
              -DPROC_LABEL:STRING=\"${PROC_LABEL}\"
              -DPROC_BIT_DEPTH:STRING=\"${PROC_BIT_DEPTH}\"
              -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
              -DCXX_FLAGS:STRING=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}\"
              -DLFLAGS:STRING=\"${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}\"
              -DOPTION_OMP:STRING=${OPTION_OMP}
              -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
              -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Windows.cmake
      COMMENT "Creating the about file"
    )
    find_file(HG_CMD hg.exe HINTS ENV Path PATH_SUFFIXES ../)
  elseif (APPLE)
    add_custom_target (AboutFile ALL
      COMMAND ${CMAKE_COMMAND}
              -DSRC_DIR:STRING=${CMAKE_CURRENT_SOURCE_DIR}
              -DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX}
              -DSYSTEM:STRING=Apple
              -DPROC_LABEL:STRING=\"${PROC_LABEL}\"
              -DPROC_BIT_DEPTH:STRING=\"${PROC_BIT_DEPTH}\"
              -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
              -DCXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
              -DLFLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
              -DOPTION_OMP:STRING=${OPTION_OMP}
              -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
              -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Apple.cmake
      COMMENT "Creating the about file"
    )
    find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin")
    find_file(HG_CMD hg)
  else (WIN32)
    add_custom_target (AboutFile ALL
      COMMAND ${CMAKE_COMMAND}
              -DSRC_DIR:STRING=${CMAKE_CURRENT_SOURCE_DIR}
              -DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX}
              -DSYSTEM:STRING=Linux
              -DPROC_LABEL:STRING=\"${PROC_LABEL}\"
              -DPROC_BIT_DEPTH:STRING=\"${PROC_BIT_DEPTH}\"
              -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
              -DCXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
              -DLFLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
              -DOPTION_OMP:STRING=${OPTION_OMP}
              -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
              -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Linux.cmake
      COMMENT "Creating the about file"
    )
    find_file(HG_CMD hg)
  endif (WIN32)
  add_dependencies(AboutFile Debug Release MinSizeRel RelWithDebInfo)
  if (HG_CMD STREQUAL HG_CMD-NOTFOUND)
    message(FATAL_ERROR "hg command not found!")
  else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
    message(STATUS "hg command found: ${HG_CMD}")
  endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
 endif (AUTOMATED_BUILD_SYSTEM)
 # link witz bzip
 if (WITH_BZIP)
  find_package(BZip2)
  if (BZIP2_FOUND)
    add_definitions (-DBZIP_SUPPORT)
    set (EXTRA_INCDIR ${EXTRA_LIB} ${BZIP2_INCLUDE_DIR})
    set (EXTRA_LIB ${EXTRA_LIB} ${BZIP2_LIBRARIES})
  endif (BZIP2_FOUND)
 endif (WITH_BZIP)
 if (WITH_MYFILE_MMAP)
 	add_definitions (-DMYFILE_MMAP)
 endif (WITH_MYFILE_MMAP)
 if (OPTION_OMP)
    find_package(OpenMP)
    if (OPENMP_FOUND)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
    endif (OPENMP_FOUND)
 endif (OPTION_OMP)
 install (FILES AUTHORS.txt DESTINATION ${CREDITSDIR})
 install (FILES LICENSE.txt DESTINATION ${LICENCEDIR})
 install (FILES AboutThisBuild.txt DESTINATION ${CREDITSDIR})
 add_subdirectory (rtexif)
 add_subdirectory (rtengine)
 add_subdirectory (rtgui)
 add_subdirectory (rtdata)
--- a/COMPILE.txt
+++ b/COMPILE.txt
@ -0,0 +1,308 @@
 If you have problems with the compilation, please ask on the appropriated RawTherapee forum :
 http://www.rawtherapee.com/forum/viewforum.php?f=10
 Preamble
 --------
 Cmake is actually used to create the Makefiles (scripts that handle the build process) or specific Integrated Developement Environement (IDE) projects.
 It is designed to find all necessary compilation flags for your specific machine, but everything can be overriden.
 RT's build mechanism will generate a build information file, named "AboutThisBuild.txt", and require some parameters that can't be set by Cmake, so it's
 done in our build script, and may be overridden at your own will. The build process also enable some sort of cross compiling, since you can only choose
 a specific processor variation of the same type (e.g. core2, athlon64, which are both an x86 architecture). Real cross compiling (e.g. building the windows
 version on a linux platform) has not been tested.
 By default, no processor is specified, so Cmake/GCC will build RT for your processor (or maybe a generic processor). Developers that are providing build to
 download then have to set the processor label manually (set to 'undefined' by default) with the PROC_LABEL cmake's parameter (we assume that you know
 how to specify a cmake parameter).
 Note for developers that handle an automated build system : Mercurial is requested in order to produce the build information file, but you build system will
 certainly only use the source code without any access to a Mercurial repository. In this case, you have to first build RT like explained below to generates
 the build information files, then you can tell your build system to run cmake with the following additionnal parameter : -D AUTOMATED_BUILD_SYSTEM:BOOL=ON.
 Cmake will then pass the files creation step, but will check the presence of the requested files and stop if they're not there.
 Windows
 -------
 	The toolchain:
 		There is 2 method to compile RawTherapee, and they each rely on different and common packages. They are
 		now referred to METHOD 1 and METHOD 2.
 		Of course, you'll have to install the package for the build method explained later in this document.
 		The rest of this document assumes that you've installed MinGW, MSYS and Gtkmm respectively to "C:\mingw",
 		"C:\msys" and "C:\gtkmm". 
 		This tutorial assume that you've installed the packages in paths THAT DOES NOT CONTAIN SPACES.
 		METHOD 1:
 			- MinGW64-TDM (Bundle or On-Demand installer from http://tdm-gcc.tdragon.net/download)
 			            Make sure you use the current 4.5.2 or better, and install MinGW64 (not MinGW32)
 			            MinGW64 is more comprehensive, plus it runs AND compiles both 32bit and 64bit Windows.
 			            Old Mingw32 version miss some required header files, so some Windows functions will be disabled though it will compile.
 			            However MinGW64 does not fully support XP, only Vista and up.
 			- MSYS      (http://downloads.sourceforge.net/mingw/MSYS-1.0.11.exe)
 			            If you have some trouble installing MSYS, see here : http://www.mingw.org/wiki/MSYS
 			- CMake     (http://www.cmake.org/cmake/resources/software.html)
 			            Version 2.8.4 or above is required for this platform
 			- Gtkmm2.22 (for 32bit: http://ftp.se.debian.org/pub/gnome/binaries/win32/gtkmm/2.22/
 			             for 64bit: http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.22/)
 		METHOD 2:
 			- MinGW-TDM (Bundle or On-Demand insteller from http://tdm-gcc.tdragon.net/download)
 			- CMake     (http://www.cmake.org/cmake/resources/software.html)
 			- Gtkmm2.22 (for 32bit: http://ftp.se.debian.org/pub/gnome/binaries/win32/gtkmm/2.22/
 			             for 64bit: http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.22/)
 		Additionnal steps:
 			When all the packages of your preferred method are installed:
 			- set the GTKMM_BASEPATH user or system environment variable to the installation directory of Gtkmm
 			  (the Gtkmm's installer can do it for you)
 			- set the MINGW_BASEPATH user or system environment variable to the installation directory of MinGW32
 			- set the PKG_CONFIG_PATH user or system environment variable to the location of the pkgconfig directories:
 			      c:\mingw\lib\pkgconfig;c:\gtkmm\lib\pkgconfig
 			  You have to restart the console to take this new variables into account
 			- On Windows, set Cmake option BUILD_BUNDLE ON
 			- If you run MinGW64 and want to compile for 32bit, change the following vars in CMAKE (use CMAKE-GUI to makes this easier):
 			  CMAKE_CXX_FLAGS,CMAKE_C_FLAGS,CMAKE_SHARED_LINKER_FLAGS: -m32
 			  CMAKE_EXE_LINKER_FLAGS: -m32 --large-address-aware
 			  CMAKE_RC_FLAGS: -F pe-i386
 			- Copy the "Win32CMakeOptions-sample.txt" file located in the root directory of RT's source tree, to "cmo.txt" (e.g.)
 			  You can edit that copy to change the compilation flags to your needs, but the default values should be fine.
 			  However, if you wants to upload a build, you should set some additionnal information about your processor. There are two possibilities:
 			  1. You pickup a target processor from "ProcessorTargets.cmake": all you have to do is set the PROC_TARGET_NUMBER parameter in cmo.txt
 			     to the right target number.
 			     If you choose the 'native' solution, you have to set the processor label manually in cmo.txt, by uncommenting and set the PROC_LABEL
 			     parameter. Please provide a short name, like "core i5" or "athlon64" (without double quote)... processor frequency if of no use.
 			  2. You don't need specific processor flags, so you'll let PROC_TARGET_NUMBER set to 0, but you have to set the PROC_LABEL parameter
 			     in cmo.txt (don't forget to uncomment the line). Please provide a short name, like "core i5" or "athlon64" (without double quote)...
 			     specifying the processor frequency in it is useless.
 	Dependancies:
 		RawTherapee rely on libraries that may not be part of the Gtkmm or MinGW package. There is two ways of installing
 		thoses libraries.
 		The simple way:
 			For your convenience, those libraries has been precompiled and are downloadable at :
 			         http://www.rawtherapee.com/releases_head/windows/dependencies_for_creating_builds/
 			If you don't find a suitable package for your toolchain, take the DIY way or ask a developer
 			to build them for you.
 			Just unpack the content of this archive to the base installation dir of MinGW, and everything
 			should work fine.
 		The "Do It Yourself" way:
 			The MSYS package is required to build the libraries. See above for the download link.
 			Before building them, look if they are already installed in your Gtkmm and MinGW directories. There shouldn't be
 			two versions of the same library in different place.
 			Open an MSYS console, that will create a Linux environment, and compile the dependancies in that order:
 			zlib:
 			If you have Gtkmm2.22 installed, you should skip this section
 			- download: http://zlib.net/
 			- how to build:
 			  cd to the unarchiving directory of zlib-1.2.5
 			    make -f win32/Makefile.gcc
 			  Then, manually copy the files as follows (tip: you can individually copy the lines below and paste them in MSys's prompt with the middle mouse button):
 				cp -iv zlib1.dll /mingw/bin
 				cp -iv zconf.h zlib.h /mingw/include
 				cp -iv libz.a /mingw/lib
 				cp -iv libzdll.a /mingw/lib/libz.dll.a
 			libpng:
 			If you have Gtkmm2.22 installed, you should skip this section
 			- download:     http://sourceforge.net/projects/libpng/files/
 			                (please note that libpng 1.5 has not been tested yet)
 			- how to build:
 			  cd to the unarchiving directory of lpng144
 				There are two options to build libpng:
 				1. gtkmm doesn't provide zlib so i've compiled it myself
 				   cmake -G "MSYS Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/mingw -DCMAKE_BUILD_TYPE:STRING=Release
 				2. gtkmm provide zlib and i want to reuse it (so we're assuming that you didn't compiled zlib like explained here above)
 				   cmake -G "MSYS Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/mingw -DCMAKE_PREFIX_PATH:PATH=C:/gtkmm -DCMAKE_BUILD_TYPE:STRING=Release
 				Then build and install:
 				   make
 				   make install
 			libjpeg:
 			- download:     http://www.ijg.org/
 			- how to build:
 			  cd to the unarchiving directory of jpeg-8b
 			  ./configure --prefix=/mingw
 			  copy the content of jconfig.txt to jconfig.h (overwrite the existing file)
 			  make
 			  make install
 			libtiff:
 			- download:     ftp://ftp.remotesensing.org/pub/libtiff/
 			- how to build:
 			  In the configure process below, set the zlib include and lib path to the right folder. We're assuming that you're using
 			  the one provided in the gtkmm bundle
 			  ./configure --prefix=/mingw --with-zlib-include-dir=/c/gtkmm/include --with-zlib-lib-dir=/c/gtkmm/lib
 			  make
 			  cd libtiff
 			  make install
 			libiptcdata:
 			- download:     http://libiptcdata.sourceforge.net/
 			- how to build:
 			  ./configure --prefix=/mingw
 			  Edit the "Makefile" file from the root dir of libiptcdata, and search for "DIST_SUBDIRS ="
 			  and "SUBDIRS =". You should only find one line for each search. From those lines, remove "iptc", then
 			  make
 			  make install
 			lcms:
 			- download lcm v1.x for RT3.0, v2.x for RT3.1 and upper: http://sourceforge.net/projects/lcms/files/
 			- how to build (suitable for both version):
 			  ./configure --prefix=/mingw
 			  make
 			  make install
 			IMPORTANT:
 			   Make sure that the lcms.pc and libiptcdata.pc files located in the pkgconfig dir has the first
 			   line like this : prefix=/mingw
 			If everything is well installed, you should see the following lines when running the cmake command (see "Building RT" below) :
 					-- checking for module 'libiptcdata'
 					--   found libiptcdata, version 1.0.4
 					-- checking for module 'lcms<=1.99'
 					--   found lcms, version 1.19
 					-- Found JPEG: C:/mingw/lib/libjpeg.dll.a
 					-- Found ZLIB: C:/gtkmm/lib/libz.dll.a
 					-- Found PNG: C:/gtkmm/lib/libpng.lib
 					-- Found TIFF: C:/mingw/lib/libtiff.dll.a
 	Building RT:
 		METHOD 1:
 			Requirements:
 			- MinGW + MSYS
 			- CMake
 			- GTK and GTKMM development environments
 			Compile:
 			- Start an MSYS command line interface
 			- Enter the root directory of the RawTherapee source tree (type: cd "/C/Absolute/Path/To/RawTherapee_sourceTree")
 			- Type: cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -Ccmo.txt .
 			- Type: make install
 			- You'll find the compiled program in the subdirectory named like the value of CMAKE_BUILD_TYPE ("Release" in this example)
 		METHOD 2:
 			Requirements:
 			- MinGW-TDM (http://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/tdm-gcc-4.5.1.exe/download)
 			- CMake     (http://www.cmake.org/cmake/resources/software.html)
 			- Mercurial (http://mercurial.selenic.com/wiki/WindowsInstall)
 			- Gtkmm     (http://ftp.se.debian.org/pub/gnome/binaries/win32/gtkmm/2.22/)
 			Compile:
 			- Start a standard DOS command line interface (WIN + "R" -> "cmd")
 			- Enter the root directory of the RawTherapee source tree (type: cd C:\Absolute\Path\To\RawTherapee_sourceTree)
 		  If you wants to upload a build, you should set some additionnal information about your processor. There are two possibilities:
 		  1. You pickup a target processor from "ProcessorTargets.cmake": all you have to do is adding "-D PROC_TARGET_NUMBER:STRING=number"
 		     to cmake's command line
 		     If you choose the 'native' solution's number, you have to set the processor label manually by setting "-D PROC_LABEL:STRING=procLabel"
 		     in cmake's command line
 		     Please provide a short name, like "core i5" or "athlon64" (without double quote)... processor frequency if of no use.
 		  2. You don't need specific processor flags, you still have to set the PROC_LABEL parameter (see point 1 righ above)
 			- Type: mingw32-make.exe install
 			- You'll find the compiled program in the subdirectory named like the value of CMAKE_BUILD_TYPE ("Release" in this example)
 Linux
 -----
 	Requirements:
 		- CMake
 		- GTK and GTKMM development packages
 		- libtiff, libpng, libjpeg, lcms, libiptcdata development packages
 		- ...did I forget something?
 	On Ubuntu/Debian the requirements can be installed by running:
 		sudo apt-get install build-essential cmake libgtk2.0-dev libgtkmm-2.4-dev libtiff-dev libpng-dev libjpeg-dev liblcms-dev libiptcdata-dev mercurial
 	Compile:
 		- Enter the root directory of the RawTherapee source tree
 		- Type: cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./release -DBINDIR=. -DDATADIR=. -DLIBDIR=.
 		        developers that wants to provide a build has to set the PROC_LABEL to their processor name, e.g.:
 		        cmake -DPROC_LABEL:STRING=athlon64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./release -DBINDIR=. -DDATADIR=. -DLIBDIR=.
 		- Type: make install
 		- You find the compiled program in the release directory (you can copy it anywhere you want)
 	(By changing the cmake flags, you can change where the release is.  By removing all flags it should go to the standard system install location).
 	Using Eclipse under Linux:
 		Eclipse mercurial plugin:
 			click Help -> Install new Software.
 			The Eclipse Update Site for MercurialEclipse is available at this URL:
 			http://cbes.javaforge.com/update
 		Import the rawtherapee mercurial repository:
 			File->new->'other'->mercurial->Clone existing repository
 			fill in URL: https://rawtherapee.googlecode.com/hg
 		Enter root directory of RawTherapee source tree from a terminal window.
 		configure the source for Eclipse with:
 			cmake -G "Eclipse CDT4 - Unix Makefiles" -DCMAKE_INSTALL_PREFIX=./release -DBINDIR=. -DDATADIR=. -DLIBDIR=. -DCMAKE_BUILD_TYPE=Release
 		If you wants to upload a build, you should set some additionnal information about your processor. There are two possibilities:
 		1. You pickup a target processor from "ProcessorTargets.cmake": all you have to do is adding "-D PROC_TARGET_NUMBER:STRING=number"
 		   to cmake's command line
 		   If you choose the 'native' solution's number, you have to set the processor label manually by setting "-D PROC_LABEL:STRING=procLabel"
 		   in cmake's command line
 		   Please provide a short name, like "core i5" or "athlon64" (without double quote)... processor frequency if of no use.
 		2. You don't need specific processor flags, you still have to set the PROC_LABEL parameter (see point 1 righ above)
 		Eclipse does not do 'make install' but only 'make all' so to get the release there are 2 ways.
 			1. type 'make install' in the console or,
 			2. in 'Project'->'properties'->'C/C++ Make Project'->'Build (incremental build)' change 'all' to 'install'
 OSX
 ---
 Requirements:
 - XCode Development Tools (you only need a subset of these, but it is probably easier to just install all of them)
 - MacPorts
 	- Set /opt/local/etc/macports/variants.conf to include "+no_x11 +quartz"
 	- If you want to build for multiple architectures, add +universal to variants.conf.  Note that this will increase the size of the final application substantially.
 		- Set /opt/local/etc/macports/macports.conf key 'universal_archs' to the architectures you wish to build for.  Possible values
 		  include "i386 x86_64 ppc ppc64"
 		- Edit beginning of CMakeLists.txt to enable the same architectures as you added to variants.conf
 	- Run "sudo port install cairomm pango-devel gtk2 cmake glibmm gtkmm lcms libiptcdata" to install all needed libraries and tools
 	- If you don't already have Mercurial installed, run "sudo port install mercurial"
 	- If you want to try OpenMP builds, run "sudo port install gcc45"
 Compile:
 - Enter root directory of RawTherapee source tree
 - Type: cmake -D CMAKE_C_COMPILER=gcc-mp-4.5 -D CMAKE_CXX_COMPILER=g++-mp-4.5 . (to enable OpenMP, assuming you have installed gcc45) OR:
        cmake -D OPTION_OMP=false . (to disable OpenMP and use the default compiler)
  If you wants to upload a build, you should set some additionnal information about your processor. There are two possibilities:
  1. You pickup a target processor from "ProcessorTargets.cmake": all you have to do is adding "-D PROC_TARGET_NUMBER:STRING=number"
     to cmake's command line
     If you choose the 'native' solution's number, you have to set the processor label manually by setting "-D PROC_LABEL:STRING=procLabel"
     in cmake's command line
     Please provide a short name, like "core i5" or "athlon64" (without double quote)... processor frequency if of no use.
  2. You don't need specific processor flags, you still have to set the PROC_LABEL parameter (see point 1 righ above)
 - Type: make install
 - Type: ./tools/osx/make-app-bundle
 - You will find a RawTherapee.dmg file in release/ folder; this is the distribution release and can be run on any machine which meets the 
  architecture requirements you specified in variants.conf earlier.
 For any bugs or patches to the OSX build, please contact Wyatt <wyatt@digitalcave.ca>
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -0,0 +1,640 @@
                          RawTherapee
 Copyright ©2004-2011 Gábor Horváth <hgabor@rawtherapee.com>
 RawTherapee is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 RawTherapee is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License below for more details.
                    GNU GENERAL PUBLIC LICENSE
                      Version 3, 29 June 2007
                  <http://www.gnu.org/licenses/>
 Copyright ©2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
--- a/ProcessorTargets.cmake
+++ b/ProcessorTargets.cmake
@ -0,0 +1,36 @@
 # We have to create a label variable if we want to display it in AboutThisBuild.txt...
 # This first choice should be used for official releases
 set(PROC_TARGET_1_LABEL generic x86 CACHE STRING "Processor-1 label - should be used for official Windows release")
 set(PROC_TARGET_1_FLAGS "-mtune=generic" CACHE STRING "Processor-1 flags")
 # This second choice should be used for your own build only
 set(PROC_TARGET_2_LABEL native CACHE STRING "Processor-2 label - use it for your own build")
 set(PROC_TARGET_2_FLAGS "-march=native" CACHE STRING "Processor-2 flags")
 # The later choices is intended to be used if you want to provide specific builds, but it should match your own processor
 # You can cross compile but you have to know what you're doing, this mechanism has not been designed for that
 set(PROC_TARGET_3_LABEL pentium CACHE STRING "Processor-3 label - use it to provide a pentium optimized build, if you have this processor")
 set(PROC_TARGET_3_FLAGS "-march=pentium" CACHE STRING "Processor-3 flags")
 set(PROC_TARGET_4_LABEL pentium4 CACHE STRING "Processor-4 label - use it to provide a pentium4 optimized build, if you have this processor")
 set(PROC_TARGET_4_FLAGS "-march=pentium4" CACHE STRING "Processor-4 flags")
 set(PROC_TARGET_5_LABEL core2 CACHE STRING "Processor-5 label - use it to provide a core2 optimized build, if you have this processor")
 set(PROC_TARGET_5_FLAGS "-march=core2" CACHE STRING "Processor-5 flags")
 set(PROC_TARGET_6_LABEL corei7 CACHE STRING "Processor-6 label - use it to provide a corei7 optimized build, if you have this processor")
 set(PROC_TARGET_6_FLAGS "-march=corei7" CACHE STRING "Processor-6 flags")
 set(PROC_TARGET_7_LABEL athlon-4 CACHE STRING "Processor-7 label - use it to provide a athlon-4 optimized build, if you have this processor")
 set(PROC_TARGET_7_FLAGS "-march=athlon-4" CACHE STRING "Processor-7 flags")
 set(PROC_TARGET_8_LABEL athlon64 CACHE STRING "Processor-8 label - use it to provide a athlon64 optimized build, if you have this processor")
 set(PROC_TARGET_8_FLAGS "-march=athlon64 -mtune=athlon64" CACHE STRING "Processor-8 flags")
 set(PROC_TARGET_9_LABEL phenomX4 CACHE STRING "Processor-9 label - use it to provide a phenomX4 optimized build, if you have this processor")
 set(PROC_TARGET_9_FLAGS "-march=amdfam10" CACHE STRING "Processor-9 flags")
 #set(PROC_TARGET__LABEL procLabel CACHE STRING "Processor- label")
 #set(PROC_TARGET__FLAGS "procFlags" CACHE STRING "Processor- flags")
--- a/Win32CMakeOptions-Sample.txt
+++ b/Win32CMakeOptions-Sample.txt
@ -0,0 +1,50 @@
 # Use the 'Debug'          build type to have a non optimized,        with    debugging information, with a console executable
 # Use the 'Release'        build type to have an    optimized,        without debugging information, console free executable
 # Use the 'RelWithDebInfo' build type to have an    optimized,        without debugging information, with a console executable
 # Use the 'MinSizeRel'     build type to have the smallest possible, without debugging information, console free executable
 #set(CMAKE_BUILD_TYPE Release CACHE STRING "Between: None Debug Release RelWithDebInfo MinSizeRel.")
 set(CMAKE_INSTALL_PREFIX ./Builds/${CMAKE_BUILD_TYPE} CACHE PATH "Libraries installation path")
 set(DATADIR . CACHE PATH "Datas installation path")
 set(BINDIR . CACHE PATH "Binaries installation path")
 set(LIBDIR . CACHE PATH "Libraries installation path")
 set(DOCDIR ./doc CACHE PATH "Documentation installation path")
 set(CREDITSDIR . CACHE PATH "Credit file installation path")
 set(LICENCEDIR . CACHE PATH "Licence file installation path")
 set(BUILD_SHARED OFF CACHE BOOL "Should RT generate shared libraries")
 set(OPTION_OMP ON CACHE BOOL "Use OpenMP to speedup the preview and batch processing")
 # set WITH_MYFILE_MMAP to OFF if you experience crash with thumbnail creation (it should be slower, but more reliable)
 set(WITH_MYFILE_MMAP ON CACHE BOOL "Use the MMAP mechanism to speedup thumbnail creations")
 set(CACHE_NAME_SUFFIX "" CACHE STRING "RawTherapee's cache folder suffix (leave empty to use the default suffix, i.e. latesttag)")
 # This line will let you chose the target number, and the associated processor
 set(PROC_TARGET_NUMBER 0 CACHE STRING "Target Processor")
 # If you want to force the target processor name when PROC_TARGET_NUMBER = 0 or 2,
 # uncomment the next line and replace labelWithoutQuotes by its value
 #set (PROC_LABEL labelWithoutQuotes CACHE STRING "Target Processor label")
 # Important: MinGW-w64 user may need to specify the -m32 or -m64 flag in CMAKE_CXX_FLAGS,
 # CMAKE_C_FLAGS and CMAKE_EXE_LINKER_FLAGS to selectect between 32/64bit build
 set(CMAKE_CXX_FLAGS "-mwin32 -mthreads" CACHE STRING "Compiler options for C++ source files")
 set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g2" CACHE STRING "Compiler options for C++ source files and Debug target")
 set(CMAKE_CXX_FLAGS_RELEASE "-mwindows -DNDEBUG -O2" CACHE STRING "Compiler options for C++ source files and Release target")
 set(CMAKE_CXX_FLAGS_MINSIZEREL "-mwindows -DNDEBUG -Os" CACHE STRING "Compiler options for C++ source files and MinSizeRel target")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Compiler options for C++ source files and RelWithDebInfo target")
 # Uncomment the next line and set the right value to override the default value (special compiling flags for RTEngine)
 #set(RTENGINE_CXX_FLAGS "-funroll-loops" CACHE STRING "Special compilation flags for RTEngine")
 set(CMAKE_C_FLAGS "-mwin32 -mthreads" CACHE STRING "Compiler options for C source files")
 set(CMAKE_C_FLAGS_DEBUG "-O0 -g2" CACHE STRING "Compiler options for C source files and Debug target")
 set(CMAKE_C_FLAGS_RELEASE "-mwindows -DNDEBUG -O2" CACHE STRING "Compiler options for C source files and Release target")
 set(CMAKE_C_FLAGS_MINSIZEREL "-mwindows -DNDEBUG -Os" CACHE STRING "Compiler options for C source files and MinSizeRel target")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Compiler options for C source files and RelWithDebInfo target")
 set(CMAKE_EXE_LINKER_FLAGS "-mwin32 -mthreads -mthread -static-libgcc -static-libstdc++ --large-address-aware" CACHE STRING "Linker options")
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-O0" CACHE STRING "Linkage options for the Debug target")
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-mwindows -s -O2" CACHE STRING "Linkage options for the Release target")
 set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-mwindows -s -Os" CACHE STRING "Linkage options for the MinSizeRel target")
 set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "-s -O2" CACHE STRING "Linkage options for the RelWithDebInfo target")
--- a/WindowsEnvironmentSetup.html
+++ b/WindowsEnvironmentSetup.html
@ -0,0 +1,45 @@
 <H1>Building Raw Therapee in Windows 64</H1>
 12 November 2011<BR>
 <BR>
 <BR>
 This short guide outlines setting up a development environment for building RawTherapee (64 bit) in Windows.<BR>
 Apology and warning: the procedure is convoluted. Prepare for frustration if you deviate even one bit. Sorry.<BR>
 <BR>
 <B>Step 0:</B><BR>
 Use <A HREF=http://tortoisehg.bitbucket.org/>TortoiseHg</A> to grab the latest Raw Therapee, put it in a directory whose name doesn't contain spaces. This is more or less simple but well documented, please figure it out yourself.<BR>
 <BR>
 <B>Step 1:</B><BR>
 Download the latest <A HREF=http://cmake.org/cmake/resources/software.html>CMake</A>. Install it into C:\CMake.<BR>
 <BR>
 <B>Step 2:</B><BR>
 Download <A HREF=http://ftp.gnome.org/pub/GNOME/binaries/win64/gtkmm/2.22/gtkmm-win64-devel-2.22.0-2.exe>a rather specific version of gtkmm64</A>. Install it into C:\gtkmm64.<BR>
 <BR>
 <B>Step 3:</B><BR>
 Download <A HREF=http://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/Previous/1.1006.0/tdm64-gcc-4.5.2.exe/download>a rather specific build of MinGW</A>. When installing, uncheck "Check for updated files...", check "Experimental (32 and 64 bit)", check the "openmp" component under Components->gcc, install into C:\MinGW64.<BR>
 <BR>
 <B>Step 4:</B><BR>
 Download the latest <A HREF=http://www.visualbakery.com/rawtherapee/Downloads.aspx>Precompiled package for 64bit Windows</A>. Unzip the file contents (already organized into several subdirectories) into C:\MinGW64.<BR>
 <BR>
 <B>Step 5:</B><BR>
 Download <A HREF=http://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.11/MSYS-1.0.11.exe/download>a rather specific build</A> of MSYS. Install to C:\msys. At the end it asks for your MinGW directory, <u>make sure</u> you give it C:/MinGW64. That's a forward slash, and it matters.<BR>
 <BR>
 <B>Step 6:</B><BR>
 Create a file named build.bat in your raw therapee source directory with the following content:<BR>
 <BR>
 set GTKMM_BASEPATH=C:\gtkmm64<BR>
 set GTKMM64_BASEPATH=C:\gtkmm64<BR>
 set MINGW_BASEPATH=C:\MinGW64<BR>
 set PATH=%PATH%;C:\gtkmm64\bin;C:\MinGW64\bin;C:\CMake\bin<BR>
 set PKG_CONFIG_PATH=C:\MinGW64\lib\pkgconfig;c:\gtkmm64\lib\pkgconfig<BR>
 <BR>
 cmake  -DCMAKE_BUILD_TYPE=Release -G "MinGW Makefiles" -DPROC_TARGET_NUMBER:STRING=2<BR>
 mingw32-make -j2 install<BR>
 pause<BR>
 <BR>
 <BR>
 <BR>
 Running the batch file above after completing all steps properly should slowly but flawlessly build Raw Therapee.<BR>
 <B>If it doesn't work, <U>please</U> tell us about it at the <A HREF=http://www.rawtherapee.com/forum/viewforum.php?f=10>Raw Therapee forum</A>. Maybe this document needs updating.</B><BR>
 Do not rest until it builds. A complicated build sucks, but out of date or inaccurate build documentation is unacceptable.<BR>
 <BR>
 <BR>
--- a/27
+++ b/27
@ -0,0 +1,27 @@
 #!/bin/sh
 rm -v CMakeCache.txt
 rm -v install_manifest.txt
 rm -vr ./CMakeFiles 
 rm -vr ./rtengine/CMakeFiles
 rm -vr ./rtexif/CMakeFiles
 rm -vr ./rtgui/CMakeFiles
 rm -vr ./rtdata/CMakeFiles
 rm -v ./cmake*
 rm -v ./rtengine/cmake*
 rm -v ./rtexif/cmake*
 rm -v ./rtgui/cmake*
 rm -v ./rtdata/cmake*
 rm -v ./Makefile
 rm -v ./rtengine/Makefile
 rm -v ./rtexif/Makefile
 rm -v ./rtgui/Makefile
 rm -v ./rtengine/librtengine.so
 rm -v ./rtengine/librtengine.a
 rm -v ./rtgui/rawtherapee
 rm -v ./rtexif/librtexif.so
 rm -v ./rtexif/librtexif.a
 exit 0
--- a/clean.bat
+++ b/clean.bat
@ -0,0 +1,17 @@
 del CMakeCache.txt
 del install_manifest.txt
 del ./CMakeFiles 
 del ./rtengine/CMakeFiles
 rm -R ./rtexif/CMakeFiles
 rm -R ./rtgui/CMakeFiles
 rm ./cmake*
 rm ./rtengine/cmake*
 rm ./rtexif/cmake*
 rm ./rtgui/cmake*
 rm ./Makefile
 rm ./rtengine/Makefile
 rm ./rtexif/Makefile
 rm ./rtgui/Makefile
 rm ./rtengine/librtengine.so
 rm ./rtgui/rth
 rm ./rtexif/librtexif.a
--- a/clean.sh
+++ b/clean.sh
@ -0,0 +1,27 @@
 #!/bin/sh
 rm -v CMakeCache.txt
 rm -v install_manifest.txt
 rm -vr ./CMakeFiles 
 rm -vr ./rtengine/CMakeFiles
 rm -vr ./rtexif/CMakeFiles
 rm -vr ./rtgui/CMakeFiles
 rm -vr ./rtdata/CMakeFiles
 rm -v ./cmake*
 rm -v ./rtengine/cmake*
 rm -v ./rtexif/cmake*
 rm -v ./rtgui/cmake*
 rm -v ./rtdata/cmake*
 rm -v ./Makefile
 rm -v ./rtengine/Makefile
 rm -v ./rtexif/Makefile
 rm -v ./rtgui/Makefile
 rm -v ./rtengine/librtengine.so
 rm -v ./rtengine/librtengine.a
 rm -v ./rtgui/rawtherapee
 rm -v ./rtexif/librtexif.so
 rm -v ./rtexif/librtexif.a
 exit 0
--- a/doc/built/pdf/de/RT-Internal-Workflow_2.4_de.pdf
+++ b/doc/built/pdf/de/RT-Internal-Workflow_2.4_de.pdf
--- a/doc/built/pdf/de/RawTherapeeManual_2.4_de.pdf
+++ b/doc/built/pdf/de/RawTherapeeManual_2.4_de.pdf
--- a/doc/built/pdf/de/RawTherapeeManual_3.0_de.pdf
+++ b/doc/built/pdf/de/RawTherapeeManual_3.0_de.pdf
--- a/doc/built/pdf/en/RT-Internal-Workflow_2.4.pdf
+++ b/doc/built/pdf/en/RT-Internal-Workflow_2.4.pdf
--- a/doc/built/pdf/en/RawTherapeeManual_2.4.pdf
+++ b/doc/built/pdf/en/RawTherapeeManual_2.4.pdf
--- a/doc/built/pdf/en/RawTherapeeManual_3.0.pdf
+++ b/doc/built/pdf/en/RawTherapeeManual_3.0.pdf
--- a/doc/built/pdf/en/RawTherapeeManual_4.0.pdf
+++ b/doc/built/pdf/en/RawTherapeeManual_4.0.pdf
--- a/doc/built/pdf/fr/RT-Internal-Workflow_2.4_fr.pdf
+++ b/doc/built/pdf/fr/RT-Internal-Workflow_2.4_fr.pdf
--- a/doc/built/pdf/fr/RawTherapeeManual_2.4_fr.pdf
+++ b/doc/built/pdf/fr/RawTherapeeManual_2.4_fr.pdf
--- a/doc/built/pdf/it/RT-Internal-Workflow_2.4_it.pdf
+++ b/doc/built/pdf/it/RT-Internal-Workflow_2.4_it.pdf
--- a/doc/built/pdf/it/RawTherapeeManual_2.3_it.pdf
+++ b/doc/built/pdf/it/RawTherapeeManual_2.3_it.pdf
--- a/doc/built/pdf/it/RawTherapeeManual_2.4_it.pdf
+++ b/doc/built/pdf/it/RawTherapeeManual_2.4_it.pdf
--- a/doc/built/pdf/it/RawTherapeeManual_3.0_it.pdf
+++ b/doc/built/pdf/it/RawTherapeeManual_3.0_it.pdf
--- a/doc/built/pdf/jp/RawTherapeeManual_2.4_jp.pdf
+++ b/doc/built/pdf/jp/RawTherapeeManual_2.4_jp.pdf
--- a/doc/built/pdf/nl/RawTherapeeManual_2.4.1_nl.pdf
+++ b/doc/built/pdf/nl/RawTherapeeManual_2.4.1_nl.pdf
--- a/doc/source/odg/de/RT-Internal-Workflow_2.4_de.odg
+++ b/doc/source/odg/de/RT-Internal-Workflow_2.4_de.odg
--- a/doc/source/odg/en/RT-Internal-Workflow_2.4.odg
+++ b/doc/source/odg/en/RT-Internal-Workflow_2.4.odg
--- a/doc/source/odg/fr/RT-Internal-Workflow_2.4_fr.odg
+++ b/doc/source/odg/fr/RT-Internal-Workflow_2.4_fr.odg
--- a/doc/source/odg/it/RT-Internal-Workflow_2.4_it.odg
+++ b/doc/source/odg/it/RT-Internal-Workflow_2.4_it.odg
--- a/doc/source/odt/de/RawTherapeeManual_2.4_de.odt
+++ b/doc/source/odt/de/RawTherapeeManual_2.4_de.odt
--- a/doc/source/odt/de/RawTherapeeManual_3.0_de.odt
+++ b/doc/source/odt/de/RawTherapeeManual_3.0_de.odt
--- a/doc/source/odt/en/RawTherapeeManual_2.4.odt
+++ b/doc/source/odt/en/RawTherapeeManual_2.4.odt
--- a/doc/source/odt/en/RawTherapeeManual_3.0.odt
+++ b/doc/source/odt/en/RawTherapeeManual_3.0.odt
--- a/doc/source/odt/fr/RawTherapeeManual_2.4_fr.odt
+++ b/doc/source/odt/fr/RawTherapeeManual_2.4_fr.odt
--- a/doc/source/odt/it/RawTherapeeManual_2.4_it.odt
+++ b/doc/source/odt/it/RawTherapeeManual_2.4_it.odt
--- a/doc/source/odt/it/RawTherapeeManual_3.0_it.odt
+++ b/doc/source/odt/it/RawTherapeeManual_3.0_it.odt
--- a/doc/source/odt/nl/RawTherapeeManual_2.4.1_nl.odt
+++ b/doc/source/odt/nl/RawTherapeeManual_2.4.1_nl.odt
--- a/18
+++ b/18
@ -0,0 +1,18 @@
 /*
 *  This file is part of RawTherapee.
 *
 *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
 *
 *  RawTherapee is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation, either version 3 of the License, or
 *  (at your option) any later version.
 * 
 *  RawTherapee is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
 */
--- a/languagePack.nsi
+++ b/languagePack.nsi
@ -0,0 +1,126 @@
 ; RawTherapee Language Pack
 ;
 ; Installes just the language file in an existing RawTherapee installation.
 ;
 ;------------------------------------------------------------------------------
 ; Name, Outputfile and Version information
 ;------------------------------------------------------------------------------
 ; **** start edit section: please adapt below options per language pack release ****
 ; The name of the installer
 Name "RT 2.4.1 - language Pack"
 ; The file to write
 OutFile "RT241-langPack-20091018.exe"
 LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
  VIProductVersion "2.4.1.0"
  VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "RawTherapee Language Pack"
  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© Raw Therapee"
  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Language Pack RawTherapee 2.4.1"
  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.4.1-2009-10-18"
  VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Compatible also for RT2.4 and RT2.3"
 ;  VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Fake company"
 ;  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company"
 ; **** end edit section: no changes needed per release below ****
 ;------------------------------------------------------------------------------
 ; Installation Directory, Dialog box for 
 ;------------------------------------------------------------------------------
 ; The default installation directory
 InstallDir "$PROGRAMFILES\Raw Therapee\languages"
 DirText "The Language Pack has to be installed into the RawTherapee installation directory, into the language subdirectory." \
        "RawTherapee Installation Directory" \
        "" \
        "Please select the installation Directory of RawTherapee:" 
 ;PageEx directory
 ;   DirVerify leave
 ;   PageCallbacks "" "" dirLeave
 ;PageExEnd
 ; Registry key to check for directory (so if you install again, it will 
 ; overwrite the old one automatically)
 InstallDirRegKey HKCU "Software\Raw Therapee" ""
 ;------------------------------------------------------------------------------
 ; Installation Rights (Vista only)
 ;------------------------------------------------------------------------------
 ; Request application privileges for Windows Vista
 RequestExecutionLevel admin
 ;------------------------------------------------------------------------------
 ; Pages:
 ;------------------------------------------------------------------------------
 ; Pages
 ;Page components
 Page directory
 Page instfiles
 ;UninstPage uninstConfirm
 ;UninstPage instfiles
 ;------------------------------------------------------------------------------
 ; Sections: stuff to be installed
 ;------------------------------------------------------------------------------
 ; The stuff to install
 Section "RawTherapee Language Pack (required)"
  SectionIn RO
  ifFileExists $INSTDIR\languages\*.* 0 +3
  SetOutPath $INSTDIR\languages
  Goto +2
  SetOutPath $INSTDIR
  ; Set output path to the installation directory.
  ;SetOutPath $INSTDIR
  ; Put file there
  File "release\languages\*"
  ; Write the installation path into the registry
  ;WriteRegStr HKLM SOFTWARE\NSIS_Example2 "Install_Dir" "$INSTDIR"
  ; Write the uninstall keys for Windows
  ;WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "DisplayName" "NSIS Example2"
  ;WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "UninstallString" '"$INSTDIR\uninstall.exe"'
  ;WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "NoModify" 1
  ;WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "NoRepair" 1
  ;WriteUninstaller "uninstall.exe"
 SectionEnd
 ;------------------------------------------------------------------------------
 ; Uninstaller: not needed here
 ;------------------------------------------------------------------------------
 ; Uninstaller
 ;Section "Uninstall"
  ; Remove registry keys
 ;  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2"
 ;  DeleteRegKey HKLM SOFTWARE\NSIS_Example2
  ; Remove files and uninstaller
 ;  Delete $INSTDIR\example2.nsi
 ;  Delete $INSTDIR\uninstall.exe
  ; Remove shortcuts, if any
 ;  Delete "$SMPROGRAMS\Example2\*.*"
  ; Remove directories used
 ;  RMDir "$SMPROGRAMS\Example2"
 ;  RMDir "$INSTDIR"
 ;SectionEnd
--- a/licenses/README
+++ b/licenses/README
@ -0,0 +1 @@
 This folder contains the licenses and supporting documentation for third party components of RawTherapee.  Each file name reflects the portion which it is relevent for.
--- a/licenses/jdatasrc
+++ b/licenses/jdatasrc
@ -0,0 +1,325 @@
 The Independent JPEG Group's JPEG software
 ==========================================
 README for release 8a of 28-Feb-2010
 ====================================
 This distribution contains the eighth public release of the Independent JPEG
 Group's free JPEG software.  You are welcome to redistribute this software and
 to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
 This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
 Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
 Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
 and other members of the Independent JPEG Group.
 IJG is not affiliated with the official ISO JPEG standards committee.
 DOCUMENTATION ROADMAP
 =====================
 This file contains the following sections:
 OVERVIEW            General description of JPEG and the IJG software.
 LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
 REFERENCES          Where to learn more about JPEG.
 ARCHIVE LOCATIONS   Where to find newer versions of this software.
 ACKNOWLEDGMENTS     Special thanks.
 FILE FORMAT WARS    Software *not* to get.
 TO DO               Plans for future IJG releases.
 Other documentation files in the distribution are:
 User documentation:
  install.txt       How to configure and install the IJG software.
  usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
                    rdjpgcom, and wrjpgcom.
  *.1               Unix-style man pages for programs (same info as usage.txt).
  wizard.txt        Advanced usage instructions for JPEG wizards only.
  change.log        Version-to-version change highlights.
 Programmer and internal documentation:
  libjpeg.txt       How to use the JPEG library in your own programs.
  example.c         Sample code for calling the JPEG library.
  structure.txt     Overview of the JPEG library's internal structure.
  filelist.txt      Road map of IJG files.
  coderules.txt     Coding style rules --- please read if you contribute code.
 Please read at least the files install.txt and usage.txt.  Some information
 can also be found in the JPEG FAQ (Frequently Asked Questions) article.  See
 ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
 If you want to understand how the JPEG code works, we suggest reading one or
 more of the REFERENCES, then looking at the documentation files (in roughly
 the order listed) before diving into the code.
 OVERVIEW
 ========
 This package contains C software to implement JPEG image encoding, decoding,
 and transcoding.  JPEG (pronounced "jay-peg") is a standardized compression
 method for full-color and gray-scale images.
 This software implements JPEG baseline, extended-sequential, and progressive
 compression processes.  Provision is made for supporting all variants of these
 processes, although some uncommon parameter settings aren't implemented yet.
 We have made no provision for supporting the hierarchical or lossless
 processes defined in the standard.
 We provide a set of library routines for reading and writing JPEG image files,
 plus two sample applications "cjpeg" and "djpeg", which use the library to
 perform conversion between JPEG and some other popular image file formats.
 The library is intended to be reused in other applications.
 In order to support file conversion and viewing software, we have included
 considerable functionality beyond the bare JPEG coding/decoding capability;
 for example, the color quantization modules are not strictly part of JPEG
 decoding, but they are essential for output to colormapped file formats or
 colormapped displays.  These extra functions can be compiled out of the
 library if not required for a particular application.
 We have also included "jpegtran", a utility for lossless transcoding between
 different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple
 applications for inserting and extracting textual comments in JFIF files.
 The emphasis in designing this software has been on achieving portability and
 flexibility, while also making it fast enough to be useful.  In particular,
 the software is not intended to be read as a tutorial on JPEG.  (See the
 REFERENCES section for introductory material.)  Rather, it is intended to
 be reliable, portable, industrial-strength code.  We do not claim to have
 achieved that goal in every aspect of the software, but we strive for it.
 We welcome the use of this software as a component of commercial products.
 No royalty is required, but we do ask for an acknowledgement in product
 documentation, as described under LEGAL ISSUES.
 LEGAL ISSUES
 ============
 In plain English:
 1. We don't promise that this software works.  (But if you find any bugs,
   please let us know!)
 2. You can use this software for whatever you want.  You don't have to pay us.
 3. You may not pretend that you wrote this software.  If you use it in a
   program, you must acknowledge somewhere in your documentation that
   you've used the IJG code.
 In legalese:
 The authors make NO WARRANTY or representation, either express or implied,
 with respect to this software, its quality, accuracy, merchantability, or
 fitness for a particular purpose.  This software is provided "AS IS", and you,
 its user, assume the entire risk as to its quality and accuracy.
 This software is copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
 All Rights Reserved except as specified below.
 Permission is hereby granted to use, copy, modify, and distribute this
 software (or portions thereof) for any purpose, without fee, subject to these
 conditions:
 (1) If any part of the source code for this software is distributed, then this
 README file must be included, with this copyright and no-warranty notice
 unaltered; and any additions, deletions, or changes to the original files
 must be clearly indicated in accompanying documentation.
 (2) If only executable code is distributed, then the accompanying
 documentation must state that "this software is based in part on the work of
 the Independent JPEG Group".
 (3) Permission for use of this software is granted only if the user accepts
 full responsibility for any undesirable consequences; the authors accept
 NO LIABILITY for damages of any kind.
 These conditions apply to any software derived from or based on the IJG code,
 not just to the unmodified library.  If you use our work, you ought to
 acknowledge us.
 Permission is NOT granted for the use of any IJG author's name or company name
 in advertising or publicity relating to this software or products derived from
 it.  This software may be referred to only as "the Independent JPEG Group's
 software".
 We specifically permit and encourage the use of this software as the basis of
 commercial products, provided that all warranty or liability claims are
 assumed by the product vendor.
 ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
 sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
 ansi2knr.c is NOT covered by the above copyright and conditions, but instead
 by the usual distribution terms of the Free Software Foundation; principally,
 that you must include source code if you redistribute it.  (See the file
 ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
 of any program generated from the IJG code, this does not limit you more than
 the foregoing paragraphs do.
 The Unix configuration script "configure" was produced with GNU Autoconf.
 It is copyright by the Free Software Foundation but is freely distributable.
 The same holds for its supporting scripts (config.guess, config.sub,
 ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
 but is also freely distributable.
 The IJG distribution formerly included code to read and write GIF files.
 To avoid entanglement with the Unisys LZW patent, GIF reading support has
 been removed altogether, and the GIF writer has been simplified to produce
 "uncompressed GIFs".  This technique does not use the LZW algorithm; the
 resulting GIF files are larger than usual, but are readable by all standard
 GIF decoders.
 We are required to state that
    "The Graphics Interchange Format(c) is the Copyright property of
    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
    CompuServe Incorporated."
 REFERENCES
 ==========
 We recommend reading one or more of these references before trying to
 understand the innards of the JPEG software.
 The best short technical introduction to the JPEG compression algorithm is
 	Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
 	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
 (Adjacent articles in that issue discuss MPEG motion picture compression,
 applications of JPEG, and related topics.)  If you don't have the CACM issue
 handy, a PostScript file containing a revised version of Wallace's article is
 available at http://www.ijg.org/files/wallace.ps.gz.  The file (actually
 a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
 omits the sample images that appeared in CACM, but it includes corrections
 and some added material.  Note: the Wallace article is copyright ACM and IEEE,
 and it may not be used for commercial purposes.
 A somewhat less technical, more leisurely introduction to JPEG can be found in
 "The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
 M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
 good explanations and example C code for a multitude of compression methods
 including JPEG.  It is an excellent source if you are comfortable reading C
 code but don't know much about data compression in general.  The book's JPEG
 sample code is far from industrial-strength, but when you are ready to look
 at a full implementation, you've got one here...
 The best currently available description of JPEG is the textbook "JPEG Still
 Image Data Compression Standard" by William B. Pennebaker and Joan L.
 Mitchell, published by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.
 Price US$59.95, 638 pp.  The book includes the complete text of the ISO JPEG
 standards (DIS 10918-1 and draft DIS 10918-2).
 Although this is by far the most detailed and comprehensive exposition of
 JPEG publicly available, we point out that it is still missing an explanation
 of the most essential properties and algorithms of the underlying DCT
 technology.
 If you think that you know about DCT-based JPEG after reading this book,
 then you are in delusion.  The real fundamentals and corresponding potential
 of DCT-based JPEG are not publicly known so far, and that is the reason for
 all the mistaken developments taking place in the image coding domain.
 The original JPEG standard is divided into two parts, Part 1 being the actual
 specification, while Part 2 covers compliance testing methods.  Part 1 is
 titled "Digital Compression and Coding of Continuous-tone Still Images,
 Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
 10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
 Continuous-tone Still Images, Part 2: Compliance testing" and has document
 numbers ISO/IEC IS 10918-2, ITU-T T.83.
 IJG JPEG 8 introduces an implementation of the JPEG SmartScale extension
 which is specified in a contributed document at ITU and ISO with title "ITU-T
 JPEG-Plus Proposal for Extending ITU-T T.81 for Advanced Image Coding", April
 2006, Geneva, Switzerland.  The latest version of the document is Revision 3.
 The JPEG standard does not specify all details of an interchangeable file
 format.  For the omitted details we follow the "JFIF" conventions, revision
 1.02.  JFIF 1.02 has been adopted as an Ecma International Technical Report
 and thus received a formal publication status.  It is available as a free
 download in PDF format from
 http://www.ecma-international.org/publications/techreports/E-TR-098.htm.
 A PostScript version of the JFIF document is available at
 http://www.ijg.org/files/jfif.ps.gz.  There is also a plain text version at
 http://www.ijg.org/files/jfif.txt.gz, but it is missing the figures.
 The TIFF 6.0 file format specification can be obtained by FTP from
 ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
 found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
 IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
 Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
 (Compression tag 7).  Copies of this Note can be obtained from
 http://www.ijg.org/files/.  It is expected that the next revision
 of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
 Although IJG's own code does not support TIFF/JPEG, the free libtiff library
 uses our library to implement TIFF/JPEG per the Note.
 ARCHIVE LOCATIONS
 =================
 The "official" archive site for this software is www.ijg.org.
 The most recent released version can always be found there in
 directory "files".  This particular version will be archived as
 http://www.ijg.org/files/jpegsrc.v8a.tar.gz, and in Windows-compatible
 "zip" archive format as http://www.ijg.org/files/jpegsr8a.zip.
 The JPEG FAQ (Frequently Asked Questions) article is a source of some
 general information about JPEG.
 It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
 and other news.answers archive sites, including the official news.answers
 archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
 If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
 with body
 	send usenet/news.answers/jpeg-faq/part1
 	send usenet/news.answers/jpeg-faq/part2
 ACKNOWLEDGMENTS
 ===============
 Thank to Juergen Bruder for providing me with a copy of the common DCT
 algorithm article, only to find out that I had come to the same result
 in a more direct and comprehensible way with a more generative approach.
 Thank to Istvan Sebestyen and Joan L. Mitchell for inviting me to the
 ITU JPEG (Study Group 16) meeting in Geneva, Switzerland.
 Thank to Thomas Wiegand and Gary Sullivan for inviting me to the
 Joint Video Team (MPEG & ITU) meeting in Geneva, Switzerland.
 Thank to John Korejwa and Massimo Ballerini for inviting me to
 fruitful consultations in Boston, MA and Milan, Italy.
 Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther
 Maier-Gerber, and Walter Stoeber for corresponding business development.
 Thank to Nico Zschach and Dirk Stelling of the technical support team
 at the Digital Images company in Halle for providing me with extra
 equipment for configuration tests.
 Thank to Richard F. Lyon (then of Foveon Inc.) for fruitful
 communication about JPEG configuration in Sigma Photo Pro software.
 Thank to Andrew Finkenstadt for hosting the ijg.org site.
 Last but not least special thank to Thomas G. Lane for the original
 design and development of this singular software package.
 FILE FORMAT WARS
 ================
 The ISO JPEG standards committee actually promotes different formats like
 "JPEG 2000" or "JPEG XR" which are incompatible with original DCT-based
 JPEG and which are based on faulty technologies.  IJG therefore does not
 and will not support such momentary mistakes (see REFERENCES).
 We have little or no sympathy for the promotion of these formats.  Indeed,
 one of the original reasons for developing this free software was to help
 force convergence on common, interoperable format standards for JPEG files.
 Don't use an incompatible file format!
 (In any case, our decoder will remain capable of reading existing JPEG
 image files indefinitely.)
 TO DO
 =====
 Version 8 is the first release of a new generation JPEG standard
 to overcome the limitations of the original JPEG specification.
 More features are being prepared for coming releases...
 Please send bug reports, offers of help, etc. to jpeg-info@uc.ag.
--- a/rtdata/CMakeLists.txt
+++ b/rtdata/CMakeLists.txt
@ -0,0 +1,40 @@
 file (GLOB PROFILEFILES "profiles/*.pp3")
 file (GLOB LANGUAGEFILES "languages/*")
 file (GLOB SOUNDFILES "sounds/*")
 file (GLOB INPUTICCFILES "iccprofiles/input/*")
 file (GLOB OUTPUTICCFILES "iccprofiles/output/*")
 # THEMEDIR includes subfolders for image resources for some themes; doing the normal glob won't work.
 set (THEMEDIR "themes")
 set (IMAGESDIR "images")
 if (WIN32)
    set(OPTIONSFILE "options/options.win")
 elseif (APPLE)
    set(OPTIONSFILE "options/options.osx")
 else (WIN32)
    set(OPTIONSFILE "options/options.lin")
 endif (WIN32)
 if (UNIX)
    configure_file (${CMAKE_CURRENT_SOURCE_DIR}/icons/rawtherapee.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop)
    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop DESTINATION ${DESKTOPDIR})
    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/hi16-app-rawtherapee.png DESTINATION ${ICONSDIR}/hicolor/16x16/apps RENAME rawtherapee.png)
    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/hi24-app-rawtherapee.png DESTINATION ${ICONSDIR}/hicolor/24x24/apps RENAME rawtherapee.png)
    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/hi32-app-rawtherapee.png DESTINATION ${ICONSDIR}/hicolor/32x32/apps RENAME rawtherapee.png)
    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/hi48-app-rawtherapee.png DESTINATION ${ICONSDIR}/hicolor/48x48/apps RENAME rawtherapee.png)
    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/hi128-app-rawtherapee.png DESTINATION ${ICONSDIR}/hicolor/128x128/apps RENAME rawtherapee.png)
    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/hi256-app-rawtherapee.png DESTINATION ${ICONSDIR}/hicolor/256x256/apps RENAME rawtherapee.png)
 endif (UNIX)
 install (FILES ${IMAGEFILES} DESTINATION ${DATADIR}/images)
 install (FILES ${LANGUAGEFILES} DESTINATION ${DATADIR}/languages)
 install (FILES ${PROFILEFILES} DESTINATION ${DATADIR}/profiles)
 install (FILES ${SOUNDFILES} DESTINATION ${DATADIR}/sounds)
 install (FILES ${INPUTICCFILES} DESTINATION ${DATADIR}/iccprofiles/input)
 install (FILES ${OUTPUTICCFILES} DESTINATION ${DATADIR}/iccprofiles/output)
 install (DIRECTORY ${THEMEDIR} DESTINATION ${DATADIR})
 install (DIRECTORY ${IMAGESDIR} DESTINATION ${DATADIR} FILES_MATCHING PATTERN "index.theme")
 install (DIRECTORY ${IMAGESDIR} DESTINATION ${DATADIR} FILES_MATCHING PATTERN "*.png")
 install (FILES ${OPTIONSFILE} DESTINATION ${DATADIR} PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME options)
--- a/rtdata/iccprofiles/input/Canon
+++ b/rtdata/iccprofiles/input/Canon
--- a/rtdata/iccprofiles/input/Canon
+++ b/rtdata/iccprofiles/input/Canon
--- a/rtdata/iccprofiles/input/Canon
+++ b/rtdata/iccprofiles/input/Canon
--- a/rtdata/iccprofiles/input/Canon
+++ b/rtdata/iccprofiles/input/Canon
--- a/rtdata/iccprofiles/input/Canon
+++ b/rtdata/iccprofiles/input/Canon
--- a/rtdata/iccprofiles/input/Canon
+++ b/rtdata/iccprofiles/input/Canon
--- a/rtdata/iccprofiles/input/Nikon
+++ b/rtdata/iccprofiles/input/Nikon
--- a/rtdata/iccprofiles/input/Nikon
+++ b/rtdata/iccprofiles/input/Nikon
--- a/rtdata/iccprofiles/input/Nikon
+++ b/rtdata/iccprofiles/input/Nikon
--- a/rtdata/iccprofiles/input/Nikon
+++ b/rtdata/iccprofiles/input/Nikon
--- a/rtdata/iccprofiles/input/Olympus
+++ b/rtdata/iccprofiles/input/Olympus
--- a/rtdata/iccprofiles/input/Panasonic
+++ b/rtdata/iccprofiles/input/Panasonic
--- a/rtdata/iccprofiles/input/Panasonic
+++ b/rtdata/iccprofiles/input/Panasonic
--- a/rtdata/iccprofiles/input/Panasonic
+++ b/rtdata/iccprofiles/input/Panasonic
--- a/rtdata/iccprofiles/input/Panasonic
+++ b/rtdata/iccprofiles/input/Panasonic
--- a/rtdata/iccprofiles/input/Panasonic
+++ b/rtdata/iccprofiles/input/Panasonic
--- a/rtdata/iccprofiles/input/Panasonic
+++ b/rtdata/iccprofiles/input/Panasonic
--- a/rtdata/iccprofiles/input/Panasonic
+++ b/rtdata/iccprofiles/input/Panasonic
--- a/rtdata/iccprofiles/input/Pentax
+++ b/rtdata/iccprofiles/input/Pentax
--- a/rtdata/iccprofiles/input/Sony
+++ b/rtdata/iccprofiles/input/Sony
--- a/rtdata/iccprofiles/output/RT_Large_g10.icc
+++ b/rtdata/iccprofiles/output/RT_Large_g10.icc
--- a/rtdata/iccprofiles/output/RT_Large_gBT709.icc
+++ b/rtdata/iccprofiles/output/RT_Large_gBT709.icc
--- a/rtdata/iccprofiles/output/RT_Large_gsRGB.icc
+++ b/rtdata/iccprofiles/output/RT_Large_gsRGB.icc
--- a/rtdata/iccprofiles/output/RT_Middle_gsRGB.icc
+++ b/rtdata/iccprofiles/output/RT_Middle_gsRGB.icc
--- a/rtdata/iccprofiles/output/RT_sRGB.icm
+++ b/rtdata/iccprofiles/output/RT_sRGB.icm
--- a/rtdata/iccprofiles/output/RT_sRGB_g10.icm
+++ b/rtdata/iccprofiles/output/RT_sRGB_g10.icm
--- a/rtdata/iccprofiles/output/RT_sRGB_gBT709.icm
+++ b/rtdata/iccprofiles/output/RT_sRGB_gBT709.icm
--- a/rtdata/icons/hi128-app-rawtherapee.png
+++ b/rtdata/icons/hi128-app-rawtherapee.png
--- a/rtdata/icons/hi16-app-rawtherapee.png
+++ b/rtdata/icons/hi16-app-rawtherapee.png
--- a/rtdata/icons/hi24-app-rawtherapee.png
+++ b/rtdata/icons/hi24-app-rawtherapee.png
--- a/rtdata/icons/hi256-app-rawtherapee.png
+++ b/rtdata/icons/hi256-app-rawtherapee.png
--- a/rtdata/icons/hi32-app-rawtherapee.png
+++ b/rtdata/icons/hi32-app-rawtherapee.png
--- a/rtdata/icons/hi48-app-rawtherapee.png
+++ b/rtdata/icons/hi48-app-rawtherapee.png
--- a/rtdata/icons/rawtherapee.desktop.in
+++ b/rtdata/icons/rawtherapee.desktop.in
@ -0,0 +1,16 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
 Name=RawTherapee
 GenericName=RAW image editor
 GenericName[cs]=Editor RAW obrázků
 GenericName[fr]=Éditeur d'images RAW
 Comment=The RAW converter and digital photo processing software. 
 Comment[cs]=Program pro konverzi a zpracování digitálních RAW fotografií.
 Comment[fr]=Logiciel de conversion et de traitement de photos numériques de format RAW (but de capteur).
 Exec=${BINDIR}/rawtherapee
 Icon=rawtherapee.png
 Terminal=false
 Categories=Graphics;Photography;GTK;
 MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-crw;image/x-canon-cr2;image/x-fuji-raf;image/x-kodak-dcr;image/x-kodak-kdc;image/x-kodak-k25;image/x-minolta-mrw;image/x-nikon-nef;image/x-olympus-orf;image/x-panasonic-raw;image/x-pentax-pef;image/x-sony-arw;image/x-sony-srf;image/x-sony-sr2;
--- a/rtdata/images/Chanmixer-BB.png
+++ b/rtdata/images/Chanmixer-BB.png
--- a/rtdata/images/Chanmixer-BG.png
+++ b/rtdata/images/Chanmixer-BG.png
--- a/rtdata/images/Chanmixer-BR.png
+++ b/rtdata/images/Chanmixer-BR.png
--- a/rtdata/images/Chanmixer-GB.png
+++ b/rtdata/images/Chanmixer-GB.png
--- a/rtdata/images/Chanmixer-GG.png
+++ b/rtdata/images/Chanmixer-GG.png
--- a/rtdata/images/Chanmixer-GR.png
+++ b/rtdata/images/Chanmixer-GR.png
--- a/rtdata/images/Chanmixer-RB.png
+++ b/rtdata/images/Chanmixer-RB.png
--- a/rtdata/images/Chanmixer-RG.png
+++ b/rtdata/images/Chanmixer-RG.png
--- a/rtdata/images/Chanmixer-RR.png
+++ b/rtdata/images/Chanmixer-RR.png
--- a/rtdata/images/Dark/.gtk-undo-ltr-small.png
+++ b/rtdata/images/Dark/.gtk-undo-ltr-small.png
--- a/rtdata/images/Dark/.gtk-undo-ltr.png
+++ b/rtdata/images/Dark/.gtk-undo-ltr.png
--- a/rtdata/images/Dark/.gtk-undo-rtl-small.png
+++ b/rtdata/images/Dark/.gtk-undo-rtl-small.png
--- a/rtdata/images/Dark/.gtk-undo-rtl.png
+++ b/rtdata/images/Dark/.gtk-undo-rtl.png
--- a/rtdata/images/Dark/actions/PanelEnding.png
+++ b/rtdata/images/Dark/actions/PanelEnding.png
--- a/rtdata/images/Dark/actions/beforeafter.png
+++ b/rtdata/images/Dark/actions/beforeafter.png
--- a/rtdata/images/Dark/actions/cglabel0.png
+++ b/rtdata/images/Dark/actions/cglabel0.png
--- a/rtdata/images/Dark/actions/cglabel1.png
+++ b/rtdata/images/Dark/actions/cglabel1.png
--- a/rtdata/images/Dark/actions/cglabel2.png
+++ b/rtdata/images/Dark/actions/cglabel2.png
--- a/rtdata/images/Dark/actions/cglabel3.png
+++ b/rtdata/images/Dark/actions/cglabel3.png
--- a/Show More
+++ b/Show More
		`@ -0,0 +1 @@`
							`This folder contains the licenses and supporting documentation for third party components of RawTherapee. Each file name reflects the portion which it is relevent for.`