Convert images with pillow instead of imagemagick

datagutten · Jul 6, 2024 · 191e70d · 191e70d
1 parent 086f907
commit 191e70d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -75,13 +75,6 @@ jobs:
           sudo cp /var/cache/apt/*.bin /tmp/apt
           sudo cp -r /var/cache/apt/archives/*.deb /tmp/apt/archives
 
-      - name: Install imagemagick
-        run: |
-          sudo add-apt-repository universe
-          sudo apt install libfuse2
-          deployment/imagemagick.sh
-          echo "$PWD/bin" >> $GITHUB_PATH
-
       - run: npm install
 
       - run: pip install -r requirements.txt

diff --git a/assets.py b/assets.py
@@ -11,9 +11,10 @@
 from PyTexturePacker import Utils as PyTexturePackerUtils
 
 from audiosprite import AudioSprite
-from build_scripts.parse_animation_chart import parse_animation_chart
 from build_scripts.MulleResource import MulleResource
+from build_scripts.convert_image import convert_image
 from build_scripts.data import director_data
+from build_scripts.parse_animation_chart import parse_animation_chart
 
 optimizeImages = int(sys.argv[1])
 
@@ -349,9 +350,9 @@
                 continue
 
             if f['num'] in opaque:
-                call(["magick", "convert", fileBasePath + '.bmp', fileBasePath + '.png'])
+                convert_image(fileBasePath + '.bmp', False)
             else:
-                call(["magick", "convert", fileBasePath + '.bmp', "-transparent", "#FFFFFF", fileBasePath + '.png'])
+                convert_image(fileBasePath + '.bmp')
 
             filePath = fileBasePath + ".png"