diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-01 19:02:09 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-01 19:02:09 +0400 |
commit | cad86091725db3631cfd36fa85eabdafe756fd15 (patch) | |
tree | e318db8d56b879bdf613ff4343b1064360a1571c /extern | |
parent | 2fcd6827bfe48a4def999ba84732366579a5dad5 (diff) |
Code cleanup: silence some -Wnarrowing warnings from C++11
Diffstat (limited to 'extern')
-rw-r--r-- | extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc | 2 | ||||
-rw-r--r-- | extern/libmv/libmv/simple_pipeline/detect.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc b/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc index ab9b21d6dfd..6319846a079 100644 --- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc +++ b/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc @@ -209,7 +209,7 @@ void CameraIntrinsics::ComputeLookupGrid(Grid* grid, int width, int height, doub if( ix >= width-2 ) ix = width-2; if( iy >= height-2 ) iy = height-2; - Offset offset = { ix-x, iy-y, fx, fy }; + Offset offset = { (short)(ix-x), (short)(iy-y), (unsigned char)fx, (unsigned char)fy }; grid->offset[y*width+x] = offset; } } diff --git a/extern/libmv/libmv/simple_pipeline/detect.cc b/extern/libmv/libmv/simple_pipeline/detect.cc index 8ac42ab0aba..8a093dadeca 100644 --- a/extern/libmv/libmv/simple_pipeline/detect.cc +++ b/extern/libmv/libmv/simple_pipeline/detect.cc @@ -66,7 +66,7 @@ std::vector<Feature> DetectFAST(const unsigned char* data, int width, int height Feature *all_features = new Feature[num_features]; for(int i = 0; i < num_features; ++i) { - Feature a = { nonmax[i].x, nonmax[i].y, scores[i], 0 }; + Feature a = { (float)nonmax[i].x, (float)nonmax[i].y, (float)scores[i], 0 }; all_features[i] = a; } @@ -173,7 +173,7 @@ void DetectMORAVEC(ubyte* image, int stride, int width, int height, Feature* det for(int y=16; y<height-16; y++) { for(int x=16; x<width-16; x++) { int s = scores[y*width+x]; - Feature f = { x+8, y+8, s, 16 }; + Feature f = { (float)x+8.0f, (float)y+8.0f, (float)s, 16 }; if(s>min) detected[i++] = f; } } |