X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=c65b2bc850fcac89c49195d55fcb901ab9216572;hb=9bfa07293928c371d59db2091ba2b7e715ce5994;hp=2a14f00c78aada548ac010dfb21a9197926de5e1;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 2a14f00c7..c65b2bc85 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -22,6 +22,8 @@
  *  @brief Some utility functions and classes.
  */
 
+#define UNICODE 1
+
 #include "util.h"
 #include "exceptions.h"
 #include "dcp_content_type.h"
@@ -54,14 +56,19 @@
 #include <dcp/sound_asset.h>
 #include <dcp/subtitle_asset.h>
 #include <dcp/atmos_asset.h>
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/avfilter.h>
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 #include <curl/curl.h>
 #include <glib.h>
 #include <pangomm/init.h>
+#include <unicode/utypes.h>
+#include <unicode/unistr.h>
+#include <unicode/translit.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/algorithm/replace_if.hpp>
 #include <boost/thread.hpp>
@@ -362,10 +369,12 @@ dcpomatic_setup ()
 	SetUnhandledExceptionFilter(exception_handler);
 #endif
 
+#ifdef DCPOMATIC_HAVE_AVREGISTER
 DCPOMATIC_DISABLE_WARNINGS
 	av_register_all ();
 	avfilter_register_all ();
 DCPOMATIC_ENABLE_WARNINGS
+#endif
 
 #ifdef DCPOMATIC_OSX
 	/* Add our library directory to the libltdl search path so that
@@ -592,7 +601,7 @@ short_audio_channel_name (int c)
 		_("BsR"),
 		_("DBP"),
 		_("DBS"),
-		"",
+		_("Sign"),
 		""
 	};
 
@@ -613,7 +622,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"
 		);
 }
 
@@ -771,28 +780,20 @@ careful_string_filter (string s)
 	   Safety first and all that.
 	*/
 
-	wstring ws = boost::locale::conv::utf_to_utf<wchar_t>(s);
+	/* First transliterate using libicu to try to remove accents in a "nice" way */
+	auto icu_utf16 = icu::UnicodeString::fromUTF8(icu::StringPiece(s));
+	auto status = U_ZERO_ERROR;
+	auto transliterator = icu::Transliterator::createInstance("NFD; [:M:] Remove; NFC", UTRANS_FORWARD, status);
+	transliterator->transliterate(icu_utf16);
+	s.clear ();
+	icu_utf16.toUTF8String(s);
 
+	/* Then remove anything that's not in a very limited character set */
+	wstring ws = boost::locale::conv::utf_to_utf<wchar_t>(s);
 	string out;
 	string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.+";
 	for (size_t i = 0; i < ws.size(); ++i) {
-
 		wchar_t c = ws[i];
-
-		/* Remove some accents */
-		if (wstring(L"áàâ").find(c) != string::npos) {
-			c = 'a';
-		}
-		if (wstring(L"éèêë").find(c) != string::npos) {
-			c = 'e';
-		}
-		if (wstring(L"ö").find(c) != string::npos) {
-			c = 'o';
-		}
-		if (wstring(L"ü").find(c) != string::npos) {
-			c = 'u';
-		}
-
 		if (allowed.find(c) != string::npos) {
 			out += c;
 		}
@@ -954,8 +955,8 @@ void
 emit_subtitle_image (ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, shared_ptr<TextDecoder> decoder)
 {
 	/* XXX: this is rather inefficient; decoding the image just to get its size */
-	FFmpegImageProxy proxy (sub.png_image(), VideoRange::FULL);
-	auto image = proxy.image().image;
+	FFmpegImageProxy proxy (sub.png_image());
+	auto image = proxy.image(false).image;
 	/* set up rect with height and width */
 	dcpomatic::Rect<double> rect(0, 0, image->size().width / double(size.width), image->size().height / double(size.height));
 
@@ -1045,7 +1046,7 @@ show_jobs_on_console (bool progress)
 
 /** XXX: could use mmap? */
 void
-copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, boost::function<void (float)> progress)
+copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, std::function<void (float)> progress)
 {
 	auto f = fopen_boost (from, "rb");
 	if (!f) {
@@ -1172,3 +1173,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
+