upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash on faulty wml

Browse Source
This commit is contained in:
Dominic Bolin 2006-04-19 01:34:23 +00:00
parent ac3b5ebfc4
commit 8937af54ff
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/color_range.cpp
View File

@ -22,25 +22,22 @@
std::vector<Uint32> string2rgb(std::string s){
std::vector<Uint32> out;
std::vector<std::string> rgb_vec = utils::split(s);
while(rgb_vec.size()%3) {
rgb_vec.push_back("0");
}
std::vector<std::string>::iterator c=rgb_vec.begin();
int r,g,b;
while(c!=rgb_vec.end()){
r = (lexical_cast_default<int>(*c));
c++;
if(c != rgb_vec.end()){
g = (lexical_cast_default<int>(*c));
}else{
g=0;
}
g = (lexical_cast_default<int>(*c));
c++;
if(c != rgb_vec.end()){
b=(lexical_cast_default<int>(*c));
}else{
b=0;
}
b=(lexical_cast_default<int>(*c));
c++;
out.push_back((Uint32) ((r<<16 & 0x00FF0000) + (g<<8 & 0x0000FF00) + (b & 0x000000FF)));
out.push_back((Uint32) ((r<<16 & 0x00FF0000) + (g<<8 & 0x0000FF00) + (b & 0x000000FF)));
}
return(out);
}