From 4cdced9ba44ee8144e2f7e8b914419e3b29c73ab Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Fri, 22 Jun 2018 13:38:16 +0900 Subject: [PATCH] [Tizen] NUI version 502 Change-Id: I0bc21f70342f79ab0c0950fed9e40279308b205b --- dali-csharp-binder/src/version-check.cpp | 42 +++++++++++++++++++------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dali-csharp-binder/src/version-check.cpp b/dali-csharp-binder/src/version-check.cpp index c9b2ba2..2a41128 100755 --- a/dali-csharp-binder/src/version-check.cpp +++ b/dali-csharp-binder/src/version-check.cpp @@ -1,18 +1,18 @@ -/** Copyright (c) 2017 Samsung Electronics Co., Ltd. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*/ +/* Copyright (c) 2018 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ #include "common.h" @@ -84,14 +84,22 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_NUI_InternalAPIVersionCheck(int * version, in *reserved2 = 0; return true; } - else if(Dali::CORE_MICRO_VERSION <= 99) + else if(Dali::CORE_MICRO_VERSION <= 27) { - //from dali_1.3.23, nui_api_internal_version is set as 501 + //from dali_1.3.23 to dali 1.3.27, nui_api_internal_version is set as 501 *version = 501; *reserved1 = 0; *reserved2 = 0; return true; } + else if(Dali::CORE_MICRO_VERSION <= 99) + { + //from dali_1.3.28, nui_api_internal_version is set as 502 + *version = 502; + *reserved1 = 0; + *reserved2 = 0; + return true; + } else { *version = Dali::CORE_MAJOR_VERSION; -- 2.7.4