diff options
| author | Tae-Young Chung <ty83.chung@samsung.com> | 2019-12-26 15:48:51 +0900 |
|---|---|---|
| committer | Tae-Young Chung <ty83.chung@samsung.com> | 2019-12-26 15:52:23 +0900 |
| commit | c0ca0659756ab60f8c027a3fc7be90da2a64017e (patch) | |
| tree | cf340d49ef99eb476c361a0dba2e5cf71a4b97fd | |
| parent | fb1b8f7daef979c7049bab4f70d8a6c2e4300227 (diff) | |
| download | mediavision-c0ca0659756ab60f8c027a3fc7be90da2a64017e.tar.gz mediavision-c0ca0659756ab60f8c027a3fc7be90da2a64017e.tar.bz2 mediavision-c0ca0659756ab60f8c027a3fc7be90da2a64017e.zip | |
Fix build error due to toolchain upgrade (gcc6->gcc9)submit/tizen/20191226.071539accepted/tizen/unified/20191227.142834
Error is caused by "call of overloaded 'abs(size_t)' is ambiguous"
Change-Id: I96e14a791203931767e3e32b64d7b45a50c56430
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
| -rw-r--r-- | mv_image/image/src/Features/FeatureMatcher.cpp | 2 | ||||
| -rw-r--r-- | mv_image/image/src/Recognition/ImageRecognizer.cpp | 2 | ||||
| -rw-r--r-- | packaging/capi-media-vision.spec | 4 | ||||
| -rw-r--r-- | test/testsuites/face/face_test_suite.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mv_image/image/src/Features/FeatureMatcher.cpp b/mv_image/image/src/Features/FeatureMatcher.cpp index 5e18b75a..24d9d9e9 100644 --- a/mv_image/image/src/Features/FeatureMatcher.cpp +++ b/mv_image/image/src/Features/FeatureMatcher.cpp @@ -107,7 +107,7 @@ size_t matchesSelection( /* Swap */ std::swap(examples[leftLimit], examples[rightLimit]); } - if (std::abs(filterAmount - leftLimit) <= static_cast<int>(allowableError)) + if (std::abs(static_cast<int>(filterAmount - leftLimit)) <= static_cast<int>(allowableError)) break; if (static_cast<int>(filterAmount) > leftLimit) { requiredNumber -= leftLimit - startLeftLimit; diff --git a/mv_image/image/src/Recognition/ImageRecognizer.cpp b/mv_image/image/src/Recognition/ImageRecognizer.cpp index 5101e2f6..b7040db8 100644 --- a/mv_image/image/src/Recognition/ImageRecognizer.cpp +++ b/mv_image/image/src/Recognition/ImageRecognizer.cpp @@ -215,7 +215,7 @@ size_t ImageRecognizer::matchesSelection( std::swap(examples[leftLimit], examples[rightLimit]); } - if (std::abs(filterAmount - leftLimit) <= (int)allowableError) + if (std::abs(static_cast<int>(filterAmount - leftLimit)) <= static_cast<int>(allowableError)) break; if ((int)filterAmount > leftLimit) { diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index 313ec8e8..e072ab8d 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,7 +1,7 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API -Version: 0.5.0 -Release: 5 +Version: 0.5.1 +Release: 1 Group: Multimedia/Framework License: Apache-2.0 and BSD-3-Clause Source0: %{name}-%{version}.tar.gz diff --git a/test/testsuites/face/face_test_suite.c b/test/testsuites/face/face_test_suite.c index c170246b..7aac080d 100644 --- a/test/testsuites/face/face_test_suite.c +++ b/test/testsuites/face/face_test_suite.c @@ -1649,7 +1649,7 @@ void eos_cb(void *user_data) pthread_mutex_unlock((pthread_mutex_t*)user_data); } -inline void release_resources_for_process_video_file_function( +static inline void release_resources_for_process_video_file_function( mv_video_reader_h *reader, mv_video_writer_h *writer) { |