Merge "resize_test: fix implicit float->int conversion"

This commit is contained in:
James Zern
2016-07-23 01:17:49 +00:00
committed by Gerrit Code Review

View File

@@ -369,7 +369,7 @@ class ResizeInternalTest : public ResizeTest {
}
virtual void PSNRPktHook(const vpx_codec_cx_pkt_t *pkt) {
if (!frame0_psnr_)
if (frame0_psnr_ == 0.)
frame0_psnr_ = pkt->data.psnr.psnr[0];
EXPECT_NEAR(pkt->data.psnr.psnr[0], frame0_psnr_, 2.0);
}
@@ -671,7 +671,7 @@ class ResizeCspTest : public ResizeTest {
}
virtual void PSNRPktHook(const vpx_codec_cx_pkt_t *pkt) {
if (!frame0_psnr_)
if (frame0_psnr_ == 0.)
frame0_psnr_ = pkt->data.psnr.psnr[0];
EXPECT_NEAR(pkt->data.psnr.psnr[0], frame0_psnr_, 2.0);
}