[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38431] branches/soc-2011-salad: Merging r38367 through r38430 soc-2011-tomato into soc-2011-salad

Sergey Sharybin g.ulairi at gmail.com
Sat Jul 16 11:56:56 CEST 2011 

Revision: 38431
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38431
Author:   nazgul
Date:     2011-07-16 09:56:55 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Merging r38367 through r38430 soc-2011-tomato into soc-2011-salad

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38367
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38430

Modified Paths:
--------------
    branches/soc-2011-salad/extern/libmv/CMakeLists.txt
    branches/soc-2011-salad/extern/libmv/ChangeLog
    branches/soc-2011-salad/extern/libmv/SConscript
    branches/soc-2011-salad/extern/libmv/bundle.sh
    branches/soc-2011-salad/extern/libmv/files.txt
    branches/soc-2011-salad/extern/libmv/libmv/multiview/projection.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/soc-2011-salad/extern/libmv/libmv/tracking/region_tracker.h
    branches/soc-2011-salad/extern/libmv/libmv-capi.cpp
    branches/soc-2011-salad/extern/libmv/libmv-capi.h
    branches/soc-2011-salad/extern/libmv/patches/series
    branches/soc-2011-salad/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-salad/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-salad/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/object.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-salad/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2011-salad/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2011-salad/source/blender/blenlib/intern/uvproject.c
    branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-salad/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-salad/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-salad/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2011-salad/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-salad/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-salad/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-salad/source/blender/render/intern/include/render_types.h
    branches/soc-2011-salad/source/blender/render/intern/source/envmap.c
    branches/soc-2011-salad/source/blender/render/intern/source/initrender.c
    branches/soc-2011-salad/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-salad/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2011-salad/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2011-salad/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2011-salad/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-salad/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/soc-2011-salad/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/soc-2011-salad/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2011-salad/source/gameengine/VideoTexture/ImageRender.cpp

Added Paths:
-----------
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/detect.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/detect.h
    branches/soc-2011-salad/extern/libmv/third_party/fast/
    branches/soc-2011-salad/extern/libmv/third_party/fast/LICENSE
    branches/soc-2011-salad/extern/libmv/third_party/fast/README
    branches/soc-2011-salad/extern/libmv/third_party/fast/README.libmv
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast.h
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast_10.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast_11.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast_12.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast_9.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/nonmax.c
    branches/soc-2011-salad/release/scripts/presets/camera/
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/

Removed Paths:
-------------
    branches/soc-2011-salad/extern/Eigen2/
    branches/soc-2011-salad/extern/libmv/third_party/fast/LICENSE
    branches/soc-2011-salad/extern/libmv/third_party/fast/README
    branches/soc-2011-salad/extern/libmv/third_party/fast/README.libmv
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast.h
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast_10.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast_11.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast_12.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/fast_9.c
    branches/soc-2011-salad/extern/libmv/third_party/fast/nonmax.c

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38366
/trunk/blender:36834-38419
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38430
/trunk/blender:36834-38419

Modified: branches/soc-2011-salad/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/extern/libmv/CMakeLists.txt	2011-07-16 07:58:52 UTC (rev 38430)
+++ branches/soc-2011-salad/extern/libmv/CMakeLists.txt	2011-07-16 09:56:55 UTC (rev 38431)
@@ -46,6 +46,7 @@
 	libmv/simple_pipeline/initialize_reconstruction.cc
 	libmv/simple_pipeline/camera_intrinsics.cc
 	libmv/simple_pipeline/pipeline.cc
+	libmv/simple_pipeline/detect.cc
 	libmv/simple_pipeline/tracks.cc
 	libmv/simple_pipeline/bundle.cc
 	libmv/image/convolve.cc
@@ -65,6 +66,12 @@
 	third_party/gflags/gflags.cc
 	third_party/gflags/gflags_reporting.cc
 	third_party/gflags/gflags_completions.cc
+	third_party/fast/fast_9.c
+	third_party/fast/fast_10.c
+	third_party/fast/fast_11.c
+	third_party/fast/fast_12.c
+	third_party/fast/fast.c
+	third_party/fast/nonmax.c
 	third_party/ldl/Source/ldl.c
 
 	libmv-capi.h
@@ -78,6 +85,7 @@
 	libmv/simple_pipeline/reconstruction.h
 	libmv/simple_pipeline/camera_intrinsics.h
 	libmv/simple_pipeline/tracks.h
+	libmv/simple_pipeline/detect.h
 	libmv/simple_pipeline/pipeline.h
 	libmv/simple_pipeline/intersect.h
 	libmv/simple_pipeline/bundle.h
@@ -115,6 +123,7 @@
 	third_party/gflags/mutex.h
 	third_party/gflags/config.h
 	third_party/gflags/gflags.h
+	third_party/fast/fast.h
 	third_party/ldl/Include/ldl.h
 	third_party/msinttypes/stdint.h
 	third_party/msinttypes/inttypes.h
@@ -151,6 +160,16 @@
 		./third_party/glog/src/windows
 		./third_party/msinttypes
 	)
+
+	IF(MSVC)
+		set(MSVC_OFLAGS O1 O2 Ox)
+		foreach(FLAG )
+			string(REPLACE "" "Od" CMAKE_CXX_FLAGS_RELEASE "")
+			string(REPLACE "" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "")
+		endforeach()
+	ENDIF(MSVC)
+
+	add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
 ELSE(WIN32)
 	list(APPEND SRC
 		third_party/glog/src/utilities.cc

Modified: branches/soc-2011-salad/extern/libmv/ChangeLog
===================================================================
--- branches/soc-2011-salad/extern/libmv/ChangeLog	2011-07-16 07:58:52 UTC (rev 38430)
+++ branches/soc-2011-salad/extern/libmv/ChangeLog	2011-07-16 09:56:55 UTC (rev 38431)
@@ -1,3 +1,110 @@
+commit dec996966d5466717a813da2d8b9962115dfc8ac
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Fri Jul 15 20:04:06 2011 +0200
+
+    Detect API documentation.
+
+commit bfc07bd0940bba0d5439ccd0297368607db514be
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Fri Jul 15 16:22:52 2011 +0200
+
+    Refactor Qt Tracker.
+    Create Detect API.
+    Improve CameraIntrinsics API.
+    Put Calibration settings UI in a QDockWidget.
+    Support anamorphic.
+    
+    TODO: Finish new Zoom widget.
+
+commit e59595806c045916ab4ef15ef7047c1a728b2da9
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Thu Jul 14 22:29:06 2011 +0200
+
+    Use FAST detector.
+    
+    FAST is much faster and works much better than the "Good Features to Track algorithm".
+
+commit 17c036e9f8c6529c2f771fdd9dc73f3022e36c77
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Wed Jul 13 22:23:40 2011 +0200
+
+    Add visualization of image filtering operations.
+
+commit c4f71e17b6b72acc0f863906c01c87d53e8bbb2c
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Wed Jul 13 10:37:26 2011 +0200
+
+    Simplify feature detection.
+
+commit d8109b7a4fede1660e0dbd73735f1a9e3fd79eec
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Wed Jul 13 10:21:52 2011 +0200
+
+    Add feature detection.
+    
+    Remove unused keyframe selection code.
+
+commit 1088517da70ae9ec2369752fbc17dde4bb869c47
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Mon Jul 11 22:42:14 2011 +0200
+
+    Replace system file dialog with custom one which supports multiple file/folder selection.
+    Add Stop button when adding frame from video.
+
+commit 323af7a3a1344e7ef419c72fe22b674c17c578e3
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Mon Jul 11 16:30:59 2011 +0200
+
+    Add stub for feature detection.
+
+commit 739ec729fa8bc6e0ba6a40cc7b89d85e5332e900
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Mon Jul 11 16:30:42 2011 +0200
+
+    Fix compilation of Qt Calibration tool.
+
+commit 113ccc413db6bdfb75839418bddfba5ce3ba60f7
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Mon Jul 11 12:27:47 2011 +0200
+
+    Add raw on-disk video cache.
+    
+    This is useful for faster testing iterations.
+    It avoids waiting for the footage to decode on startup.
+    Using file memory mapping, we let the OS handle caching.
+    The OS disk cache also has the advantage of being kept in memory between runs.
+    A cache is only created for shot < 1GiB (e.g 17s of 1080 at 30).
+
+commit efbe8b6a3e2a8cff497726e11afffbce0ec6aa53
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Mon Jul 11 11:11:47 2011 +0200
+
+    Miscellaneous UI fixes, faster grayscale conversion, compute window size from pattern size and pyramid level count.
+
+commit 0c6911831b0a391da14bf1c5833b1e5c0d5056b7
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Sun Jul 10 22:48:15 2011 +0200
+
+    Add Video support using FFmpeg to Qt Calibration.
+
+commit c9f2bd5a17585f816bf0ef89097ac8f222ad058e
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Sun Jul 10 19:44:35 2011 +0200
+
+    Add Video support using FFmpeg to Qt Tracker.
+
+commit af8f9c412b0592868a0e68a14686651b45de9737
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Sat Jul 9 12:08:28 2011 +0200
+
+    Update README with instructions to build Qt OpenCV Calibration tool.
+
+commit dc4e18b474b024c04fbb0ef6b4f2c2cd642c8715
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Fri Jul 8 13:25:14 2011 +0200
+
+    Make Qt OpenCV Calibration Tool optionnal.
+
 commit 86356bd988b1b937082d56330f18a20e4cb26c19
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
 Date:   Fri Jul 8 10:19:30 2011 +0200
@@ -462,288 +569,3 @@
 Date:   Wed Jun 15 21:51:04 2011 +0200
 
     Fixed issue 26.
-
-commit 9e339a46668e4a8d2330598a66ee855e5cd26f9c
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jun 15 19:23:21 2011 +0200
-
-    Reimplement 2D Tracker View to use GL.
-    
-    This will allow to easily render the 3D Scene overlay on the 2D Tracker View.
-    Add Tracks::MarkerInImageForTrack.
-    Some renames to improve consistency.
-    Zoom view still need to be readded.
-
-commit 32c9a3010066363f37a275dcbc712d27454e2e87
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jun 15 10:11:00 2011 +0200
-
-    Comment non-essential GL calls which don't link properly on some GL implementations.
-
-commit 2260465ac4f3963cc56a7e310b142382dfe5d203
-Merge: 24eacab a45e91d
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Tue Jun 14 20:00:43 2011 -0700
-
-    Merge branch 'master' of git://github.com/Matthias-Fauconneau/libmv
-
-commit 24eacab863638551824534b8777ad5fbcaf688b9
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Tue Jun 14 20:00:32 2011 -0700
-
-    Implement CoordinatesForMarkersInImage in the simple pipeline.
-
-commit a45e91d9285bdb191781d9c4031e925a3e2475c9
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jun 15 00:34:35 2011 +0200
-
-    Bundle,Camera,Object persistence, Render from Camera.
-    
-    Render from Camera doesn't overlay on 2D View yet.
-    Would be easier to reimplement 2D View using GL.
-
-commit c2e6e58533d24e78036b8a8d6b915458500af58f
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Tue Jun 14 22:39:17 2011 +0200
-
-    Implement Object support.
-    
-    Match code style.
-    Add objects.
-    Display objects.
-    Select objects.
-    Link active object to selected bundles.
-
-commit 26668a24bf63a98ed2519fe4b6bd6dff1760645d
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Tue Jun 14 19:58:18 2011 +0200
-
-    Implement Camera selection.
-    
-    Camera selection bounds is a sphere around camera origin.
-    TODO: we might want an accurate pyramid intersection.
-    Reconstruction::AllPoints() and Reconstruction::AllCameras() now only returns valid objects.
-
-commit da716826247e7afa152bf3598852b3fc013b51c0
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jun 13 21:17:34 2011 +0200
-
-    Implement bundle selection.
-
-commit 37714c581c585f8efb1212704459f91e26e32b31
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jun 13 15:01:22 2011 +0200
-
-    Use Reconstruction container.
-    
-    Add Reconstruction::AllCameras() and Recontruction::AllPoints().
-
-commit ab40db86cc9fd3fd9e031e3029f618b68a0a4158
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jun 13 11:26:33 2011 +0200
-
-    display random cameras
-
-commit 95a150f80325abad21f746cf46f165922673a791
-Merge: cefe6aa 007aa36
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sun Jun 12 10:18:28 2011 +0200
-
-    Merge branch 'master' of git://github.com/keir/libmv
-
-commit 007aa3629ea4f5f74355e896dd29da191b39b03b
-Merge: 2ae39cb daab3ad
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Sat Jun 11 17:43:51 2011 -0700
-
-    Merge pull request #1 from paulinus/master
-    
-    This makes the project compile on the mac.
-
-commit daab3ad96dbf6defe153b97b28b78a3d99a7a092
-Author: Pau Gargallo <pau.gargallo at gmail.com>
-Date:   Sun Jun 12 01:12:30 2011 +0200
-

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list