[Bf-blender-cvs] [73feae6] master: Libmv: Solve strict compiler warnings in stubs

Sergey Sharybin noreply at git.blender.org
Thu Jan 14 11:56:22 CET 2016


Commit: 73feae6f5dd81a81e0321db80e55c15c3518b7a0
Author: Sergey Sharybin
Date:   Thu Jan 14 15:56:05 2016 +0500
Branches: master
https://developer.blender.org/rB73feae6f5dd81a81e0321db80e55c15c3518b7a0

Libmv: Solve strict compiler warnings in stubs

===================================================================

M	intern/libmv/intern/stub.cc

===================================================================

diff --git a/intern/libmv/intern/stub.cc b/intern/libmv/intern/stub.cc
index 5d667ba..ad64820 100644
--- a/intern/libmv/intern/stub.cc
+++ b/intern/libmv/intern/stub.cc
@@ -257,7 +257,8 @@ void libmv_cameraIntrinsicsUndistortByte(
     const libmv_CameraIntrinsics * /*libmv_intrinsics*/,
     const unsigned char *source_image,
     int width, int height,
-    float overscan, int channels,
+    float /*overscan*/,
+    int channels,
     unsigned char *destination_image) {
   memcpy(destination_image, source_image,
          channels * width * height * sizeof(unsigned char));
@@ -268,7 +269,7 @@ void libmv_cameraIntrinsicsUndistortFloat(
     const float* source_image,
     int width,
     int height,
-    float overscan,
+    float /*overscan*/,
     int channels,
     float* destination_image) {
   memcpy(destination_image, source_image,
@@ -280,7 +281,7 @@ void libmv_cameraIntrinsicsDistortByte(
     const unsigned char *source_image,
     int width,
     int height,
-    float overscan,
+    float /*overscan*/,
     int channels,
     unsigned char *destination_image) {
   memcpy(destination_image, source_image,
@@ -292,7 +293,7 @@ void libmv_cameraIntrinsicsDistortFloat(
     float* source_image,
     int width,
     int height,
-    float overscan,
+    float /*overscan*/,
     int channels,
     float* destination_image) {
   memcpy(destination_image, source_image,
@@ -327,9 +328,9 @@ void libmv_cameraIntrinsicsInvert(
   *y1 = (y - principal_y) / focal_length;
 }
 
-void libmv_homography2DFromCorrespondencesEuc(/* const */ double (*x1)[2],
-                                              /* const */ double (*x2)[2],
-                                              int num_points,
+void libmv_homography2DFromCorrespondencesEuc(/* const */ double (* /*x1*/)[2],
+                                              /* const */ double (* /*x2*/)[2],
+                                              int /*num_points*/,
                                               double H[3][3]) {
   memset(H, 0, sizeof(double[3][3]));
   H[0][0] = 1.0f;




More information about the Bf-blender-cvs mailing list