[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46456] branches/soc-2011-tomato: Merging r46414 through r46455 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed May 9 11:41:27 CEST 2012
Revision: 46456
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46456
Author: nazgul
Date: 2012-05-09 09:41:27 +0000 (Wed, 09 May 2012)
Log Message:
-----------
Merging r46414 through r46455 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46414
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46455
Modified Paths:
--------------
branches/soc-2011-tomato/extern/Eigen3/Eigen/Core
branches/soc-2011-tomato/extern/Eigen3/Eigen/SVD
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Cholesky/LDLT.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Cholesky/LLT.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Array.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Block.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/DenseBase.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Map.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/MapBase.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Matrix.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/MatrixBase.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/ProductBase.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Replicate.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/SolveTriangular.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/util/Macros.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/util/Memory.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/util/XprHelper.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Geometry/Quaternion.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Geometry/Transform.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/LU/FullPivLU.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
branches/soc-2011-tomato/extern/libmv/libmv/image/correlation.h
branches/soc-2011-tomato/extern/libmv/libmv/image/sample.h
branches/soc-2011-tomato/extern/libmv/libmv/tracking/brute_region_tracker.cc
branches/soc-2011-tomato/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/soc-2011-tomato/intern/cycles/kernel/kernel_light.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_object.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
branches/soc-2011-tomato/intern/cycles/util/util_progress.h
branches/soc-2011-tomato/intern/dualcon/dualcon.h
branches/soc-2011-tomato/intern/dualcon/intern/GeoCommon.h
branches/soc-2011-tomato/intern/dualcon/intern/MemoryAllocator.h
branches/soc-2011-tomato/intern/dualcon/intern/ModelReader.h
branches/soc-2011-tomato/intern/dualcon/intern/Projections.cpp
branches/soc-2011-tomato/intern/dualcon/intern/Projections.h
branches/soc-2011-tomato/intern/dualcon/intern/Queue.h
branches/soc-2011-tomato/intern/dualcon/intern/cubes.h
branches/soc-2011-tomato/intern/dualcon/intern/dualcon_c_api.cpp
branches/soc-2011-tomato/intern/dualcon/intern/marching_cubes_table.cpp
branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp
branches/soc-2011-tomato/intern/dualcon/intern/octree.h
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-tomato/source/blender/collada/InstanceWriter.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_deps.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_draw.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_intern.h
branches/soc-2011-tomato/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_ops.c
branches/soc-2011-tomato/source/blender/editors/animation/drivers.c
branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/animation/keyingsets.c
branches/soc-2011-tomato/source/blender/editors/armature/BIF_generate.h
branches/soc-2011-tomato/source/blender/editors/armature/BIF_retarget.h
branches/soc-2011-tomato/source/blender/editors/armature/armature_intern.h
branches/soc-2011-tomato/source/blender/editors/armature/armature_ops.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_generate.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.h
branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
branches/soc-2011-tomato/source/blender/editors/armature/poseUtils.c
branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/armature/reeb.c
branches/soc-2011-tomato/source/blender/editors/armature/reeb.h
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-tomato/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_intern.h
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_ops.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_undo.c
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-tomato/source/blender/editors/metaball/mball_ops.c
branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_context.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_intern.h
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_draw.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_intern.h
branches/soc-2011-tomato/source/blender/editors/space_action/action_ops.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
branches/soc-2011-tomato/source/blender/editors/space_action/space_action.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_file/fsmenu.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_intern.h
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_utils.c
branches/soc-2011-tomato/source/blender/editors/space_graph/space_graph.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_draw.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_ops.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-tomato/source/blender/editors/space_nla/space_nla.c
branches/soc-2011-tomato/source/blender/editors/space_script/script_edit.c
branches/soc-2011-tomato/source/blender/editors/space_script/script_ops.c
branches/soc-2011-tomato/source/blender/editors/space_script/space_script.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_time/space_time.c
branches/soc-2011-tomato/source/blender/editors/space_time/time_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
branches/soc-2011-tomato/source/blender/imbuf/intern/scaling.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/python/BPY_extern.h
branches/soc-2011-tomato/source/blender/python/generic/bgl.c
branches/soc-2011-tomato/source/blender/python/generic/bgl.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_util.h
branches/soc-2011-tomato/source/blender/render/intern/source/gammaCorrectionTables.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-46413
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-46455
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/Core
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/Core 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/Core 2012-05-09 09:41:27 UTC (rev 46456)
@@ -167,7 +167,7 @@
#include <intrin.h>
#endif
-#if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(EIGEN_NO_EXCEPTIONS)
+#if defined(_CPPUNWIND) || defined(__EXCEPTIONS)
#define EIGEN_EXCEPTIONS
#endif
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/SVD
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/SVD 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/SVD 2012-05-09 09:41:27 UTC (rev 46456)
@@ -13,9 +13,9 @@
*
*
*
- * This module provides SVD decomposition for (currently) real matrices.
+ * This module provides SVD decomposition for matrices (both real and complex).
* This decomposition is accessible via the following MatrixBase method:
- * - MatrixBase::svd()
+ * - MatrixBase::jacobiSvd()
*
* \code
* #include <Eigen/SVD>
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Cholesky/LDLT.h
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Cholesky/LDLT.h 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Cholesky/LDLT.h 2012-05-09 09:41:27 UTC (rev 46456)
@@ -331,16 +331,16 @@
template<typename MatrixType> struct LDLT_Traits<MatrixType,Lower>
{
- typedef TriangularView<MatrixType, UnitLower> MatrixL;
- typedef TriangularView<typename MatrixType::AdjointReturnType, UnitUpper> MatrixU;
+ typedef const TriangularView<const MatrixType, UnitLower> MatrixL;
+ typedef const TriangularView<const typename MatrixType::AdjointReturnType, UnitUpper> MatrixU;
inline static MatrixL getL(const MatrixType& m) { return m; }
inline static MatrixU getU(const MatrixType& m) { return m.adjoint(); }
};
template<typename MatrixType> struct LDLT_Traits<MatrixType,Upper>
{
- typedef TriangularView<typename MatrixType::AdjointReturnType, UnitLower> MatrixL;
- typedef TriangularView<MatrixType, UnitUpper> MatrixU;
+ typedef const TriangularView<const typename MatrixType::AdjointReturnType, UnitLower> MatrixL;
+ typedef const TriangularView<const MatrixType, UnitUpper> MatrixU;
inline static MatrixL getL(const MatrixType& m) { return m.adjoint(); }
inline static MatrixU getU(const MatrixType& m) { return m; }
};
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Cholesky/LLT.h
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Cholesky/LLT.h 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Cholesky/LLT.h 2012-05-09 09:41:27 UTC (rev 46456)
@@ -274,8 +274,8 @@
template<typename MatrixType> struct LLT_Traits<MatrixType,Lower>
{
- typedef TriangularView<MatrixType, Lower> MatrixL;
- typedef TriangularView<typename MatrixType::AdjointReturnType, Upper> MatrixU;
+ typedef const TriangularView<const MatrixType, Lower> MatrixL;
+ typedef const TriangularView<const typename MatrixType::AdjointReturnType, Upper> MatrixU;
inline static MatrixL getL(const MatrixType& m) { return m; }
inline static MatrixU getU(const MatrixType& m) { return m.adjoint(); }
static bool inplace_decomposition(MatrixType& m)
@@ -284,8 +284,8 @@
template<typename MatrixType> struct LLT_Traits<MatrixType,Upper>
{
- typedef TriangularView<typename MatrixType::AdjointReturnType, Lower> MatrixL;
- typedef TriangularView<MatrixType, Upper> MatrixU;
+ typedef const TriangularView<const typename MatrixType::AdjointReturnType, Lower> MatrixL;
+ typedef const TriangularView<const MatrixType, Upper> MatrixU;
inline static MatrixL getL(const MatrixType& m) { return m.adjoint(); }
inline static MatrixU getU(const MatrixType& m) { return m; }
static bool inplace_decomposition(MatrixType& m)
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Array.h
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Array.h 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Array.h 2012-05-09 09:41:27 UTC (rev 46456)
@@ -68,10 +68,8 @@
friend struct internal::conservative_resize_like_impl;
using Base::m_storage;
+
public:
- enum { NeedsToAlign = (!(Options&DontAlign))
- && SizeAtCompileTime!=Dynamic && ((static_cast<int>(sizeof(Scalar))*SizeAtCompileTime)%16)==0 };
- EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(NeedsToAlign)
using Base::base;
using Base::coeff;
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Block.h
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Block.h 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Block.h 2012-05-09 09:41:27 UTC (rev 46456)
@@ -94,7 +94,7 @@
MaskPacketAccessBit = (InnerSize == Dynamic || (InnerSize % packet_traits<Scalar>::size) == 0)
&& (InnerStrideAtCompileTime == 1)
? PacketAccessBit : 0,
- MaskAlignedBit = (InnerPanel && (OuterStrideAtCompileTime!=Dynamic) && ((OuterStrideAtCompileTime % packet_traits<Scalar>::size) == 0)) ? AlignedBit : 0,
+ MaskAlignedBit = (InnerPanel && (OuterStrideAtCompileTime!=Dynamic) && (((OuterStrideAtCompileTime * int(sizeof(Scalar))) % 16) == 0)) ? AlignedBit : 0,
FlagsLinearAccessBit = (RowsAtCompileTime == 1 || ColsAtCompileTime == 1) ? LinearAccessBit : 0,
FlagsLvalueBit = is_lvalue<XprType>::value ? LvalueBit : 0,
FlagsRowMajorBit = IsRowMajor ? RowMajorBit : 0,
@@ -342,7 +342,7 @@
}
const typename XprType::Nested m_xpr;
- int m_outerStride;
+ Index m_outerStride;
};
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/DenseBase.h
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/DenseBase.h 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/DenseBase.h 2012-05-09 09:41:27 UTC (rev 46456)
@@ -169,8 +169,8 @@
IsRowMajor = int(Flags) & RowMajorBit, /**< True if this expression has row-major storage order. */
- InnerSizeAtCompileTime = int(IsVectorAtCompileTime) ? SizeAtCompileTime
- : int(IsRowMajor) ? ColsAtCompileTime : RowsAtCompileTime,
+ InnerSizeAtCompileTime = int(IsVectorAtCompileTime) ? int(SizeAtCompileTime)
+ : int(IsRowMajor) ? int(ColsAtCompileTime) : int(RowsAtCompileTime),
CoeffReadCost = internal::traits<Derived>::CoeffReadCost,
/**< This is a rough measure of how expensive it is to read one coefficient from
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Map.h
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Map.h 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Map.h 2012-05-09 09:41:27 UTC (rev 46456)
@@ -102,7 +102,7 @@
|| HasNoOuterStride
|| ( OuterStrideAtCompileTime!=Dynamic
&& ((static_cast<int>(sizeof(Scalar))*OuterStrideAtCompileTime)%16)==0 ) ),
- Flags0 = TraitsBase::Flags,
+ Flags0 = TraitsBase::Flags & (~NestByRefBit),
Flags1 = IsAligned ? (int(Flags0) | AlignedBit) : (int(Flags0) & ~AlignedBit),
Flags2 = (bool(HasNoStride) || bool(PlainObjectType::IsVectorAtCompileTime))
? int(Flags1) : int(Flags1 & ~LinearAccessBit),
@@ -120,7 +120,6 @@
public:
typedef MapBase<Map> Base;
-
EIGEN_DENSE_PUBLIC_INTERFACE(Map)
typedef typename Base::PointerType PointerType;
@@ -181,7 +180,6 @@
PlainObjectType::Base::_check_template_params();
}
-
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Map)
protected:
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/MapBase.h
===================================================================
--- branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/MapBase.h 2012-05-09 09:24:15 UTC (rev 46455)
+++ branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/MapBase.h 2012-05-09 09:41:27 UTC (rev 46456)
@@ -170,8 +170,8 @@
EIGEN_STATIC_ASSERT(EIGEN_IMPLIES(internal::traits<Derived>::Flags&PacketAccessBit,
internal::inner_stride_at_compile_time<Derived>::ret==1),
PACKET_ACCESS_REQUIRES_TO_HAVE_INNER_STRIDE_FIXED_TO_1);
- eigen_assert(EIGEN_IMPLIES(internal::traits<Derived>::Flags&AlignedBit, (size_t(m_data) % (sizeof(Scalar)*internal::packet_traits<Scalar>::size)) == 0)
- && "data is not aligned");
+ eigen_assert(EIGEN_IMPLIES(internal::traits<Derived>::Flags&AlignedBit, (size_t(m_data) % 16) == 0)
+ && "data is not aligned");
}
PointerType m_data;
Modified: branches/soc-2011-tomato/extern/Eigen3/Eigen/src/Core/Matrix.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list