From 7258a88930092beffa14afeb581a61985c72fd3d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 1 May 2015 13:33:23 +0100 Subject: f45b53e8f5d13f3dd3eecd14bfd44a12fb788d4e from master; ignore ._ files. --- src/lib/image_content.cc | 2 +- src/lib/util.cc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index a9cb148c2..f9a772e00 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -40,7 +40,7 @@ ImageContent::ImageContent (shared_ptr f, boost::filesystem::path p) , VideoContent (f) { bool have_j2k = false; - if (boost::filesystem::is_regular_file (p)) { + if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) { _paths.push_back (p); if (valid_j2k_file (p)) { have_j2k = true; diff --git a/src/lib/util.cc b/src/lib/util.cc index f98e5960b..22baa8fd3 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -509,6 +509,10 @@ audio_channel_name (int c) bool valid_image_file (boost::filesystem::path f) { + if (boost::starts_with (f.string(), "._")) { + return false; + } + string ext = f.extension().string(); transform (ext.begin(), ext.end(), ext.begin(), ::tolower); return ( -- cgit v1.2.3