diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2011-08-11 00:08:23 +0400 |
|---|---|---|
| committer | Underground78 <underground78@users.sourceforge.net> | 2011-08-11 00:08:23 +0400 |
| commit | 8caf4b5aaf91b5ffabc65d2ac2f000d8603ba233 (patch) | |
| tree | 9abcc8e8d78463d09ff1b69ec0443c71361a55e1 /src/filters/parser/AviSplitter | |
| parent | 3f21c3923cc0793b068cf74094225dabbd5c7dbb (diff) | |
Fix ~130 C4018 warnings (signed/unsigned mismatch).
Patch partially by XhmikosR.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3637 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser/AviSplitter')
| -rw-r--r-- | src/filters/parser/AviSplitter/AviReportWnd.cpp | 4 | ||||
| -rw-r--r-- | src/filters/parser/AviSplitter/AviReportWnd.h | 2 | ||||
| -rw-r--r-- | src/filters/parser/AviSplitter/AviSplitter.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/filters/parser/AviSplitter/AviReportWnd.cpp b/src/filters/parser/AviSplitter/AviReportWnd.cpp index 4007e33cf..77e994c2b 100644 --- a/src/filters/parser/AviSplitter/AviReportWnd.cpp +++ b/src/filters/parser/AviSplitter/AviReportWnd.cpp @@ -255,13 +255,13 @@ bool CAviPlotterWnd::Create(CAviFile* pAF, CRect r, CWnd* pParentWnd) if(nmax > 0 && tmax > 0) {
CAtlArray<CPen> pen;
pen.SetCount(pAF->m_avih.dwStreams);
- for(int i = 0; i < pen.GetCount(); i++) {
+ for(size_t i = 0; i < pen.GetCount(); i++) {
pen[i].CreatePen(PS_SOLID, 2, clr[i]);
}
CAtlArray<CPoint> pp;
pp.SetCount(pAF->m_avih.dwStreams);
- for(int i = 0; i < pen.GetCount(); i++) {
+ for(size_t i = 0; i < pen.GetCount(); i++) {
pp[i].SetPoint(-1, -1);
}
diff --git a/src/filters/parser/AviSplitter/AviReportWnd.h b/src/filters/parser/AviSplitter/AviReportWnd.h index 2f27b2d79..f610e2ad4 100644 --- a/src/filters/parser/AviSplitter/AviReportWnd.h +++ b/src/filters/parser/AviSplitter/AviReportWnd.h @@ -17,7 +17,7 @@ public: bool Create(CAviFile* pAF, CRect r, CWnd* pParentWnd);
int GetChunkDist(int x) {
- return x >= 0 && x < m_chunkdist.GetCount() ? m_chunkdist[x] : 0;
+ return (x >= 0 && (size_t)x < m_chunkdist.GetCount()) ? m_chunkdist[x] : 0;
}
DECLARE_MESSAGE_MAP()
diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp index 2815422fe..1311a7f68 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.cpp +++ b/src/filters/parser/AviSplitter/AviSplitter.cpp @@ -221,7 +221,7 @@ HRESULT CAviSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) if(s->cs.GetCount() && pvih->AvgTimePerFrame > 0) {
__int64 size = 0;
- for(int i = 0; i < s->cs.GetCount(); i++) {
+ for(size_t i = 0; i < s->cs.GetCount(); i++) {
size += s->cs[i].orgsize;
}
pvih->dwBitRate = size*8 / s->cs.GetCount() * 10000000i64 / pvih->AvgTimePerFrame;
@@ -811,7 +811,7 @@ STDMETHODIMP CAviSplitterFilter::GetKeyFrameCount(UINT& nKFs) continue;
}
- for(int j = 0; j < s->cs.GetCount(); j++) {
+ for(size_t j = 0; j < s->cs.GetCount(); j++) {
CAviFile::strm_t::chunk& c = s->cs[j];
if(c.fKeyFrame) {
nKFs++;
@@ -850,7 +850,7 @@ STDMETHODIMP CAviSplitterFilter::GetKeyFrames(const GUID* pFormat, REFERENCE_TIM bool fConvertToRefTime = !!(*pFormat == TIME_FORMAT_MEDIA_TIME);
- for(int j = 0; j < s->cs.GetCount() && nKFsTmp < nKFs; j++) {
+ for(size_t j = 0; j < s->cs.GetCount() && nKFsTmp < nKFs; j++) {
if(s->cs[j].fKeyFrame) {
pKFs[nKFsTmp++] = fConvertToRefTime ? s->GetRefTime(j, s->cs[j].size) : j;
}
|