From eef025588590151ce1eca54f86eec117cc6c92bc Mon Sep 17 00:00:00 2001 From: Tae-Young Chung Date: Thu, 9 Jan 2020 17:23:05 +0900 Subject: [PATCH] Fix(#2) build error due to toolchain upgrade (gcc6->gcc9) Error caused by -Wno-deprecated-copy, -Wcatch-value, -Wstringop-truncation are fixed. Change-Id: I26405d9942f8b8803e2e9f0b2d8f5a984e69da4c Signed-off-by: Tae-Young Chung --- mv_barcode/barcode_generator/src/BarcodeGenerator.cpp | 8 ++++---- mv_face/face/src/FaceDetector.cpp | 2 +- mv_image/image/include/Tracking/ObjectTracker.h | 2 +- packaging/capi-media-vision.spec | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp index 1bfe327..4057946 100644 --- a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp +++ b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp @@ -85,21 +85,21 @@ int createBarcode( /* set default values */ if (fgcolour) { - std::strncpy(symbol->fgcolour, fgcolour, 10); + std::strncpy(symbol->fgcolour, fgcolour, ZINT_COLOUR_SIZE-1); if (strlen(fgcolour) > 9) { symbol->fgcolour[9] = '\0'; } } else { - std::strncpy(symbol->fgcolour, "000000", 10); + std::strncpy(symbol->fgcolour, "000000", ZINT_COLOUR_SIZE-1); } if (bgcolour) { - std::strncpy(symbol->bgcolour, bgcolour, 10); + std::strncpy(symbol->bgcolour, bgcolour, ZINT_COLOUR_SIZE-1); if (strlen(bgcolour) > 9) { symbol->bgcolour[9] = '\0'; } } else { - std::strncpy(symbol->bgcolour, "ffffff", 10); + std::strncpy(symbol->bgcolour, "ffffff", ZINT_COLOUR_SIZE-1); } LOGI("Check colors: front %s, back %s", symbol->fgcolour, symbol->bgcolour); diff --git a/mv_face/face/src/FaceDetector.cpp b/mv_face/face/src/FaceDetector.cpp index 11d4043..9b66368 100644 --- a/mv_face/face/src/FaceDetector.cpp +++ b/mv_face/face/src/FaceDetector.cpp @@ -61,7 +61,7 @@ bool FaceDetector::detectFaces( 3, 0, minSize); - } catch (cv::Exception e) { + } catch (cv::Exception &e) { return false; } diff --git a/mv_image/image/include/Tracking/ObjectTracker.h b/mv_image/image/include/Tracking/ObjectTracker.h index 0fe88b4..e3e6894 100644 --- a/mv_image/image/include/Tracking/ObjectTracker.h +++ b/mv_image/image/include/Tracking/ObjectTracker.h @@ -71,7 +71,7 @@ private: * @param [in] copy @ref ObjectTracker which will be copied * @return itself */ - ObjectTracker& operator=(const ObjectTracker& copy); + ObjectTracker& operator=(const ObjectTracker& copy) = default; }; } /* Image */ diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index e072ab8..aafbc29 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.1 -Release: 1 +Release: 2 Group: Multimedia/Framework License: Apache-2.0 and BSD-3-Clause Source0: %{name}-%{version}.tar.gz -- 2.7.4