[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39253] branches/soc-2011-salad: Merging r39070 through r39252 from soc-2011-tomato into soc-2011-salad

Sergey Sharybin g.ulairi at gmail.com
Wed Aug 10 14:36:18 CEST 2011 

Revision: 39253
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39253
Author:   nazgul
Date:     2011-08-10 12:36:18 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Merging r39070 through r39252 from soc-2011-tomato into soc-2011-salad

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

Modified Paths:
--------------
    branches/soc-2011-salad/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-salad/extern/libmv/ChangeLog
    branches/soc-2011-salad/extern/libmv/libmv/image/array_nd.h
    branches/soc-2011-salad/extern/libmv/libmv/image/sample.h
    branches/soc-2011-salad/extern/libmv/libmv/multiview/projection.cc
    branches/soc-2011-salad/extern/libmv/libmv/multiview/projection.h
    branches/soc-2011-salad/extern/libmv/libmv/numeric/levenberg_marquardt.h
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/bundle.h
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/detect.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/intersect.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/intersect.h
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/reconstruction.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/reconstruction.h
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/resect.h
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/tracks.cc
    branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/tracks.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/intern/ffmpeg/ffmpeg_compat.h
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_1100D.py
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_1D.py
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_1DS.py
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_500D.py
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_550D.py
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_5D.py
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_600D.py
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_60D.py
    branches/soc-2011-salad/release/scripts/presets/camera/Canon_7D.py
    branches/soc-2011-salad/release/scripts/presets/camera/Nikon_D300S.py
    branches/soc-2011-salad/release/scripts/presets/camera/Nikon_D3100.py
    branches/soc-2011-salad/release/scripts/presets/camera/Nikon_D35.py
    branches/soc-2011-salad/release/scripts/presets/camera/Nikon_D5000.py
    branches/soc-2011-salad/release/scripts/presets/camera/Nikon_D5100.py
    branches/soc-2011-salad/release/scripts/presets/camera/Nikon_D7000.py
    branches/soc-2011-salad/release/scripts/presets/camera/Nikon_D90.py
    branches/soc-2011-salad/release/scripts/presets/camera/Red_Epic.py
    branches/soc-2011-salad/release/scripts/presets/camera/Red_One_2K.py
    branches/soc-2011-salad/release/scripts/presets/camera/Red_One_3K.py
    branches/soc-2011-salad/release/scripts/presets/camera/Red_One_4K.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_1100D.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_1D.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_1DS.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_500D.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_550D.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_5D.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_600D.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_60D.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Canon_7D.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Nikon_D300S.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Nikon_D3100.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Nikon_D35.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Nikon_D5000.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Nikon_D5100.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Nikon_D7000.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Nikon_D90.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Red_Epic.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Red_One_2K.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Red_One_3K.py
    branches/soc-2011-salad/release/scripts/presets/tracking_camera/Red_One_4K.py
    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/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-salad/source/blender/blenkernel/BKE_moviecache.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-salad/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/image.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/moviecache.c
    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/sequencer.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/blenloader/intern/readfile.c
    branches/soc-2011-salad/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-salad/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-salad/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-salad/source/blender/editors/space_clip/CMakeLists.txt
    branches/soc-2011-salad/source/blender/editors/space_clip/SConscript
    branches/soc-2011-salad/source/blender/editors/space_clip/clip_buttons.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/clip_ops.c
    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_image/image_buttons.c
    branches/soc-2011-salad/source/blender/editors/space_sequencer/SConscript
    branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-salad/source/blender/imbuf/CMakeLists.txt
    branches/soc-2011-salad/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-salad/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2011-salad/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2011-salad/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-salad/source/blender/imbuf/intern/filter.c
    branches/soc-2011-salad/source/blender/imbuf/intern/thumbs.c
    branches/soc-2011-salad/source/blender/imbuf/intern/util.c
    branches/soc-2011-salad/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_sequence_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_movieclip.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-salad/source/blender/windowmanager/WM_api.h
    branches/soc-2011-salad/source/blender/windowmanager/intern/wm_jobs.c

Added Paths:
-----------
    branches/soc-2011-salad/extern/libmv/patches/bundle_tweaks.patch
    branches/soc-2011-salad/extern/libmv/patches/fast.patch
    branches/soc-2011-salad/extern/libmv/patches/snrptinf_fix.patch
    branches/soc-2011-salad/extern/libmv/patches/v3d_verbosity.patch
    branches/soc-2011-salad/source/blender/imbuf/intern/IMB_indexer.h
    branches/soc-2011-salad/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-salad/source/blender/imbuf/intern/indexer_dv.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:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39215
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39251
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39215
/branches/soc-2011-tomato:36831-39252
/trunk/blender:36834-39251

Modified: branches/soc-2011-salad/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/linuxcross-config.py	2011-08-10 12:18:27 UTC (rev 39252)
+++ branches/soc-2011-salad/build_files/scons/config/linuxcross-config.py	2011-08-10 12:36:18 UTC (rev 39253)
@@ -125,8 +125,9 @@
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg'
-BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
+BF_FFMPEG = LIBDIR + '/ffmpeg-0.8'
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
 

Modified: branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py	2011-08-10 12:18:27 UTC (rev 39252)
+++ branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py	2011-08-10 12:36:18 UTC (rev 39253)
@@ -21,6 +21,7 @@
 BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
 BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg-0.8/lib'
 BF_FFMPEG_INC =  LIBDIR + '/ffmpeg-0.8/include'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
 BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'

Modified: branches/soc-2011-salad/extern/libmv/ChangeLog
===================================================================
--- branches/soc-2011-salad/extern/libmv/ChangeLog	2011-08-10 12:18:27 UTC (rev 39252)
+++ branches/soc-2011-salad/extern/libmv/ChangeLog	2011-08-10 12:36:18 UTC (rev 39253)
@@ -1,571 +1,445 @@
-commit dec996966d5466717a813da2d8b9962115dfc8ac
+commit c2af303e7bf0dddcb02937323ac5846b1801e6cc
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 15 20:04:06 2011 +0200
+Date:   Tue Aug 9 11:13:29 2011 +0200
 
-    Detect API documentation.
+    Remove reconstruction breaking debug code.
 
-commit bfc07bd0940bba0d5439ccd0297368607db514be
+commit 8792a633e5c5f1c1f12e164b9e8897ca0790ac59
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 15 16:22:52 2011 +0200
+Date:   Tue Aug 9 10:49:18 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.
+    Remove getchar()s.
 
-commit e59595806c045916ab4ef15ef7047c1a728b2da9
+commit 63a9bdee0cbd1197e0315d01c27bfc2361bd5656
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Thu Jul 14 22:29:06 2011 +0200
+Date:   Tue Aug 9 10:35:07 2011 +0200
 
-    Use FAST detector.
-    
-    FAST is much faster and works much better than the "Good Features to Track algorithm".
+    Adapt patch to new PipelineRoutines code generation strategy.
 
-commit 17c036e9f8c6529c2f771fdd9dc73f3022e36c77
+commit 096ff1a4070f7212c50fb0a4b2feec7ca9d97158
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jul 13 22:23:40 2011 +0200
+Date:   Tue Aug 9 09:54:12 2011 +0200
 
-    Add visualization of image filtering operations.
+    Merge max_image and max_track fix from tomato.
 
-commit c4f71e17b6b72acc0f863906c01c87d53e8bbb2c
+commit d8450cd3c37278a397482cd36b1e2419f154cfb9
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jul 13 10:37:26 2011 +0200
+Date:   Tue Aug 9 09:38:49 2011 +0200
 
-    Simplify feature detection.
+    Synchronize tree with Tomato: Merge patch for better resection, keep deprecated KLT tracker.
 
-commit d8109b7a4fede1660e0dbd73735f1a9e3fd79eec
+commit e9b2dca920cf9575c15150a4988634b00e343a41
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jul 13 10:21:52 2011 +0200
+Date:   Mon Aug 8 17:07:08 2011 +0200
 
-    Add feature detection.
-    
-    Remove unused keyframe selection code.
+    Fixes, Documentation.
 
-commit 1088517da70ae9ec2369752fbc17dde4bb869c47
+commit 4fc1c57a2d92442808ac4a3676e6d9a25a51e310
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 22:42:14 2011 +0200
+Date:   Sun Aug 7 14:35:08 2011 +0200
 
-    Replace system file dialog with custom one which supports multiple file/folder selection.
-    Add Stop button when adding frame from video.
+    Improve tracker resilience by penalizing large motion vectors.
 
-commit 323af7a3a1344e7ef419c72fe22b674c17c578e3
+commit cc8e7e8e08cd91f75c080a0091461ca9fe969664
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 16:30:59 2011 +0200
+Date:   Sun Aug 7 09:28:09 2011 +0200
 
-    Add stub for feature detection.
+    Leverage SSE2 SAD instruction for 16x speed improvement in integer pixel search resulting in ~1ms per marker for 16x16 pattern on 128x128 region.
 
-commit 739ec729fa8bc6e0ba6a40cc7b89d85e5332e900
+commit f362ab4999a768370fca57552464b459eb9fbddc
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 16:30:42 2011 +0200
+Date:   Sun Aug 7 09:06:04 2011 +0200
 
-    Fix compilation of Qt Calibration tool.
+    Improve SAD Tracker subpixel precision (avoid drift even when adapting at each frame).
 
-commit 113ccc413db6bdfb75839418bddfba5ce3ba60f7
+commit fce7a214c561b5f5f0e17115c31fb48814bde2db
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 12:27:47 2011 +0200
+Date:   Sat Aug 6 21:57:06 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).
+    Track using simple Sum of Absolute Differences matching.
+    This method is simpler, more robust, faster and accurate.
 
-commit efbe8b6a3e2a8cff497726e11afffbce0ec6aa53
+commit 620a7a35d9a2818bf6e9dbf5d11debda4be6bc26
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 11:11:47 2011 +0200
+Date:   Fri Jul 29 12:35:57 2011 +0200
 
-    Miscellaneous UI fixes, faster grayscale conversion, compute window size from pattern size and pyramid level count.
+    Add Intersect unit test.
 
-commit 0c6911831b0a391da14bf1c5833b1e5c0d5056b7
+commit a2bf58fa57be11215eb17ff7f7de58f97d480ec3
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sun Jul 10 22:48:15 2011 +0200
+Date:   Thu Jul 28 11:08:06 2011 +0200
 
-    Add Video support using FFmpeg to Qt Calibration.
+    Remove tests depending on dead code.
+    Fix CameraIntrinsics test.
+    Add Intersect and Resect tests.
 
-commit c9f2bd5a17585f816bf0ef89097ac8f222ad058e
+commit 19bddee10b4879c8cd2238ccdf5b8f7620cf8384
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sun Jul 10 19:44:35 2011 +0200
+Date:   Wed Jul 27 12:07:21 2011 +0200
 
-    Add Video support using FFmpeg to Qt Tracker.
+    Image Distortion: Fixes and more testing.
 
-commit af8f9c412b0592868a0e68a14686651b45de9737
+commit 0454d97da328fb0eda8c6c50511ac31864a6d3d6
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sat Jul 9 12:08:28 2011 +0200
+Date:   Wed Jul 27 10:32:37 2011 +0200
 
-    Update README with instructions to build Qt OpenCV Calibration tool.
+    Test float image distortion.
 
-commit dc4e18b474b024c04fbb0ef6b4f2c2cd642c8715
+commit 8db01595a8721f766d85931a8d92b780461d8741
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 8 13:25:14 2011 +0200
+Date:   Wed Jul 27 10:27:07 2011 +0200
 
-    Make Qt OpenCV Calibration Tool optionnal.
+    Image Distortion: Bilinear sampling, Optimization, Instantiate all variants (Distort/Undistort, float/ubyte, 1-4 channels).
 
-commit 86356bd988b1b937082d56330f18a20e4cb26c19
+commit 91916db921e1f2818f0aa2be823bf92c50ad4de9
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 8 10:19:30 2011 +0200
+Date:   Tue Jul 26 22:51:21 2011 +0200
 
-    add QCompleter with QFileSystemModel to choose source image folder easily.
+    New Undistortion API in CameraIntrinsics.h.
+    Implement Undistortion API in CameraIntrinsics.cc.
 
-commit 209983a5e74c8b328d22d17668b3ad20d6e87f7a
-Merge: 0396ccf 7bef9ca
+commit 8c47a26072cfa9cf216771e5ae7a1dc60a770f82
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 8 10:17:05 2011 +0200
+Date:   Tue Jul 26 22:16:06 2011 +0200
 
-    Merge branch 'master' of git://github.com/libmv/libmv
+    Qt Calibration fixes. Image undistortion experiments.
 
-commit 0396ccf81dee87c3e7a06aa15f05bcaad8dd6ac3
+commit b575d9f68856b4e95a6b0a92ecc4e7d635342f95
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Thu Jul 7 18:35:12 2011 +0200
+Date:   Tue Jul 26 22:14:54 2011 +0200
 
-    calibration: Compute intrinsincs, undistort image and corners, output custom XML file.
+    Qt Calibration fixes.
+    Image undistortion experiments.
 
-commit 540a48b1e9f9d4e28fe6b1ef56decf1b29b4811f
+commit fac2b3e88ef8f14fa62149f6fc929c623d73fe39

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list