[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49461] trunk/blender/extern/libmv/libmv/ simple_pipeline: Code cleanup: silence some -Wnarrowing warnings from C++11

[Sergey Sharybin]

Revision: 49461
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49461
Author:   nazgul
Date:     2012-08-01 15:02:09 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Code cleanup: silence some -Wnarrowing warnings from C++11

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc

Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc	2012-08-01 14:56:15 UTC (rev 49460)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc	2012-08-01 15:02:09 UTC (rev 49461)
@@ -209,7 +209,7 @@
       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;
     }
   }

Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc	2012-08-01 14:56:15 UTC (rev 49460)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc	2012-08-01 15:02:09 UTC (rev 49461)
@@ -66,7 +66,7 @@
     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 @@
   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;
     }
   }