From 1350cfb3b6f3b826d83e404309edb4003b4f46c3 Mon Sep 17 00:00:00 2001 From: Alexandra Latysheva Date: Mon, 19 Oct 2020 10:40:19 +0000 Subject: [PATCH] bool status -> bool status_ok (tests:raw_decode) --- oss-internship-2020/libtiff/test/raw_decode.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/oss-internship-2020/libtiff/test/raw_decode.cc b/oss-internship-2020/libtiff/test/raw_decode.cc index 740e1e9..d5cb1c2 100644 --- a/oss-internship-2020/libtiff/test/raw_decode.cc +++ b/oss-internship-2020/libtiff/test/raw_decode.cc @@ -138,8 +138,8 @@ bool CheckRgbaPixel(uint32_t pixel, const ChannelLimits& limits, TEST(SandboxTest, RawDecode) { tsize_t sz; - bool pixel_status = false; - bool cluster_status = false; + bool pixel_status_ok = false; + bool cluster_status_ok = false; std::string srcfile = GetFilePath("quad-tile.jpg.tiff"); TiffSapiSandbox sandbox(srcfile); @@ -187,9 +187,9 @@ TEST(SandboxTest, RawDecode) { << (int)status_or_long.value() << " instead of " << (int)sz << ")"; for (const auto& [id, data] : kClusters) { - cluster_status |= CheckCluster(id, buffer_, data); + cluster_status_ok |= CheckCluster(id, buffer_, data); } - ASSERT_FALSE(cluster_status) << "Clusters did not match expected results"; + ASSERT_FALSE(cluster_status_ok) << "Clusters did not match expected results"; status_or_int = api.TIFFSetFieldU1(&tif, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB); @@ -213,7 +213,7 @@ TEST(SandboxTest, RawDecode) { << status_or_long.value() << " instead of " << sz; for (const auto& [id, data] : kLimits) { - pixel_status |= CheckRgbPixel(id, data, buffer2_); + pixel_status_ok |= CheckRgbPixel(id, data, buffer2_); } ASSERT_THAT(api.TIFFClose(&tif), IsOk()) << "TIFFClose fatal error"; @@ -234,11 +234,11 @@ TEST(SandboxTest, RawDecode) { << "TIFFReadRGBATile() returned failure code"; for (const auto& [id, data] : kLimits) { - pixel_status |= CheckRgbaPixel(id, data, rgba_buffer_); + pixel_status_ok |= CheckRgbaPixel(id, data, rgba_buffer_); } EXPECT_THAT(api.TIFFClose(&tif2), IsOk()) << "TIFFClose fatal error"; - EXPECT_THAT(pixel_status, IsFalse()) << "wrong encoding"; + EXPECT_THAT(pixel_status_ok, IsFalse()) << "wrong encoding"; } } // namespace