summaryrefslogtreecommitdiff
path: root/src/lib/image_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-02-17 23:43:23 +0000
committerCarl Hetherington <cth@carlh.net>2015-02-17 23:43:23 +0000
commitbd0ddc4da8fa288130dbadd34f84de0ed3368d01 (patch)
treeb549b01ee6f950f1b8ff0ee944e8fd5e68fdb37f /src/lib/image_content.cc
parentf2416324fdaef8d75678da751446113fbe19de8a (diff)
Hand-apply 71a4c0f5440688a38a2bb34170a3ccf9b1ea598f from 1.x;
correctly sort image sequences.
Diffstat (limited to 'src/lib/image_content.cc')
-rw-r--r--src/lib/image_content.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index eb8b35210..a9cb148c2 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -29,6 +29,8 @@
#include "i18n.h"
+#include "image_filename_sorter.cc"
+
using std::string;
using std::cout;
using boost::shared_ptr;
@@ -57,7 +59,7 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
throw FileError (_("No valid image files were found in the folder."), p);
}
- sort (_paths.begin(), _paths.end());
+ sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
}
if (have_j2k) {