From 4b61b842b8ede9b9b0f88ed48529931072c2d74d Mon Sep 17 00:00:00 2001 From: ChristianFeldmann Date: Wed, 20 Mar 2024 10:26:17 +0100 Subject: [PATCH] Try ul as literal. On linux uint64_t is ul. --- .../three_dimensional_reference_displays_info.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/YUViewLib/src/parser/HEVC/SEI/three_dimensional_reference_displays_info.cpp b/YUViewLib/src/parser/HEVC/SEI/three_dimensional_reference_displays_info.cpp index 24e24ac74..ea8b3815f 100644 --- a/YUViewLib/src/parser/HEVC/SEI/three_dimensional_reference_displays_info.cpp +++ b/YUViewLib/src/parser/HEVC/SEI/three_dimensional_reference_displays_info.cpp @@ -40,10 +40,10 @@ namespace parser::hevc using namespace reader; SEIParsingResult three_dimensional_reference_displays_info::parse( - reader::SubByteReaderLogging & reader, + reader::SubByteReaderLogging &reader, bool reparse, - VPSMap & vpsMap, - SPSMap & spsMap, + VPSMap &vpsMap, + SPSMap &spsMap, std::shared_ptr associatedSPS) { (void)reparse; @@ -67,8 +67,8 @@ SEIParsingResult three_dimensional_reference_displays_info::parse( const auto refDispWidthBits = this->exponent_ref_display_width.at(i) == 0 - ? std::max(0ull, this->prec_ref_display_width - 30) - : std::max(0ull, + ? std::max(0UL, this->prec_ref_display_width - 30) + : std::max(0UL, this->exponent_ref_display_width.at(i) + this->prec_ref_display_width - 31); this->mantissa_ref_display_width.push_back( reader.readBits(formatArray("mantissa_ref_display_width", i), refDispWidthBits)); @@ -79,8 +79,8 @@ SEIParsingResult three_dimensional_reference_displays_info::parse( reader.readBits(formatArray("exponent_ref_viewing_distance", i), 6)); const auto refViewDistBits = exponent_ref_viewing_distance.at(i) == 0 - ? std::max(0ull, this->prec_ref_viewing_dist - 30) - : std::max(0ull, + ? std::max(0UL, this->prec_ref_viewing_dist - 30) + : std::max(0UL, this->exponent_ref_viewing_distance.at(i) + this->prec_ref_viewing_dist - 31); this->mantissa_ref_viewing_distance.push_back(