[NUI] Fix a memory leak in Vector4.

Samsung · Feb 11, 2025 · 6bad862 · 6bad862
1 parent a5a2073
commit 6bad862
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/Drawable.cs b/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/Drawable.cs
@@ -81,7 +81,7 @@ public Vector4 BoundingBox
             get
             {
                 global::System.IntPtr cPtr = Interop.Drawable.GetBoundingBox(BaseHandle.getCPtr(this));
-                return Vector4.GetVector4FromPtr(cPtr);
+                return new Vector4(cPtr, true);
             }
         }
 

diff --git a/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/Gradient.cs b/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/Gradient.cs
@@ -71,7 +71,7 @@ public ReadOnlyCollection<ColorStop> ColorStops
                 for (uint i = 0; i < colorStopsCount; i++)
                 {
                     retList.Add(new ColorStop(Interop.Gradient.GetColorStopsOffsetIndexOf(BaseHandle.getCPtr(this), i),
-                                              Vector4.GetVector4FromPtr(Interop.Gradient.GetColorStopsColorIndexOf(BaseHandle.getCPtr(this), i))));
+                                              new Vector4(Interop.Gradient.GetColorStopsColorIndexOf(BaseHandle.getCPtr(this), i), true)));
                 }
 
                 return retList.AsReadOnly();

diff --git a/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/Shape.cs b/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/Shape.cs
@@ -56,7 +56,7 @@ public Color FillColor
             get
             {
                 global::System.IntPtr cPtr = Interop.Shape.GetFillColor(BaseHandle.getCPtr(this));
-                return Vector4.GetVector4FromPtr(cPtr);
+                return new Vector4(cPtr, true);
             }
             set
             {
@@ -144,7 +144,7 @@ public Color StrokeColor
             get
             {
                 global::System.IntPtr cPtr = Interop.Shape.GetStrokeColor(BaseHandle.getCPtr(this));
-                return Vector4.GetVector4FromPtr(cPtr);
+                return new Vector4(cPtr, true);
             }
             set
             {

diff --git a/src/Tizen.NUI/src/public/Common/Vector4.cs b/src/Tizen.NUI/src/public/Common/Vector4.cs
@@ -732,13 +732,6 @@ internal void Reset(float x, float y, float z, float w)
             NDalicPINVOKE.ThrowExceptionIfExists();
         }
 
-        internal static Vector4 GetVector4FromPtr(global::System.IntPtr cPtr)
-        {
-            Vector4 ret = new Vector4(cPtr, false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
         internal float Dot(Vector3 other)
         {
             float ret = Interop.Vector4.DotWithVector3(SwigCPtr, Vector3.getCPtr(other));
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,7 @@ public Vector4 BoundingBox @@
                 get
                 {
                     global::System.IntPtr cPtr = Interop.Drawable.GetBoundingBox(BaseHandle.getCPtr(this));
-                    return Vector4.GetVector4FromPtr(cPtr);
+                    return new Vector4(cPtr, true);
                 }
             }
@@ Expand Down @@