Merge 3.6 pull request

[HSP3Dish][hsp3js] 大きいフォントが描画されない不具合に対応(zakki)
[CI] aptでinstall前にupdateを呼ぶ #49

Author: onitama

.github/workflows/build.yml

@@ -12,7 +12,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install libraries
-      run: sudo apt install -y libgtk2.0-dev libglew-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libgles2-mesa-dev libegl1-mesa-dev libcurl4-openssl-dev libgpiod2 libgpiod-dev
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libgtk2.0-dev libglew-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libgles2-mesa-dev libegl1-mesa-dev libcurl4-openssl-dev libgpiod2 libgpiod-dev
     - name: make
       run: make -j2
     - name: Archive production artifacts

src/hsp3dish/emscripten/fontsystem.cpp

@@ -818,7 +818,7 @@ int hgio_fontsystem_exec(char* msg, unsigned char* buffer, int pitch, int* out_s
 				document.body.appendChild(canvas);
 			}
 
-			if ($4 != = 0) {
+			if ($4 != 0) {
 				const context = canvas.getContext("2d");
 				context.font = $1 + "px 'sans-serif'";
 
@@ -860,12 +860,16 @@ int hgio_fontsystem_exec(char* msg, unsigned char* buffer, int pitch, int* out_s
 			canvas.height = $3;
 			document.body.appendChild(canvas);
 		}
+		if (canvas.width < $2)
+			canvas.width = $2;
+		if (canvas.height < $3)
+			canvas.height = $3;
 
 		var context = canvas.getContext("2d", { willReadFrequently: true });
 		context.font = $1 + "px 'sans-serif'";
 
 		var msg = UTF8ToString($0);
-		context.clearRect(0 , 0 , $2 , $3);
+		context.clearRect(0, 0, Math.min(canvas.width, $2 + 1), Math.min(canvas.height, $3 + 1));
 		context.fillStyle = 'rgba(255, 255, 255, 255)';
 		context.fillText(msg, 0, $1);
 		//console.log(msg);