diff options
Diffstat (limited to 'third_party/jpeg-xl/lib/jxl/modular/transform/transform.h')
| -rw-r--r-- | third_party/jpeg-xl/lib/jxl/modular/transform/transform.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h b/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h index d5d3259f7a..b68861706f 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h +++ b/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h @@ -77,11 +77,13 @@ class Transform : public Fields { Transform() : Transform(TransformId::kInvalid) {} Status VisitFields(Visitor *JXL_RESTRICT visitor) override { - JXL_QUIET_RETURN_IF_ERROR(visitor->U32( - Val((uint32_t)TransformId::kRCT), Val((uint32_t)TransformId::kPalette), - Val((uint32_t)TransformId::kSqueeze), - Val((uint32_t)TransformId::kInvalid), (uint32_t)TransformId::kRCT, - reinterpret_cast<uint32_t *>(&id))); + JXL_QUIET_RETURN_IF_ERROR( + visitor->U32(Val(static_cast<uint32_t>(TransformId::kRCT)), + Val(static_cast<uint32_t>(TransformId::kPalette)), + Val(static_cast<uint32_t>(TransformId::kSqueeze)), + Val(static_cast<uint32_t>(TransformId::kInvalid)), + static_cast<uint32_t>(TransformId::kRCT), + reinterpret_cast<uint32_t *>(&id))); if (id == TransformId::kInvalid) { return JXL_FAILURE("Invalid transform ID"); } @@ -109,7 +111,7 @@ class Transform : public Fields { visitor->U32(Val(0), BitsOffset(8, 1), BitsOffset(10, 257), BitsOffset(16, 1281), 0, &nb_deltas)); JXL_QUIET_RETURN_IF_ERROR( - visitor->Bits(4, (uint32_t)Predictor::Zero, + visitor->Bits(4, static_cast<uint32_t>(Predictor::Zero), reinterpret_cast<uint32_t *>(&predictor))); if (predictor >= Predictor::Best) { return JXL_FAILURE("Invalid predictor"); |