Merge branch 'stable'

Bumped version to 0.2.5

CHANGELOG

@@ -1,3 +1,20 @@
+=========================================
+Version 0.2.5
+
+* New features:
+
+- [freehand drawing] Added brush feathering and improved painting performances.
+  Added Ctrl+Alt+left_click mouse combination to continue last stroke.
+- Implemented first version of spline path mask tool.
+- [HSL mask] Added mask inversion.
+- [lens correction] Bundled LensFun version 0.3.2. This fixes a crash of the lensfun module under Ubuntu.
+
+* Bug fixes
+
+- [clone stamp] Fixed bug in region selection affecting strokes after the first one
+- Fixed compilation issues under Fedora 23
+
+
 =========================================
 Version 0.2.4
 

CMakeLists.txt

@@ -1,10 +1,11 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.9)
 
 project(photoflow CXX C)
 
 option(USE_NLS "Build Native Language Support (using gettext)" ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+set(CMAKE_POSITION_INDEPENDENT_CODE True)
 
 find_package(PkgConfig)
 
@@ -31,10 +32,10 @@ pkg_check_modules(GEXIV2 REQUIRED gexiv2)
 MESSAGE( STATUS "GEXIV2_INCLUDE_DIRS:         " ${GEXIV2_INCLUDE_DIRS} )
 MESSAGE( STATUS "GEXIV2_LIBRARY_DIRS:         " ${GEXIV2_LIBRARY_DIRS} )
 
-pkg_check_modules(LENSFUN lensfun)
-MESSAGE( STATUS "LENSFUN_INCLUDE_DIRS:         " ${LENSFUN_INCLUDE_DIRS} )
-MESSAGE( STATUS "LENSFUN_LIBRARY_DIRS:         " ${LENSFUN_LIBRARY_DIRS} )
-MESSAGE( STATUS "LENSFUN_LIBRARIES:         " ${LENSFUN_LIBRARIES})
+#pkg_check_modules(LENSFUN lensfun)
+#MESSAGE( STATUS "LENSFUN_INCLUDE_DIRS:         " ${LENSFUN_INCLUDE_DIRS} )
+#MESSAGE( STATUS "LENSFUN_LIBRARY_DIRS:         " ${LENSFUN_LIBRARY_DIRS} )
+#MESSAGE( STATUS "LENSFUN_LIBRARIES:         " ${LENSFUN_LIBRARIES})
 
 
 IF(NOT MINGW)
@@ -65,6 +66,11 @@ pkg_check_modules(GOBJECT gobject-2.0)
 pkg_check_modules(GLIBMM glibmm-2.4) 
 #pkg_check_modules(GTKMM3 gtkmm-3.0<=3.4.0) 
 
+if (APPLE)
+    find_package (MacIntegration REQUIRED)
+endif (APPLE)
+
+
 if(USE_GTKMM3)
   pkg_check_modules(GTKMM3 REQUIRED gtkmm-3.0) 
 else(USE_GTKMM3)

VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

cmake/modules/FindGLIB2.cmake

@@ -0,0 +1,69 @@
+IF (NOT MSVC)
+    INCLUDE(FindPkgConfig)
+    PKG_SEARCH_MODULE( GLIB2 REQUIRED glib-2.0 )
+    IF(WIN32 AND NOT BUILD_STATIC)
+        FIND_FILE(GLIB2_DLL 
+                NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll
+                PATHS "${GLIB2_LIBRARY_DIRS}/../bin"
+                NO_SYSTEM_ENVIRONMENT_PATH)
+    ENDIF()
+ENDIF()
+
+IF (NOT GLIB2_FOUND OR NOT PKG_CONFIG_FOUND)
+    FIND_PATH(GLIB2_GLIB2CONFIG_INCLUDE_PATH
+        NAMES glibconfig.h
+        PATHS
+          /usr/local/lib
+          /usr/lib
+          /usr/lib64
+          /opt/local/lib
+          ${GLIB2_BASE_DIR}/lib
+          ${CMAKE_LIBRARY_PATH}
+        PATH_SUFFIXES glib-2.0/include
+    )
+
+
+    FIND_PATH(GLIB2_INCLUDE_DIRS
+        NAMES glib.h
+        PATHS
+            /usr/local/include
+            /usr/include
+            /opt/local/include
+            ${GLIB2_BASE_DIR}/include
+        PATH_SUFFIXES gtk-2.0 glib-2.0 glib20 
+    )
+
+    FIND_LIBRARY(GLIB2_LIBRARIES
+        NAMES  glib-2.0 glib20 glib
+        PATHS  
+            /usr/local/lib
+            /usr/lib
+            /usr/lib64
+            /opt/local/lib
+            ${GLIB2_BASE_DIR}/lib
+    )
+
+    IF(GLIB2_GLIB2CONFIG_INCLUDE_PATH AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES)
+        SET( GLIB2_INCLUDE_DIRS  ${GLIB2_GLIB2CONFIG_INCLUDE_PATH} ${GLIB2_INCLUDE_DIRS} )
+        SET( GLIB2_LIBRARIES ${GLIB2_LIBRARIES} )
+        SET( GLIB2_FOUND 1 )
+    ELSE()
+        SET( GLIB2_INCLUDE_DIRS )
+        SET( GLIB2_LIBRARIES )
+        SET( GLIB2_FOUND 0)
+    ENDIF()    
+
+    IF(WIN32 AND NOT BUILD_STATIC)
+        FIND_FILE(GLIB2_DLL 
+                NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll
+                PATHS "${GLIB2_BASE_DIR}/bin"
+                NO_SYSTEM_ENVIRONMENT_PATH)
+    ENDIF()    
+ENDIF ()
+
+#INCLUDE( FindPackageHandleStandardArgs )
+#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_GLIB2CONFIG_INCLUDE_PATH GLIB2_GLIB2_INCLUDE_PATH )
+
+IF (NOT GLIB2_FOUND AND GLIB2_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find glib2")
+ENDIF()

cmake/modules/FindMacIntegration.cmake

@@ -0,0 +1,32 @@
+# - Find the native GtkOSXApplication includes and library
+#
+# This module defines
+#  MACINTEGRATION_INCLUDE_DIR, where to find gtkosxapplication.h, etc.
+#  MACINTEGRATION_LIBRARIES, the libraries to link against to use GtkOSXApplication.
+#  MACINTEGRATION_FOUND, If false, do not try to use GtkOSXApplication.
+# also defined, but not for general use are
+#  MACINTEGRATION_LIBRARY, where to find the GtkOSXApplication library.
+
+
+#=============================================================================
+# Copyright 2010 henrik andersson
+#=============================================================================
+
+SET(MACINTEGRATION_FIND_REQUIRED ${MacIntegration_FIND_REQUIRED})
+
+find_path(MACINTEGRATION_INCLUDE_DIR gtkosxapplication.h PATH_SUFFIXES gtkmacintegration gtkmacintegration-gtk2)
+mark_as_advanced(MACINTEGRATION_INCLUDE_DIR)
+
+set(MACINTEGRATION_NAMES ${MACINTEGRATION_NAMES} gtkmacintegration libgtkmacintegration gtkmacintegration-gtk2 libgtkmacintegration-gtk2)
+find_library(MACINTEGRATION_LIBRARY NAMES ${MACINTEGRATION_NAMES})
+mark_as_advanced(MACINTEGRATION_LIBRARY)
+
+# handle the QUIETLY and REQUIRED arguments and set MACINTEGRATION_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MACINTEGRATION DEFAULT_MSG MACINTEGRATION_LIBRARY MACINTEGRATION_INCLUDE_DIR)
+
+IF(MACINTEGRATION_FOUND)
+  SET(MacIntegration_LIBRARIES ${MACINTEGRATION_LIBRARY})
+  SET(MacIntegration_INCLUDE_DIRS ${MACINTEGRATION_INCLUDE_DIR})
+ENDIF(MACINTEGRATION_FOUND)

src/CMakeLists.txt

@@ -3,6 +3,7 @@ IF(MINGW)
 ELSEIF(APPLE)
    #SET(GMIC_FLAGS "-DPF_DISABLE_GMIC -std=c++11 -Wno-error=c++11-narrowing -Dgmic_build -W  -Dcimg_use_vt100 -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -Dcimg_use_fftw3_singlethread -fpermissive")
    SET(GMIC_FLAGS "-std=c++11 -Wno-error=c++11-narrowing -Dgmic_build -W  -Dcimg_use_vt100 -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -Dcimg_use_fftw3_singlethread -fpermissive")
+   #SET(GMIC_FLAGS "-Wno-error=c++11-narrowing -Dgmic_build -W  -Dcimg_use_vt100 -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -Dcimg_use_fftw3_singlethread -fpermissive")
 ELSE(MINGW)
   SET(GMIC_FLAGS "-std=gnu++11 -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fno-ipa-sra -fpermissive")
 ENDIF(MINGW)
@@ -54,11 +55,11 @@ link_directories(${SIGC2_LIBRARY_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
 
-if(LENSFUN_FOUND)
-  link_directories( ${LENSFUN_LIBRARY_DIRS}  )
-  include_directories( ${LENSFUN_INCLUDE_DIRS}  )  
+#if(LENSFUN_FOUND)
+#  link_directories( ${LENSFUN_LIBRARY_DIRS}  )
+#  include_directories( ${LENSFUN_INCLUDE_DIRS}  )  
   set(CMAKE_CXX_FLAGS "-DPF_HAS_LENSFUN")
-endif()
+#endif()
 
 include_directories(${OPENEXR_INCLUDE_DIRS})
 include_directories(${TIFF_INCLUDE_DIRS})
@@ -96,9 +97,16 @@ link_directories(${PANGOFT2_LIBRARY_DIRS}  )
 include_directories(${VIPS_INCLUDE_DIRS})
 link_directories(${VIPS_LIBRARY_DIRS}  )
 
+if (APPLE)
+	include_directories(${MacIntegration_INCLUDE_DIRS})
+	link_directories(${MacIntegration_LIBRARY_DIRS}  )
+    set (MACINTEG_LIBS ${MacIntegration_LIBRARIES})
+endif (APPLE)
+
+
 
-FILE(GLOB DTIncludes dt/common/*.h)
-FILE(GLOB DTSources dt/common/*.c)
+FILE(GLOB DTIncludes dt/common/*.h dt/develop/*.h)
+FILE(GLOB DTSources dt/common/*.c dt/develop/masks/*.c)
 
 add_library (pfdt STATIC
   ${DTIncludes}
@@ -144,6 +152,15 @@ add_subdirectory(external/LibRaw)
 list(APPEND LIB_DEPS libraw_r)
 list(APPEND STATIC_LIBS libraw_static)
 
+LIST(APPEND CMAKE_MODULE_PATH " ${CMAKE_SOURCE_DIR}/src/external/lensfun/cmake/modules ")
+set(BUILD_STATIC "ON")
+add_library(lensfun_static STATIC IMPORTED)
+set_target_properties(lensfun_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/lensfun/libs/lensfun/liblensfun.a)
+add_subdirectory(external/lensfun)
+list(APPEND LIB_DEPS lensfun)
+list(APPEND STATIC_LIBS lensfun_static)
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
+
 #FILE(GLOB LibRawIncludes external/LibRaw/libraw/*.h)
 #set(LibRawSources external/LibRaw/internal/dcraw_common.cpp external/LibRaw/src/libraw_cxx.cpp external/LibRaw/internal/dcraw_fileio.cpp external/LibRaw/internal/demosaic_packs.cpp external/LibRaw/src/libraw_c_api.cpp external/LibRaw/src/libraw_datastream.cpp)
 
@@ -204,10 +221,11 @@ target_link_libraries(photoflow ${LIBS}
   ${EXIF_LIBRARIES}
   ${EXIV2_LIBRARIES}
   ${GEXIV2_LIBRARIES}
-  ${LENSFUN_LIBRARIES}
+  #${LENSFUN_LIBRARIES}
   ${SIGC2_LIBRARIES}
   ${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES} 
   ${PIXMAN_LIBRARIES} 
+  ${MACINTEG_LIBS}
   ${GTKMM_LIBRARIES} 
   ${GLIBMM_LIBRARIES} 
   ${GLIB_LIBRARIES} 
@@ -240,7 +258,7 @@ target_link_libraries(pfbatch ${LIBS}
   ${EXIF_LIBRARIES}
   ${EXIV2_LIBRARIES}
   ${GEXIV2_LIBRARIES}
-  ${LENSFUN_LIBRARIES}
+  #${LENSFUN_LIBRARIES}
   ${SIGC2_LIBRARIES}
   ${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES} 
   ${GLIBMM_LIBRARIES} 
@@ -268,20 +286,23 @@ INSTALL(DIRECTORY ../help DESTINATION share/photoflow)
 INSTALL(FILES ../src/vips/gmic/gmic/src/gmic_def.gmic DESTINATION share/photoflow)
 
 
+#if(GTKMM3_FOUND)
+
 #add_executable(scrollwin tests/scrollwin.cc)
 
 #target_link_libraries(scrollwin
-#  ${SIGC2_LIBRARIES}
-#  ${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES} 
-#  ${PIXMAN_LIBRARIES} 
+  #${SIGC2_LIBRARIES}
+  #${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES} 
+  #${PIXMAN_LIBRARIES} 
 #  ${GTKMM_LIBRARIES} 
-#  ${GLIBMM_LIBRARIES} 
-#  ${GLIB_LIBRARIES} 
-#  ${GMODULE_LIBRARIES} 
-#  ${GOBJECT_LIBRARIES} 
-#  ${GTHREAD_LIBRARIES} 
+  #${GLIBMM_LIBRARIES} 
+  #${GLIB_LIBRARIES} 
+  #${GMODULE_LIBRARIES} 
+  #${GOBJECT_LIBRARIES} 
+  #${GTHREAD_LIBRARIES} 
 #  )
 
+#endif(GTKMM3_FOUND)
 
 #add_executable(cast tests/cast.c)