Bug 677648 - Change the type of the 'advance' variable in gfxTextRun::AdjustAdvancesForSyntheticBold, to allow using it to initialize the mAdvance field of DetailedGlyph using clang in c++0x mode; r=roc
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Thu, 11 Aug 2011 15:40:59 +0200
changeset 74250 90719558b5e226593af33d47e65fa770df203bc2
parent 74249 51c7a6512631c77768c8cc8b67622f0f45712b86
child 74251 420c7a55b4a084a6c132662de25265ed9013f949
child 74305 94f632be4b201c1425d8bcca25ba15c4393fa4e3
push id20968
push userMs2ger@gmail.com
push dateThu, 11 Aug 2011 13:42:55 +0000
treeherdermozilla-central@90719558b5e2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs677648
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 677648 - Change the type of the 'advance' variable in gfxTextRun::AdjustAdvancesForSyntheticBold, to allow using it to initialize the mAdvance field of DetailedGlyph using clang in c++0x mode; r=roc
gfx/thebes/gfxFont.cpp
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -3522,17 +3522,17 @@ gfxTextRun::AdjustAdvancesForSyntheticBo
             PRUint32 i;
             
             // iterate over glyphs, start to end
             for (i = start; i < end; ++i) {
                 gfxTextRun::CompressedGlyph *glyphData = &mCharacterGlyphs[i];
                 
                 if (glyphData->IsSimpleGlyph()) {
                     // simple glyphs ==> just add the advance
-                    PRUint32 advance = glyphData->GetSimpleAdvance() + synAppUnitOffset;
+                    PRInt32 advance = glyphData->GetSimpleAdvance() + synAppUnitOffset;
                     if (CompressedGlyph::IsSimpleAdvance(advance)) {
                         glyphData->SetSimpleGlyph(advance, glyphData->GetSimpleGlyph());
                     } else {
                         // rare case, tested by making this the default
                         PRUint32 glyphIndex = glyphData->GetSimpleGlyph();
                         glyphData->SetComplex(PR_TRUE, PR_TRUE, 1);
                         DetailedGlyph detail = {glyphIndex, advance, 0, 0};
                         SetGlyphs(i, *glyphData, &detail);