diff options
| author | janwillem32 <janwillem32@users.sourceforge.net> | 2012-06-16 02:05:06 +0400 |
|---|---|---|
| committer | janwillem32 <janwillem32@users.sourceforge.net> | 2012-06-16 02:05:06 +0400 |
| commit | 4e77d4e4e9a302282a385724870db9cd1538a5f9 (patch) | |
| tree | f2bd2a05ea86898b24f84d295712a71320713cb1 /src/filters | |
| parent | a881a35a66f37298c448391d2295ed5f0d62d39b (diff) | |
DSMPropertyBag.h, range_bsearch: extended the valid range to MAXSIZE_T - 1, made the loop work with unsigned values for i, j and mid (partially to avoid a currently present warning) and added the regular declspec and inlining attributes.
The related files were updated to handle the unsigned return values from range_bsearch.
This commit fixes ticket #2381.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5145 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters')
| -rw-r--r-- | src/filters/parser/DSMSplitter/DSMSplitterFile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp index fb47c6139..3a0acf454 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp +++ b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp @@ -309,8 +309,8 @@ __int64 CDSMSplitterFile::Read(__int64 len, CStringW& str) __int64 CDSMSplitterFile::FindSyncPoint(REFERENCE_TIME rt)
{
if (/*!m_sps.IsEmpty()*/ m_sps.GetCount() > 1) {
- ptrdiff_t i = range_bsearch(m_sps, m_rtFirst + rt);
- return i >= 0 ? m_sps[i].fp : 0;
+ size_t i = range_bsearch(m_sps, m_rtFirst + rt);
+ return (i != MAXSIZE_T) ? m_sps[i].fp : 0;
}
if (m_rtDuration <= 0 || rt <= m_rtFirst) {
|