From 532685f7cb9949e2f708ec3badf010793e1820ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Tue, 19 Nov 2013 16:04:16 +0100
Subject: [PATCH] Removed unused memory.h/c

---
 src/rendering/rendering.pro    |  2 --
 src/rendering/tools/memory.cpp | 53 ----------------------------------
 src/rendering/tools/memory.h   | 12 --------
 3 files changed, 67 deletions(-)
 delete mode 100644 src/rendering/tools/memory.cpp
 delete mode 100644 src/rendering/tools/memory.h

diff --git a/src/rendering/rendering.pro b/src/rendering/rendering.pro
index cdbd955..9849e78 100644
--- a/src/rendering/rendering.pro
+++ b/src/rendering/rendering.pro
@@ -29,7 +29,6 @@ SOURCES += main.cpp \
     textures/tex_preview.cpp \
     tools/texture.cpp \
     tools/parallel.cpp \
-    tools/memory.cpp \
     tools/lighting.cpp \
     tools/euclid.cpp \
     tools/data.cpp \
@@ -62,7 +61,6 @@ HEADERS += \
     textures/private.h \
     tools/texture.h \
     tools/parallel.h \
-    tools/memory.h \
     tools/lighting.h \
     tools/euclid.h \
     tools/data.h \
diff --git a/src/rendering/tools/memory.cpp b/src/rendering/tools/memory.cpp
deleted file mode 100644
index 456558e..0000000
--- a/src/rendering/tools/memory.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "memory.h"
-
-#include <cstdlib>
-#include <cstring>
-#include <cassert>
-
-char* memory2dRealloc(char* data, int datasize, int oldxsize, int oldysize, int newxsize, int newysize, int xoffset, int yoffset)
-{
-    int xstart, xend, xlen;
-    int ystart, yend, y;
-    char* result = (char*)malloc(datasize * newxsize * newysize);
-
-    /* Move remaining part*/
-    ystart = yoffset;
-    yend = yoffset + oldysize;
-    if (yend >= 0 && ystart < newysize)
-    {
-        if (ystart < 0)
-        {
-            ystart = 0;
-        }
-        if (yend > newysize - 1)
-        {
-            yend = newysize - 1;
-        }
-
-        xstart = xoffset;
-        xend = xoffset + oldxsize;
-        if (xend >= 0 && xstart < newxsize)
-        {
-            if (xstart < 0)
-            {
-                xstart = 0;
-            }
-            if (xend > newxsize - 1)
-            {
-                xend = newxsize - 1;
-            }
-
-            xlen = xend - xstart + 1;
-            if (xlen > 0)
-            {
-                for (y = ystart; y <= yend; y++)
-                {
-                    memcpy(result + (y * newxsize + xstart) * datasize, data + ((y - ystart) * oldxsize) * datasize, xlen * datasize);
-                }
-            }
-        }
-    }
-
-    free(data);
-    return result;
-}
diff --git a/src/rendering/tools/memory.h b/src/rendering/tools/memory.h
deleted file mode 100644
index 59475e5..0000000
--- a/src/rendering/tools/memory.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PAYSAGES_TOOLS_MEMORY_H_
-#define _PAYSAGES_TOOLS_MEMORY_H_
-
-/*
- * Memory tools.
- */
-
-#include "../rendering_global.h"
-
-RENDERINGSHARED_EXPORT char* memory2dRealloc(char* data, int datasize, int oldxsize, int oldysize, int newxsize, int newysize, int xoffset, int yoffset);
-
-#endif