From 8cd680d6a4ee06df31152b3b59c0a07334945f61 Mon Sep 17 00:00:00 2001
From: Attila Uygun <auygun@opera.com>
Date: Thu, 10 Nov 2022 21:52:19 +0100
Subject: [PATCH] Enable C++20

---
 build/linux/Makefile | 7 +++++--
 src/engine/font.cc   | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/linux/Makefile b/build/linux/Makefile
index f916c26..a8e258d 100644
--- a/build/linux/Makefile
+++ b/build/linux/Makefile
@@ -32,6 +32,9 @@ LDFLAGS = -lX11 -lGL -pthread -lasound -ldl
 # Always enable debug information.
 CFLAGS += -g
 
+# Make all warnings into errors.
+CFLAGS += -Werror
+
 # Flags to generate dependency information.
 CFLAGS += -MD -MP -MT $@
 
@@ -55,8 +58,8 @@ CFLAGS += -msse2
 # Let C++ inherit all C flags.
 CXXFLAGS = $(CFLAGS) -I$(SRC_ROOT)
 
-# Enable C++17
-CXXFLAGS += -std=c++17
+# Enable C++20
+CXXFLAGS += -std=c++20
 
 # Vulkan config
 CFLAGS += -DVK_USE_PLATFORM_XLIB_KHR
diff --git a/src/engine/font.cc b/src/engine/font.cc
index e33b53d..55d50ea 100644
--- a/src/engine/font.cc
+++ b/src/engine/font.cc
@@ -187,8 +187,10 @@ void Font::Print(int x,
       //     q.x0, q.y0, q.x1, q.y1, q.s0, q.t0, q.s1, q.t1);
 
       int ix0 = (int)q.x0, iy0 = (int)q.y0, ix1 = (int)q.x1, iy1 = (int)q.y1,
-          iu0 = (int)(q.s0 * kGlyphSize), iv0 = (int)(q.t0 * kGlyphSize),
-          iu1 = (int)(q.s1 * kGlyphSize), iv1 = (int)(q.t1 * kGlyphSize);
+          iu0 = (int)(q.s0 * (float)kGlyphSize),
+          iv0 = (int)(q.t0 * (float)kGlyphSize),
+          iu1 = (int)(q.s1 * (float)kGlyphSize),
+          iv1 = (int)(q.t1 * (float)kGlyphSize);
 
       StretchBlit_I8_to_RGBA32(ix0, iy0, ix1, iy1, iu0, iv0, iu1, iv1, buffer,
                                width, glyph_cache_.get(), kGlyphSize);