From 2ab83e1abbf5ee6d00e16056a9e9394114026f28 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sat, 7 Jan 2017 18:25:37 -0300
Subject: Memory pool vectors (DVector) have been enormously simplified in
 code, and renamed to PoolVector

---
 core/io/resource_format_binary.cpp | 88 +++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'core/io/resource_format_binary.cpp')

diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 512031b128..2a9089e8e8 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -264,22 +264,22 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 				uint32_t datalen = f->get_32();
 
-				DVector<uint8_t> imgdata;
+				PoolVector<uint8_t> imgdata;
 				imgdata.resize(datalen);
-				DVector<uint8_t>::Write w = imgdata.write();
+				PoolVector<uint8_t>::Write w = imgdata.write();
 				f->get_buffer(w.ptr(),datalen);
 				_advance_padding(datalen);
-				w=DVector<uint8_t>::Write();
+				w=PoolVector<uint8_t>::Write();
 
 				r_v=Image(width,height,mipmaps,fmt,imgdata);
 
 			} else {
 				//compressed
-				DVector<uint8_t> data;
+				PoolVector<uint8_t> data;
 				data.resize(f->get_32());
-				DVector<uint8_t>::Write w = data.write();
+				PoolVector<uint8_t>::Write w = data.write();
 				f->get_buffer(w.ptr(),data.size());
-				w = DVector<uint8_t>::Write();
+				w = PoolVector<uint8_t>::Write();
 
 				Image img;
 
@@ -448,12 +448,12 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 			uint32_t len = f->get_32();
 
-			DVector<uint8_t> array;
+			PoolVector<uint8_t> array;
 			array.resize(len);
-			DVector<uint8_t>::Write w = array.write();
+			PoolVector<uint8_t>::Write w = array.write();
 			f->get_buffer(w.ptr(),len);
 			_advance_padding(len);
-			w=DVector<uint8_t>::Write();
+			w=PoolVector<uint8_t>::Write();
 			r_v=array;
 
 		} break;
@@ -461,9 +461,9 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 			uint32_t len = f->get_32();
 
-			DVector<int> array;
+			PoolVector<int> array;
 			array.resize(len);
-			DVector<int>::Write w = array.write();
+			PoolVector<int>::Write w = array.write();
 			f->get_buffer((uint8_t*)w.ptr(),len*4);
 #ifdef BIG_ENDIAN_ENABLED
 			{
@@ -475,16 +475,16 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 			}
 
 #endif
-			w=DVector<int>::Write();
+			w=PoolVector<int>::Write();
 			r_v=array;
 		} break;
 		case VARIANT_REAL_ARRAY: {
 
 			uint32_t len = f->get_32();
 
-			DVector<real_t> array;
+			PoolVector<real_t> array;
 			array.resize(len);
-			DVector<real_t>::Write w = array.write();
+			PoolVector<real_t>::Write w = array.write();
 			f->get_buffer((uint8_t*)w.ptr(),len*sizeof(real_t));
 #ifdef BIG_ENDIAN_ENABLED
 			{
@@ -497,18 +497,18 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 #endif
 
-			w=DVector<real_t>::Write();
+			w=PoolVector<real_t>::Write();
 			r_v=array;
 		} break;
 		case VARIANT_STRING_ARRAY: {
 
 			uint32_t len = f->get_32();
-			DVector<String> array;
+			PoolVector<String> array;
 			array.resize(len);
-			DVector<String>::Write w = array.write();
+			PoolVector<String>::Write w = array.write();
 			for(uint32_t i=0;i<len;i++)
 				w[i]=get_unicode_string();
-			w=DVector<String>::Write();
+			w=PoolVector<String>::Write();
 			r_v=array;
 
 
@@ -517,9 +517,9 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 			uint32_t len = f->get_32();
 
-			DVector<Vector2> array;
+			PoolVector<Vector2> array;
 			array.resize(len);
-			DVector<Vector2>::Write w = array.write();
+			PoolVector<Vector2>::Write w = array.write();
 			if (sizeof(Vector2)==8) {
 				f->get_buffer((uint8_t*)w.ptr(),len*sizeof(real_t)*2);
 #ifdef BIG_ENDIAN_ENABLED
@@ -537,7 +537,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 				ERR_EXPLAIN("Vector2 size is NOT 8!");
 				ERR_FAIL_V(ERR_UNAVAILABLE);
 			}
-			w=DVector<Vector2>::Write();
+			w=PoolVector<Vector2>::Write();
 			r_v=array;
 
 		} break;
@@ -545,9 +545,9 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 			uint32_t len = f->get_32();
 
-			DVector<Vector3> array;
+			PoolVector<Vector3> array;
 			array.resize(len);
-			DVector<Vector3>::Write w = array.write();
+			PoolVector<Vector3>::Write w = array.write();
 			if (sizeof(Vector3)==12) {
 				f->get_buffer((uint8_t*)w.ptr(),len*sizeof(real_t)*3);
 #ifdef BIG_ENDIAN_ENABLED
@@ -565,7 +565,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 				ERR_EXPLAIN("Vector3 size is NOT 12!");
 				ERR_FAIL_V(ERR_UNAVAILABLE);
 			}
-			w=DVector<Vector3>::Write();
+			w=PoolVector<Vector3>::Write();
 			r_v=array;
 
 		} break;
@@ -573,9 +573,9 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 
 			uint32_t len = f->get_32();
 
-			DVector<Color> array;
+			PoolVector<Color> array;
 			array.resize(len);
-			DVector<Color>::Write w = array.write();
+			PoolVector<Color>::Write w = array.write();
 			if (sizeof(Color)==16) {
 				f->get_buffer((uint8_t*)w.ptr(),len*sizeof(real_t)*4);
 #ifdef BIG_ENDIAN_ENABLED
@@ -593,7 +593,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v)  {
 				ERR_EXPLAIN("Color size is NOT 16!");
 				ERR_FAIL_V(ERR_UNAVAILABLE);
 			}
-			w=DVector<Color>::Write();
+			w=PoolVector<Color>::Write();
 			r_v=array;
 		} break;
 
@@ -1587,12 +1587,12 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 
 				int dlen = val.get_data().size();
 				f->store_32(dlen);
-				DVector<uint8_t>::Read r = val.get_data().read();
+				PoolVector<uint8_t>::Read r = val.get_data().read();
 				f->store_buffer(r.ptr(),dlen);
 				_pad_buffer(dlen);
 			} else {
 
-				DVector<uint8_t> data;
+				PoolVector<uint8_t> data;
 				if (encoding==IMAGE_ENCODING_LOSSY) {
 					data=Image::lossy_packer(val,quality);
 
@@ -1604,7 +1604,7 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 				int ds=data.size();
 				f->store_32(ds);
 				if (ds>0) {
-					DVector<uint8_t>::Read r = data.read();
+					PoolVector<uint8_t>::Read r = data.read();
 					f->store_buffer(r.ptr(),ds);
 
 					_pad_buffer(ds);
@@ -1703,10 +1703,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 		case Variant::RAW_ARRAY: {
 
 			f->store_32(VARIANT_RAW_ARRAY);
-			DVector<uint8_t> arr = p_property;
+			PoolVector<uint8_t> arr = p_property;
 			int len=arr.size();
 			f->store_32(len);
-			DVector<uint8_t>::Read r = arr.read();
+			PoolVector<uint8_t>::Read r = arr.read();
 			f->store_buffer(r.ptr(),len);
 			_pad_buffer(len);
 
@@ -1714,10 +1714,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 		case Variant::INT_ARRAY: {
 
 			f->store_32(VARIANT_INT_ARRAY);
-			DVector<int> arr = p_property;
+			PoolVector<int> arr = p_property;
 			int len=arr.size();
 			f->store_32(len);
-			DVector<int>::Read r = arr.read();
+			PoolVector<int>::Read r = arr.read();
 			for(int i=0;i<len;i++)
 				f->store_32(r[i]);
 
@@ -1725,10 +1725,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 		case Variant::REAL_ARRAY: {
 
 			f->store_32(VARIANT_REAL_ARRAY);
-			DVector<real_t> arr = p_property;
+			PoolVector<real_t> arr = p_property;
 			int len=arr.size();
 			f->store_32(len);
-			DVector<real_t>::Read r = arr.read();
+			PoolVector<real_t>::Read r = arr.read();
 			for(int i=0;i<len;i++) {
 				f->store_real(r[i]);
 			}
@@ -1737,10 +1737,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 		case Variant::STRING_ARRAY: {
 
 			f->store_32(VARIANT_STRING_ARRAY);
-			DVector<String> arr = p_property;
+			PoolVector<String> arr = p_property;
 			int len=arr.size();
 			f->store_32(len);
-			DVector<String>::Read r = arr.read();
+			PoolVector<String>::Read r = arr.read();
 			for(int i=0;i<len;i++) {
 				save_unicode_string(r[i]);
 			}
@@ -1749,10 +1749,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 		case Variant::VECTOR3_ARRAY: {
 
 			f->store_32(VARIANT_VECTOR3_ARRAY);
-			DVector<Vector3> arr = p_property;
+			PoolVector<Vector3> arr = p_property;
 			int len=arr.size();
 			f->store_32(len);
-			DVector<Vector3>::Read r = arr.read();
+			PoolVector<Vector3>::Read r = arr.read();
 			for(int i=0;i<len;i++) {
 				f->store_real(r[i].x);
 				f->store_real(r[i].y);
@@ -1763,10 +1763,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 		case Variant::VECTOR2_ARRAY: {
 
 			f->store_32(VARIANT_VECTOR2_ARRAY);
-			DVector<Vector2> arr = p_property;
+			PoolVector<Vector2> arr = p_property;
 			int len=arr.size();
 			f->store_32(len);
-			DVector<Vector2>::Read r = arr.read();
+			PoolVector<Vector2>::Read r = arr.read();
 			for(int i=0;i<len;i++) {
 				f->store_real(r[i].x);
 				f->store_real(r[i].y);
@@ -1776,10 +1776,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 		case Variant::COLOR_ARRAY: {
 
 			f->store_32(VARIANT_COLOR_ARRAY);
-			DVector<Color> arr = p_property;
+			PoolVector<Color> arr = p_property;
 			int len=arr.size();
 			f->store_32(len);
-			DVector<Color>::Read r = arr.read();
+			PoolVector<Color>::Read r = arr.read();
 			for(int i=0;i<len;i++) {
 				f->store_real(r[i].r);
 				f->store_real(r[i].g);
-- 
cgit v1.2.3