Recognise JP2 files.

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 656cf9f4d16613ce7547634f7a15e177cef39059..7d2ae2216735081b2be7f7807a2af5dfa4496e74 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -522,7 +522,7 @@ valid_image_file (boost::filesystem::path f)
        return (
                ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" ||
                ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx" ||
-               ext == ".j2c" || ext == ".j2k"
+               ext == ".j2c" || ext == ".j2k" || ext == ".jp2"
                );
 }
 
@@ -531,7 +531,7 @@ valid_j2k_file (boost::filesystem::path f)
 {
        string ext = f.extension().string();
        transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
-       return (ext == ".j2k" || ext == ".j2c");
+       return (ext == ".j2k" || ext == ".j2c" || ext == ".jp2");
 }
 
 string