Merge branch 'hyperion-project:master' into feature/hd108

Author: FutureMan0

.github/workflows/qt5_6.yml

@@ -36,7 +36,7 @@ jobs:
 
   Linux:
     name: 🐧 ${{ matrix.os.description }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -182,7 +182,7 @@ jobs:
 
       - name: Install Vulkan SDK
         if: ${{ inputs.qt_version == '6' }}
-        uses: jakoch/[email protected].5
+        uses: jakoch/[email protected].6
         with:
           install_runtime: false
           cache: true

bin/scripts/docker-compile.sh

@@ -200,7 +200,7 @@ if [ ${CURRENT_ARCHITECTURE} == "aarch64" ]; then
 		   USER_ARCHITECTURE="arm/v6"
 	   fi
 	fi
-    if [ $ARCHITECTURE != $USER_ARCHITECTURE ]; then
+    if [ $CURRENT_ARCHITECTURE != $USER_ARCHITECTURE ]; then
         log "Identified user space current architecture: $USER_ARCHITECTURE"
         CURRENT_ARCHITECTURE=$USER_ARCHITECTURE
     fi
@@ -211,7 +211,7 @@ fi
 log "Identified kernel current architecture: $CURRENT_ARCHITECTURE"
 if [ $ARCHITECTURE != $CURRENT_ARCHITECTURE ]; then
 	echo "---> Build is not for the same architecturem, enable emulation for ${PLATFORM_ARCHITECTURE}"
-	ENTRYPOINT_OPTION=
+	ENTRYPOINT_OPTION="--entrypoint /usr/bin/qemu-static"
 
 	if [ $CURRENT_ARCHITECTURE != "amd64" ]; then
 		echo "---> Emulation builds can only be executed on linux/amd64, linux/x86_64 platforms, current architecture is ${CURRENT_ARCHITECTURE}"

libsrc/utils/ImageResampler.cpp

@@ -53,7 +53,7 @@ void ImageResampler::processImage(const uint8_t * data, int width, int height, i
 	int xDestStart {0};
 	int xDestEnd = {outputWidth-1};
 	int yDestStart = {0};
-	int yDestEnd = {outputWidth-1};
+	int yDestEnd = {outputHeight-1};
 
 	switch (_flipMode)
 	{