#include <boost/next_prior.hpp>
-#include <cmath>
-
using namespace std;
using namespace lyx::support;
static bool equal(DocIterator & o, DocIterator & n) {
+ // Explicitly check for this, so we won't call
+ // Paragraph::getChar for the last pos.
+ bool const o_lastpos = o.pos() == o.lastpos();
+ bool const n_lastpos = n.pos() == n.lastpos();
+ if (o_lastpos || n_lastpos)
+ return o_lastpos && n_lastpos;
+
Paragraph const & old_par = o.text()->getPar(o.pit());
Paragraph const & new_par = n.text()->getPar(n.pit());
ors.reset(DocIterator());
nrs.reset(DocIterator());
+ // In the formula below, the "+ 1" ensures we round like ceil()
+ int const D_max = (M_ + N_ + 1)/2;
// D is the number of horizontal and vertical steps, i.e.
// different characters in the old and new chunk.
- int const D_max = ceil(((double)M_ + N_)/2);
for (int D = 0; D <= D_max; ++D) {
// to be used in the status messages
D_ = D;
return 2 * D - odd_offset_;
}
}
+ if (abort_)
+ return 0;
}
}
}
void Compare::Impl::diff_i(DocRangePair const & rp)
{
+ if (abort_)
+ return;
+
// The middle snake
DocPair middle_snake;