Change abstract class to interface

shaovoon · Jul 20, 2019 · 1f3929b · 1f3929b
1 parent f1999b7
commit 1f3929b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/CSharpEncodeImage/Program.cs b/CSharpEncodeImage/Program.cs
@@ -10,11 +10,10 @@
 
 namespace CSharpEncodeImage
 {
-    /*
     // render a red image once!
     public class RenderRedImage : FrameRenderer
     {
-        public override bool Render(int width, int height, int fps, int frame_cnt, UInt32[] pixels)
+        public bool Render(int width, int height, int fps, int frame_cnt, UInt32[] pixels)
         {
             if (frame_cnt == 0)
             {
@@ -53,12 +52,12 @@ static void Main(string[] args)
 
         }
     }
-    */
+
     /*
     // render a jpeg once!
     public class RenderJPG : FrameRenderer
     {
-        public override bool Render(int width, int height, int fps, int frame_cnt, UInt32[] pixels)
+        public bool Render(int width, int height, int fps, int frame_cnt, UInt32[] pixels)
         {
             if (frame_cnt == 0)
             {
@@ -115,8 +114,8 @@ public override bool Render(int width, int height, int fps, int frame_cnt, UInt3
                 bmp.UnlockBits(bitmapData);
 
                 bmp.Dispose();
-                bitmapData.Dispose();
                 jpg.Dispose();
+                brush.Dispose();
                 g.Dispose();
             }
             return true;
@@ -170,7 +169,7 @@ public Render2JPG(string img1, string img2)
             g2.Dispose();
         }
 
-        public override bool Render(int width, int height, int fps, int frame_cnt, UInt32[] pixels)
+        public bool Render(int width, int height, int fps, int frame_cnt, UInt32[] pixels)
         {
             if (bmp == null)
             {
@@ -249,6 +248,8 @@ public override bool Render(int width, int height, int fps, int frame_cnt, UInt3
             bmp.UnlockBits(bitmapData);
             bmp2.UnlockBits(bitmapData2);
 
+            brush.Dispose();
+
             return true;
         }
 
@@ -303,6 +304,7 @@ static void Main(string[] args)
     }
     */
 
+    /*
     // text animation!
     public class RenderText : FrameRenderer
     {
@@ -325,7 +327,7 @@ public RenderText(string img1, string img2)
             g2.Dispose();
         }
 
-        public override bool Render(int width, int height, int fps, int frame_cnt, UInt32[] pixels)
+        public bool Render(int width, int height, int fps, int frame_cnt, UInt32[] pixels)
         {
             if (bmp == null)
             {
@@ -406,6 +408,8 @@ public override bool Render(int width, int height, int fps, int frame_cnt, UInt3
             renderbmp.UnlockBits(bitmapData);
 
             renderbmp.Dispose();
+            brush.Dispose();
+            whitebrush.Dispose();
             render_g.Dispose();
 
             return true;
@@ -441,5 +445,5 @@ static void Main(string[] args)
 
         }
     }
-
+    */
 }
diff --git a/H264WriterDLL/H264WriterDLL.h b/H264WriterDLL/H264WriterDLL.h
@@ -69,9 +69,9 @@ namespace H264WriterDLL {
 		Software
 	};
 
-	public ref class FrameRenderer abstract
+	public interface class FrameRenderer
 	{
-	public: virtual bool Render(int width, int height, int fps, int frame_cnt, array<System::UInt32>^ pixels) abstract;
+	public: bool Render(int width, int height, int fps, int frame_cnt, array<System::UInt32>^ pixels);
 	};
 
 	public ref class H264Writer