Add .dpx to the list of acceptable image files.

diff --git a/ChangeLog b/ChangeLog
index 4911adf1bd9a534212711ba1b0f565c19df5d348..9be6bc56ff1cf911f1e673f1b5e816a4bfde537b 100644 (file)
--- 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 7a19790eb4ec261d1131ebd5e015565324f562a6..f15d2283c4cfb2d1bbb1066d582a38c36b2a5511 100644 (file)
--- 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