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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Beep6581
2016-02-23 09:26:00 +01:00
parent 34734350be e16a505e04
commit cb916f7c2d
17 changed files with 132 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/opthelper.h
View File

@@ -69,7 +69,7 @@
#define ALIGNED64
#define ALIGNED16
#endif
#ifndef __clang__
#define _RT_NESTED_OPENMP _OPENMP
#if !defined(__clang__) && defined _OPENMP
#define _RT_NESTED_OPENMP
#endif
#endif

2
rtengine/safegtk.cc
View File

@@ -174,7 +174,7 @@ void safe_build_subdir_list (Glib::RefPtr<Gio::File> &dir, std::vector<Glib::ust
return;
}
SAFE_ENUMERATOR_CODE_START("standard::name,standard::type,standard::is_hidden")
SAFE_ENUMERATOR_CODE_START("standard::name,standard::type,standard::is-hidden")
if (info->get_file_type() == Gio::FILE_TYPE_DIRECTORY && (!info->is_hidden() || add_hidden)) {
subDirs.push_back (info->get_name());