projects / platform / core / csapi / tizenfx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7845c1f)
fix args names & warning
authorabdullah <abdullahhasan10@gmail.com>
Sun, 19 Dec 2021 14:04:31 +0000 (16:04 +0200)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Tue, 21 Dec 2021 09:32:16 +0000 (18:32 +0900)
src/Tizen.NUI/src/internal/Interop/Interop.VectorVector2.cs patch | blob | history
src/Tizen.NUI/src/public/BaseComponents/TextGeometry.cs patch | blob | history

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.VectorVector2.cs b/src/Tizen.NUI/src/internal/Interop/Interop.VectorVector2.cs
index 363c2bf..b37c084 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.VectorVector2.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.VectorVector2.cs
@@ -28,61 +28,61 @@ namespace Tizen.NUI
             public static extern global::System.IntPtr NewVectorVector2();
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_VectorVector2")]
-            public static extern void DeleteVectorVector2(global::System.Runtime.InteropServices.HandleRef jarg1);
+            public static extern void DeleteVectorVector2(global::System.Runtime.InteropServices.HandleRef daliVector);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_VectorVector2__SWIG_1")]
-            public static extern global::System.IntPtr NewVectorVector2(global::System.Runtime.InteropServices.HandleRef jarg1);
+            public static extern global::System.IntPtr NewVectorVector2(global::System.Runtime.InteropServices.HandleRef daliVector);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Assign")]
-            public static extern global::System.IntPtr Assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+            public static extern global::System.IntPtr Assign(global::System.Runtime.InteropServices.HandleRef daliVectorDest, global::System.Runtime.InteropServices.HandleRef daliVectorSrc);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Begin")]
-            public static extern global::System.IntPtr Begin(global::System.Runtime.InteropServices.HandleRef jarg1);
+            public static extern global::System.IntPtr Begin(global::System.Runtime.InteropServices.HandleRef daliVector);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_End")]
-            public static extern global::System.IntPtr End(global::System.Runtime.InteropServices.HandleRef jarg1);
+            public static extern global::System.IntPtr End(global::System.Runtime.InteropServices.HandleRef daliVector);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_ValueOfIndex__SWIG_0")]
-            public static extern global::System.IntPtr ValueOfIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
+            public static extern global::System.IntPtr ValueOfIndex(global::System.Runtime.InteropServices.HandleRef daliVector, uint index);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_PushBack")]
-            public static extern void PushBack(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+            public static extern void PushBack(global::System.Runtime.InteropServices.HandleRef daliVector, global::System.Runtime.InteropServices.HandleRef item);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Insert__SWIG_0")]
-            public static extern void Insert(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+            public static extern void Insert(global::System.Runtime.InteropServices.HandleRef daliVector, global::System.Runtime.InteropServices.HandleRef iterator, global::System.Runtime.InteropServices.HandleRef item);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Insert__SWIG_1")]
-            public static extern void Insert(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4);
+            public static extern void Insert(global::System.Runtime.InteropServices.HandleRef daliVector, global::System.Runtime.InteropServices.HandleRef iterator, global::System.Runtime.InteropServices.HandleRef first, global::System.Runtime.InteropServices.HandleRef last);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Reserve")]
-            public static extern void Reserve(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
+            public static extern void Reserve(global::System.Runtime.InteropServices.HandleRef daliVector, uint size);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Resize__SWIG_0")]
-            public static extern void Resize(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
+            public static extern void Resize(global::System.Runtime.InteropServices.HandleRef daliVector, uint size);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Resize__SWIG_1")]
-            public static extern void Resize(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+            public static extern void Resize(global::System.Runtime.InteropServices.HandleRef daliVector, uint size, global::System.Runtime.InteropServices.HandleRef item);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Erase__SWIG_0")]
-            public static extern global::System.IntPtr Erase(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+            public static extern global::System.IntPtr Erase(global::System.Runtime.InteropServices.HandleRef daliVector, global::System.Runtime.InteropServices.HandleRef iterator);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Erase__SWIG_1")]
-            public static extern global::System.IntPtr Erase(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+            public static extern global::System.IntPtr Erase(global::System.Runtime.InteropServices.HandleRef daliVector, global::System.Runtime.InteropServices.HandleRef first, global::System.Runtime.InteropServices.HandleRef last);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Remove")]
-            public static extern void Remove(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+            public static extern void Remove(global::System.Runtime.InteropServices.HandleRef daliVector, global::System.Runtime.InteropServices.HandleRef item);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Swap")]
-            public static extern void Swap(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+            public static extern void Swap(global::System.Runtime.InteropServices.HandleRef daliVector1, global::System.Runtime.InteropServices.HandleRef daliVector2);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Clear")]
-            public static extern void Clear(global::System.Runtime.InteropServices.HandleRef jarg1);
+            public static extern void Clear(global::System.Runtime.InteropServices.HandleRef daliVector);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Release")]
-            public static extern void Release(global::System.Runtime.InteropServices.HandleRef jarg1);
+            public static extern void Release(global::System.Runtime.InteropServices.HandleRef daliVector);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorVector2_Size")]
-            public static extern int Size(global::System.Runtime.InteropServices.HandleRef jarg1);
+            public static extern int Size(global::System.Runtime.InteropServices.HandleRef daliVector);
 
         }
     }
diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextGeometry.cs b/src/Tizen.NUI/src/public/BaseComponents/TextGeometry.cs
index bb0a8c6..7684fc5 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TextGeometry.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextGeometry.cs
@@ -38,26 +38,30 @@ namespace Tizen.NUI.BaseComponents
 
         private static List<Size2D> GetSizeListFromNativeVector(System.IntPtr ptr)
         {
-            VectorVector2 sizeVector = new VectorVector2 (ptr, true);
-            int count = sizeVector.Size();
-            List<Size2D> list = new List<Size2D>();
+            using (VectorVector2 sizeVector = new VectorVector2 (ptr, true))
+            {
+                int count = sizeVector.Size();
+                List<Size2D> list = new List<Size2D>();
 
-            for(int i = 0; i < count; i++)
-                list.Add(sizeVector.ValueOfIndex( (uint)i ));
+                for(int i = 0; i < count; i++)
+                    list.Add(sizeVector.ValueOfIndex( (uint)i ));
 
-            return list;
+                return list;
+            }
         }
 
         private static List<Position2D> GetPositionListFromNativeVector(System.IntPtr ptr)
         {
-            VectorVector2 positionVector = new VectorVector2 (ptr, true);
-            int count = positionVector.Size();
-            List<Position2D> list = new List<Position2D>();
+            using (VectorVector2 positionVector = new VectorVector2 (ptr, true))
+            {
+                int count = positionVector.Size();
+                List<Position2D> list = new List<Position2D>();
 
-            for(int i = 0; i < count; i++)
-                list.Add(positionVector.ValueOfIndex( (uint)i ));
+                for(int i = 0; i < count; i++)
+                    list.Add(positionVector.ValueOfIndex( (uint)i ));
 
-            return list;
+                return list;
+            }
         }
 
         private static void CheckSWIGPendingException()
Domain: Dotnet / Frameworks;