From: dongsug.song Date: Wed, 5 Jul 2017 04:51:23 +0000 (+0900) Subject: Revert "[Tizen] Add value check to color." X-Git-Tag: submit/trunk/20170823.075128~91^2~117 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23a1996f3634ff6c5e60fd87bdbeb5abd469196c;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git Revert "[Tizen] Add value check to color." This reverts commit 89b9eae131c6f3b53aa91f6fb094c960d39b52a7. Change-Id: I019df8fd0a3281434946c7b785b61abc20fa2e8f --- diff --git a/src/Tizen.NUI/src/public/Color.cs b/src/Tizen.NUI/src/public/Color.cs index 9170658..505feb6 100755 --- a/src/Tizen.NUI/src/public/Color.cs +++ b/src/Tizen.NUI/src/public/Color.cs @@ -116,9 +116,7 @@ namespace Tizen.NUI /// A Color containing the result of the addition public static Color operator +(Color arg1, Color arg2) { - Color result = arg1.Add(arg2); - ValueCheck(result); - return result; + return arg1.Add(arg2); } /// @@ -129,9 +127,7 @@ namespace Tizen.NUI /// A Color containing the result of the subtraction public static Color operator -(Color arg1, Color arg2) { - Color result = arg1.Subtract(arg2); - ValueCheck(result); - return result; + return arg1.Subtract(arg2); } /// @@ -141,9 +137,7 @@ namespace Tizen.NUI /// A Color containg the negation public static Color operator -(Color arg1) { - Color result = arg1.Subtract(); - ValueCheck(result); - return result; + return arg1.Subtract(); } /// @@ -154,16 +148,12 @@ namespace Tizen.NUI /// A Color containing the result of the multiplication public static Color operator *(Color arg1, Color arg2) { - Color result = arg1.Multiply(arg2); - ValueCheck(result); - return result; + return arg1.Multiply(arg2); } public static Color operator*(Color arg1, float arg2) { - Color result = arg1.Multiply(arg2); - ValueCheck(result); - return result; + return arg1.Multiply(arg2); } /// @@ -174,16 +164,12 @@ namespace Tizen.NUI /// A Color containing the result of the division public static Color operator /(Color arg1, Color arg2) { - Color result = arg1.Divide(arg2); - ValueCheck(result); - return result; + return arg1.Divide(arg2); } public static Color operator/(Color arg1, float arg2) { - Color result = arg1.Divide(arg2); - ValueCheck(result); - return result; + return arg1.Divide(arg2); } /// @@ -224,10 +210,6 @@ namespace Tizen.NUI /// alpha component public Color(float r, float g, float b, float a) : this(NDalicPINVOKE.new_Vector4__SWIG_1(r, g, b, a), true) { - ValueCheck(ref r); - ValueCheck(ref g); - ValueCheck(ref b); - ValueCheck(ref a); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -237,10 +219,6 @@ namespace Tizen.NUI /// array Array of R,G,B,A public Color(float[] array) : this(NDalicPINVOKE.new_Vector4__SWIG_2(array), true) { - ValueCheck(ref array[0]); - ValueCheck(ref array[1]); - ValueCheck(ref array[2]); - ValueCheck(ref array[3]); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -377,7 +355,6 @@ namespace Tizen.NUI { set { - ValueCheck(ref value); NDalicPINVOKE.Vector4_r_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -396,7 +373,6 @@ namespace Tizen.NUI { set { - ValueCheck(ref value); NDalicPINVOKE.Vector4_g_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -415,7 +391,6 @@ namespace Tizen.NUI { set { - ValueCheck(ref value); NDalicPINVOKE.Vector4_b_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -434,7 +409,6 @@ namespace Tizen.NUI { set { - ValueCheck(ref value); NDalicPINVOKE.Vector4_a_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -590,64 +564,6 @@ namespace Tizen.NUI return new Color(vec.R, vec.G, vec.B, vec.A); } - internal static void ValueCheck(Color color) - { - if (color.R < 0.0f) - { - color.R = 0.0f; - Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1]."); - } - else if (color.R > 1.0f) - { - color.R = 1.0f; - Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1]."); - } - if (color.G < 0.0f) - { - color.G = 0.0f; - Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1]."); - } - else if (color.G > 1.0f) - { - color.G = 1.0f; - Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1]."); - } - if (color.B < 0.0f) - { - color.B = 0.0f; - Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1]."); - } - else if (color.B > 1.0f) - { - color.B = 1.0f; - Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1]."); - } - if (color.A < 0.0f) - { - color.A = 0.0f; - Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1]."); - } - else if (color.A > 1.0f) - { - color.A = 1.0f; - Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1]."); - } - } - - internal static void ValueCheck(ref float value) - { - if (value < 0.0f) - { - value = 0.0f; - Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1]."); - } - else if (value > 1.0f) - { - value = 1.0f; - Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1]."); - } - } - } }