diff options
author | volzhs <volzhs@gmail.com> | 2015-07-01 15:13:10 +0900 |
---|---|---|
committer | volzhs <volzhs@gmail.com> | 2015-07-01 15:13:10 +0900 |
commit | f6668dc9db34fc4a3ef9e9e309e0fc248c3f51a8 (patch) | |
tree | 0c9a6e5cd8b6d3fdfab3cb6aff41458a08841133 /core/image.cpp | |
parent | 903e6b37c0ed94cd0b3447dd3ff471abbfaa4460 (diff) | |
parent | b4d5f7e154973e8fb93a9a0af6ffa0b065e2c50c (diff) |
Merge branch 'master' of https://github.com/okamstudio/godot into fix_android_payments
Diffstat (limited to 'core/image.cpp')
-rw-r--r-- | core/image.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/image.cpp b/core/image.cpp index 037018519e..c31fa47847 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -1016,10 +1016,10 @@ void Image::create( const char ** p_xpm ) { String line_str=line_ptr; line_str.replace("\t"," "); - size_width=line_str.get_slice(" ",0).to_int(); - size_height=line_str.get_slice(" ",1).to_int(); - colormap_size=line_str.get_slice(" ",2).to_int(); - pixelchars=line_str.get_slice(" ",3).to_int(); + size_width=line_str.get_slicec(' ',0).to_int(); + size_height=line_str.get_slicec(' ',1).to_int(); + colormap_size=line_str.get_slicec(' ',2).to_int(); + pixelchars=line_str.get_slicec(' ',3).to_int(); ERR_FAIL_COND(colormap_size > 32766); ERR_FAIL_COND(pixelchars > 5); ERR_FAIL_COND(size_width > 32767); |