summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-04-27 20:56:35 +0100
committerCarl Hetherington <cth@carlh.net>2014-04-27 20:56:35 +0100
commitbecbcedd712a6d53c4c6be56aadf3121b2f16341 (patch)
treebcf06eb98e621678eedb742d6df8642755366ed7
parenta4afc8e3dd6ce7c5f02d0eb69f03bf9f043afed0 (diff)
Add .dpx to the list of acceptable image files.
-rw-r--r--ChangeLog2
-rw-r--r--src/lib/util.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4911adf1b..9be6bc56f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-04-27 Carl Hetherington <cth@carlh.net>
+ * Add .dpx to the list of acceptable image files.
+
* Slightly better handling of uncaught exceptions.
* Use our own directory picker on 14.04 (as well as 13.04 and 13.10) as
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 7a19790eb..f15d2283c 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -876,7 +876,7 @@ valid_image_file (boost::filesystem::path f)
{
string ext = f.extension().string();
transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
- return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga");
+ return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx");
}
string