Memory allocation changes

[libs/gl.git] / source / vertexformat.cpp

diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp
index 02410857bff6e8873570055499b4be71800a6c02..0a26d94268847b94d443bcf6e9d47192936d1722 100644 (file)
--- a/source/vertexformat.cpp
+++ b/source/vertexformat.cpp
@@ -1,4 +1,4 @@
-#include <cstring>
+#include <algorithm>
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
@@ -24,11 +24,7 @@ VertexFormat::VertexFormat(VertexComponent c):
 VertexFormat::VertexFormat(const VertexFormat &f):
        data(0)
 {
-       if(f.data)
-       {
-               data = new unsigned char[(f.data[0]&~7)+8];
-               memcpy(data, f.data, f.data[0]+1);
-       }
+       *this = f;
 }
 
 VertexFormat &VertexFormat::operator=(const VertexFormat &f)
@@ -37,7 +33,7 @@ VertexFormat &VertexFormat::operator=(const VertexFormat &f)
        if(f.data)
        {
                data = new unsigned char[(f.data[0]&~7)+8];
-               memcpy(data, f.data, f.data[0]+1);
+               copy(f.data, f.data+f.data[0]+1, data);
        }
        else
                data = 0;
@@ -50,6 +46,44 @@ VertexFormat::~VertexFormat()
        delete[] data;
 }
 
+VertexFormat VertexFormat::operator,(VertexComponent c) const
+{
+       VertexFormat r = *this;
+       if(r.data)
+       {
+               const unsigned char n = ++r.data[0];
+               if((n&7)==0)
+               {
+                       unsigned char *newdt = new unsigned char[n+8];
+                       copy(r.data, r.data+n, newdt);
+                       delete r.data;
+                       r.data = newdt;
+               }
+               r.data[n] = c;
+       }
+       else
+       {
+               r.data = new unsigned char[8];
+               r.data[0] = 1;
+               r.data[1] = c;
+       }
+
+       return r;
+}
+
+VertexFormat VertexFormat::operator,(unsigned i) const
+{
+       if(!data)
+               throw invalid_operation("VertexFormat::operator,");
+       VertexFormat r = *this;
+       unsigned char *c = r.data+r.data[0];
+       if((*c<TEXCOORD1 && i>0) || (*c<ATTRIB1 && i>=8) || i>=53)
+               throw invalid_argument("VertexFormat::operator,");
+       *c += i*4;
+
+       return r;
+}
+
 unsigned VertexFormat::stride() const
 {
        unsigned s = 0;
@@ -82,44 +116,6 @@ int VertexFormat::offset(VertexComponent comp, unsigned index) const
        return -1;
 }
 
-VertexFormat operator,(const VertexFormat &f, VertexComponent c)
-{
-       VertexFormat r = f;
-       if(r.data)
-       {
-               const unsigned char n = ++r.data[0];
-               if((n&7)==7)
-               {
-                       unsigned char *newdt = new unsigned char[n+9];
-                       memcpy(newdt, r.data, n);
-                       delete r.data;
-                       r.data = newdt;
-               }
-               r.data[n] = c;
-       }
-       else
-       {
-               r.data = new unsigned char[8];
-               r.data[0] = 1;
-               r.data[1] = c;
-       }
-
-       return r;
-}
-
-VertexFormat operator,(const VertexFormat &f, unsigned i)
-{
-       if(!f.data)
-               throw invalid_operation("VertexFormat::operator,");
-       VertexFormat r = f;
-       unsigned char *c = r.data+r.data[0];
-       if((*c<TEXCOORD1 && i>0) || (*c<ATTRIB1 && i>=8) || i>=53)
-               throw invalid_argument("VertexFormat::operator,");
-       *c += i*4;
-
-       return r;
-}
-
 void operator>>(const LexicalConverter &conv, VertexComponent &c)
 {
        const string &str = conv.get();