Merge pull request #371 from scratchcpp/remove_image_api

Remove image api

Author: adazem009

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev libgd-dev
+        sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev
       shell: bash
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

.github/workflows/utests.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev libgd-dev
+        sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev
       shell: bash
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DLIBSCRATCHCPP_BUILD_UNIT_TESTS=ON

CMakeLists.txt

@@ -49,8 +49,6 @@ target_sources(scratchcpp
     include/scratchcpp/sprite.h
     include/scratchcpp/itimer.h
     include/scratchcpp/keyevent.h
-    include/scratchcpp/iimageformat.h
-    include/scratchcpp/iimageformatfactory.h
     include/scratchcpp/rect.h
     include/scratchcpp/igraphicseffect.h
     include/scratchcpp/comment.h
@@ -65,8 +63,6 @@ include_directories(thirdparty/zip/src)
 
 include_directories(thirdparty/spimpl)
 
-include(build/FindGD.cmake)
-
 target_link_libraries(scratchcpp PRIVATE nlohmann_json::nlohmann_json)
 target_link_libraries(scratchcpp PRIVATE utf8cpp)
 target_link_libraries(scratchcpp PRIVATE zip)

build/FindGD.cmake

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "iimageformat.h"
 #include "spimpl.h"
 
 #include "asset.h"
@@ -29,22 +28,8 @@ class LIBSCRATCHCPP_EXPORT Costume : public Asset
         int rotationCenterY() const;
         void setRotationCenterY(int newRotationCenterY);
 
-        unsigned int width() const;
-        unsigned int height() const;
-
-        double scale() const;
-        void setScale(double scale);
-
-        bool mirrorHorizontally() const;
-        void setMirrorHorizontally(bool mirror);
-
-        Rgb **bitmap() const;
-
         Broadcast *broadcast();
 
-    protected:
-        void processData(unsigned int size, void *data) override;
-
     private:
         spimpl::unique_impl_ptr<CostumePrivate> impl;
 };

include/scratchcpp/costume.h

@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "iimageformat.h"
+#include "global.h"
 
 namespace libscratchcpp
 {

include/scratchcpp/igraphicseffect.h

@@ -11,8 +11,6 @@ namespace libscratchcpp
 {
 
 class IExtension;
-class IImageFormat;
-class IImageFormatFactory;
 class IGraphicsEffect;
 class ScratchConfigurationPrivate;
 
@@ -38,10 +36,6 @@ class LIBSCRATCHCPP_EXPORT ScratchConfiguration
             return nullptr;
         };
 
-        static void registerImageFormat(const std::string &name, std::shared_ptr<IImageFormatFactory> formatFactory);
-        static void removeImageFormat(const std::string &name);
-        static std::shared_ptr<IImageFormat> createImageFormat(const std::string &name);
-
         static void registerGraphicsEffect(std::shared_ptr<IGraphicsEffect> effect);
         static void removeGraphicsEffect(const std::string &name);
         static IGraphicsEffect *getGraphicsEffect(const std::string &name);

include/scratchcpp/iimageformat.h

@@ -15,4 +15,3 @@ add_subdirectory(blocks)
 add_subdirectory(engine)
 add_subdirectory(internal)
 add_subdirectory(scratch)
-add_subdirectory(imageformats)