From 0f6977fa39e34df12ca5b5aa2b17b7506977420d Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 23 Jul 2009 15:37:47 +0000 Subject: [PATCH] Fix a cast issue in GetCacheFilename under wx2.9.. fix by jfs, thanks! Originally committed to SVN as r3221. --- aegisub/src/ffmpegsource_common.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp index 3080e84b9..224287c6e 100644 --- a/aegisub/src/ffmpegsource_common.cpp +++ b/aegisub/src/ffmpegsource_common.cpp @@ -163,10 +163,11 @@ wxString FFmpegSourceProvider::GetCacheFilename(const wxString& filename) wxString toHash = filename + wxString::Format(_T(":%i"),len); // Get the MD5 digest of the string + const wchar_t *tmp = toHash.wc_str(); md5_state_t state; md5_byte_t digest[16]; md5_init(&state); - md5_append(&state,(md5_byte_t*)toHash.wc_str(),toHash.Length()*sizeof(wxChar)); + md5_append(&state,(md5_byte_t*)tmp,toHash.Length()*sizeof(wchar_t)); md5_finish(&state,digest); // Generate the filename @@ -305,4 +306,4 @@ wxThread::ExitCode FFmpegSourceCacheCleaner::Entry() { } -#endif WITH_FFMPEGSOURCE +#endif // WITH_FFMPEGSOURCE