liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with Dev

Browse Source
This commit is contained in:
Desmis 2017-12-14 09:11:35 +01:00
commit ce5f9f1715
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtengine/colortemp.h
View File

@ -21,6 +21,7 @@
#include <cmath> #include <cmath>
#include <map> #include <map>
#include <string>
namespace rtengine namespace rtengine
{ {

2
rtgui/colorappearance.cc
View File

@ -21,7 +21,7 @@
#include "guiutils.h" #include "guiutils.h"
#include "../rtengine/color.h" #include "../rtengine/color.h"
#define MINTEMP0 1500 //1200 #define MINTEMP0 2000 //1200
#define MAXTEMP0 12000 //12000 #define MAXTEMP0 12000 //12000
#define CENTERTEMP0 5000 #define CENTERTEMP0 5000
#define MINGREEN0 0.8 #define MINGREEN0 0.8

2
rtgui/exifpanel.cc
View File

@ -47,7 +47,7 @@ ExifPanel::ExifPanel () : idata (nullptr)
exifTree->set_model (exifTreeModel); exifTree->set_model (exifTreeModel);
exifTree->set_grid_lines (Gtk::TREE_VIEW_GRID_LINES_NONE); exifTree->set_grid_lines (Gtk::TREE_VIEW_GRID_LINES_NONE);
exifTree->set_row_separator_func ( exifTree->set_row_separator_func (
[&] (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator & row) { [&] (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator & row)-> bool {
return row->get_value (exifColumns.isSeparator); return row->get_value (exifColumns.isSeparator);
} }
); );

8
tools/osx/macosx_bundle.sh
View File

@ -156,7 +156,13 @@ ditto {"${GTK_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme
# Copy the Lensfun database into the app bundle # Copy the Lensfun database into the app bundle
mkdir -p "${RESOURCES}/share/lensfun" 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 # Copy the libiomp5 license into the app bundle
cp "${PROJECT_SOURCE_DIR}/licenses/osx_libiomp5_LICENSE.txt" "${RESOURCES}" cp "${PROJECT_SOURCE_DIR}/licenses/osx_libiomp5_LICENSE.txt" "${RESOURCES}"