Add data size to asset data info and use void ptr

Author: adazem009

include/scratchcpp/asset.h

@@ -28,11 +28,12 @@ class LIBSCRATCHCPP_EXPORT Asset : public Entity
 
         const std::string &dataFormat() const;
 
-        const char *data() const;
-        void setData(const char *data);
+        const void *data() const;
+        unsigned int dataSize() const;
+        void setData(unsigned int size, void *data);
 
     protected:
-        virtual void processData(const char *data) { }
+        virtual void processData(unsigned int size, void *data) { }
 
     private:
         spimpl::unique_impl_ptr<AssetPrivate> impl;

include/scratchcpp/costume.h

@@ -43,7 +43,7 @@ class LIBSCRATCHCPP_EXPORT Costume : public Asset
         Broadcast *broadcast();
 
     protected:
-        void processData(const char *data) override;
+        void processData(unsigned int size, void *data) override;
 
     private:
         spimpl::unique_impl_ptr<CostumePrivate> impl;

include/scratchcpp/iimageformat.h

@@ -17,7 +17,7 @@ class LIBSCRATCHCPP_EXPORT IImageFormat
         virtual ~IImageFormat() { }
 
         /*! Sets the image data (buffer). */
-        virtual void setData(const char *data) = 0;
+        virtual void setData(unsigned int size, void *data) = 0;
 
         /*! Returns the width of the image. */
         virtual unsigned int width() const = 0;

src/imageformats/stub/imageformatstub.cpp

@@ -9,7 +9,7 @@ ImageFormatStub::ImageFormatStub()
 {
 }
 
-void ImageFormatStub::setData(const char *)
+void ImageFormatStub::setData(unsigned int size, void *)
 {
 }
 

src/imageformats/stub/imageformatstub.h

@@ -12,7 +12,7 @@ class ImageFormatStub : public IImageFormat
     public:
         ImageFormatStub();
 
-        void setData(const char *) override;
+        void setData(unsigned int size, void *) override;
 
         unsigned int width() const override;
         unsigned int height() const override;

src/internal/scratch3reader.cpp

@@ -212,8 +212,8 @@ bool Scratch3Reader::load()
                 costume->setRotationCenterY(jsonCostume["rotationCenterY"]);
 
                 void *data;
-                m_zipReader->readFile(costume->fileName(), &data);
-                costume->setData(static_cast<char *>(data));
+                unsigned int size = m_zipReader->readFile(costume->fileName(), &data);
+                costume->setData(size, data);
 
                 target->addCostume(costume);
             }

src/scratch/asset.cpp

@@ -40,14 +40,21 @@ const std::string &Asset::dataFormat() const
 }
 
 /*! Returns the asset data. */
-const char *Asset::data() const
+const void *Asset::data() const
 {
     return impl->data;
 }
 
+/*! Returns the size of the asset data. */
+unsigned int Asset::dataSize() const
+{
+    return impl->dataSize;
+}
+
 /*! Sets the asset data. */
-void Asset::setData(const char *data)
+void Asset::setData(unsigned int size, void *data)
 {
+    impl->dataSize = size;
     impl->data = data;
-    processData(data);
+    processData(size, data);
 }

src/scratch/asset_p.h

@@ -17,7 +17,8 @@ struct AssetPrivate
         std::string name;
         std::string dataFormat;
         std::string fileName;
-        const char *data = nullptr;
+        const void *data = nullptr;
+        unsigned int dataSize = 0;
 };
 
 } // namespace libscratchcpp

src/scratch/costume.cpp

@@ -112,9 +112,9 @@ Broadcast *Costume::broadcast()
     return &impl->broadcast;
 }
 
-void Costume::processData(const char *data)
+void Costume::processData(unsigned int size, void *data)
 {
-    impl->image->setData(data);
+    impl->image->setData(size, data);
     impl->freeImage();
     impl->updateImage();
 }

test/assets/asset_test.cpp

@@ -28,9 +28,10 @@ TEST(AssetTest, Data)
     TestAsset asset;
     ASSERT_EQ(asset.data(), nullptr);
 
-    static const char *data = "abcd";
-    asset.setData(data);
+    static char data[5] = "abcd";
+    asset.setData(5, data);
     ASSERT_EQ(asset.data(), data);
+    ASSERT_EQ(asset.size, 5);
     ASSERT_EQ(asset.processedData, data);
     ASSERT_EQ(asset.callCount, 1);
 }