Merge pull request #7 from oblivioncth/dev

Merge to master for v1.15.1.1

.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

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"
 )

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;
 }