From fd44382630c40381c3d929e4441a1b28590dbc6d Mon Sep 17 00:00:00 2001 From: SeonhyungLee Date: Wed, 14 Aug 2013 14:20:49 +0300 Subject: [PATCH] fix a build error Change-Id: I1c65a311521273001f786a415ed6fee06f80ef46 --- src/visual-element/src/osp-appfw/CMakeLists.txt | 2 +- .../src/osp-appfw/FBaseCharacter.cpp | 295 +++++++++++++++++++++ src/visual-element/src/ui-core/CMakeLists.txt | 2 +- 3 files changed, 297 insertions(+), 2 deletions(-) create mode 100644 src/visual-element/src/osp-appfw/FBaseCharacter.cpp diff --git a/src/visual-element/src/osp-appfw/CMakeLists.txt b/src/visual-element/src/osp-appfw/CMakeLists.txt index d86cb50..bdc035a 100644 --- a/src/visual-element/src/osp-appfw/CMakeLists.txt +++ b/src/visual-element/src/osp-appfw/CMakeLists.txt @@ -24,7 +24,7 @@ SET(${this_target}_SOURCE_FILES FApp_AppInfo.cpp FAppApp.cpp FIo_FileImpl.cpp - ${APPFW_DIRECTORY}/src/base/FBaseCharacter.cpp + FBaseCharacter.cpp ${APPFW_DIRECTORY}/src/base/FBaseDateTime.cpp ${APPFW_DIRECTORY}/src/base/FBaseTimeSpan.cpp ${APPFW_DIRECTORY}/src/base/FBaseObject.cpp diff --git a/src/visual-element/src/osp-appfw/FBaseCharacter.cpp b/src/visual-element/src/osp-appfw/FBaseCharacter.cpp new file mode 100644 index 0000000..11aa089 --- /dev/null +++ b/src/visual-element/src/osp-appfw/FBaseCharacter.cpp @@ -0,0 +1,295 @@ +// +// Copyright (c) 2012 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. +// + +/** + * @file FBaseCharacter.cpp + * @brief This is the implementation file for Char class. + */ +#include + +#ifndef VE_SO +#include +#endif + +#include +#include + +#include "FBase_CharacterImpl.h" + +namespace Tizen { namespace Base +{ + +Character::Character(wchar_t value) + : __val(value) + , __pCharacterImpl(null) +{ +} + +Character::Character(const Character& value) + : __val(value.__val) + , __pCharacterImpl(null) +{ +} + +Character::~Character(void) +{ +} + +Character& +Character::operator =(const Character& rhs) +{ + if (&rhs != this) + { + __val = rhs.__val; + } + return *this; +} + +int +Character::CompareTo(const Character& value) const +{ + return __val - value.__val; +} + +bool +Character::Equals(const Object& obj) const +{ + const Character* pOther = dynamic_cast< const Character* >(&obj); + if (pOther == null) + { + return false; + } + + return((*this).CompareTo((*pOther).ToMchar()) == 0 ? true : false); +} + +int +Character::GetHashCode(void) const +{ + return __val; +} + +wchar_t +Character::ToMchar(void) const +{ + return __val; +} + +void +Character::ToLower(void) +{ + if (IsUpper(__val)) + { + __val = towlower(__val); + } +} + +void +Character::ToLowerCase(void) +{ + __val = _CharacterImpl::ToLowerCase(__val); +} + +void +Character::ToUpper(void) +{ + if (IsLower(__val)) + { + __val = towupper(__val); + } +} + +void +Character::ToUpperCase(void) +{ + __val = _CharacterImpl::ToUpperCase(__val); +} + +String +Character::ToString(void) const +{ + return Character::ToString(__val); +} + +String +Character::ToString(wchar_t value) +{ + return String(value); +} + +UnicodeCategory +Character::GetUnicodeCategory(wchar_t ch) +{ + return _CharacterImpl::GetUnicodeCategory(ch); +} + +wchar_t +Character::ToLower(wchar_t ch) +{ + if (IsUpper(ch)) + { + return towlower(ch); + } + else + { + return ch; + } +} + +wchar_t +Character::ToLowerCase(wchar_t ch) +{ + return _CharacterImpl::ToLowerCase(ch); +} + +wchar_t +Character::ToUpper(wchar_t ch) +{ + if (IsLower(ch)) + { + return towupper(ch); + } + else + { + return ch; + } +} + +wchar_t +Character::ToUpperCase(wchar_t ch) +{ + return _CharacterImpl::ToUpperCase(ch); +} + +bool +Character::IsAlphaNumeric(wchar_t ch) +{ + if (_CharacterImpl::IsLetter(ch)) + { + return true; + } + + if (_CharacterImpl::IsDigit(ch)) + { + return true; + } + + return false; +} + +bool +Character::IsDigit(wchar_t ch) +{ + if (_CharacterImpl::IsDigit(ch)) + { + return true; + } + + return false; +} + +bool +Character::IsLetter(wchar_t ch) +{ +#ifndef VE_SO + if ((appinfo_get_api_version() == APP_INFO_VERSION_2_0) && (appinfo_is_compat() == 1)) + { + return(iswalpha(ch) != 0); + } + else +#endif + { + return _CharacterImpl::IsLetter(ch); + } +} + +bool +Character::IsLower(wchar_t ch) +{ + return(iswlower(ch) != 0); +} + +bool +Character::IsLowerCase(wchar_t ch) +{ + return(Character::ToUpperCase(ch) != ch); +} + +bool +Character::IsUpper(wchar_t ch) +{ + return(iswupper(ch) != 0); +} + +bool +Character::IsUpperCase(wchar_t ch) +{ + return(Character::ToLowerCase(ch) != ch); +} + +int +Character::ToDigit(wchar_t ch, int radix) +{ + return _CharacterImpl::ToDigit(ch, radix); +} + + +wchar_t +Character::ForDigit(int digit, int radix) +{ + return _CharacterImpl::ForDigit(digit, radix); +} + + +double +Character::GetNumericValue(wchar_t ch) +{ + return _CharacterImpl::GetNumericValue(ch); +} + + +bool +Character::IsDefined(wchar_t ch) +{ + return _CharacterImpl::IsDefined(ch); +} + + +bool +Character::IsWhitespace(wchar_t ch) +{ + return _CharacterImpl::IsWhitespace(ch); +} + +bool +Character::IsTitleCase(wchar_t ch) +{ + return _CharacterImpl::IsTitleCase(ch); +} + +wchar_t +Character::ToTitleCase(wchar_t ch) +{ + return _CharacterImpl::ToTitleCase(ch); +} + +bool +Character::IsISOControl(wchar_t ch) +{ + return _CharacterImpl::IsISOControl(ch); +} + +}} // Tizen::Base diff --git a/src/visual-element/src/ui-core/CMakeLists.txt b/src/visual-element/src/ui-core/CMakeLists.txt index 38f91b2..cbba10b 100755 --- a/src/visual-element/src/ui-core/CMakeLists.txt +++ b/src/visual-element/src/ui-core/CMakeLists.txt @@ -47,8 +47,8 @@ TARGET_LINK_LIBRARIES(${this_target} "-lswscale" ) TARGET_LINK_LIBRARIES(${this_target} "-lavutil" ) TARGET_LINK_LIBRARIES(${this_target} "-lexif" ) TARGET_LINK_LIBRARIES(${this_target} "-lgif" ) -TARGET_LINK_LIBRARIES(${this_target} "-ltiff" ) TARGET_LINK_LIBRARIES(${this_target} "-lpng" ) +TARGET_LINK_LIBRARIES(${this_target} "-ljpeg" ) TARGET_LINK_LIBRARIES(${this_target} "-lturbojpeg" ) -- 2.7.4