mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix check for 'start after' and 'end after' keyframe snapping in the TPP

Browse source 
Originally committed to SVN as r6349.
This commit is contained in:
Thomas Goyne 2012-01-24 01:28:26 +00:00
parent df9f46b49c
commit 1c14740d51
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aegisub/src/dialog_timing_processor.cpp
View file

@ -323,11 +323,11 @@ std::vector<AssDialogue*> DialogTimingProcessor::SortDialogues() {
} }
static int get_closest_kf(std::vector<int> const& kf, int frame) { static int get_closest_kf(std::vector<int> const& kf, int frame) {
std::vector<int>::const_iterator pos = lower_bound(kf.begin(), kf.end(), frame); std::vector<int>::const_iterator pos = upper_bound(kf.begin(), kf.end(), frame);
// Return last keyframe if this is on or after the last one // Return last keyframe if this is after the last one
if (distance(pos, kf.end()) < 2) return kf.back(); if (pos == kf.end()) return kf.back();
// Check if this one or the one after is closer to the frame // *pos is greater than frame, and *(pos - 1) is less than or equal to frame
return frame - *pos < *(pos + 1) - frame ? *pos : *(pos + 1); return (pos == kf.begin() || *pos - frame < frame - *(pos - 1)) ? *pos : *(pos - 1);
} }
template<class Iter, class Field> template<class Iter, class Field>