History

Add casts when converting from size_t or std::streamsize to int

Martin Storsjö committed 11 years ago

Commit 96384bd1 parent af938a63 files · +5 −5Browse files

Showing the changes to test/api/encode_decode_api_test.cpp (1 of 3 files). Show all

Unified · Split

test/api/encode_decode_api_test.cpp+3−3
@@ -726,7 +726,7 @@ void ExtractDidNal (SFrameBSInfo* pBsInfo, int& iSrcLen, std::vector<SLostSim>* · 725 unmodified lines
726int SimulateNALLoss (const unsigned char* pSrc, int& iSrcLen, std::vector<SLostSim>* p_SLostSim,726int SimulateNALLoss (const unsigned char* pSrc, int& iSrcLen, std::vector<SLostSim>* p_SLostSim,
727 const char* pLossChars, bool bLossPara, int& iLossIdx, bool& bVCLLoss) {727 const char* pLossChars, bool bLossPara, int& iLossIdx, bool& bVCLLoss) {
728 unsigned char* pDst = new unsigned char[iSrcLen];728 unsigned char* pDst = new unsigned char[iSrcLen];
729 int iLossCharLen = strlen (pLossChars);729 int iLossCharLen = (int) strlen (pLossChars);
730 int iSkipedBytes = 0;730 int iSkipedBytes = 0;
731 int iDstLen = 0;731 int iDstLen = 0;
732 int iBufPos = 0;732 int iBufPos = 0;
@@ -2400,10 +2400,10 @@ class DecodeParseAPI : public EncodeDecodeTestBase { · 1667 unmodified lines
2400 2400
2401 void EncodeOneFrame (int iIdx) {2401 void EncodeOneFrame (int iIdx) {
2402 int iFrameSize = iWidth_ * iHeight_ * 3 / 2;2402 int iFrameSize = iWidth_ * iHeight_ * 3 / 2;
2403 int iSize = fread (buf_.data(), sizeof (char), iFrameSize, fYuv_);2403 int iSize = (int) fread (buf_.data(), sizeof (char), iFrameSize, fYuv_);
2404 if (feof (fYuv_) || iSize != iFrameSize) {2404 if (feof (fYuv_) || iSize != iFrameSize) {
2405 rewind (fYuv_);2405 rewind (fYuv_);
2406 iSize = fread (buf_.data(), sizeof (char), iFrameSize, fYuv_);2406 iSize = (int) fread (buf_.data(), sizeof (char), iFrameSize, fYuv_);
2407 ASSERT_TRUE (iSize == iFrameSize);2407 ASSERT_TRUE (iSize == iFrameSize);
2408 }2408 }
2409 int rv = encoder_->EncodeFrame (&EncPic, &info);2409 int rv = encoder_->EncodeFrame (&EncPic, &info);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t