summaryrefslogtreecommitdiff
path: root/src/lib/decoder_factory.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-24 22:13:53 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-24 22:13:53 +0100
commit63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 (patch)
treed248762556466fd076cfd20f2e6aa1d5d9544184 /src/lib/decoder_factory.cc
parent977b36672892b14de4ecb68e98415c64946e8a93 (diff)
Use boost::signals2; fix bugs with x-thread signalling.
Diffstat (limited to 'src/lib/decoder_factory.cc')
-rw-r--r--src/lib/decoder_factory.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 56fb56296..06377e26c 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -27,15 +27,15 @@
#include "imagemagick_decoder.h"
#include "film.h"
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
shared_ptr<Decoder>
decoder_factory (
shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal = false, bool ignore_length = false
)
{
- if (filesystem::is_directory (f->content_path ())) {
+ if (boost::filesystem::is_directory (f->content_path ())) {
/* Assume a directory contains TIFFs */
return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal, ignore_length));
}