[Bf-blender-cvs] [0dd9a4a5764] master: Cleanup: Libmv, clang-format
Sergey Sharybin
noreply at git.blender.org
Fri Mar 5 15:05:17 CET 2021
Commit: 0dd9a4a576452007da9d3f02a03499e50a8ddfae
Author: Sergey Sharybin
Date: Fri Mar 5 14:42:30 2021 +0100
Branches: master
https://developer.blender.org/rB0dd9a4a576452007da9d3f02a03499e50a8ddfae
Cleanup: Libmv, clang-format
Is based on Google style which was used in the Libmv project before,
but is now consistently applied for the sources of the library itself
and to C-API. With some time C-API will likely be removed, and it
makes it easier to make it follow Libmv style, hence the diversion
from Blender's style.
There are quite some exceptions (clang-format off) in the code around
Eigen matrix initialization. It is rather annoying, and there could be
some neat way to make initialization readable without such exception.
Could be some places where loss of readability in matrix initialization
got lost as the change is quite big. If this has happened it is easier
to address readability once actually working on the code.
This change allowed to spot some missing header guards, so that's nice.
Doing it in bundled version, as the upstream library needs to have some
of the recent development ported over from bundle to upstream.
There should be no functional changes.
===================================================================
M intern/libmv/.clang-format
M intern/libmv/intern/autotrack.cc
M intern/libmv/intern/autotrack.h
M intern/libmv/intern/camera_intrinsics.cc
M intern/libmv/intern/camera_intrinsics.h
M intern/libmv/intern/detector.cc
M intern/libmv/intern/detector.h
M intern/libmv/intern/frame_accessor.cc
M intern/libmv/intern/frame_accessor.h
M intern/libmv/intern/homography.cc
M intern/libmv/intern/image.cc
M intern/libmv/intern/image.h
M intern/libmv/intern/reconstruction.cc
M intern/libmv/intern/reconstruction.h
M intern/libmv/intern/stub.cc
M intern/libmv/intern/track_region.cc
M intern/libmv/intern/track_region.h
M intern/libmv/intern/tracks.cc
M intern/libmv/intern/tracksN.cc
M intern/libmv/intern/tracksN.h
M intern/libmv/intern/utildefines.h
M intern/libmv/libmv/autotrack/autotrack.cc
M intern/libmv/libmv/autotrack/autotrack.h
M intern/libmv/libmv/autotrack/frame_accessor.h
M intern/libmv/libmv/autotrack/marker.h
M intern/libmv/libmv/autotrack/model.h
M intern/libmv/libmv/autotrack/predict_tracks.cc
M intern/libmv/libmv/autotrack/predict_tracks_test.cc
M intern/libmv/libmv/autotrack/quad.h
M intern/libmv/libmv/autotrack/reconstruction.h
M intern/libmv/libmv/autotrack/region.h
M intern/libmv/libmv/autotrack/tracks.cc
M intern/libmv/libmv/autotrack/tracks.h
M intern/libmv/libmv/autotrack/tracks_test.cc
M intern/libmv/libmv/base/aligned_malloc.cc
M intern/libmv/libmv/base/aligned_malloc.h
M intern/libmv/libmv/base/id_generator.h
M intern/libmv/libmv/base/map.h
M intern/libmv/libmv/base/scoped_ptr.h
M intern/libmv/libmv/base/scoped_ptr_test.cc
M intern/libmv/libmv/base/vector_test.cc
M intern/libmv/libmv/base/vector_utils.h
M intern/libmv/libmv/image/array_nd.cc
M intern/libmv/libmv/image/array_nd.h
M intern/libmv/libmv/image/array_nd_test.cc
M intern/libmv/libmv/image/convolve.cc
M intern/libmv/libmv/image/convolve.h
M intern/libmv/libmv/image/convolve_test.cc
M intern/libmv/libmv/image/correlation.h
M intern/libmv/libmv/image/image.h
M intern/libmv/libmv/image/image_converter.h
M intern/libmv/libmv/image/image_drawing.h
M intern/libmv/libmv/image/image_test.cc
M intern/libmv/libmv/image/sample.h
M intern/libmv/libmv/image/sample_test.cc
M intern/libmv/libmv/image/tuple.h
M intern/libmv/libmv/multiview/conditioning.cc
M intern/libmv/libmv/multiview/conditioning.h
M intern/libmv/libmv/multiview/euclidean_resection.cc
M intern/libmv/libmv/multiview/euclidean_resection.h
M intern/libmv/libmv/multiview/euclidean_resection_test.cc
M intern/libmv/libmv/multiview/fundamental.cc
M intern/libmv/libmv/multiview/fundamental.h
M intern/libmv/libmv/multiview/fundamental_test.cc
M intern/libmv/libmv/multiview/homography.cc
M intern/libmv/libmv/multiview/homography.h
M intern/libmv/libmv/multiview/homography_error.h
M intern/libmv/libmv/multiview/homography_parameterization.h
M intern/libmv/libmv/multiview/homography_test.cc
M intern/libmv/libmv/multiview/nviewtriangulation.h
M intern/libmv/libmv/multiview/nviewtriangulation_test.cc
M intern/libmv/libmv/multiview/panography.cc
M intern/libmv/libmv/multiview/panography.h
M intern/libmv/libmv/multiview/panography_kernel.cc
M intern/libmv/libmv/multiview/panography_kernel.h
M intern/libmv/libmv/multiview/panography_test.cc
M intern/libmv/libmv/multiview/projection.cc
M intern/libmv/libmv/multiview/projection.h
M intern/libmv/libmv/multiview/projection_test.cc
M intern/libmv/libmv/multiview/resection.h
M intern/libmv/libmv/multiview/resection_test.cc
M intern/libmv/libmv/multiview/test_data_sets.cc
M intern/libmv/libmv/multiview/test_data_sets.h
M intern/libmv/libmv/multiview/triangulation.cc
M intern/libmv/libmv/multiview/triangulation.h
M intern/libmv/libmv/multiview/triangulation_test.cc
M intern/libmv/libmv/multiview/two_view_kernel.h
M intern/libmv/libmv/numeric/dogleg.h
M intern/libmv/libmv/numeric/dogleg_test.cc
M intern/libmv/libmv/numeric/function_derivative.h
M intern/libmv/libmv/numeric/function_derivative_test.cc
M intern/libmv/libmv/numeric/levenberg_marquardt.h
M intern/libmv/libmv/numeric/levenberg_marquardt_test.cc
M intern/libmv/libmv/numeric/numeric.cc
M intern/libmv/libmv/numeric/numeric.h
M intern/libmv/libmv/numeric/numeric_test.cc
M intern/libmv/libmv/numeric/poly.h
M intern/libmv/libmv/numeric/poly_test.cc
M intern/libmv/libmv/simple_pipeline/bundle.cc
M intern/libmv/libmv/simple_pipeline/bundle.h
M intern/libmv/libmv/simple_pipeline/callbacks.h
M intern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
M intern/libmv/libmv/simple_pipeline/camera_intrinsics.h
M intern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h
M intern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc
M intern/libmv/libmv/simple_pipeline/detect.cc
M intern/libmv/libmv/simple_pipeline/detect.h
M intern/libmv/libmv/simple_pipeline/detect_test.cc
M intern/libmv/libmv/simple_pipeline/distortion_models.cc
M intern/libmv/libmv/simple_pipeline/distortion_models.h
M intern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
M intern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
M intern/libmv/libmv/simple_pipeline/intersect.cc
M intern/libmv/libmv/simple_pipeline/intersect.h
M intern/libmv/libmv/simple_pipeline/intersect_test.cc
M intern/libmv/libmv/simple_pipeline/keyframe_selection.cc
M intern/libmv/libmv/simple_pipeline/keyframe_selection.h
M intern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc
M intern/libmv/libmv/simple_pipeline/modal_solver.cc
M intern/libmv/libmv/simple_pipeline/modal_solver.h
M intern/libmv/libmv/simple_pipeline/modal_solver_test.cc
M intern/libmv/libmv/simple_pipeline/packed_intrinsics.h
M intern/libmv/libmv/simple_pipeline/pipeline.cc
M intern/libmv/libmv/simple_pipeline/pipeline.h
M intern/libmv/libmv/simple_pipeline/reconstruction.cc
M intern/libmv/libmv/simple_pipeline/reconstruction.h
M intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
M intern/libmv/libmv/simple_pipeline/reconstruction_scale.h
M intern/libmv/libmv/simple_pipeline/resect.cc
M intern/libmv/libmv/simple_pipeline/resect.h
M intern/libmv/libmv/simple_pipeline/resect_test.cc
M intern/libmv/libmv/simple_pipeline/tracks.cc
M intern/libmv/libmv/simple_pipeline/tracks.h
M intern/libmv/libmv/threading/threading.h
M intern/libmv/libmv/tracking/brute_region_tracker.cc
M intern/libmv/libmv/tracking/brute_region_tracker.h
M intern/libmv/libmv/tracking/hybrid_region_tracker.cc
M intern/libmv/libmv/tracking/hybrid_region_tracker.h
M intern/libmv/libmv/tracking/kalman_filter.h
M intern/libmv/libmv/tracking/klt_region_tracker.cc
M intern/libmv/libmv/tracking/klt_region_tracker.h
M intern/libmv/libmv/tracking/pyramid_region_tracker.cc
M intern/libmv/libmv/tracking/pyramid_region_tracker.h
M intern/libmv/libmv/tracking/pyramid_region_tracker_test.cc
M intern/libmv/libmv/tracking/region_tracker.h
M intern/libmv/libmv/tracking/retrack_region_tracker.cc
M intern/libmv/libmv/tracking/retrack_region_tracker.h
M intern/libmv/libmv/tracking/track_region.cc
M intern/libmv/libmv/tracking/track_region.h
M intern/libmv/libmv/tracking/trklt_region_tracker.cc
M intern/libmv/libmv/tracking/trklt_region_tracker.h
===================================================================
diff --git a/intern/libmv/.clang-format b/intern/libmv/.clang-format
index 9d159247d51..fae0530c572 100644
--- a/intern/libmv/.clang-format
+++ b/intern/libmv/.clang-format
@@ -1,2 +1,34 @@
-DisableFormat: true
-SortIncludes: false
+BasedOnStyle: Google
+
+ColumnLimit: 80
+
+Standard: Cpp11
+
+# Indent nested preprocessor.
+# #ifdef Foo
+# # include <nested>
+# #endif
+IndentPPDirectives: AfterHash
+
+# For the cases when namespace is closing with a wrong comment
+FixNamespaceComments: true
+
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortBlocksOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: true
+
+# No bin packing, every argument is on its own line.
+BinPackArguments: false
+BinPackParameters: false
+
+# Ensure pointer alignment.
+# ObjectType* object;
+PointerAlignment: Left
+DerivePointerAlignment: false
+
+AlignEscapedNewlines: Right
+
+IncludeBlocks: Preserve
+SortIncludes: true
diff --git a/intern/libmv/intern/autotrack.cc b/intern/libmv/intern/autotrack.cc
index 7000a422de8..b7110957b15 100644
--- a/intern/libmv/intern/autotrack.cc
+++ b/intern/libmv/intern/autotrack.cc
@@ -22,15 +22,15 @@
#include "intern/utildefines.h"
#include "libmv/autotrack/autotrack.h"
+using libmv::TrackRegionOptions;
+using libmv::TrackRegionResult;
using mv::AutoTrack;
using mv::FrameAccessor;
using mv::Marker;
-using libmv::TrackRegionOptions;
-using libmv::TrackRegionResult;
-libmv_AutoTrack* libmv_autoTrackNew(libmv_FrameAccessor *frame_accessor) {
- return (libmv_AutoTrack*) LIBMV_OBJECT_NEW(AutoTrack,
- (FrameAccessor*) frame_accessor);
+libmv_AutoTrack* libmv_autoTrackNew(libmv_FrameAccessor* frame_accessor) {
+ return (libmv_AutoTrack*)LIBMV_OBJECT_NEW(AutoTrack,
+ (FrameAccessor*)frame_accessor);
}
void libmv_autoTrackDestroy(libmv_AutoTrack* libmv_autotrack) {
@@ -39,7 +39,7 @@ void libmv_autoTrackDestroy(libmv_AutoTrack* libmv_autotrack) {
void libmv_autoTrackSetOptions(libmv_AutoTrack* libmv_autotrack,
const libmv_AutoTrackOptions* options) {
- AutoTrack *autotrack = ((AutoTrack*) libmv_autotrack);
+ AutoTrack* autotrack = ((AutoTrack*)libmv_autotrack);
libmv_configureTrackRegionOptions(options->track_region,
&autotrack->options.track_region);
@@ -51,18 +51,15 @@ void libmv_autoTrackSetOptions(libmv_AutoTrack* libmv_autotrack,
int libmv_autoTrackMarker(libmv_AutoTrack* libmv_autotrack,
const libmv_TrackRegionOptions* libmv_options,
- libmv_Marker *libmv_tracked_marker,
+ libmv_Marker* libmv_tracked_marker,
libmv_TrackRegionResult* libmv_result) {
-
Marker tracked_marker;
TrackRegionOptions options;
TrackRegionResult result;
libmv_apiMarkerToMarker(*libmv_tracked_marker, &tracked_marker);
- libmv_configureTrackRegionOptions(*libmv_options,
- &options);
- bool ok = (((AutoTrack*) libmv_autotrack)->TrackMarker(&tracked_marker,
- &result,
- &options));
+ libmv_configureTrackRegionOptions(*libmv_options, &options);
+ bool ok = (((AutoTrack*)libmv_autotrack)
+ ->TrackMarker(&tracked_marker, &result, &options));
libmv_markerToApiMarker(tracked_marker, libmv_tracked_marker);
libmv_regionTrackergetResult(result, libmv_result);
return ok && result.is_usable();
@@ -72,7 +69,7 @@ void libmv_autoTrackAddMarker(libmv_AutoTrack* libmv_autotrack,
const libmv_Marker* libmv_marker) {
Marker marker;
libmv_apiMarkerToMarker(*libmv_marker, &marker);
- ((AutoTrack*) libmv_autotrack)->AddMarker(marker);
+ ((AutoTrack*)libmv_autotrack)->AddMarker(marker);
}
void libmv_autoTrackSetMarkers(libmv_AutoTrack* libmv_autotrack,
@@ -87,19 +84,17 @@ void libmv_autoTrackSetMarkers(libmv_AutoTrack* libmv_autotrack,
for (size_t i = 0; i < num_markers; ++i) {
libmv_apiMarkerToMarker(libmv_marker[i], &markers[i]);
}
- ((AutoTrack*) libmv_autotrack)->SetMarkers(&markers);
+ ((AutoTrack*)libmv_autotrack)->SetMarkers(&markers);
}
int libmv_autoTrackGetMarker(libmv_AutoTrack* libmv_autotrack,
int clip,
int frame,
int track,
- libmv_Marker *libmv_marker) {
+ libmv_Marker* libmv_marker) {
Marker marker;
- int ok = ((AutoTrack*) libmv_autotrack)->GetMarker(clip,
- frame,
- track,
- &marker);
+ int ok =
+ ((AutoTrack*)libmv_autotrack)->GetMarker(clip, frame, track, &marker);
if (ok) {
libmv_markerToApiMarker(marker, libmv_marker);
}
diff --git a/intern/libmv/intern/autotrack.h b/intern/libmv/intern/autotrack.h
index 6b49a6908e1..3887983814b 100644
--- a/intern/libmv/intern/autotrack.h
+++ b/intern/libmv/intern/autotrack.h
@@ -21,9 +21,9 @@
#define LIBMV_C_API_AUTOTRACK_H_
#include "intern/frame_accessor.h"
-#include "intern/tracksN.h"
-#include "intern/track_region.h"
#include "intern/region.h"
+#include "intern/track_region.h"
+#include "intern/tracksN.h"
#ifdef __cplusplus
extern "C" {
@@ -36,7 +36,7 @@ typedef struct libmv_AutoTrackOptions {
libmv_Region search_region;
} libmv_AutoTrackOptions;
-libmv_AutoTrack* libmv_autoTrackNew(libmv_FrameAccessor *frame_accessor);
+libmv_AutoTrack* libmv_autoTrackNew(libmv_FrameAccessor* frame_accessor);
void libmv_autoTrackDestroy(libmv_AutoTrack* libmv_autotrack);
@@ -45,7 +45,7 @@ void libmv_autoTrackSetOptions(libmv_AutoTrack* libmv_autotrack,
int libmv_autoTrackMarker(libmv_AutoTrack* libmv_autotrack,
const libmv_TrackRegionOptions* libmv_options,
- libmv_Marker *libmv_tracker_marker,
+ libmv_Marker* libmv_tracker_marker,
libmv_TrackRegionResult* libmv_result);
void libmv_autoTrackAddMarker(libmv_AutoTrack* libmv_autotrack,
@@ -59,7 +59,7 @@ int libmv_autoTrackGetMarker(libmv_AutoTrack* libmv_autotrack,
int clip,
int frame,
int track,
- libmv_Marker *libmv_marker);
+ libmv_Marker* libmv_marker);
#ifdef __cplusplus
}
diff --git a/intern/libmv/intern/camera_intrinsics.cc b/intern/libmv/intern/camera_intrinsics.cc
index 628637e12cc..243b26d9fb3 100644
--- a/intern/libmv/intern/camera_intrinsics.cc
+++ b/intern/libmv/intern/camera_intrinsics.cc
@@ -21,62 +21,56 @@
#include "intern/utildefines.h"
#include "libmv/simple_pipeline/camera_intrinsics.h"
+using libmv::BrownCameraIntrinsics;
using libmv::CameraIntrinsics;
using libmv::DivisionCameraIntrinsics;
-using libmv::PolynomialCameraIntrinsics;
using libmv::NukeCameraIntrinsics;
-using libmv::BrownCameraIntrinsics;
+using libmv::PolynomialCameraIntrinsics;
-libmv_CameraIntrinsics *libmv_cameraIntrinsicsNew(
+libmv_CameraIntrinsics* libmv_cameraIntrinsicsNew(
const libmv_CameraIntrinsicsOptions* libmv_camera_intrinsics_options) {
- CameraIntrinsics *camera_intrinsics =
- libmv_cameraIntrinsicsCreateFromOptions(libmv_camera_intrinsics_options);
- return (libmv_CameraIntrinsics *) camera_intrinsics;
+ CameraIntrinsics* camera_intrinsics =
+ libmv_cameraIntrinsicsCreateFromOptions(libmv_camera_intrinsics_options);
+ return (libmv_CameraIntrinsics*)camera_intrinsics;
}
-libmv_CameraIntrinsics *libmv_cameraIntrinsicsCopy(
+libmv_CameraIntrinsics* libmv_cameraIntrinsicsCopy(
const libmv_CameraIntrinsics* libmv_intrinsics) {
- const CameraIntrinsics *orig_intrinsics =
- (const CameraIntrinsics *) libmv_intrinsics;
+ const CameraIntrinsics* orig_intrinsics =
+ (const CameraIntrinsics*)libmv_intrinsics;
- CameraIntrinsics *new_intrinsics = NULL;
+ CameraIntrinsics* new_intrinsics = NULL;
switch (orig_intrinsics->GetDistortionModelType()) {
- case libmv::DISTORTION_MODEL_POLYNOMIAL:
- {
- const PolynomialCameraIntrinsics *polynomial_intrinsics =
+ case libmv::DISTORTION_MODEL_POLYNOMIAL: {
+ const PolynomialCameraIntrinsics* polynomial_intrinsics =
static_cast<const PolynomialCameraIntrinsics*>(orig_intrinsics);
- new_intrinsics = LIBMV_OBJECT_NEW(PolynomialCameraIntrinsics,
- *polynomial_intrinsics);
- break;
- }
- case libmv::DISTORTION_MODEL_DIVISION:
- {
- const DivisionCameraIntrinsics *division_intrinsics =
+ new_intrinsics =
+ LIBMV_OBJECT_NEW(PolynomialCameraIntrinsics, *polynomial_intrinsics);
+ break;
+ }
+ case libmv::DISTORTION_MODEL_DIVISION: {
+ const DivisionCameraIntrinsics* division_intrinsics =
static_cast<const DivisionCameraIntrinsics*>(orig_intrinsics);
- new_intrinsics = LIBMV_OBJECT_NEW(DivisionCameraIntrinsics,
- *division_intrinsics);
- break;
- }
- case libmv::DISTORTION_MODEL_NUKE:
- {
- const NukeCameraIntrinsics *nuke_intrinsics =
+ new_intrinsics =
+ LIBMV_OBJECT_NEW(DivisionCameraIntrinsics, *division_intrinsics);
+ break;
+ }
+ case libmv::DISTORTION_MODEL_NUKE: {
+ const NukeCameraIntrinsics* nuke_intrinsics =
static_cast<const NukeCameraIntrinsics*>(orig_intrinsics);
- new_intrinsics = LIBMV_OBJECT_NEW(NukeCameraIntrinsics,
- *nuke_intrinsics);
- break;
- }
- case libmv::DISTORTION_MODEL_BROWN:
- {
- const BrownCameraIntrinsics *brown_intrinsics =
+ new_intrinsics = LIBMV_OBJECT_NEW(NukeCameraIntrinsics, *nuke_intrinsics);
+ break;
+ }
+ case libmv::DISTORTION_MODEL
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list