Remove fedora-x64 as NuGet target, as linux-x64 is preferred now

.clang-tidy

@@ -23,6 +23,7 @@ Checks: >
   -cppcoreguidelines-pro-type-const-cast,
   -cppcoreguidelines-pro-type-reinterpret-cast,
   -cppcoreguidelines-special-member-functions,
+  -cppcoreguidelines-use-enum-class,
   -modernize-avoid-c-arrays,
   -modernize-macro-to-enum,
   -modernize-redundant-void-arg,

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  SFML_VERSION: 3.0.0
+  SFML_VERSION: 3.0.1
 
 defaults:
   run:
@@ -22,10 +22,10 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-        - { name: Windows VS2022 x86,  os: windows-2022, flags: -AWin32 }
+        - { name: Windows VS2022 x86,  os: windows-2025, flags: -AWin32 }
-        - { name: Windows VS2022 x64,  os: windows-2022, flags: -Ax64 }
+        - { name: Windows VS2022 x64,  os: windows-2025, flags: -Ax64 }
-        - { name: Windows ClangCL,     os: windows-2022, flags: -T ClangCL }
+        - { name: Windows ClangCL,     os: windows-2025, flags: -T ClangCL }
-        - { name: Windows Clang,       os: windows-2022, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
+        - { name: Windows Clang,       os: windows-2025, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
         - { name: Linux GCC,           os: ubuntu-22.04, flags: -GNinja }
         - { name: Linux Clang,         os: ubuntu-22.04, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
         - { name: MacOS,               os: macos-14,     flags: -GNinja }
@@ -55,7 +55,12 @@ jobs:
         path: SFML
 
     - name: Configure SFML CMake
-      run: cmake -S SFML -B SFML/build -DCMAKE_INSTALL_PREFIX=SFML/install ${{matrix.platform.flags}} ${{matrix.config.flags}} -DCMAKE_BUILD_TYPE=${{matrix.type.name}}
+      run: |
+        cmake -S SFML -B SFML/build \
+          -DCMAKE_BUILD_TYPE=${{matrix.type.name}} \
+          -DCMAKE_INSTALL_PREFIX=SFML/install \
+          ${{matrix.platform.flags}} \
+          ${{matrix.config.flags}}
 
     - name: Build SFML
       run: cmake --build SFML/build --config ${{matrix.type.name}} --target install
@@ -66,7 +71,15 @@ jobs:
         path: CSFML
 
     - name: Configure CSFML CMake
-      run: cmake --preset dev -S CSFML -B CSFML/build -DCMAKE_INSTALL_PREFIX=CSFML/install -DSFML_ROOT=SFML/install -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}} ${{matrix.config.flags}} ${{matrix.config.csfml_flags}} -DCMAKE_BUILD_TYPE=${{matrix.type.name}}
+      run: |
+        cmake --preset dev -S CSFML -B CSFML/build \
+          -DCMAKE_BUILD_TYPE=${{matrix.type.name}} \
+          -DCMAKE_INSTALL_PREFIX=CSFML/install \
+          -DSFML_ROOT=SFML/install \
+          -DCMAKE_VERBOSE_MAKEFILE=ON \
+          ${{matrix.platform.flags}} \
+          ${{matrix.config.flags}} \
+          ${{matrix.config.csfml_flags}}
 
     - name: Build CSFML
       run: cmake --build CSFML/build --config ${{matrix.type.name}} --target install

.github/workflows/nuget.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - master
       - 2.6.x
+    tags:
+      - "**"
   workflow_dispatch: {}
 
 concurrency:
@@ -17,7 +19,7 @@ env:
 jobs:
   windows:
     name: Windows VS2022
-        runs-on: windows-2022
+    runs-on: windows-2025
 
     steps:
       - name: Checkout CSFML
@@ -37,10 +39,16 @@ jobs:
           cd CSFML/tools/nuget
           ./build.win.ps1 "win-x64"
 
+      - name: Build ARM64
+        shell: pwsh
+        run: |
+          cd CSFML/tools/nuget
+          ./build.win.ps1 "win-arm64"
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-                  name: CSFML-win-x86-x64
+          name: CSFML-win-x86-x64-arm64
           path: CSFML/tools/nuget/CSFML/runtimes
 
   linux-x64:
@@ -79,7 +87,7 @@ jobs:
           path: CSFML
 
       - name: Build in an ARM container
-              uses: uraimo/run-on-arch-action@v2.8.1
+        uses: uraimo/run-on-arch-action@v3.0.1
         with:
           arch: armv7
           distro: ubuntu22.04
@@ -111,7 +119,7 @@ jobs:
           path: CSFML
 
       - name: Build in an ARM64 container
-              uses: uraimo/run-on-arch-action@v2.8.1
+        uses: uraimo/run-on-arch-action@v3.0.1
         with:
           arch: aarch64
           distro: ubuntu22.04
@@ -136,7 +144,7 @@ jobs:
     name: Linux MUSL x64
     runs-on: ubuntu-22.04
     container:
-            image: alpine:3.20.3
+      image: alpine:3.20.7
 
     steps:
       - name: Checkout CSFML
@@ -157,31 +165,6 @@ jobs:
           name: CSFML-linux-musl-x64
           path: CSFML/tools/nuget/CSFML/runtimes
 
-    fedora-x64:
-        name: Fedora x64
-        runs-on: ubuntu-22.04
-        container:
-            image: fedora:37
-
-        steps:
-            - name: Checkout CSFML
-              uses: actions/checkout@v4
-              with:
-                  path: CSFML
-
-            - name: Build
-              shell: bash
-              run: |
-                  cd ./CSFML/tools/nuget
-                  chmod +x ./docker.fedora-x64.sh
-                  ./docker.fedora-x64.sh
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: CSFML-fedora-x64
-                  path: CSFML/tools/nuget/CSFML/runtimes
-
   macos:
     name: macOS
     runs-on: macos-14
@@ -213,14 +196,13 @@ jobs:
 
   package:
     name: Package Builds
-        runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - windows
       - linux-x64
       - linux-arm
       - linux-arm64
       - linux-musl-x64
-            - fedora-x64
       - macos
     steps:
       - name: Checkout CSFML

.github/workflows/release.yml

@@ -13,10 +13,13 @@ concurrency:
   group: release-${{github.ref}}
   cancel-in-progress: true
 
+env:
+  SFML_VERSION: 3.0.1
+
 jobs:
   windows-x86:
     name: Windows x86
-        runs-on: windows-2022
+    runs-on: windows-2025
 
     steps:
       - name: Cache MinGW x86
@@ -24,14 +27,14 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/mingw32
-                  key: 14.2.0posix-19.1.1-12.0.0-ucrt-r2-x86
+          key: 15.2.0posix-13.0.0-ucrt-r1-x86
 
       - name: Install MinGW x86
         if: steps.mingw-x86-cache.outputs.cache-hit != 'true'
         uses: bwoodsend/setup-winlibs-action@v1
         id: winlibs-32
         with:
-                  tag: 14.2.0posix-19.1.1-12.0.0-ucrt-r2
+          tag: 15.2.0posix-13.0.0-ucrt-r1
           with_clang: false
           architecture: 32
           destination: ${{ github.workspace }}
@@ -41,7 +44,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: SFML/SFML
-                  ref: 3.0.0
+          ref: ${{ env.SFML_VERSION }}
           path: SFML
 
       - name: Checkout CSFML
@@ -103,7 +106,7 @@ jobs:
 
   windows-x64:
     name: Windows x64
-        runs-on: windows-2022
+    runs-on: windows-2025
 
     steps:
       - name: Cache MinGW x64
@@ -111,14 +114,14 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/mingw64
-                  key: 14.2.0posix-19.1.1-12.0.0-ucrt-r2-x64
+          key: 15.2.0posix-13.0.0-ucrt-r1-x64
 
       - name: Install MinGW x64
         if: steps.mingw-x64-cache.outputs.cache-hit != 'true'
         uses: bwoodsend/setup-winlibs-action@v1
         id: winlibs-64
         with:
-                  tag: 14.2.0posix-19.1.1-12.0.0-ucrt-r2
+          tag: 15.2.0posix-13.0.0-ucrt-r1
           with_clang: false
           architecture: 64
           destination: ${{ github.workspace }}
@@ -128,7 +131,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: SFML/SFML
-                  ref: 3.0.0
+          ref: ${{ env.SFML_VERSION }}
           path: SFML
 
       - name: Checkout CSFML
@@ -188,6 +191,45 @@ jobs:
           name: CSFML-windows-64-bit
           path: install/CSFML
 
+  windows-arm64:
+    name: Windows ARM64
+    runs-on: windows-2025
+
+    steps:
+      - name: Checkout SFML
+        uses: actions/checkout@v4
+        with:
+          repository: SFML/SFML
+          ref: ${{ env.SFML_VERSION }}
+          path: SFML
+
+      - name: Checkout CSFML
+        uses: actions/checkout@v4
+        with:
+          path: CSFML
+
+      - name: Build SFML
+        run: |
+          cmake -S SFML -B SFML-build -A ARM64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+          cmake --build SFML-build --config Release --target install
+
+      - name: Build CSFML
+        run: |
+          cmake -S CSFML -B CSFML-build -A ARM64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=ON -DCSFML_LINK_SFML_STATICALLY=OFF -DCMAKE_BUILD_TYPE=Release -DSFML_ROOT=${{ github.workspace }}/SFML-install -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+          cmake --build CSFML-build --config Release --target install
+
+      - name: Move Files
+        shell: pwsh
+        run: |
+          New-Item -ItemType "directory" -PATH "install\CSFML"
+          Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: CSFML-windows-arm64
+          path: install/CSFML
+
   macos-x64:
     name: macOS x64
     runs-on: macos-13
@@ -197,7 +239,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: SFML/SFML
-                  ref: 3.0.0
+          ref: ${{ env.SFML_VERSION }}
           path: SFML
 
       - name: Checkout CSFML
@@ -260,7 +302,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: SFML/SFML
-                  ref: 3.0.0
+          ref: ${{ env.SFML_VERSION }}
           path: SFML
 
       - name: Checkout CSFML

include/CSFML/Graphics/Texture.h

@@ -178,6 +178,20 @@ CSFML_GRAPHICS_API sfTexture* sfTexture_copy(const sfTexture* texture);
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API void sfTexture_destroy(const sfTexture* texture);
 
+////////////////////////////////////////////////////////////
+/// \brief Resize the texture
+///
+/// If this function fails, the texture is left unchanged.
+///
+/// \param texture Texture to resize
+/// \param size Width and height of the texture
+/// \param sRgb `true` to enable sRGB conversion, `false` to disable it
+///
+/// \return `true` if resizing was successful, `false` if it failed
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API bool sfTexture_resize(sfTexture* texture, sfVector2u size, bool sRgb);
+
 ////////////////////////////////////////////////////////////
 /// \brief Return the size of the texture
 ///

src/CSFML/Graphics/Texture.cpp

@@ -170,6 +170,15 @@ void sfTexture_destroy(const sfTexture* texture)
 }
 
 
+////////////////////////////////////////////////////////////
+bool sfTexture_resize(sfTexture* texture, sfVector2u size, bool sRgb)
+{
+    assert(texture);
+    assert(texture->This);
+    return texture->This->resize(convertVector2(size), sRgb);
+}
+
+
 ////////////////////////////////////////////////////////////
 sfVector2u sfTexture_getSize(const sfTexture* texture)
 {

test/CMakeLists.txt

@@ -48,6 +48,7 @@ add_executable(test-csfml-graphics
     Graphics/BlendMode.test.cpp
     Graphics/Color.test.cpp
     Graphics/CoordinateType.test.cpp
+    Graphics/Image.test.cpp
     Graphics/PrimitiveType.test.cpp
     Graphics/Rect.test.cpp
     Graphics/RenderStates.test.cpp
@@ -59,7 +60,7 @@ add_executable(test-csfml-graphics
 )
 target_link_libraries(test-csfml-graphics PRIVATE csfml-graphics Catch2::Catch2WithMain SFML::Graphics)
 set_target_warnings(test-csfml-graphics)
-catch_discover_tests(test-csfml-graphics)
+catch_discover_tests(test-csfml-graphics WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_executable(test-csfml-network
     Network/Ftp.test.cpp

test/Graphics/Image.test.cpp

@@ -0,0 +1,56 @@
+#include <CSFML/Graphics/Image.h>
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+
+TEST_CASE("[Graphics] sfImage")
+{
+    SECTION("sfImage_create")
+    {
+        const sfImage* image = sfImage_create({100, 100});
+        REQUIRE(image);
+        const auto size = sfImage_getSize(image);
+        CHECK(size.x == 100);
+        CHECK(size.y == 100);
+        const auto pixel = sfImage_getPixel(image, {50, 50});
+        CHECK(pixel.r == sfBlack.r);
+        CHECK(pixel.g == sfBlack.g);
+        CHECK(pixel.b == sfBlack.b);
+        CHECK(pixel.a == sfBlack.a);
+        CHECK(sfImage_getPixelsPtr(image));
+        sfImage_destroy(image);
+    }
+
+    SECTION("sfImage_createFromColor")
+    {
+        const sfImage* image = sfImage_createFromColor({100, 100}, sfMagenta);
+        REQUIRE(image);
+        const auto size = sfImage_getSize(image);
+        CHECK(size.x == 100);
+        CHECK(size.y == 100);
+        const auto pixel = sfImage_getPixel(image, {50, 50});
+        CHECK(pixel.r == sfMagenta.r);
+        CHECK(pixel.g == sfMagenta.g);
+        CHECK(pixel.b == sfMagenta.b);
+        CHECK(pixel.a == sfMagenta.a);
+        CHECK(sfImage_getPixelsPtr(image));
+        sfImage_destroy(image);
+    }
+
+    SECTION("sfImage_createFromFile")
+    {
+        const auto filename = std::string("Graphics/sfml-logo-big.") + GENERATE("bmp", "gif", "jpg", "png", "psd");
+        INFO("Filename: " << filename);
+        const sfImage* image = sfImage_createFromFile(filename.c_str());
+        REQUIRE(image);
+        const auto size = sfImage_getSize(image);
+        CHECK(size.x == 1001);
+        CHECK(size.y == 304);
+        const auto pixel = sfImage_getPixel(image, {0, 0});
+        CHECK(pixel.r == sfWhite.r);
+        CHECK(pixel.g == sfWhite.g);
+        CHECK(pixel.b == sfWhite.b);
+        CHECK(sfImage_getPixelsPtr(image));
+        sfImage_destroy(image);
+    }
+}

tools/nuget/build.linux.sh

@@ -42,7 +42,7 @@ echo "Please note that all SFML dependencies must be installed and available to
 
 RID="$1"
 
-SFMLBranch="3.0.0" # The branch or tag of the SFML repository to be cloned
+SFMLBranch="3.0.1" # The branch or tag of the SFML repository to be cloned
 CSFMLDir="$(realpath ../../)"  # The directory of the source code of CSFML
 
 OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries
@@ -94,6 +94,7 @@ cmake -E env LDFLAGS="-z origin" \
     "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$SFMLLibDir" \
     '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON' \
     '-DCMAKE_INSTALL_RPATH=$ORIGIN' \
+    '-DSFML_USE_SYSTEM_DEPS=OFF' \
     '-DSFML_BUILD_NETWORK=OFF' \
     "$SFMLDir"
 

tools/nuget/build.macos.sh

@@ -46,7 +46,7 @@ echo "Please note that all SFML dependencies must be installed and available to
 
 RID="$1"
 
-SFMLBranch="3.0.0" # The branch or tag of the SFML repository to be cloned
+SFMLBranch="3.0.1" # The branch or tag of the SFML repository to be cloned
 CSFMLDir="$(grealpath "$(git rev-parse --show-toplevel)")" # The directory of the source code of CSFML
 
 OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries

tools/nuget/build.win.ps1

@@ -18,6 +18,7 @@ if (-not $RID) {
 
 $Generator = 'Visual Studio 17 2022'
 
+# See also: https://learn.microsoft.com/en-us/dotnet/core/rid-catalog#known-rids
 switch ($RID) {
     'win-x86' {
         $Architecture = 'Win32'
@@ -25,6 +26,9 @@ switch ($RID) {
     'win-x64' {
         $Architecture = 'x64'
     }
+    'win-arm64' {
+        $Architecture = 'ARM64'
+    }
     Default {
         Write-Error "Unknown RID '$RID'"
         exit
@@ -35,7 +39,7 @@ Write-Output "Building $RID"
 Write-Output "Using $Generator as the cmake generator"
 Write-Output "Using architecture $Architecture"
 
-$SFMLBranch = "3.0.0" # The branch or tag of the SFML repository to be cloned
+$SFMLBranch = "3.0.1" # The branch or tag of the SFML repository to be cloned
 $CSFMLDir = (Get-Item (git rev-parse --show-toplevel)).FullName # The directory of the source code of CSFML
 
 $OutDir = "./CSFML/runtimes/$RID/native" # The directory of all CSFML modules, used to copy the final dlls
@@ -83,7 +87,7 @@ Push-Location "SFML"
 
 $SFMLDir = (Get-Item .).FullName
 
-IF ($RID -ne 'win-x86' -and $RID -ne 'win-x64') {
+IF ($RID -ne 'win-x86' -and $RID -ne 'win-x64' -and $RID -ne 'win-arm64') {
     Write-Error "Unknown RID '$RID'"
     exit
 }