Quicktime(Carbon/win32) : add operator to raise the "compression settings" quicktime...

[blender.git] / intern / itasc / CopyPose.cpp

diff --git a/intern/itasc/CopyPose.cpp b/intern/itasc/CopyPose.cpp
index 3bf7edd7975938077b45704fe970ca7d478c9eb9..69722909ed18eec02795e4a3825e36ee2bea6b72 100644 (file)
--- a/intern/itasc/CopyPose.cpp
+++ b/intern/itasc/CopyPose.cpp
@@ -8,7 +8,6 @@
 #include "CopyPose.hpp"
 #include "kdl/kinfam_io.hpp"
 #include <math.h>
-#include <malloc.h>
 #include <string.h>
 
 namespace iTaSC
@@ -22,7 +21,7 @@ CopyPose::CopyPose(unsigned int control_output, unsigned int dynamic_output, dou
 {
        m_maxerror = armlength/2.0;
        m_outputControl = (control_output & CTL_ALL);
-       int _nc = nBitsOn(m_outputControl);
+       unsigned int _nc = nBitsOn(m_outputControl);
        if (!_nc) 
                return;
        // reset the constraint set
@@ -285,7 +284,7 @@ void CopyPose::updateJacobian()
 
 void CopyPose::updateState(ConstraintValues* _values, ControlState* _state, unsigned int mask, double timestep)
 {
-       int id = (mask == CTL_ROTATIONX) ? ID_ROTATIONX : ID_POSITIONX;
+       unsigned int id = (mask == CTL_ROTATIONX) ? ID_ROTATIONX : ID_POSITIONX;
        ControlState::ControlValue* _yval;
        ConstraintSingleValue* _data;
        int i, j, k;