diff --git a/rtengine/colortemp.h b/rtengine/colortemp.h index d96e6f5ce..145c8ed20 100644 --- a/rtengine/colortemp.h +++ b/rtengine/colortemp.h @@ -21,6 +21,7 @@ #include #include +#include namespace rtengine { diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc index 7a31ae39f..c9fb1baa3 100644 --- a/rtgui/colorappearance.cc +++ b/rtgui/colorappearance.cc @@ -21,7 +21,7 @@ #include "guiutils.h" #include "../rtengine/color.h" -#define MINTEMP0 1500 //1200 +#define MINTEMP0 2000 //1200 #define MAXTEMP0 12000 //12000 #define CENTERTEMP0 5000 #define MINGREEN0 0.8 diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc index da2659a4f..cd054e7ab 100644 --- a/rtgui/exifpanel.cc +++ b/rtgui/exifpanel.cc @@ -47,7 +47,7 @@ ExifPanel::ExifPanel () : idata (nullptr) exifTree->set_model (exifTreeModel); exifTree->set_grid_lines (Gtk::TREE_VIEW_GRID_LINES_NONE); exifTree->set_row_separator_func ( - [&] (const Glib::RefPtr& model, const Gtk::TreeModel::iterator & row) { + [&] (const Glib::RefPtr& model, const Gtk::TreeModel::iterator & row)-> bool { return row->get_value (exifColumns.isSeparator); } ); diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh index 8b9cbccb6..20a140ce5 100644 --- a/tools/osx/macosx_bundle.sh +++ b/tools/osx/macosx_bundle.sh @@ -156,7 +156,13 @@ ditto {"${GTK_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme # Copy the Lensfun database into the app bundle mkdir -p "${RESOURCES}/share/lensfun" -cp /opt/local/share/lensfun/version_1/* "${RESOURCES}/share/lensfun" +cp /opt/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun" + +# Copy liblensfun to Frameworks +cp /opt/local/lib/liblensfun.1.dylib "${RESOURCES}/../Frameworks" + +# Copy libiomp5 to Frameworks +cp /opt/local/lib/libomp/libiomp5.dylib "${RESOURCES}/../Frameworks" # Copy the libiomp5 license into the app bundle cp "${PROJECT_SOURCE_DIR}/licenses/osx_libiomp5_LICENSE.txt" "${RESOURCES}"