fix #1057499
This commit is contained in:
parent
3bbb3e6244
commit
fa1692180e
1 changed files with 5 additions and 4 deletions
|
@ -19,7 +19,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
//$Id: Font.cc,v 1.21 2004/09/11 22:58:20 fluxgen Exp $
|
//$Id: Font.cc,v 1.22 2004/10/31 23:04:30 akir Exp $
|
||||||
|
|
||||||
|
|
||||||
#include "StringUtil.hh"
|
#include "StringUtil.hh"
|
||||||
|
@ -364,8 +364,9 @@ bool Font::load(const std::string &name) {
|
||||||
std::list< std::string > tokens;
|
std::list< std::string > tokens;
|
||||||
std::string fname;
|
std::string fname;
|
||||||
|
|
||||||
fname= std::string(name.c_str(), sep + 1);
|
fname= std::string(name.c_str(), sep);
|
||||||
FbTk::StringUtil::stringtok(tokens, name.substr(sep + 1, name.length()), ",");
|
|
||||||
|
FbTk::StringUtil::stringtok(tokens, name.substr(sep + 1), ",");
|
||||||
|
|
||||||
tokens.unique();
|
tokens.unique();
|
||||||
bool firstone= true;
|
bool firstone= true;
|
||||||
|
@ -386,7 +387,7 @@ bool Font::load(const std::string &name) {
|
||||||
fname+= ", ";
|
fname+= ", ";
|
||||||
else
|
else
|
||||||
firstone= false;
|
firstone= false;
|
||||||
fname= fname + *token;
|
fname= fname + ":" + *token;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue