From 5ddcbdecdee23adbaa19bd3e56c1197aeedfb03b Mon Sep 17 00:00:00 2001
From: Victor Derks <vbaderks@gmail.com>
Date: Sat, 14 Oct 2023 16:39:12 +0200
Subject: [PATCH] Suppress warnings introduced with Visual Studio 2022 17.8.0
 Preview 3.0

---
 Directory.Build.props      | 3 ++-
 azure-pipelines.yml        | 6 +++---
 default.ruleset.md         | 2 +-
 src/jpeg_stream_reader.cpp | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 85c6b8a4..2b99a3c2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -54,8 +54,9 @@
         C5246 = the initialization of a subobject should be wrapped in braces [prevents simple usage of std::byte]
         C5264 = 'const' variable is not used [reported for const in header files]
         C5258 = explicit capture of '' is not required for this use [VS 2019 requires capture of constexpr]
+        C6393 = A lookup table of size 365 is not sufficient to handle leap years [CharLS doesn't handle leap years]
       -->
-      <DisableSpecificWarnings Condition="'$(CHARLS_ALL_WARNINGS)'!=''">4061;4365;4464;4514;4571;4623;4625;4626;4710;4711;4738;4820;5026;5027;5045;5246;5264;5258</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(CHARLS_ALL_WARNINGS)'!=''">4061;4365;4464;4514;4571;4623;4625;4626;4710;4711;4738;4820;5026;5027;5045;5246;5264;5258;6393</DisableSpecificWarnings>
 
       <!--
         __cplusplus = Use the correct value for the __cplusplus macro
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bd414b51..55b5935b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -226,10 +226,10 @@ jobs:
         CXX: g++-12
         Shared: 'ON'
 
-      Clang-12 Debug:
+      Clang-13 Debug:
         buildType: Debug
-        CC: clang-12
-        CXX: clang++-12
+        CC: clang-13
+        CXX: clang++-13
         Shared: 'OFF'
 
       Clang-13 Release:
diff --git a/default.ruleset.md b/default.ruleset.md
index 561c0d1f..5b9c53b4 100644
--- a/default.ruleset.md
+++ b/default.ruleset.md
@@ -16,7 +16,7 @@ C26472: Don't use static_cast for arithmetic conversions
  -> Rationale: can only be solved with gsl::narrow_cast
 
 C26478: Don't use std::move on constant variables. (es.56).
--> Rationale: false warnings [Visual Studio 2022 17.7.0]
+-> Rationale: false warnings [Visual Studio 2022 17.7.0, note: fixed in 17.8.0]
 
 C26481: Do not pass an array as a single pointer.
 -> Rationale: gsl::span is not available.
diff --git a/src/jpeg_stream_reader.cpp b/src/jpeg_stream_reader.cpp
index 20d29363..ca2694e4 100644
--- a/src/jpeg_stream_reader.cpp
+++ b/src/jpeg_stream_reader.cpp
@@ -110,7 +110,7 @@ void jpeg_stream_reader::read_next_start_of_scan()
     ASSERT(state_ == state::bit_stream_section);
     state_ = state::scan_section;
 
-    do
+    do // NOLINT(cppcoreguidelines-avoid-do-while): the loop must be executed at least once.
     {
         const jpeg_marker_code marker_code{read_next_marker_code()};
         validate_marker_code(marker_code);
@@ -129,7 +129,7 @@ jpeg_marker_code jpeg_stream_reader::read_next_marker_code()
         throw_jpegls_error(jpegls_errc::jpeg_marker_start_byte_not_found);
 
     // Read all preceding 0xFF fill values until a non 0xFF value has been found. (see ISO/IEC 10918-1, B.1.1.2)
-    do
+    do // NOLINT(cppcoreguidelines-avoid-do-while): the loop must be executed at least once.
     {
         value = read_byte_checked();
     } while (value == jpeg_marker_start_byte);