Fix violations of CPP coding rule

1. remove redundant blank line at the start or the end of a code block

Change-Id: Ibd5c6bfa0eec81aefae8dd0731f89db69bd6a5fb
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/mv_common/src/EngineConfig.cpp b/mv_common/src/EngineConfig.cpp
index f69db65..18e7025 100644 (file)
--- a/mv_common/src/EngineConfig.cpp
+++ b/mv_common/src/EngineConfig.cpp
@@ -298,7 +298,6 @@ int EngineConfig::cacheDictionaries(bool isLazyCache, std::string configFilePath
                        if (!json_object_has_member(attr_obj, "name") ||
                                        !json_object_has_member(attr_obj, "type") ||
                                        !json_object_has_member(attr_obj, "value")) {
-
                                LOGW("Attribute %u wasn't parsed from json file.", attrInd);
                                continue;
                        }

diff --git a/mv_face/face/src/FaceDetector.cpp b/mv_face/face/src/FaceDetector.cpp
index f80983d..9ce2bbe 100644 (file)
--- a/mv_face/face/src/FaceDetector.cpp
+++ b/mv_face/face/src/FaceDetector.cpp
@@ -49,14 +49,12 @@ bool FaceDetector::detectFaces(
        if (roi.x >= 0 && roi.y >= 0 && roi.width > 0 && roi.height > 0 &&
                        (roi.x + roi.width) <= image.cols &&
                        (roi.y + roi.height) <= image.rows) {
-
                intrestingRegion = intrestingRegion(roi);
                roiIsUsed = true;
        }
 
        if (minSize.width > 0 && minSize.height > 0 &&
                        minSize.width <= image.cols && minSize.height <= image.rows) {
-
                m_faceCascade.detectMultiScale(
                                intrestingRegion,
                                faceLocations,
@@ -66,7 +64,6 @@ bool FaceDetector::detectFaces(
                                minSize);
 
        } else {
-
                m_faceCascade.detectMultiScale(intrestingRegion, faceLocations);
        }
 
@@ -85,7 +82,6 @@ bool FaceDetector::loadHaarcascade(const std::string& haarcascadeFilepath)
 {
        if (!m_faceCascadeIsLoaded ||
                        m_haarcascadeFilepath != haarcascadeFilepath) {
-
                if (!(m_faceCascadeIsLoaded = m_faceCascade.load(haarcascadeFilepath)))
                        return false;
 

diff --git a/mv_face/face/src/FaceEyeCondition.cpp b/mv_face/face/src/FaceEyeCondition.cpp
index 77ca38b..9a24cfe 100644 (file)
--- a/mv_face/face/src/FaceEyeCondition.cpp
+++ b/mv_face/face/src/FaceEyeCondition.cpp
@@ -134,7 +134,6 @@ int FaceEyeCondition::isEyeOpen(const cv::Mat& eye)
                                boundThresold.contains(currentRect.tl()) &&
                                currentArea > areaSmallRatio * boundThresold.area())
                        ++rectanglesInsideCount;
-
        }
 
        if (rectanglesInsideCount > 8u)

diff --git a/mv_face/face/src/FaceRecognitionModel.cpp b/mv_face/face/src/FaceRecognitionModel.cpp
index 1037be0..e247f58 100644 (file)
--- a/mv_face/face/src/FaceRecognitionModel.cpp
+++ b/mv_face/face/src/FaceRecognitionModel.cpp
@@ -127,7 +127,6 @@ void ParseOpenCVLabels(
                std::set<int>& outLabels)
 {
        if (!recognizer.empty()) {
-
                cv::Mat labels = recognizer->getMat("labels");
 
                for (int i = 0; i < labels.rows; ++i)

diff --git a/mv_image/image/include/Recognition/ImageObject.h b/mv_image/image/include/Recognition/ImageObject.h
index 12e3f26..2b9253e 100644 (file)
--- a/mv_image/image/include/Recognition/ImageObject.h
+++ b/mv_image/image/include/Recognition/ImageObject.h
@@ -38,7 +38,6 @@ namespace Image {
  * @since_tizen 3.0
  */
 class ImageObject {
-
 public:
        /**
         * @brief   @ref ImageObject default constructor.

diff --git a/mv_surveillance/surveillance/include/SurveillanceHelper.h b/mv_surveillance/surveillance/include/SurveillanceHelper.h
index ffb6302..1ad303a 100644 (file)
--- a/mv_surveillance/surveillance/include/SurveillanceHelper.h
+++ b/mv_surveillance/surveillance/include/SurveillanceHelper.h
@@ -60,7 +60,6 @@ public:
         */
        static int convertSourceMVRGB2GrayCVNeon(mv_source_h mvSource, cv::Mat& cvSource);
 #endif
-
 };
 
 

diff --git a/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp b/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
index c76d3d5..59bc61a 100644 (file)
--- a/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
+++ b/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
@@ -325,7 +325,6 @@ void EventTriggerPersonAppearance::movementDetectedCB(
        trigger->__rectToDetect &= ALL_IMAGE_RECT;
        /* 4. Perform Hog detector or try to track using movement regions */
        if (trigger->__frameCounter % (trigger->__skipFramesCount + 1) == 0) {
-
                trigger->__frameCounter = 0;
 
                /* 4.1 Perform Hog detector */
@@ -377,13 +376,11 @@ void EventTriggerPersonAppearance::movementDetectedCB(
                gettimeofday(&time, NULL);
                TrackedRectanglesIter trackRectIter = trigger->__trackedRects.begin();
                for (; trackRectIter != trigger->__trackedRects.end(); ++trackRectIter) {
-
                        time_t currentLifetime = 1000000 *
                                        (time.tv_sec - trackRectIter->appearanceTime.tv_sec) +
                                        (time.tv_usec - trackRectIter->appearanceTime.tv_usec);
 
                        if (currentLifetime > PERSON_LIFETIME) {
-
                                trigger->__disappearedRects.push_back(trackRectIter->rect);
                                trackRectIter = trigger->__trackedRects.erase(trackRectIter);
                        }
@@ -392,7 +389,6 @@ void EventTriggerPersonAppearance::movementDetectedCB(
                /* 4.2 Try to track */
                TrackedRectanglesIter iter = trigger->__trackedRects.begin();
                while (iter != trigger->__trackedRects.end()) {
-
                        cv::Rect_<float> trackingResult;
                        if (iter->tracker.track(result->__grayImage, trackingResult))
                                iter->rect = supplementRectAfterTracking(trackingResult);
@@ -427,7 +423,6 @@ std::vector<bool> EventTriggerPersonAppearance::reinforceTrackedPersons(
        const size_t hogRectsSize = appearedPersons.size();
        std::vector<bool> appearedBusyRects(hogRectsSize, false);
        if (__trackedRects.size() > 0u && hogRectsSize > 0u) {
-
                TrackedRectanglesIter trackRectIter = __trackedRects.begin();
                std::vector<std::vector<size_t> > intersectionAreas(
                                __trackedRects.size(), std::vector<size_t>(hogRectsSize, 0u));
@@ -437,18 +432,15 @@ std::vector<bool> EventTriggerPersonAppearance::reinforceTrackedPersons(
                /* Merge tracked -> appearance */
                for (size_t trIdx = 0u; trackRectIter != __trackedRects.end();
                                ++trackRectIter, ++trIdx) {
-
                        size_t bestIdx = 0u;
                        bool haveRes = false;
                        for (size_t apIdx = 0u; apIdx < hogRectsSize; ++apIdx) {
-
                                intersectionAreas[trIdx][apIdx] =
                                                (appearedPersons[apIdx] & trackRectIter->rect).area();
 
                                if (intersectionAreas[trIdx][apIdx] > 0 &&
                                                (intersectionAreas[trIdx][apIdx] >
                                                intersectionAreas[trIdx][bestIdx] || !haveRes)) {
-
                                        bestIdx = apIdx;
                                        haveRes = true;
                                }
@@ -461,7 +453,6 @@ std::vector<bool> EventTriggerPersonAppearance::reinforceTrackedPersons(
 
                /* Merge appearance -> tracked */
                for (size_t apIdx = 0u; apIdx < hogRectsSize; ++apIdx) {
-
                        trackRectIter = __trackedRects.begin();
                        size_t bestIdx = 0u;
                        bool haveRes = false;
@@ -469,11 +460,9 @@ std::vector<bool> EventTriggerPersonAppearance::reinforceTrackedPersons(
 
                        for (size_t trIdx = 0u; trackRectIter != __trackedRects.end();
                                        ++trackRectIter, ++trIdx) {
-
                                if (intersectionAreas[trIdx][apIdx] > 0 &&
                                                (intersectionAreas[trIdx][apIdx] >
                                                intersectionAreas[bestIdx][apIdx] || !haveRes)) {
-
                                        bestIdx = trIdx;
                                        bestTrackedRect = trackRectIter->rect;
                                        haveRes = true;
@@ -489,14 +478,12 @@ std::vector<bool> EventTriggerPersonAppearance::reinforceTrackedPersons(
                trackRectIter = __trackedRects.begin();
                for (size_t trIdx = 0u; trackRectIter != __trackedRects.end();
                                ++trackRectIter, ++trIdx) {
-
                        bool haveRes = false;
                        size_t bestIdx = 0u;
 
                        for (size_t apIdx = 0u; apIdx < hogRectsSize; ++apIdx) {
                                if (!appearedBusyRects[apIdx] && (!haveRes ||
                                                confidence[trIdx][apIdx] > confidence[trIdx][bestIdx])) {
-
                                        bestIdx = apIdx;
                                        haveRes = true;
                                }
@@ -504,7 +491,6 @@ std::vector<bool> EventTriggerPersonAppearance::reinforceTrackedPersons(
 
                        if (isPossibleToMerge(trackRectIter->rect, appearedPersons[bestIdx]) &&
                                        haveRes) {
-
                                appearedBusyRects[bestIdx] = true;
 
                                struct timeval time;

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index 12af7e0..85c0f61 100644 (file)
--- 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.3.27
-Release:     2
+Release:     3
 Group:       Multimedia/Framework
 License:     Apache-2.0 and BSD-3-Clause
 Source0:     %{name}-%{version}.tar.gz

diff --git a/test/testsuites/common/image_helper/include/ImageHelper.h b/test/testsuites/common/image_helper/include/ImageHelper.h
index 7cd7e88..9e3102f 100644 (file)
--- a/test/testsuites/common/image_helper/include/ImageHelper.h
+++ b/test/testsuites/common/image_helper/include/ImageHelper.h
@@ -213,7 +213,6 @@ private:
                        const unsigned char *pInBuffer,
                        const ImageData& imageData,
                        unsigned char **pOutBuffer);
-
 };
 
 } /* Common */