summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-02-19 00:17:34 +0000
committerCarl Hetherington <cth@carlh.net>2015-02-19 00:17:34 +0000
commit688fa9d705a6b23f216f380ac701c6a60e934f70 (patch)
tree2d4be6b4b5a09bffaef43651f97c57951662b0e5 /src/lib
parentc6476088a34079cc2786253d60db56b0dbd74011 (diff)
Split up Timeline view classes.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/image_filename_sorter.cc2
-rw-r--r--src/lib/rect.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/image_filename_sorter.cc b/src/lib/image_filename_sorter.cc
index 251124758..7bb1b4c37 100644
--- a/src/lib/image_filename_sorter.cc
+++ b/src/lib/image_filename_sorter.cc
@@ -57,6 +57,6 @@ private:
return boost::optional<int> ();
}
- return libdcp::raw_convert<int> (number);
+ return dcp::raw_convert<int> (number);
}
};
diff --git a/src/lib/rect.h b/src/lib/rect.h
index 1feb8ad4f..963119b50 100644
--- a/src/lib/rect.h
+++ b/src/lib/rect.h
@@ -21,6 +21,7 @@
#define DCPOMATIC_RECT_H
#include "position.h"
+#include <algorithm>
/* Put this inside a namespace as Apple put a Rect in the global namespace */