From 93a15ce983c6fdcee7bf69da57ea6c3f298dcfd0 Mon Sep 17 00:00:00 2001 From: Mastificate Date: Fri, 13 Jan 2017 19:28:09 -0500 Subject: [PATCH 1/4] added error handling for bezier curves and fixed infinite loop bugs --- src/modules/math/BezierCurve.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/modules/math/BezierCurve.cpp b/src/modules/math/BezierCurve.cpp index a10b3cf0f..7ada2c554 100644 --- a/src/modules/math/BezierCurve.cpp +++ b/src/modules/math/BezierCurve.cpp @@ -105,6 +105,9 @@ BezierCurve BezierCurve::getDerivative() const const Vector &BezierCurve::getControlPoint(int i) const { + if (controlPoints.size() == 0) + throw Exception("Curve contains no control points."); + while (i < 0) i += controlPoints.size(); @@ -116,6 +119,9 @@ const Vector &BezierCurve::getControlPoint(int i) const void BezierCurve::setControlPoint(int i, const Vector &point) { + if (controlPoints.size() == 0) + throw Exception("Curve contains no control points."); + while (i < 0) i += controlPoints.size(); @@ -127,6 +133,9 @@ void BezierCurve::setControlPoint(int i, const Vector &point) void BezierCurve::insertControlPoint(const Vector &point, int i) { + if (controlPoints.size() == 0) + i = 0; + while (i < 0) i += controlPoints.size(); @@ -138,6 +147,9 @@ void BezierCurve::insertControlPoint(const Vector &point, int i) void BezierCurve::removeControlPoint(int i) { + if (controlPoints.size() == 0) + throw Exception("No control points to remove."); + while (i < 0) i += controlPoints.size(); From 2aff0b11994bf7c2da0dec4d7c6e94a9188ba2c0 Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Sun, 15 Jan 2017 20:21:38 +0100 Subject: [PATCH 2/4] Remove executable bit from source files --- src/common/utf8.cpp | 0 src/common/utf8.h | 0 src/libraries/Box2D/Box2D.h | 0 src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp | 0 src/libraries/Box2D/Collision/Shapes/b2ChainShape.h | 0 src/libraries/Box2D/Collision/Shapes/b2CircleShape.cpp | 0 src/libraries/Box2D/Collision/Shapes/b2CircleShape.h | 0 src/libraries/Box2D/Collision/Shapes/b2EdgeShape.cpp | 0 src/libraries/Box2D/Collision/Shapes/b2EdgeShape.h | 0 src/libraries/Box2D/Collision/Shapes/b2PolygonShape.cpp | 0 src/libraries/Box2D/Collision/Shapes/b2PolygonShape.h | 0 src/libraries/Box2D/Collision/Shapes/b2Shape.h | 0 src/libraries/Box2D/Collision/b2BroadPhase.cpp | 0 src/libraries/Box2D/Collision/b2BroadPhase.h | 0 src/libraries/Box2D/Collision/b2CollideCircle.cpp | 0 src/libraries/Box2D/Collision/b2CollideEdge.cpp | 0 src/libraries/Box2D/Collision/b2CollidePolygon.cpp | 0 src/libraries/Box2D/Collision/b2Collision.cpp | 0 src/libraries/Box2D/Collision/b2Collision.h | 0 src/libraries/Box2D/Collision/b2Distance.cpp | 0 src/libraries/Box2D/Collision/b2Distance.h | 0 src/libraries/Box2D/Collision/b2DynamicTree.cpp | 0 src/libraries/Box2D/Collision/b2DynamicTree.h | 0 src/libraries/Box2D/Collision/b2TimeOfImpact.cpp | 0 src/libraries/Box2D/Collision/b2TimeOfImpact.h | 0 src/libraries/Box2D/Common/b2BlockAllocator.cpp | 0 src/libraries/Box2D/Common/b2BlockAllocator.h | 0 src/libraries/Box2D/Common/b2Draw.cpp | 0 src/libraries/Box2D/Common/b2Draw.h | 0 src/libraries/Box2D/Common/b2GrowableStack.h | 0 src/libraries/Box2D/Common/b2Math.cpp | 0 src/libraries/Box2D/Common/b2Math.h | 0 src/libraries/Box2D/Common/b2Settings.cpp | 0 src/libraries/Box2D/Common/b2Settings.h | 0 src/libraries/Box2D/Common/b2StackAllocator.cpp | 0 src/libraries/Box2D/Common/b2StackAllocator.h | 0 src/libraries/Box2D/Common/b2Timer.cpp | 0 src/libraries/Box2D/Common/b2Timer.h | 0 src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h | 0 .../Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h | 0 src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.h | 0 src/libraries/Box2D/Dynamics/Contacts/b2Contact.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2Contact.h | 0 src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.h | 0 src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h | 0 src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h | 0 .../Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h | 0 src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.cpp | 0 src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.h | 0 src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2GearJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2GearJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2Joint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2Joint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.h | 0 src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.cpp | 0 src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.h | 0 src/libraries/Box2D/Dynamics/b2Body.cpp | 0 src/libraries/Box2D/Dynamics/b2Body.h | 0 src/libraries/Box2D/Dynamics/b2ContactManager.cpp | 0 src/libraries/Box2D/Dynamics/b2ContactManager.h | 0 src/libraries/Box2D/Dynamics/b2Fixture.cpp | 0 src/libraries/Box2D/Dynamics/b2Fixture.h | 0 src/libraries/Box2D/Dynamics/b2Island.cpp | 0 src/libraries/Box2D/Dynamics/b2Island.h | 0 src/libraries/Box2D/Dynamics/b2TimeStep.h | 0 src/libraries/Box2D/Dynamics/b2World.cpp | 0 src/libraries/Box2D/Dynamics/b2World.h | 0 src/libraries/Box2D/Dynamics/b2WorldCallbacks.cpp | 0 src/libraries/Box2D/Dynamics/b2WorldCallbacks.h | 0 src/libraries/Box2D/Rope/b2Rope.cpp | 0 src/libraries/Box2D/Rope/b2Rope.h | 0 src/libraries/lz4/lz4.c | 0 src/libraries/lz4/lz4.h | 0 src/libraries/lz4/lz4hc.c | 0 src/libraries/lz4/lz4hc.h | 0 src/modules/system/System.cpp | 0 100 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/common/utf8.cpp mode change 100755 => 100644 src/common/utf8.h mode change 100755 => 100644 src/libraries/Box2D/Box2D.h mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2ChainShape.h mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2CircleShape.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2CircleShape.h mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2EdgeShape.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2EdgeShape.h mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2PolygonShape.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2PolygonShape.h mode change 100755 => 100644 src/libraries/Box2D/Collision/Shapes/b2Shape.h mode change 100755 => 100644 src/libraries/Box2D/Collision/b2BroadPhase.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/b2BroadPhase.h mode change 100755 => 100644 src/libraries/Box2D/Collision/b2CollideCircle.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/b2CollideEdge.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/b2CollidePolygon.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/b2Collision.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/b2Collision.h mode change 100755 => 100644 src/libraries/Box2D/Collision/b2Distance.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/b2Distance.h mode change 100755 => 100644 src/libraries/Box2D/Collision/b2DynamicTree.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/b2DynamicTree.h mode change 100755 => 100644 src/libraries/Box2D/Collision/b2TimeOfImpact.cpp mode change 100755 => 100644 src/libraries/Box2D/Collision/b2TimeOfImpact.h mode change 100755 => 100644 src/libraries/Box2D/Common/b2BlockAllocator.cpp mode change 100755 => 100644 src/libraries/Box2D/Common/b2BlockAllocator.h mode change 100755 => 100644 src/libraries/Box2D/Common/b2Draw.cpp mode change 100755 => 100644 src/libraries/Box2D/Common/b2Draw.h mode change 100755 => 100644 src/libraries/Box2D/Common/b2GrowableStack.h mode change 100755 => 100644 src/libraries/Box2D/Common/b2Math.cpp mode change 100755 => 100644 src/libraries/Box2D/Common/b2Math.h mode change 100755 => 100644 src/libraries/Box2D/Common/b2Settings.cpp mode change 100755 => 100644 src/libraries/Box2D/Common/b2Settings.h mode change 100755 => 100644 src/libraries/Box2D/Common/b2StackAllocator.cpp mode change 100755 => 100644 src/libraries/Box2D/Common/b2StackAllocator.h mode change 100755 => 100644 src/libraries/Box2D/Common/b2Timer.cpp mode change 100755 => 100644 src/libraries/Box2D/Common/b2Timer.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2Contact.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2Contact.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2GearJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2GearJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2Joint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2Joint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2Body.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2Body.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2ContactManager.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2ContactManager.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2Fixture.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2Fixture.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2Island.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2Island.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2TimeStep.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2World.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2World.h mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2WorldCallbacks.cpp mode change 100755 => 100644 src/libraries/Box2D/Dynamics/b2WorldCallbacks.h mode change 100755 => 100644 src/libraries/Box2D/Rope/b2Rope.cpp mode change 100755 => 100644 src/libraries/Box2D/Rope/b2Rope.h mode change 100755 => 100644 src/libraries/lz4/lz4.c mode change 100755 => 100644 src/libraries/lz4/lz4.h mode change 100755 => 100644 src/libraries/lz4/lz4hc.c mode change 100755 => 100644 src/libraries/lz4/lz4hc.h mode change 100755 => 100644 src/modules/system/System.cpp diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp old mode 100755 new mode 100644 diff --git a/src/common/utf8.h b/src/common/utf8.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Box2D.h b/src/libraries/Box2D/Box2D.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp b/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2ChainShape.h b/src/libraries/Box2D/Collision/Shapes/b2ChainShape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2CircleShape.cpp b/src/libraries/Box2D/Collision/Shapes/b2CircleShape.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2CircleShape.h b/src/libraries/Box2D/Collision/Shapes/b2CircleShape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2EdgeShape.cpp b/src/libraries/Box2D/Collision/Shapes/b2EdgeShape.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2EdgeShape.h b/src/libraries/Box2D/Collision/Shapes/b2EdgeShape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2PolygonShape.cpp b/src/libraries/Box2D/Collision/Shapes/b2PolygonShape.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2PolygonShape.h b/src/libraries/Box2D/Collision/Shapes/b2PolygonShape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2Shape.h b/src/libraries/Box2D/Collision/Shapes/b2Shape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2BroadPhase.cpp b/src/libraries/Box2D/Collision/b2BroadPhase.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2BroadPhase.h b/src/libraries/Box2D/Collision/b2BroadPhase.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2CollideCircle.cpp b/src/libraries/Box2D/Collision/b2CollideCircle.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2CollideEdge.cpp b/src/libraries/Box2D/Collision/b2CollideEdge.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2CollidePolygon.cpp b/src/libraries/Box2D/Collision/b2CollidePolygon.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2Collision.cpp b/src/libraries/Box2D/Collision/b2Collision.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2Collision.h b/src/libraries/Box2D/Collision/b2Collision.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2Distance.cpp b/src/libraries/Box2D/Collision/b2Distance.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2Distance.h b/src/libraries/Box2D/Collision/b2Distance.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2DynamicTree.cpp b/src/libraries/Box2D/Collision/b2DynamicTree.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2DynamicTree.h b/src/libraries/Box2D/Collision/b2DynamicTree.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2TimeOfImpact.cpp b/src/libraries/Box2D/Collision/b2TimeOfImpact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2TimeOfImpact.h b/src/libraries/Box2D/Collision/b2TimeOfImpact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2BlockAllocator.cpp b/src/libraries/Box2D/Common/b2BlockAllocator.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2BlockAllocator.h b/src/libraries/Box2D/Common/b2BlockAllocator.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Draw.cpp b/src/libraries/Box2D/Common/b2Draw.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Draw.h b/src/libraries/Box2D/Common/b2Draw.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2GrowableStack.h b/src/libraries/Box2D/Common/b2GrowableStack.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Math.cpp b/src/libraries/Box2D/Common/b2Math.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Math.h b/src/libraries/Box2D/Common/b2Math.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Settings.cpp b/src/libraries/Box2D/Common/b2Settings.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Settings.h b/src/libraries/Box2D/Common/b2Settings.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2StackAllocator.cpp b/src/libraries/Box2D/Common/b2StackAllocator.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2StackAllocator.h b/src/libraries/Box2D/Common/b2StackAllocator.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Timer.cpp b/src/libraries/Box2D/Common/b2Timer.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Timer.h b/src/libraries/Box2D/Common/b2Timer.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2Contact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2Contact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2Contact.h b/src/libraries/Box2D/Dynamics/Contacts/b2Contact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.h b/src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2GearJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2GearJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2GearJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2GearJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2Joint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2Joint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2Joint.h b/src/libraries/Box2D/Dynamics/Joints/b2Joint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Body.cpp b/src/libraries/Box2D/Dynamics/b2Body.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Body.h b/src/libraries/Box2D/Dynamics/b2Body.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2ContactManager.cpp b/src/libraries/Box2D/Dynamics/b2ContactManager.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2ContactManager.h b/src/libraries/Box2D/Dynamics/b2ContactManager.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Fixture.cpp b/src/libraries/Box2D/Dynamics/b2Fixture.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Fixture.h b/src/libraries/Box2D/Dynamics/b2Fixture.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Island.cpp b/src/libraries/Box2D/Dynamics/b2Island.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Island.h b/src/libraries/Box2D/Dynamics/b2Island.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2TimeStep.h b/src/libraries/Box2D/Dynamics/b2TimeStep.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2World.cpp b/src/libraries/Box2D/Dynamics/b2World.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2World.h b/src/libraries/Box2D/Dynamics/b2World.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2WorldCallbacks.cpp b/src/libraries/Box2D/Dynamics/b2WorldCallbacks.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2WorldCallbacks.h b/src/libraries/Box2D/Dynamics/b2WorldCallbacks.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Rope/b2Rope.cpp b/src/libraries/Box2D/Rope/b2Rope.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Rope/b2Rope.h b/src/libraries/Box2D/Rope/b2Rope.h old mode 100755 new mode 100644 diff --git a/src/libraries/lz4/lz4.c b/src/libraries/lz4/lz4.c old mode 100755 new mode 100644 diff --git a/src/libraries/lz4/lz4.h b/src/libraries/lz4/lz4.h old mode 100755 new mode 100644 diff --git a/src/libraries/lz4/lz4hc.c b/src/libraries/lz4/lz4hc.c old mode 100755 new mode 100644 diff --git a/src/libraries/lz4/lz4hc.h b/src/libraries/lz4/lz4hc.h old mode 100755 new mode 100644 diff --git a/src/modules/system/System.cpp b/src/modules/system/System.cpp old mode 100755 new mode 100644 From a9a294beb3cacac520983d9565038d271540421a Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Sun, 15 Jan 2017 20:26:21 +0100 Subject: [PATCH 3/4] Rebuild boot.lua.h --- src/scripts/boot.lua.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index d762fc154..6d0fbadb7 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -1201,9 +1201,7 @@ const unsigned char boot_lua[] = 0x09, 0x09, 0x09, 0x09, 0x63, 0x6f, 0x70, 0x79, 0x54, 0x6f, 0x43, 0x6c, 0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x28, 0x29, 0x0a, 0x09, 0x09, 0x09, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x65, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x6f, - 0x75, 0x63, 0x68, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x65, 0x20, 0x3d, - 0x3d, 0x20, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x22, 0x20, 0x74, - 0x68, 0x65, 0x6e, 0x0a, + 0x75, 0x63, 0x68, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x67, 0x65, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x28, 0x29, 0x0a, From f45c6a0d745ccf75d39cbc3de017ff3c4d637edf Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 21 Jan 2017 12:03:43 -0400 Subject: [PATCH 4/4] Fix a crash related to love.graphics.push and love.window.setMode. --- src/modules/graphics/opengl/Graphics.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index ebc8a135a..a37133520 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -63,6 +63,9 @@ Graphics::Graphics() states.reserve(10); states.push_back(DisplayState()); + pixelSizeStack.reserve(5); + pixelSizeStack.push_back(1); + if (currentWindow.get()) { int w, h; @@ -313,10 +316,6 @@ bool Graphics::setMode(int width, int height) // Restore the graphics state. restoreState(states.back()); - pixelSizeStack.clear(); - pixelSizeStack.reserve(5); - pixelSizeStack.push_back(1); - int gammacorrect = isGammaCorrect() ? 1 : 0; // We always need a default shader.