From fa0706ab03cdd137a68a58943e98abef76d1a80b Mon Sep 17 00:00:00 2001
From: David Tschumperle <David.Tschumperle@unicaen.fr>
Date: Fri, 15 Mar 2024 19:21:28 +0100
Subject: [PATCH 1/2] Auto-commit for release 3.3.6_pre

---
 html/header.html         | 2 +-
 html/header_doxygen.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/header.html b/html/header.html
index e5a601c5..5b1f63b7 100644
--- a/html/header.html
+++ b/html/header.html
@@ -23,7 +23,7 @@
     <div class="header">
       <a href="index.html"><img alt="Logo" src="img/logo_header.jpg" class="center_image" style="margin-top:1em;"/></a>
       <h2  style="padding-bottom: 1em">
-        Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.3.5</a></b>
+        Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.3.5</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.3.6</a></b> (2024/03/15)
       </h2>
 
       <hr/>
diff --git a/html/header_doxygen.html b/html/header_doxygen.html
index 381cff27..9ff830f8 100644
--- a/html/header_doxygen.html
+++ b/html/header_doxygen.html
@@ -26,7 +26,7 @@
     <div class="header">
       <a href="../index.html"><img alt="Logo" src="../img/logo_header.jpg" class="center_image" style="margin-top:1em;"/></a>
       <h2  style="padding-bottom: 1em">
-        Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.3.5</a></b>
+        Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.3.5</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.3.6</a></b> (2024/03/15)
       </h2>
 
       <hr/>

From 6895bf2bd6d04941ebacb32a74ac70b5ca81e180 Mon Sep 17 00:00:00 2001
From: David Tschumperle <David.Tschumperle@unicaen.fr>
Date: Fri, 15 Mar 2024 19:45:53 +0100
Subject: [PATCH 2/2] .

---
 CImg.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CImg.h b/CImg.h
index 17c7600d..22253f6a 100644
--- a/CImg.h
+++ b/CImg.h
@@ -238,6 +238,7 @@ enum {FALSE_WIN = 0};
 #define cimg_fuint64 "%llu"
 #define cimg_fint64 "%lld"
 #endif
+#define cimg_fhex64 "%llx"
 
 #else
 
@@ -246,11 +247,13 @@ enum {FALSE_WIN = 0};
 #define cimg_int64 long long
 #define cimg_fuint64 "%llu"
 #define cimg_fint64 "%lld"
+#define cimg_fhex64 "%llx"
 #else
 #define cimg_uint64 unsigned long
 #define cimg_int64 long
 #define cimg_fuint64 "%lu"
 #define cimg_fint64 "%ld"
+#define cimg_fhex64 "%lx"
 #endif
 
 #if defined(__arm__) || defined(_M_ARM)
@@ -17275,7 +17278,7 @@ namespace cimg_library {
           else if (!cimg::strcasecmp(s,"nan")) { val = cimg::type<double>::nan(); nb = 1; }
         } else if (*s=='0' && (s[1]=='x' || s[1]=='X') && s[2]!='-') { // Hexadecimal literal
           cimg_uint64 num;
-          if ((nb = cimg_sscanf(s + 2,"%lx%c",&num,&sep))==1 || (nb==2 && sep=='%'))
+          if ((nb = cimg_sscanf(s + 2,cimg_fhex64 "%c",&num,&sep))==1 || (nb==2 && sep=='%'))
             val = (double)num;
         } else if (*s=='0' && (s[1]=='b' || s[1]=='B') && s[2]!='-') { // Binary literal
           variable_name.assign(65);