[patch] Fixes gflags namespace issue in libmv

blender-gflags-2.1.1.patch (text/plain), 1.43 KB, created by Adam Stylinski on 2014-07-15 13:35:13 UTC

--- /var/tmp/portage/media-gfx/blender-2.71/work/blender-2.71/extern/libmv/libmv-capi.cc	2014-06-25 16:43:52.000000000 -0400
+++ /home/adam/scratch/libmv-capi.cc	2014-07-15 09:29:04.332922116 -0400
@@ -112,18 +112,18 @@
 	         google::GLOG_FATAL);
 
 	google::InitGoogleLogging(argv0);
-	google::SetCommandLineOption("logtostderr", "1");
-	google::SetCommandLineOption("v", "0");
-	google::SetCommandLineOption("stderrthreshold", severity_fatal);
-	google::SetCommandLineOption("minloglevel", severity_fatal);
+	gflags::SetCommandLineOption("logtostderr", "1");
+	gflags::SetCommandLineOption("v", "0");
+	gflags::SetCommandLineOption("stderrthreshold", severity_fatal);
+	gflags::SetCommandLineOption("minloglevel", severity_fatal);
 }
 
 void libmv_startDebugLogging(void)
 {
-	google::SetCommandLineOption("logtostderr", "1");
-	google::SetCommandLineOption("v", "2");
-	google::SetCommandLineOption("stderrthreshold", "1");
-	google::SetCommandLineOption("minloglevel", "0");
+	gflags::SetCommandLineOption("logtostderr", "1");
+	gflags::SetCommandLineOption("v", "2");
+	gflags::SetCommandLineOption("stderrthreshold", "1");
+	gflags::SetCommandLineOption("minloglevel", "0");
 }
 
 void libmv_setLoggingVerbosity(int verbosity)
@@ -131,7 +131,7 @@
 	char val[10];
 	snprintf(val, sizeof(val), "%d", verbosity);
 
-	google::SetCommandLineOption("v", val);
+	gflags::SetCommandLineOption("v", val);
 }
 
 /* ************ Planar tracker ************ */