wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 799062 - eliminate "warning: '&&' within '||'" messages in gfxFont.cpp. r=bas

Browse Source
This commit is contained in:
Jonathan Kew 2012-10-09 13:11:20 +01:00
parent 5fc1043cdb
commit 02be153e3c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/thebes/gfxFont.cpp
View File

@ -1588,7 +1588,7 @@ struct GlyphBufferAzure {
gfxContext *aThebesContext, const Matrix *aInvFontMatrix, bool aFinish = false)
{
// Ensure there's enough room for a glyph to be added to the buffer
if (!aFinish && mNumGlyphs < GLYPH_BUFFER_SIZE || !mNumGlyphs) {
if ((!aFinish && mNumGlyphs < GLYPH_BUFFER_SIZE) || !mNumGlyphs) {
return;
}
@ -4926,7 +4926,7 @@ gfxTextRun::Draw(gfxContext *aContext, gfxPoint aPt, gfxFont::DrawMode aDrawMode
ShrinkToLigatureBoundaries(&ligatureRunStart, &ligatureRunEnd);
bool drawPartial = aDrawMode == gfxFont::GLYPH_FILL ||
aDrawMode == gfxFont::GLYPH_PATH && aCallbacks;
(aDrawMode == gfxFont::GLYPH_PATH && aCallbacks);
if (drawPartial) {
DrawPartialLigature(font, aContext, start, ligatureRunStart, &pt,