Remove use of boost::noncopyable.

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 2c01678296f489c8038c39160f83ebba6dfc7baf..8a039764d0a77f4bec576e579b4b801c2f211ba3 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -616,7 +616,7 @@ valid_image_file (boost::filesystem::path f)
                ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" ||
                ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx" ||
                ext == ".j2c" || ext == ".j2k" || ext == ".jp2" || ext == ".exr" ||
-               ext == ".jpf"
+               ext == ".jpf" || ext == ".psd"
                );
 }
 
@@ -1167,3 +1167,30 @@ default_font_file ()
 
        return liberation_normal;
 }
+
+
+string
+to_upper (string s)
+{
+       transform (s.begin(), s.end(), s.begin(), ::toupper);
+       return s;
+}
+
+
+/* Set to 1 to print the IDs of some of our threads to stdout on creation */
+#define DCPOMATIC_DEBUG_THREADS 0
+
+#if DCPOMATIC_DEBUG_THREADS
+void
+start_of_thread (string name)
+{
+       std::cout << "THREAD:" << name << ":" << std::hex << pthread_self() << "\n";
+}
+#else
+void
+start_of_thread (string)
+{
+
+}
+#endif
+