From 13b5c672fec7c84ff7f22368f0344516a1c779fa Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Fri, 17 Mar 2023 19:58:52 -0400 Subject: [PATCH 1/3] CI: Exclude gh-pages artifact from release --- .github/workflows/master-pull-request-merge-reaction.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-pull-request-merge-reaction.yml b/.github/workflows/master-pull-request-merge-reaction.yml index 34c7604..5912c45 100644 --- a/.github/workflows/master-pull-request-merge-reaction.yml +++ b/.github/workflows/master-pull-request-merge-reaction.yml @@ -92,7 +92,7 @@ jobs: - name: Zip up release artifacts shell: pwsh run: | - $artifact_folders = Get-ChildItem -Directory -Path "${{ env.artifacts_path }}" + $artifact_folders = Get-ChildItem -Directory -Path "${{ env.artifacts_path }}" -Exclude "github-pages" foreach($art_dir in $artifact_folders) { $name = $art_dir.name From 2e2e11af6cee545738b6c33e9ba29d69cfad85ba Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sun, 13 Aug 2023 12:21:03 -0400 Subject: [PATCH 2/3] Fix minimal example Pitch was wrong --- doc/cmake/file_templates/mainpage.md.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/cmake/file_templates/mainpage.md.in b/doc/cmake/file_templates/mainpage.md.in index 51fe671..043db98 100644 --- a/doc/cmake/file_templates/mainpage.md.in +++ b/doc/cmake/file_templates/mainpage.md.in @@ -90,7 +90,7 @@ Minimal Example class RGBAImage { private: - const int PITCH = 4; // RGBA + const int CH_COUNT = 4; // RGBA const int mWidth; const int mHeight; @@ -100,7 +100,7 @@ public: RGBAImage(int width, int height, bool dummy = false) : mWidth(width), mHeight(height), - mPixels(width * height * PITCH) + mPixels(width * height * CH_COUNT) { if(dummy) { @@ -112,7 +112,7 @@ public: const int width() const { return mWidth; }; const int height() const { return mHeight; } - const int pitch() const { return PITCH; } + const int pitch() const { return mWidth * CH_COUNT; } const squish::u8* data() const { return mPixels.data(); } squish::u8* data() { return mPixels.data(); } @@ -138,9 +138,6 @@ int main() // Decompress image RGBAImage output(input.width(), input.height()); squish::DecompressImage(output.data(), input.width(), input.height(), input.pitch(), cPixels.data(), cFlags); - - // Confirm - std::cout << (input == output); return 0; } From 58f301cbc9182fb8f55166195ed787b6e6c29201 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sun, 13 Aug 2023 12:21:12 -0400 Subject: [PATCH 3/3] Bump --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 220f834..dfd2a6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,12 +7,12 @@ #================= Project Setup ========================== # CMake -cmake_minimum_required(VERSION 3.23.0...3.25.0) +cmake_minimum_required(VERSION 3.23.0...3.26.0) # Project # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS project(Squish - VERSION 1.15.1 + VERSION 1.15.1.1 LANGUAGES CXX DESCRIPTION "S3TC/DXT compliant image compression" )