StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

use absl format string

Browse Source
This commit is contained in:
Alexandra Latysheva 2020-10-11 10:53:08 +00:00
parent 60541cc8ea
commit 554c03bec9
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
oss-internship-2020/libtiff/example/main_sandboxed.cc
View File

@ -54,6 +54,21 @@ constexpr std::array<std::pair<uint32_t, ChannelLimits>, kTestCount> kLimits = {
{64, {0, 0, 0, 0, 0, 2, 255, 255}}, {64, {0, 0, 0, 0, 0, 2, 255, 255}},
{512, {5, 6, 34, 36, 182, 196, 255, 255}}}}; {512, {5, 6, 34, 36, 182, 196, 255, 255}}}};
constexpr absl::string_view kClusterErrorFormatStr =
"Cluster %d did not match expected results.\n"
"Expect:\t%3d\t%3d\t%3d\t%3d\t%3d\t%3d\n"
"Got:\t%3d\t%3d\t%3d\t%3d\t%3d\t%3d\n";
constexpr absl::string_view kRgbPixelErrorFormatStr =
"Pixel %d did not match expected results.\n"
"Got R=%d (expected %d..%d), G=%d (expected %d..%d), "
"B=%d (expected %d..%d)\n";
constexpr absl::string_view kRgbaPixelErrorFormatStr =
"Pixel %d did not match expected results.\n"
"Got R=%d (expected %d..%d), G=%d (expected %d..%d), "
"B=%d (expected %d..%d), A=%d (expected %d..%d)\n";
absl::Status CheckCluster(uint32_t cluster, absl::Status CheckCluster(uint32_t cluster,
const sapi::v::Array<uint8_t>& buffer, const sapi::v::Array<uint8_t>& buffer,
const ClusterData& expected_cluster) { const ClusterData& expected_cluster) {
@ -67,12 +82,11 @@ absl::Status CheckCluster(uint32_t cluster,
} }
// the image is split on 6-bit clusters because it has YCbCr color format // the image is split on 6-bit clusters because it has YCbCr color format
return absl::InternalError(absl::StrCat( return absl::InternalError(absl::StrFormat(
"Cluster ", cluster, " did not match expected results.\n", "Expect: ", kClusterErrorFormatStr, cluster, expected_cluster[0], expected_cluster[1],
expected_cluster[0], "\t", expected_cluster[1], "\t", expected_cluster[2], expected_cluster[2], expected_cluster[3], expected_cluster[4],
"\t", expected_cluster[3], "\t", expected_cluster[4], "\t", expected_cluster[5], target[0], target[1], target[2], target[3],
expected_cluster[5], "\n", "Got: ", target[0], "\t", target[1], "\t", target[4], target[5]));
target[2], "\t", target[3], "\t", target[4], "\t", target[5], "\n"));
} }
absl::Status CheckRgbPixel(uint32_t pixel, const ChannelLimits& limits, absl::Status CheckRgbPixel(uint32_t pixel, const ChannelLimits& limits,
@ -88,11 +102,10 @@ absl::Status CheckRgbPixel(uint32_t pixel, const ChannelLimits& limits,
return absl::OkStatus(); return absl::OkStatus();
} }
return absl::InternalError(absl::StrCat( return absl::InternalError(absl::StrFormat(
"Pixel ", pixel, " did not match expected results.\n", "Got R=", rgb[0], kRgbPixelErrorFormatStr, pixel, rgb[0], limits.min_red, limits.max_red,
" (expected ", limits.min_red, "..=", limits.max_red, "), G=", rgb[1], rgb[1], limits.min_green, limits.max_green, rgb[2], limits.min_blue,
" (expected ", limits.min_green, "..=", limits.max_green, "), B=", rgb[2], limits.max_blue));
" (expected ", limits.min_blue, "..=", limits.max_blue, ")\n"));
} }
absl::Status CheckRgbaPixel(uint32_t pixel, const ChannelLimits& limits, absl::Status CheckRgbaPixel(uint32_t pixel, const ChannelLimits& limits,
@ -116,13 +129,11 @@ absl::Status CheckRgbaPixel(uint32_t pixel, const ChannelLimits& limits,
return absl::OkStatus(); return absl::OkStatus();
} }
return absl::InternalError(absl::StrCat( return absl::InternalError(absl::StrFormat(
"Pixel ", pixel, " did not match expected results.\n", "Got R=", kRgbaPixelErrorFormatStr, pixel, TIFFGetR(rgba), limits.min_red,
TIFFGetR(rgba), " (expected ", limits.min_red, "..=", limits.max_red, limits.max_red, TIFFGetG(rgba), limits.min_green, limits.max_green,
"), G=", TIFFGetG(rgba), " (expected ", limits.min_green, TIFFGetB(rgba), limits.min_blue, limits.max_blue, TIFFGetA(rgba),
"..=", limits.max_green, "), B=", TIFFGetB(rgba), " (expected ", limits.min_alpha, limits.max_alpha));
limits.min_blue, "..=", limits.max_blue, "), A=", TIFFGetA(rgba),
" (expected ", limits.min_alpha, "..=", limits.max_alpha, ")\n"));
} }
} // namespace } // namespace