Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonasno <jonasno@users.sourceforge.net>2010-02-21 21:50:41 +0300
committerjonasno <jonasno@users.sourceforge.net>2010-02-21 21:50:41 +0300
commit3244957f4563575d22bf109de27a703558611b19 (patch)
tree749080f5503fe3fd31e28587000b60b90aacf995 /src/subtitles/CCDecoder.cpp
parentc7a41c0086a8bfcd07530779645d98c80039bd84 (diff)
Merged VSFilterMod rev20, only 64 bit code enabled for the time being
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1688 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/subtitles/CCDecoder.cpp')
-rw-r--r--src/subtitles/CCDecoder.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/subtitles/CCDecoder.cpp b/src/subtitles/CCDecoder.cpp
index 8ff68b5d2..47367d62a 100644
--- a/src/subtitles/CCDecoder.cpp
+++ b/src/subtitles/CCDecoder.cpp
@@ -72,11 +72,11 @@ void CCDecoder::SaveDisp(__int64 time)
{
CStringW str;
- for(int row = 0; row < 16; row++)
+ for(ptrdiff_t row = 0; row < 16; row++)
{
bool fNonEmptyRow = false;
- for(int col = 0; col < 32; col++)
+ for(ptrdiff_t col = 0; col < 32; col++)
{
if(m_disp[row][col])
{
@@ -108,7 +108,7 @@ void CCDecoder::DecodeCC(BYTE* buff, int len, __int64 time)
(int)((time/1000)%60),
(int)(time%1000));
- for(int i = 0; i < len; i++)
+ for(ptrdiff_t i = 0; i < len; i++)
{
_ftprintf(f, _T("%02x"), buff[i]);
if(i < len-1) _ftprintf(f, _T(" "));
@@ -119,7 +119,7 @@ void CCDecoder::DecodeCC(BYTE* buff, int len, __int64 time)
}
}
- for(int i = 0; i < len; i++)
+ for(ptrdiff_t i = 0; i < len; i++)
{
BYTE c = buff[i]&0x7f;
if(c >= 0x20)
@@ -327,7 +327,7 @@ void CCDecoder::DecodeCC(BYTE* buff, int len, __int64 time)
void CCDecoder::ExtractCC(BYTE* buff, int len, __int64 time)
{
- for(int i = 0; i < len-9; i++)
+ for(ptrdiff_t i = 0; i < len-9; i++)
{
if(*(DWORD*)&buff[i] == 0xb2010000 && *(DWORD*)&buff[i+4] == 0xf8014343)
{
@@ -344,7 +344,7 @@ void CCDecoder::ExtractCC(BYTE* buff, int len, __int64 time)
{
int nBytes1 = 0, nBytes2 = 0;
- for(int j = 0; j < nBytes && i < 0x800;)
+ for(ptrdiff_t j = 0; j < nBytes && i < 0x800;)
{
if(buff[i++] == 0xff)
{