From ed23f6a91ee5f2edf236d4eafaf378a5bbefdac5 Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Fri, 17 Jun 2016 10:36:54 -0400
Subject: [PATCH] better internal memory management

---
 gamehelpers.d | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gamehelpers.d b/gamehelpers.d
index 5c063cd..49cb253 100644
--- a/gamehelpers.d
+++ b/gamehelpers.d
@@ -222,6 +222,8 @@ final class OpenGlTexture {
 	this(TrueColorImage from) {
 		assert(from.width > 0 && from.height > 0);
 
+		import core.stdc.stdlib;
+
 		_width = from.width;
 		_height = from.height;
 
@@ -230,14 +232,18 @@ final class OpenGlTexture {
 		auto _texWidth = _width;
 		auto _texHeight = _height;
 
-		const(ubyte)[] data = from.imageData.bytes;
+		const(ubyte)* data = from.imageData.bytes.ptr;
+		bool freeRequired = false;
 
 		// gotta round them to the nearest power of two which means padding the image
 		if((_texWidth & (_texWidth - 1)) || (_texHeight & (_texHeight - 1))) {
 			_texWidth = nextPowerOfTwo(_texWidth);
 			_texHeight = nextPowerOfTwo(_texHeight);
 
-			auto n = new ubyte[](_texWidth * _texHeight * 4);
+			auto n = cast(ubyte*) malloc(_texWidth * _texHeight * 4);
+			if(n is null) assert(0);
+			scope(failure) free(n);
+
 			auto size = from.width * 4;
 			auto advance = _texWidth * 4;
 			int at = 0;
@@ -248,7 +254,8 @@ final class OpenGlTexture {
 				at2 += size;
 			}
 
-			data = n[];
+			data = n;
+			freeRequired = true;
 
 			// the rest of data will be initialized to zeros automatically which is fine.
 		}
@@ -268,12 +275,15 @@ final class OpenGlTexture {
 			0,
 			GL_RGBA,
 			GL_UNSIGNED_BYTE,
-			data.ptr);
+			data);
 
 		assert(!glGetError());
 
 		_texCoordWidth = cast(float) _width / _texWidth;
 		_texCoordHeight = cast(float) _height / _texHeight;
+
+		if(freeRequired)
+			free(cast(void*) data);
 	}
 
 	/// Generates from text. Requires stb_truetype.d