Fixing memory leaks

Example-iOS/Source/ContentView.swift

@@ -17,7 +17,7 @@ struct ContentView: View {
 
 struct MyRive: UIViewControllerRepresentable {
     func makeUIViewController(context: Context) -> RiveViewController {
-        return RiveViewController(resource: "sheep", withExtension: "riv")
+        return RiveViewController(resource: "truck", withExtension: "riv")
     }
 
     func updateUIViewController(_ uiViewController: RiveViewController, context: Context) {}

Source/Rive.mm

@@ -50,6 +50,10 @@ -(instancetype) initWithContext:(CGContextRef) context {
     }
 }
 
+-(void) dealloc {
+    delete _renderer;
+}
+
 -(void) alignWithRect:(CGRect)rect withContentRect:(CGRect)contentRect withAlignment:(Alignment)alignment withFit:(Fit)fit {
 //    NSLog(@"Rect in align %@", NSStringFromCGRect(rect));
 

Source/RiveRenderer.hpp

@@ -17,6 +17,10 @@
 namespace rive
 {
 
+    /*
+     * RenderPaint
+     */
+
     enum class RiveGradient
     {
         None,
@@ -68,7 +72,6 @@ namespace rive
         Luminosity = static_cast<int>(BlendMode::luminosity)
     };
 
-
     class RiveRenderPaint : public RenderPaint
     {
     private:
@@ -103,6 +106,10 @@ namespace rive
         void completeGradient() override;
     };
 
+    /*
+     * RenderPath
+     */
+
     enum class RivePathCommandType
     {
         MoveTo,
@@ -145,14 +152,19 @@ namespace rive
         void close() override;
     };
 
+    /*
+     * Renderer
+     */
+
     class RiveRenderer : public Renderer
     {
     private:
         CGContextRef ctx;
 
     public:
         RiveRenderer(CGContextRef context) : ctx(context) {}
-
+        ~RiveRenderer();
+
         void save() override;
         void restore() override;
         void transform(const Mat2D &transform) override;

Source/RiveRenderer.mm

@@ -24,7 +24,7 @@
 }
 
 RiveRenderPaint::~RiveRenderPaint() {
-    NSLog(@"Releasing paint resources");
+//    NSLog(@"Releasing paint resources");
     CGColorRelease(cgColor);
     CGGradientRelease(gradient);
 }
@@ -49,6 +49,7 @@
         ((float)(value & 0xFF))/0xFF,
         ((float)((value & 0xFF000000) >> 24))/0xFF
     };
+    CGColorRelease(cgColor);
     cgColor = CGColorCreate(baseSpace, color);
 }
 
@@ -193,7 +194,7 @@
 }
 
 RiveRenderPath::~RiveRenderPath() {
-    NSLog(@"Releasing path resources");
+//    NSLog(@"Releasing path resources");
     CGPathRelease(path);
 }
 
@@ -244,16 +245,19 @@
     CGPathAddCurveToPoint(path, NULL, ox, oy, ix, iy, x, y);
 }
 
-// Renderer
+/*
+ * Renderer
+ */
+
+RiveRenderer::~RiveRenderer() {
+    // NSLog(@"Releasing renderer c++");
+}
 
-// Implement save by creating a sublayer
 void RiveRenderer::save() {
 //    NSLog(@" --- Renderer::save");
     CGContextSaveGState(ctx);
 }
 
-// Implement restore by moving back up to the parent layer. If the parent
-// layer is ctx, then there's been a restore without a save
 void RiveRenderer::restore() {
 //    NSLog(@" -- Renderer::restore");
     CGContextRestoreGState(ctx);
@@ -435,6 +439,5 @@
 
 namespace rive {
     RenderPaint* makeRenderPaint() { return new RiveRenderPaint(); }
-
     RenderPath* makeRenderPath() { return new RiveRenderPath(); }
 }