Chiebot-Mirror
/
opencv_contrib
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1535 from mshabunin:fix-clang-warnings

Browse Source
pull/1542/head
Alexander Alekhin 7 years ago
parent cdfcd0bd4e c99d1c3b04
commit 7e6ae5ce84
13 changed files with 122 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/bioinspired/src/parvoretinafilter.hpp
  2. 12
      modules/saliency/src/BING/kyheader.hpp
  3. 2
      modules/sfm/src/io/io_bundler.h
  4. 18
      modules/sfm/src/libmv_capi.h
  5. 2
      modules/sfm/src/libmv_light/libmv/multiview/projection.h
  6. 4
      modules/sfm/src/projection.cpp
  7. 6
      modules/sfm/src/simple_pipeline.cpp
  8. 4
      modules/sfm/src/triangulation.cpp
  9. 3
      modules/sfm/test/scene.cpp
  10. 2
      modules/tracking/src/trackerFeature.cpp
  11. 72
      modules/ximgproc/src/edgeaware_filters_common.cpp
  12. 36
      modules/ximgproc/src/edgeaware_filters_common.hpp
  13. 6
      modules/ximgproc/src/guided_filter.cpp

2
modules/bioinspired/src/parvoretinafilter.hpp
Unescape View File

@ -244,7 +244,7 @@ private:
float *parvocellularOutputON_PTR= parvocellularOutputON+r.start;
float *parvocellularOutputOFF_PTR= parvocellularOutputOFF+r.start;
for (register int IDpixel=r.start ; IDpixel!=r.end ; ++IDpixel)
for (int IDpixel=r.start ; IDpixel!=r.end ; ++IDpixel)
{
float pixelDifference = *(photoreceptorsOutput_PTR++) -*(horizontalCellsOutput_PTR++);
// test condition to allow write pixelDifference in ON or OFF buffer and 0 in the over

12
modules/saliency/src/BING/kyheader.hpp
Unescape View File

@ -163,7 +163,7 @@ inline cv::Rect Vec4i2Rect( cv::Vec4i &v )
# define POPCNT64(x) __builtin_popcountll(x)
#endif
inline int popcnt64( register uint64_t u )
inline int popcnt64( uint64_t u )
{
u = ( u & 0x5555555555555555 ) + ( ( u >> 1 ) & 0x5555555555555555 );
u = ( u & 0x3333333333333333 ) + ( ( u >> 2 ) & 0x3333333333333333 );
@ -174,7 +174,7 @@ inline int popcnt64( register uint64_t u )
return (int)u;
}
inline int popcnt( register uint32_t u )
inline int popcnt( uint32_t u )
{
u = ( u & 0x55555555 ) + ( ( u >> 1 ) & 0x55555555 );
u = ( u & 0x33333333 ) + ( ( u >> 2 ) & 0x33333333 );
@ -184,7 +184,7 @@ inline int popcnt( register uint32_t u )
return (int)u;
}
inline int popcnt64_nibble( register uint64_t u )
inline int popcnt64_nibble( uint64_t u )
{
static const uint8_t Table[] =
{ 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 };
@ -198,7 +198,7 @@ inline int popcnt64_nibble( register uint64_t u )
return (int)c;
}
inline int popcnt_nibble( register uint32_t u )
inline int popcnt_nibble( uint32_t u )
{
static const uint8_t Table[] =
{ 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 };
@ -212,7 +212,7 @@ inline int popcnt_nibble( register uint32_t u )
return (int)c;
}
inline int popcnt64_byte( register uint64_t u )
inline int popcnt64_byte( uint64_t u )
{
#define B2(k) k, k+1, k+1, k+2
#define B4(k) B2(k), B2(k+1), B2(k+1), B2(k+2)
@ -232,7 +232,7 @@ inline int popcnt64_byte( register uint64_t u )
return (int)c;
}
inline int popcnt_byte( register uint32_t u )
inline int popcnt_byte( uint32_t u )
{
#define B2(k) k, k+1, k+1, k+2
#define B4(k) B2(k), B2(k+1), B2(k+1), B2(k+2)

2
modules/sfm/src/io/io_bundler.h
Unescape View File

@ -47,7 +47,7 @@
// towards the top of the image. Thus, (-w/2, -h/2) is the lower-left corner of
// the image, and (w/2, h/2) is the top-right corner (where w and h are the
// width and height of the image).
bool readBundlerFile(const std::string &file,
static bool readBundlerFile(const std::string &file,
std::vector<cv::Matx33d> &Rs,
std::vector<cv::Vec3d> &Ts,
std::vector<cv::Matx33d> &Ks,

18
modules/sfm/src/libmv_capi.h
Unescape View File

@ -85,7 +85,7 @@ struct libmv_Reconstruction {
// Based on 'libmv_capi' (blender API)
/////////////////////////////////////
void libmv_initLogging(const char* argv0) {
static void libmv_initLogging(const char* argv0) {
// Make it so FATAL messages are always print into console.
char severity_fatal[32];
static int initLog=0;
@ -101,14 +101,14 @@ void libmv_initLogging(const char* argv0) {
SetCommandLineOption("minloglevel", severity_fatal);
}
void libmv_startDebugLogging(void) {
static void libmv_startDebugLogging(void) {
SetCommandLineOption("logtostderr", "1");
SetCommandLineOption("v", "2");
SetCommandLineOption("stderrthreshold", "1");
SetCommandLineOption("minloglevel", "0");
}
void libmv_setLoggingVerbosity(int verbosity) {
static void libmv_setLoggingVerbosity(int verbosity) {
char val[10];
snprintf(val, sizeof(val), "%d", verbosity);
SetCommandLineOption("v", val);
@ -122,7 +122,7 @@ void libmv_setLoggingVerbosity(int verbosity) {
/* Select the two keyframes that give a lower reprojection error
*/
bool selectTwoKeyframesBasedOnGRICAndVariance(
static bool selectTwoKeyframesBasedOnGRICAndVariance(
Tracks& tracks,
Tracks& normalized_tracks,
CameraIntrinsics& camera_intrinsics,
@ -252,7 +252,7 @@ static void libmv_cameraIntrinsicsFillFromOptions(
* options values.
*/
CameraIntrinsics* libmv_cameraIntrinsicsCreateFromOptions(
static CameraIntrinsics* libmv_cameraIntrinsicsCreateFromOptions(
const libmv_CameraIntrinsicsOptions* camera_intrinsics_options) {
CameraIntrinsics *camera_intrinsics = NULL;
switch (camera_intrinsics_options->distortion_model) {
@ -278,7 +278,7 @@ CameraIntrinsics* libmv_cameraIntrinsicsCreateFromOptions(
/* Normalizes the tracks given the camera intrinsics parameters
*/
void
static void
libmv_getNormalizedTracks(const libmv::Tracks &tracks,
const libmv::CameraIntrinsics &camera_intrinsics,
libmv::Tracks *normalized_tracks) {
@ -302,7 +302,7 @@ libmv_getNormalizedTracks(const libmv::Tracks &tracks,
/* Refine the final solution using Bundle Adjustment
*/
void libmv_solveRefineIntrinsics(
static void libmv_solveRefineIntrinsics(
const Tracks &tracks,
const int refine_intrinsics,
const int bundle_constraints,
@ -339,7 +339,7 @@ void libmv_solveRefineIntrinsics(
/* Finish the reconstrunction and computes the final reprojection error
*/
void finishReconstruction(
static void finishReconstruction(
const Tracks &tracks,
const CameraIntrinsics &camera_intrinsics,
libmv_Reconstruction *libmv_reconstruction) {
@ -361,7 +361,7 @@ void finishReconstruction(
/* Perform the complete reconstruction process
*/
libmv_Reconstruction *libmv_solveReconstruction(
static libmv_Reconstruction *libmv_solveReconstruction(
const Tracks &libmv_tracks,
const libmv_CameraIntrinsicsOptions* libmv_camera_intrinsics_options,
libmv_ReconstructionOptions* libmv_reconstruction_options) {

2
modules/sfm/src/libmv_light/libmv/multiview/projection.h
Unescape View File

@ -122,7 +122,7 @@ inline void Project(const Mat34 &P, const Vec3 &X, Vec3 *x) {
inline void Project(const Mat34 &P, const Vec3 &X, Vec2 *x) {
Vec3 hx;
Project(P, X, x);
Project(P, X, &hx);
*x = hx.head<2>() / hx(2);
}

4
modules/sfm/src/projection.cpp
Unescape View File

@ -75,7 +75,7 @@ homogeneousToEuclidean(const Mat & _X, Mat & _x)
}
void
homogeneousToEuclidean(const InputArray _X, OutputArray _x)
homogeneousToEuclidean(InputArray _X, OutputArray _x)
{
// src
const Mat X = _X.getMat();
@ -96,7 +96,7 @@ homogeneousToEuclidean(const InputArray _X, OutputArray _x)
}
void
euclideanToHomogeneous(const InputArray _x, OutputArray _X)
euclideanToHomogeneous(InputArray _x, OutputArray _X)
{
const Mat x = _x.getMat();
const Mat last_row = Mat::ones(1, x.cols, x.type());

6
modules/sfm/src/simple_pipeline.cpp
Unescape View File

@ -52,7 +52,7 @@ namespace sfm
/* Parses a given array of 2d points into the libmv tracks structure
*/
void
static void
parser_2D_tracks( const std::vector<Mat> &points2d, libmv::Tracks &tracks )
{
const int nframes = static_cast<int>(points2d.size());
@ -71,7 +71,7 @@ parser_2D_tracks( const std::vector<Mat> &points2d, libmv::Tracks &tracks )
/* Parses a given set of matches into the libmv tracks structure
*/
void
static void
parser_2D_tracks( const libmv::Matches &matches, libmv::Tracks &tracks )
{
std::set<Matches::ImageID>::const_iterator iter_image =
@ -115,7 +115,7 @@ parser_2D_tracks( const libmv::Matches &matches, libmv::Tracks &tracks )
* reconstruction pipeline.
*/
libmv_Reconstruction *libmv_solveReconstructionImpl(
static libmv_Reconstruction *libmv_solveReconstructionImpl(
const std::vector<String> &images,
const libmv_CameraIntrinsicsOptions* libmv_camera_intrinsics_options,
libmv_ReconstructionOptions* libmv_reconstruction_options)

4
modules/sfm/src/triangulation.cpp
Unescape View File

@ -64,7 +64,7 @@ namespace sfm
Reference: @cite HartleyZ00 12.2 pag.312
*/
void
static void
triangulateDLT( const Vec2d &xl, const Vec2d &xr,
const Matx34d &Pl, const Matx34d &Pr,
Vec3d &point3d )
@ -92,7 +92,7 @@ triangulateDLT( const Vec2d &xl, const Vec2d &xr,
* Reference: it is the standard DLT; for derivation see appendix of Keir's thesis
*/
void
static void
triangulateNViews(const Mat_<double> &x, const std::vector<Matx34d> &Ps, Vec3d &X)
{
CV_Assert(x.rows == 2);

3
modules/sfm/test/scene.cpp
Unescape View File

@ -38,8 +38,7 @@
#include "test_precomp.hpp"
cv::Matx33d
randomK(bool is_projective)
static cv::Matx33d randomK(bool is_projective)
{
static cv::RNG rng;

2
modules/tracking/src/trackerFeature.cpp
Unescape View File

@ -250,7 +250,7 @@ class Parallel_compute : public cv::ParallelLoopBody
virtual void operator()( const cv::Range &r ) const
{
for ( register int jf = r.start; jf != r.end; ++jf )
for ( int jf = r.start; jf != r.end; ++jf )
{
int cols = images[jf].cols;
int rows = images[jf].rows;

72
modules/ximgproc/src/edgeaware_filters_common.cpp
Unescape View File

@ -151,9 +151,9 @@ inline float getFloatSignBit()
return signFloat;
}
void add_(register float *dst, register float *src1, int w)
void add_(float *dst, float *src1, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -171,9 +171,9 @@ void add_(register float *dst, register float *src1, int w)
dst[j] += src1[j];
}
void mul(register float *dst, register float *src1, register float *src2, int w)
void mul(float *dst, float *src1, float *src2, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -191,9 +191,9 @@ void mul(register float *dst, register float *src1, register float *src2, int w)
dst[j] = src1[j] * src2[j];
}
void mul(register float *dst, register float *src1, float src2, int w)
void mul(float *dst, float *src1, float src2, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -211,9 +211,9 @@ void mul(register float *dst, register float *src1, float src2, int w)
dst[j] = src1[j]*src2;
}
void mad(register float *dst, register float *src1, float alpha, float beta, int w)
void mad(float *dst, float *src1, float alpha, float beta, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -233,9 +233,9 @@ void mad(register float *dst, register float *src1, float alpha, float beta, int
dst[j] = alpha*src1[j] + beta;
}
void sqr_(register float *dst, register float *src1, int w)
void sqr_(float *dst, float *src1, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -252,9 +252,9 @@ void sqr_(register float *dst, register float *src1, int w)
dst[j] = src1[j] * src1[j];
}
void sqr_dif(register float *dst, register float *src1, register float *src2, int w)
void sqr_dif(float *dst, float *src1, float *src2, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -271,9 +271,9 @@ void sqr_dif(register float *dst, register float *src1, register float *src2, in
dst[j] = (src1[j] - src2[j])*(src1[j] - src2[j]);
}
void add_mul(register float *dst, register float *src1, register float *src2, int w)
void add_mul(float *dst, float *src1, float *src2, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -295,9 +295,9 @@ void add_mul(register float *dst, register float *src1, register float *src2, in
}
}
void add_sqr(register float *dst, register float *src1, int w)
void add_sqr(float *dst, float *src1, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -318,9 +318,9 @@ void add_sqr(register float *dst, register float *src1, int w)
}
}
void add_sqr_dif(register float *dst, register float *src1, register float *src2, int w)
void add_sqr_dif(float *dst, float *src1, float *src2, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -341,9 +341,9 @@ void add_sqr_dif(register float *dst, register float *src1, register float *src2
}
}
void sub_mul(register float *dst, register float *src1, register float *src2, int w)
void sub_mul(float *dst, float *src1, float *src2, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -363,9 +363,9 @@ void sub_mul(register float *dst, register float *src1, register float *src2, in
dst[j] -= src1[j] * src2[j];
}
void sub_mad(register float *dst, register float *src1, register float *src2, float c0, int w)
void sub_mad(float *dst, float *src1, float *src2, float c0, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -387,9 +387,9 @@ void sub_mad(register float *dst, register float *src1, register float *src2, fl
dst[j] -= src1[j] * src2[j] + c0;
}
void det_2x2(register float *dst, register float *a00, register float *a01, register float *a10, register float *a11, int w)
void det_2x2(float *dst, float *a00, float *a01, float *a10, float *a11, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -407,9 +407,9 @@ void det_2x2(register float *dst, register float *a00, register float *a01, regi
dst[j] = a00[j]*a11[j] - a01[j]*a10[j];
}
void div_det_2x2(register float *a00, register float *a01, register float *a11, int w)
void div_det_2x2(float *a00, float *a01, float *a11, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -447,9 +447,9 @@ void div_det_2x2(register float *a00, register float *a01, register float *a11,
}
}
void div_1x(register float *a1, register float *b1, int w)
void div_1x(float *a1, float *b1, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -468,9 +468,9 @@ void div_1x(register float *a1, register float *b1, int w)
}
}
void inv_self(register float *src, int w)
void inv_self(float *src, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -488,9 +488,9 @@ void inv_self(register float *src, int w)
}
}
void sqrt_(register float *dst, register float *src, int w)
void sqrt_(float *dst, float *src, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -506,9 +506,9 @@ void sqrt_(register float *dst, register float *src, int w)
dst[j] = sqrt(src[j]);
}
void min_(register float *dst, register float *src1, register float *src2, int w)
void min_(float *dst, float *src1, float *src2, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{
@ -527,9 +527,9 @@ void min_(register float *dst, register float *src1, register float *src2, int w
dst[j] = std::min(src1[j], src2[j]);
}
void rf_vert_row_pass(register float *curRow, register float *prevRow, float alphaVal, int w)
void rf_vert_row_pass(float *curRow, float *prevRow, float alphaVal, int w)
{
register int j = 0;
int j = 0;
#if CV_SSE
if (CPU_SUPPORT_SSE1())
{

36
modules/ximgproc/src/edgeaware_filters_common.hpp
Unescape View File

@ -51,43 +51,43 @@ void checkSameSizeAndDepth(InputArrayOfArrays src, Size &sz, int &depth);
namespace intrinsics
{
void add_(register float *dst, register float *src1, int w);
void add_(float *dst, float *src1, int w);
void mul(register float *dst, register float *src1, register float *src2, int w);
void mul(float *dst, float *src1, float *src2, int w);
void mul(register float *dst, register float *src1, float src2, int w);
void mul(float *dst, float *src1, float src2, int w);
//dst = alpha*src + beta
void mad(register float *dst, register float *src1, float alpha, float beta, int w);
void mad(float *dst, float *src1, float alpha, float beta, int w);
void add_mul(register float *dst, register float *src1, register float *src2, int w);
void add_mul(float *dst, float *src1, float *src2, int w);
void sub_mul(register float *dst, register float *src1, register float *src2, int w);
void sub_mul(float *dst, float *src1, float *src2, int w);
void sub_mad(register float *dst, register float *src1, register float *src2, float c0, int w);
void sub_mad(float *dst, float *src1, float *src2, float c0, int w);
void det_2x2(register float *dst, register float *a00, register float *a01, register float *a10, register float *a11, int w);
void det_2x2(float *dst, float *a00, float *a01, float *a10, float *a11, int w);
void div_det_2x2(register float *a00, register float *a01, register float *a11, int w);
void div_det_2x2(float *a00, float *a01, float *a11, int w);
void div_1x(register float *a1, register float *b1, int w);
void div_1x(float *a1, float *b1, int w);
void inv_self(register float *src, int w);
void inv_self(float *src, int w);
void sqr_(register float *dst, register float *src1, int w);
void sqr_(float *dst, float *src1, int w);
void sqrt_(register float *dst, register float *src, int w);
void sqrt_(float *dst, float *src, int w);
void sqr_dif(register float *dst, register float *src1, register float *src2, int w);
void sqr_dif(float *dst, float *src1, float *src2, int w);
void add_sqr_dif(register float *dst, register float *src1, register float *src2, int w);
void add_sqr_dif(float *dst, float *src1, float *src2, int w);
void add_sqr(register float *dst, register float *src1, int w);
void add_sqr(float *dst, float *src1, int w);
void min_(register float *dst, register float *src1, register float *src2, int w);
void min_(float *dst, float *src1, float *src2, int w);
void rf_vert_row_pass(register float *curRow, register float *prevRow, float alphaVal, int w);
void rf_vert_row_pass(float *curRow, float *prevRow, float alphaVal, int w);
}
}

6
modules/ximgproc/src/guided_filter.cpp
Unescape View File

@ -415,8 +415,8 @@ void GuidedFilterImpl::ComputeCovGuideInv_ParBody::operator()(const Range& range
for (int k = 0; k < 3; k++)
{
register float *a = covars(k, 0).ptr<float>(i);
register float *ac = gf.covarsInv(k, 0).ptr<float>(i);
float *a = covars(k, 0).ptr<float>(i);
float *ac = gf.covarsInv(k, 0).ptr<float>(i);
if (k == 0)
mul(det, a, ac, gf.w);
@ -503,7 +503,7 @@ void GuidedFilterImpl::ComputeCovFromSrcChannelsMul_ParBody::operator()(const Ra
int start = (si % 2) ? 0 : gf.gCnNum - 1;
int end = (si % 2) ? gf.gCnNum : -1;
register float *srcMeanLine = srcCnMean[si].ptr<float>(i);
float *srcMeanLine = srcCnMean[si].ptr<float>(i);
for (int gi = start; gi != end; gi += step)
{

Write Preview
Loading…
Cancel
Save