[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54843] trunk/blender: code cleanup: remove unused and unsupported functions from libmv-capi
Sergey Sharybin
sergey.vfx at gmail.com
Mon Feb 25 10:38:59 CET 2013
Revision: 54843
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54843
Author: nazgul
Date: 2013-02-25 09:38:59 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
code cleanup: remove unused and unsupported functions from libmv-capi
---
svn merge -r52855:52856 ^/branches/soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52855
Modified Paths:
--------------
trunk/blender/extern/libmv/libmv-capi.cpp
trunk/blender/extern/libmv/libmv-capi.h
Property Changed:
----------------
trunk/blender/
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/space_outliner/
Property changes on: trunk/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52855,54573
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
Modified: trunk/blender/extern/libmv/libmv-capi.cpp
===================================================================
--- trunk/blender/extern/libmv/libmv-capi.cpp 2013-02-25 09:36:52 UTC (rev 54842)
+++ trunk/blender/extern/libmv/libmv-capi.cpp 2013-02-25 09:38:59 UTC (rev 54843)
@@ -117,52 +117,8 @@
V3D::optimizerVerbosenessLevel = verbosity;
}
-/* ************ RegionTracker ************ */
+/* ************ Utility ************ */
-libmv_RegionTracker *libmv_pyramidRegionTrackerNew(int max_iterations, int pyramid_level, int half_window_size, double minimum_correlation)
-{
- libmv::EsmRegionTracker *esm_region_tracker = new libmv::EsmRegionTracker;
- esm_region_tracker->half_window_size = half_window_size;
- esm_region_tracker->max_iterations = max_iterations;
- esm_region_tracker->min_determinant = 1e-4;
- esm_region_tracker->minimum_correlation = minimum_correlation;
-
- libmv::PyramidRegionTracker *pyramid_region_tracker =
- new libmv::PyramidRegionTracker(esm_region_tracker, pyramid_level);
-
- return (libmv_RegionTracker *)pyramid_region_tracker;
-}
-
-libmv_RegionTracker *libmv_hybridRegionTrackerNew(int max_iterations, int half_window_size, double minimum_correlation)
-{
- libmv::EsmRegionTracker *esm_region_tracker = new libmv::EsmRegionTracker;
- esm_region_tracker->half_window_size = half_window_size;
- esm_region_tracker->max_iterations = max_iterations;
- esm_region_tracker->min_determinant = 1e-4;
- esm_region_tracker->minimum_correlation = minimum_correlation;
-
- libmv::BruteRegionTracker *brute_region_tracker = new libmv::BruteRegionTracker;
- brute_region_tracker->half_window_size = half_window_size;
-
- /* do not use correlation check for brute checker itself,
- * this check will happen in esm tracker */
- brute_region_tracker->minimum_correlation = 0.0;
-
- libmv::HybridRegionTracker *hybrid_region_tracker =
- new libmv::HybridRegionTracker(brute_region_tracker, esm_region_tracker);
-
- return (libmv_RegionTracker *)hybrid_region_tracker;
-}
-
-libmv_RegionTracker *libmv_bruteRegionTrackerNew(int half_window_size, double minimum_correlation)
-{
- libmv::BruteRegionTracker *brute_region_tracker = new libmv::BruteRegionTracker;
- brute_region_tracker->half_window_size = half_window_size;
- brute_region_tracker->minimum_correlation = minimum_correlation;
-
- return (libmv_RegionTracker *)brute_region_tracker;
-}
-
static void floatBufToImage(const float *buf, int width, int height, int channels, libmv::FloatImage *image)
{
int x, y, k, a = 0;
@@ -316,43 +272,6 @@
}
#endif
-int libmv_regionTrackerTrack(libmv_RegionTracker *libmv_tracker, const float *ima1, const float *ima2,
- int width, int height, double x1, double y1, double *x2, double *y2)
-{
- libmv::RegionTracker *region_tracker = (libmv::RegionTracker *)libmv_tracker;
- libmv::FloatImage old_patch, new_patch;
-
- floatBufToImage(ima1, width, height, 1, &old_patch);
- floatBufToImage(ima2, width, height, 1, &new_patch);
-
-#if !defined(DUMP_FAILURE) && !defined(DUMP_ALWAYS)
- return region_tracker->Track(old_patch, new_patch, x1, y1, x2, y2);
-#else
- {
- /* double sx2 = *x2, sy2 = *y2; */
- int result = region_tracker->Track(old_patch, new_patch, x1, y1, x2, y2);
-
-#if defined(DUMP_ALWAYS)
- {
-#else
- if (!result) {
-#endif
- saveImage("old_patch", old_patch, x1, y1);
- saveImage("new_patch", new_patch, *x2, *y2);
- }
-
- return result;
- }
-#endif
-}
-
-void libmv_regionTrackerDestroy(libmv_RegionTracker *libmv_tracker)
-{
- libmv::RegionTracker *region_tracker= (libmv::RegionTracker *)libmv_tracker;
-
- delete region_tracker;
-}
-
/* ************ Planar tracker ************ */
/* TrackRegion (new planar tracker) */
@@ -1006,52 +925,6 @@
intrinsics->Distort(src, dst, width, height, overscan, channels);
}
-/* ************ distortion ************ */
-
-void libmv_undistortByte(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
- unsigned char *src, unsigned char *dst, int width, int height,
- float overscan, int channels)
-{
- libmv::CameraIntrinsics camera_intrinsics;
-
- cameraIntrinsicsFromOptions(&camera_intrinsics, libmv_camera_intrinsics_options);
-
- camera_intrinsics.Undistort(src, dst, width, height, overscan, channels);
-}
-
-void libmv_undistortFloat(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
- float *src, float *dst, int width, int height,
- float overscan, int channels)
-{
- libmv::CameraIntrinsics camera_intrinsics;
-
- cameraIntrinsicsFromOptions(&camera_intrinsics, libmv_camera_intrinsics_options);
-
- camera_intrinsics.Undistort(src, dst, width, height, overscan, channels);
-}
-
-void libmv_distortByte(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
- unsigned char *src, unsigned char *dst, int width, int height,
- float overscan, int channels)
-{
- libmv::CameraIntrinsics camera_intrinsics;
-
- cameraIntrinsicsFromOptions(&camera_intrinsics, libmv_camera_intrinsics_options);
-
- camera_intrinsics.Distort(src, dst, width, height, overscan, channels);
-}
-
-void libmv_distortFloat(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
- float *src, float *dst, int width, int height,
- float overscan, int channels)
-{
- libmv::CameraIntrinsics camera_intrinsics;
-
- cameraIntrinsicsFromOptions(&camera_intrinsics, libmv_camera_intrinsics_options);
-
- camera_intrinsics.Distort(src, dst, width, height, overscan, channels);
-}
-
/* ************ utils ************ */
void libmv_applyCameraIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
Modified: trunk/blender/extern/libmv/libmv-capi.h
===================================================================
--- trunk/blender/extern/libmv/libmv-capi.h 2013-02-25 09:36:52 UTC (rev 54842)
+++ trunk/blender/extern/libmv/libmv-capi.h 2013-02-25 09:38:59 UTC (rev 54843)
@@ -42,14 +42,6 @@
void libmv_startDebugLogging(void);
void libmv_setLoggingVerbosity(int verbosity);
-/* RegionTracker */
-struct libmv_RegionTracker *libmv_pyramidRegionTrackerNew(int max_iterations, int pyramid_level, int half_window_size, double minimum_correlation);
-struct libmv_RegionTracker *libmv_hybridRegionTrackerNew(int max_iterations, int half_window_size, double minimum_correlation);
-struct libmv_RegionTracker *libmv_bruteRegionTrackerNew(int half_window_size, double minimum_correlation);
-int libmv_regionTrackerTrack(struct libmv_RegionTracker *libmv_tracker, const float *ima1, const float *ima2,
- int width, int height, double x1, double y1, double *x2, double *y2);
-void libmv_regionTrackerDestroy(struct libmv_RegionTracker *libmv_tracker);
-
/* TrackRegion (new planar tracker) */
struct libmv_trackRegionOptions {
int motion_model;
@@ -164,17 +156,6 @@
void libmv_CameraIntrinsicsDistortFloat(struct libmv_CameraIntrinsics *libmv_intrinsics,
float *src, float *dst, int width, int height, float overscan, int channels);
-/* dsitortion */
-void libmv_undistortByte(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
- unsigned char *src, unsigned char *dst, int width, int height, float overscan, int channels);
-void libmv_undistortFloat(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
- float *src, float *dst, int width, int height, float overscan, int channels);
-
-void libmv_distortByte(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
- unsigned char *src, unsigned char *dst, int width, int height, float overscan, int channels);
-void libmv_distortFloat(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
- float *src, float *dst, int width, int height, float overscan, int channels);
-
/* utils */
void libmv_applyCameraIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
double x, double y, double *x1, double *y1);
Property changes on: trunk/blender/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list