Merge pull request #9 from victorsavu3/master

Allow animations to be transformed and various memory problems

spine-cpp/includes/spine-sfml/Atlas.h

@@ -8,6 +8,10 @@ namespace spine {
 
 class AtlasPage: public BaseAtlasPage {
 public:
+	~AtlasPage(){
+		delete texture;
+	}
+
 	sf::Texture *texture;
 };
 

spine-cpp/src/spine-sfml/Skeleton.cpp

@@ -23,7 +23,8 @@ void Skeleton::draw (RenderTarget& target, RenderStates states) const {
 	const_cast<Skeleton*>(this)->vertexArray.clear();
 	for (int i = 0, n = slots.size(); i < n; i++)
 		if (slots[i]->attachment) slots[i]->attachment->draw(slots[i]);
-	target.draw(vertexArray, texture);
+	states.texture = texture;
+	target.draw(vertexArray, states);
 }
 
 } /* namespace spine */

spine-cpp/src/spine/BaseAtlas.cpp

@@ -105,7 +105,7 @@ void BaseAtlas::load (const char *current, const char *end) {
 
 	string value;
 	string tuple[4];
-	BaseAtlasPage *page;
+	BaseAtlasPage *page = NULL;
 	while (current != end) {
 		readLine(current, end, value);
 		trim(value);

spine-cpp/src/spine/BaseSkeletonJson.cpp

@@ -21,8 +21,9 @@ namespace spine {
 static float toColor (const string &value, int index) {
 	if (value.size() != 8) throw runtime_error("Error parsing color, length must be 8: " + value);
 	char *p;
-	int color = strtoul(value.substr(index * 2, 2).c_str(), &p, 16);
-	if (*p != 0) throw runtime_error("Error parsing color: " + value + ", invalid hex value: " + value.substr(index * 2, 2));
+	string tmp = value.substr(index * 2, 2);
+	int color = strtoul(tmp.c_str(), &p, 16);
+	if (*p != 0) throw runtime_error("Error parsing color: " + value + ", invalid hex value: " + tmp);
 	return color / (float)255;
 }