Merge branch 'master' into feat/wide-path-io-v2

Author: Wires77

.github/workflows/main.yml

@@ -1,5 +1,9 @@
 name: Build DLL
-on: push
+on: 
+  push:
+  pull_request:
+  release:
+      types: [published]
 jobs:
   build_dll:
     strategy:
@@ -15,6 +19,7 @@ jobs:
       VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed/
       DEPS_DIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.triplet }}
       INST_DIR: ${{ github.workspace }}/install-prefix
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -69,3 +74,28 @@ jobs:
             ${{ env.DEPS_DIR }}/bin/*.pdb
             ${{ github.workspace }}/build/Release/lzip.pdb
             ${{ github.workspace }}/build/Release/lcurl.pdb
+
+      - name: Upload to release
+        if: ${{ github.event_name == 'release' }}
+        run: |
+          cd ${{ env.INST_DIR }}
+          tar -cvf SimpleGraphicDLLs-${{ matrix.triplet }}.tar *.dll
+          gh release upload ${{ github.event.release.tag_name }} SimpleGraphicDLLs-${{ matrix.triplet }}.tar
+
+      - name: Notify PathOfBuilding repo
+        if: ${{ github.event_name == 'release' }}
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.WIRES77_PAT }}
+          repository: ${{ github.repository_owner }}/PathOfBuilding
+          event-type: update-simple-graphic
+          client-payload: '{"tag": "${{ github.event.release.tag_name }}", "release_link": "${{ github.event.release.html_url }}"}'
+
+      - name: Notify PathOfBuilding-PoE2 repo
+        if: ${{ github.event_name == 'release' }}
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.WIRES77_PAT }}
+          repository: ${{ github.repository_owner }}/PathOfBuilding-PoE2
+          event-type: update-simple-graphic
+          client-payload: '{"tag": "${{ github.event.release.tag_name }}", "release_link": "${{ github.event.release.html_url }}"}'

engine/core/core_image.cpp

@@ -250,7 +250,7 @@ bool targa_c::Load(std::filesystem::path const& fileName, std::optional<size_cal
 bool targa_c::Save(std::filesystem::path const& fileName)
 {
 	auto format = tex.format();
-	if (is_compressed(format) || !is_unsigned_integer(format))
+	if (is_compressed(format) || !is_unsigned(format))
 		return true;
 
 	int comp = (int)component_count(format);
@@ -319,7 +319,7 @@ bool jpeg_c::Save(std::filesystem::path const& fileName)
 {
 	// JPEG only supports RGB and grayscale images
 	auto format = tex.format();
-	if (is_compressed(format) || !is_unsigned_integer(format))
+	if (is_compressed(format) || !is_unsigned(format))
 		return true;
 
 	int comp = (int)component_count(format);
@@ -385,7 +385,7 @@ bool png_c::Load(std::filesystem::path const& fileName, std::optional<size_callb
 bool png_c::Save(std::filesystem::path const& fileName)
 {
 	auto format = tex.format();
-	if (is_compressed(format) || !is_unsigned_integer(format))
+	if (is_compressed(format) || !is_unsigned(format))
 		return true;
 
 	int comp = (int)component_count(format);

ui_api.cpp

@@ -1588,12 +1588,20 @@ static int l_RemoveDir(lua_State* L)
 {
 	ui_main_c* ui = GetUIPtr(L);
 	int n = lua_gettop(L);
-	ui->LAssert(L, n >= 1, "Usage: l_RemoveDir(path)");
+	ui->LAssert(L, n >= 1, "Usage: l_RemoveDir(path, recurse)");
 	ui->LAssert(L, lua_isstring(L, 1), "l_RemoveDir() argument 1: expected string, got %s", luaL_typename(L, 1));
 	char const* givenPath = lua_tostring(L, 1);
 	auto path = std::filesystem::u8path(givenPath);
+	bool recursive = false;
+	if (n > 1) {
+		ui->LAssert(L, lua_isboolean(L, 2), "l_RemoveDir() argument 2: expected boolean, got %s", luaL_typename(L, 2));
+		recursive = lua_toboolean(L, 2);
+	}
 	std::error_code ec;
-	if (!is_directory(path, ec) || ec || !remove(path, ec) || ec) {
+	if (!is_directory(path, ec) || ec
+		|| (recursive && !remove_all(path, ec)) || ec
+		|| (!recursive && !remove(path, ec)) || ec)
+	{
 		lua_pushnil(L);
 		lua_pushstring(L, strerror(ec.value()));
 		return 2;