Commit 1a15cbc9 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files

Merge pull request #2271 from alalek:build_cxx11_warnings

parents 4f524db4 cdd19ebe

modules/cvv/src/impl/call.hpp

+0 −3
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ class Call 
	Call(const Call &) = default;

	Call(Call &&) = default;



	Call &operator=(const Call &) = default;

	Call &operator=(Call &&) = default;



	impl::CallMetaData metaData_;

	size_t id;

	QString calltype;

modules/face/src/facemarkLBF.cpp

+4 −4
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ Mat FacemarkLBFImpl::BBox::project(const Mat &shape) const { 
        res(i, 0) = (shape_(i, 0) - x_center) / x_scale;

        res(i, 1) = (shape_(i, 1) - y_center) / y_scale;

    }

    return res;

    return CV_CXX_MOVE(res);

}



// Project relative shape to absolute shape binding to this bbox
@@ -677,7 +677,7 @@ Mat FacemarkLBFImpl::BBox::reproject(const Mat &shape) const { 
        res(i, 0) = shape_(i, 0)*x_scale + x_center;

        res(i, 1) = shape_(i, 1)*y_scale + y_center;

    }

    return res;

    return CV_CXX_MOVE(res);

}



Mat FacemarkLBFImpl::getMeanShape(std::vector<Mat> &gt_shapes, std::vector<BBox> &bboxes) {
@@ -1038,7 +1038,7 @@ Mat FacemarkLBFImpl::RandomForest::generateLBF(Mat &img, Mat &current_shape, BBo 
            lbf_feat(i*trees_n + j) = (i*trees_n + j)*base + code;

        }

    }

    return lbf_feat;

    return CV_CXX_MOVE(lbf_feat);

}



void FacemarkLBFImpl::RandomForest::write(FileStorage fs, int k) {
@@ -1380,7 +1380,7 @@ Mat FacemarkLBFImpl::Regressor::globalRegressionPredict(const Mat &lbf, int stag 
        for (int j = 0; j < lbf.cols; j++) y += w_ptr[lbf_ptr[j]];

        delta_shape(i, 1) = y;

    }

    return delta_shape;

    return CV_CXX_MOVE(delta_shape);

} // Regressor::globalRegressionPredict



Mat FacemarkLBFImpl::Regressor::predict(Mat &img, BBox &bbox) {

modules/face/src/mace.cpp

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ struct MACEImpl CV_FINAL : MACE { 
        complexInput.copyTo(dftImg(Rect(0,0,IMGSIZE,IMGSIZE)));



        dft(dftImg, dftImg);

        return dftImg;

        return CV_CXX_MOVE(dftImg);

    }

modules/optflow/src/optical_flow_io.cpp

+4 −4
Original line number Diff line number Diff line
@@ -55,12 +55,12 @@ CV_EXPORTS_W Mat readOpticalFlow( const String& path ) 
    Mat_<Point2f> flow;

    std::ifstream file(path.c_str(), std::ios_base::binary);

    if ( !file.good() )

        return flow; // no file - return empty matrix

        return CV_CXX_MOVE(flow); // no file - return empty matrix



    float tag;

    file.read((char*) &tag, sizeof(float));

    if ( tag != FLOW_TAG_FLOAT )

        return flow;

        return CV_CXX_MOVE(flow);



    int width, height;
@@ -79,14 +79,14 @@ CV_EXPORTS_W Mat readOpticalFlow( const String& path ) 
            if ( !file.good() )

            {

                flow.release();

                return flow;

                return CV_CXX_MOVE(flow);

            }



            flow(i, j) = u;

        }

    }

    file.close();

    return flow;

    return CV_CXX_MOVE(flow);

}

CV_EXPORTS_W bool writeOpticalFlow( const String& path, InputArray flow )

{

modules/ovis/src/ovis.cpp

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ public: 
        node.setScale(value[0], value[1], value[2]);

    }



    void getEntityProperty(const String& name, int prop, OutputArray value)

    void getEntityProperty(const String& name, int prop, OutputArray value) CV_OVERRIDE

    {

        SceneNode& node = _getSceneNode(sceneMgr, name);

        switch(prop)