Merge changes I959fa181,If080c95a,I45edd68e into rel/api_4 4.0.1-preview1-00052
authorWonYoung Choi <wy80.choi@samsung.com>
Wed, 3 Jan 2018 01:21:26 +0000 (01:21 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 3 Jan 2018 01:21:26 +0000 (01:21 +0000)
* changes:
  Review WebView API cs files
  Review Uix.InputMethod/SttEngine/TtsEngine API cs files
  Review System.Usb API cs files

src/Tizen.Multimedia/Common/ColorSpace.cs
src/Tizen.NUI/src/internal/NDalicPINVOKE.cs
src/Tizen.NUI/src/public/ImageLoading.cs
src/Tizen.NUI/src/public/PixelBuffer.cs

index 502b8a0..c5fe95e 100644 (file)
@@ -64,20 +64,19 @@ namespace Tizen.Multimedia
         Yuyv,
 
         /// <summary>
-        /// YUV422.
+        /// YUV422, alias for <see cref="Yuv422P"/>.
         /// </summary>
         Yuv422,
 
         /// <summary>
-        /// UYVY.
+        /// YUV422P.
         /// </summary>
-        Uyvy,
+        Yuv422P = Yuv422,
 
         /// <summary>
-        /// YUV422P.
+        /// UYVY.
         /// </summary>
-        ///
-        Yuv422P,
+        Uyvy,
 
         /// <summary>
         /// RGB565.
index 23be7ce..2dbb943 100755 (executable)
@@ -11456,9 +11456,6 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PixelBuffer_Resize")]
   public static extern void PixelBuffer_Resize(global::System.Runtime.InteropServices.HandleRef jarg1, ushort jarg2, ushort jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PixelBuffer_GetMetadata")]
-  public static extern void PixelBuffer_GetMetadata(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_PixelBuffer__SWIG_2")]
   public static extern global::System.IntPtr new_PixelBuffer__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
 
index 2bff4e9..b04a085 100755 (executable)
@@ -14,7 +14,6 @@
  * limitations under the License.
  *
  */
-
 using System.ComponentModel;
 
 namespace Tizen.NUI
index c74bc4c..5c922f1 100755 (executable)
@@ -301,21 +301,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// <summary>
-        /// Get Meta data.
-        /// </summary>
-        /// <returns>PropertyMap of Metadata.</returns>
-        /// <since_tizen> 5 </since_tizen>
-        /// This will be released at Tizen.NET API Level 5, so currently this would be used as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public PropertyMap GetMetadata()
-        {
-            var retval = new PropertyMap();
-            NDalicPINVOKE.PixelBuffer_GetMetadata(swigCPtr, PropertyMap.getCPtr(retval));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return retval;
-        }
-
         internal PixelBuffer(SWIGTYPE_p_unsigned_char pointer) : this(NDalicPINVOKE.new_PixelBuffer__SWIG_2(SWIGTYPE_p_unsigned_char.getCPtr(pointer)), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();