Mercurial > otakunoraifu
comparison font/font_layout.cc @ 50:35ce1a30f3f9
* Added va_end where there is a va_start
* Used NULL instead of 0 (so it works on 64b)
author | thib |
---|---|
date | Fri, 17 Apr 2009 18:38:06 +0000 |
parents | 223b71206888 |
children | 15a18fbe6f21 |
comparison
equal
deleted
inserted
replaced
49:6581f7eccd26 | 50:35ce1a30f3f9 |
---|---|
129 if (it->type == TextElem::color) { | 129 if (it->type == TextElem::color) { |
130 gl.r = r = it->impl.Color.r; | 130 gl.r = r = it->impl.Color.r; |
131 gl.g = g = it->impl.Color.g; | 131 gl.g = g = it->impl.Color.g; |
132 gl.b = b = it->impl.Color.b; | 132 gl.b = b = it->impl.Color.b; |
133 } else if (it->type == TextElem::size) { | 133 } else if (it->type == TextElem::size) { |
134 delete face; | |
134 face = font->FaceLoad(it->impl.Size.scale); | 135 face = font->FaceLoad(it->impl.Size.scale); |
135 } else if (it->type == TextElem::escape) { | 136 } else if (it->type == TextElem::escape) { |
136 x = gl.x; | 137 x = gl.x; |
137 return it; | 138 return it; |
138 } | 139 } |