diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml index 9fa28ca3..1a714a4c 100644 --- a/.github/workflows/qt5_6.yml +++ b/.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/install-vulkan-sdk-action@v1.0.5 + uses: jakoch/install-vulkan-sdk-action@v1.0.6 with: install_runtime: false cache: true diff --git a/bin/scripts/docker-compile.sh b/bin/scripts/docker-compile.sh index 96f6abed..464adcc2 100755 --- a/bin/scripts/docker-compile.sh +++ b/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}" diff --git a/libsrc/utils/ImageResampler.cpp b/libsrc/utils/ImageResampler.cpp index d36beb10..793620a5 100644 --- a/libsrc/utils/ImageResampler.cpp +++ b/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) {