diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/streams-jar.cpp | 13 | ||||
| -rw-r--r-- | src/streams-zlib.cpp | 8 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/streams-jar.cpp b/src/streams-jar.cpp index 521b1f9a9..e597822e9 100644 --- a/src/streams-jar.cpp +++ b/src/streams-jar.cpp @@ -1,3 +1,4 @@ +#include <vector> #include "streams-jar.h" namespace Inkscape { @@ -81,9 +82,8 @@ int JarBuffer::consume_compressed(int nbytes) int ret=do_consume_and_inflate(nbytes); if ( ret == EOF && eflen > 0 ) { - guint8 *efbuf=new guint8[eflen]; - _urihandle->read(efbuf, eflen); - delete [] efbuf; + std::vector<guint8> efbuf(eflen); + _urihandle->read(&efbuf[0], eflen); return 1; } @@ -92,13 +92,12 @@ int JarBuffer::consume_compressed(int nbytes) int JarBuffer::consume_uncompressed(int nbytes) { - guint8 *data=new guint8[nbytes]; - int consumed=consume(data, nbytes); + std::vector<guint8> data(nbytes); + int consumed=consume(&data[0], nbytes); if ( consumed != EOF ) { - copy_to_get(data, consumed); + copy_to_get(&data[0], consumed); compressed_left -= consumed; } - delete [] data; return consumed; } diff --git a/src/streams-zlib.cpp b/src/streams-zlib.cpp index 5784a17cf..9e139e301 100644 --- a/src/streams-zlib.cpp +++ b/src/streams-zlib.cpp @@ -9,6 +9,7 @@ * Released under GNU LGPL, read the file 'COPYING.LIB' for more information */ +#include <vector> #include "streams-zlib.h" namespace Inkscape { @@ -104,18 +105,17 @@ int ZlibBuffer::do_consume(guint8 *buf, int nbytes) int ZlibBuffer::do_consume_and_inflate(int nbytes) { - guint8 *buf=new guint8[nbytes]; + std::vector<guint8> buf(nbytes); - int ret=consume(buf, nbytes); + int ret=consume(&buf[0], nbytes); if ( ret != EOF ) { ret = 1; - GByteArray *gba = inflate(buf, nbytes); + GByteArray *gba = inflate(&buf[0], nbytes); copy_to_get(gba->data, gba->len); g_byte_array_free(gba, TRUE); } - delete [] buf; return ret; } |