iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't rely on ADL for std algorithms called on wxArrayInt as wxArrayInt doesn't always inherit from std::vector 

Originally committed to SVN as r5671.
This commit is contained in:
Thomas Goyne 2011-09-29 02:33:22 +00:00
parent 34a7f16214
commit 9ad1434f37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aegisub/src/audio_karaoke.cpp
View File

@ -264,10 +264,10 @@ void AudioKaraoke::SetDisplayText() {
dc.GetPartialTextExtents(spaced_text, p_char_x); dc.GetPartialTextExtents(spaced_text, p_char_x);
// Convert the partial sub to the the width of each character // Convert the partial sub to the the width of each character
adjacent_difference(p_char_x.begin(), p_char_x.end(), p_char_x.begin()); std::adjacent_difference(p_char_x.begin(), p_char_x.end(), p_char_x.begin());
// Get the maximum character width // Get the maximum character width
char_width = *max_element(p_char_x.begin(), p_char_x.end()); char_width = *std::max_element(p_char_x.begin(), p_char_x.end());
// Center each character within the space available to it // Center each character within the space available to it
char_x.resize(p_char_x.size()); char_x.resize(p_char_x.size());