From e6697b19235540dd619dcbf948d9f13239661585 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 31 Mar 2012 00:28:55 +0000 Subject: [PATCH] Fix fallbacks for invalid characters when converting charsets r6632 made ConverterImpl have a vtable, which makes the iconv_fallbacks parent no longer the first thing in the object, so add an explicit cast. Originally committed to SVN as r6639. --- aegisub/libaegisub/common/charset_conv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aegisub/libaegisub/common/charset_conv.cpp b/aegisub/libaegisub/common/charset_conv.cpp index 50dff070b..566312c3d 100644 --- a/aegisub/libaegisub/common/charset_conv.cpp +++ b/aegisub/libaegisub/common/charset_conv.cpp @@ -241,7 +241,7 @@ namespace { int transliterate = 1; iconvctl(cd, ICONV_SET_TRANSLITERATE, &transliterate); - iconvctl(cd, ICONV_SET_FALLBACKS, this); + iconvctl(cd, ICONV_SET_FALLBACKS, static_cast(this)); } } ~ConverterImpl() {