aboutsummaryrefslogtreecommitdiff
path: root/core/globals.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-07 18:25:37 -0300
committerJuan Linietsky2017-01-07 18:26:38 -0300
commit2ab83e1abbf5ee6d00e16056a9e9394114026f28 (patch)
tree7efbb375cc4d00d8e8589fcf1b6a1303bec5df2d /core/globals.cpp
parent2a38a5eaa844043b846e03d6655f84caf8a31e74 (diff)
downloadgodot-2ab83e1abbf5ee6d00e16056a9e9394114026f28.tar.gz
godot-2ab83e1abbf5ee6d00e16056a9e9394114026f28.tar.zst
godot-2ab83e1abbf5ee6d00e16056a9e9394114026f28.zip
Diffstat (limited to 'core/globals.cpp')
-rw-r--r--core/globals.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/globals.cpp b/core/globals.cpp
index 6609b4714..b6498c62e 100644
--- a/core/globals.cpp
+++ b/core/globals.cpp
@@ -691,9 +691,9 @@ static Variant _decode_variant(const String& p_string) {
String data=params[4];
int datasize=data.length()/2;
- DVector<uint8_t> pixels;
+ PoolVector<uint8_t> pixels;
pixels.resize(datasize);
- DVector<uint8_t>::Write wb = pixels.write();
+ PoolVector<uint8_t>::Write wb = pixels.write();
const CharType *cptr=data.c_str();
int idx=0;
@@ -720,7 +720,7 @@ static Variant _decode_variant(const String& p_string) {
}
- wb = DVector<uint8_t>::Write();
+ wb = PoolVector<uint8_t>::Write();
return Image(w,h,mipmaps,imgformat,pixels);
}
@@ -992,9 +992,9 @@ static String _encode_variant(const Variant& p_variant) {
str+=itos(img.has_mipmaps())+", ";
str+=itos(img.get_width())+", ";
str+=itos(img.get_height())+", ";
- DVector<uint8_t> data = img.get_data();
+ PoolVector<uint8_t> data = img.get_data();
int ds=data.size();
- DVector<uint8_t>::Read r = data.read();
+ PoolVector<uint8_t>::Read r = data.read();
for(int i=0;i<ds;i++) {
uint8_t byte = r[i];
const char hex[16]={'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};