History

Add casts to avoid warnings about comparison between signed and unsigned

Martin Storsjö committed 12 years ago

Commit 57aae731 parent 94a1d442 files · +13 −13Browse files

Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 2 files). Show all

Unified · Split

test/encoder/EncUT_EncoderExt.cpp+11−11
@@ -681,12 +681,12 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 680 unmodified lines
681681 SEncoderStatistics sEncoderStatistics;
682682 iResult = pPtrEnc->GetOption (ENCODER_OPTION_GET_STATISTICS, &sEncoderStatistics);
683683 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
684− EXPECT_EQ (sEncoderStatistics.uiInputFrameCount, 2);
685− EXPECT_EQ (sEncoderStatistics.uIDRSentNum, 1);
686− EXPECT_EQ (sEncoderStatistics.uiResolutionChangeTimes, 0);
684+ EXPECT_EQ (sEncoderStatistics.uiInputFrameCount, static_cast<unsigned int> (2));
685+ EXPECT_EQ (sEncoderStatistics.uIDRSentNum, static_cast<unsigned int> (1));
686+ EXPECT_EQ (sEncoderStatistics.uiResolutionChangeTimes, static_cast<unsigned int> (0));
687687
688− EXPECT_EQ (sEncoderStatistics.uWidth, sEncParamBase.iPicWidth);
689− EXPECT_EQ (sEncoderStatistics.uHeight, sEncParamBase.iPicHeight);
688+ EXPECT_EQ (sEncoderStatistics.uWidth, static_cast<unsigned int> (sEncParamBase.iPicWidth));
689+ EXPECT_EQ (sEncoderStatistics.uHeight, static_cast<unsigned int> (sEncParamBase.iPicHeight));
690690
691691 // try param change
692692 // 1, get the existing
@@ -711,12 +711,12 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 18 unmodified lines
711711 iResult = pPtrEnc->GetOption (ENCODER_OPTION_GET_STATISTICS, &sEncoderStatistics);
712712 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
713713
714− EXPECT_EQ (sEncoderStatistics.uiInputFrameCount, 3);
715− EXPECT_EQ (sEncoderStatistics.uIDRSentNum, 2);
716− EXPECT_EQ (sEncoderStatistics.uiResolutionChangeTimes, knownResolutionChangeTimes);
714+ EXPECT_EQ (sEncoderStatistics.uiInputFrameCount, static_cast<unsigned int> (3));
715+ EXPECT_EQ (sEncoderStatistics.uIDRSentNum, static_cast<unsigned int> (2));
716+ EXPECT_EQ (sEncoderStatistics.uiResolutionChangeTimes, static_cast<unsigned int> (knownResolutionChangeTimes));
717717
718− EXPECT_EQ (sEncoderStatistics.uWidth, sEncParamBase.iPicWidth);
719− EXPECT_EQ (sEncoderStatistics.uHeight, sEncParamBase.iPicHeight);
718+ EXPECT_EQ (sEncoderStatistics.uWidth, static_cast<unsigned int> (sEncParamBase.iPicWidth));
719+ EXPECT_EQ (sEncoderStatistics.uHeight, static_cast<unsigned int> (sEncParamBase.iPicHeight));
720720
721721 // 4, change log interval
722722 int32_t iInterval = 0;
@@ -740,4 +740,4 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 17 unmodified lines
740740
741741 // finish
742742 pPtrEnc->Uninitialize();
743−}
743+}

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