diff options
author | Juan Linietsky <juan@godotengine.org> | 2020-02-17 18:06:54 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2020-02-18 10:10:36 +0100 |
commit | 3205a92ad872f918c8322cdcd1434c231a1fd251 (patch) | |
tree | db44242ca27432eb8ea849679752d0835d2ae41a /modules/etc/image_etc.cpp | |
parent | fb8c93c10b4b73d5f18f1ed287497728800e22b5 (diff) | |
download | redot-engine-3205a92ad872f918c8322cdcd1434c231a1fd251.tar.gz |
PoolVector is gone, replaced by Vector
Typed `PoolTypeArray` types are now renamed `PackedTypeArray` and are
sugar for `Vector<Type>`.
Diffstat (limited to 'modules/etc/image_etc.cpp')
-rw-r--r-- | modules/etc/image_etc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/etc/image_etc.cpp b/modules/etc/image_etc.cpp index 24ee8e458e..0dbd5ca905 100644 --- a/modules/etc/image_etc.cpp +++ b/modules/etc/image_etc.cpp @@ -143,16 +143,16 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f } } - PoolVector<uint8_t>::Read r = img->get_data().read(); - ERR_FAIL_COND(!r.ptr()); + const uint8_t *r = img->get_data().ptr(); + ERR_FAIL_COND(!r); unsigned int target_size = Image::get_image_data_size(imgw, imgh, etc_format, p_img->has_mipmaps()); int mmc = 1 + (p_img->has_mipmaps() ? Image::get_image_required_mipmaps(imgw, imgh, etc_format) : 0); - PoolVector<uint8_t> dst_data; + Vector<uint8_t> dst_data; dst_data.resize(target_size); - PoolVector<uint8_t>::Write w = dst_data.write(); + uint8_t *w = dst_data.ptrw(); // prepare parameters to be passed to etc2comp int num_cpus = OS::get_singleton()->get_processor_count(); |