aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2014-08-25 07:14:02 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-08-25 07:14:03 -0700
commitaace9976cddfa2f3e65f2ba263a5b66c7f0b923d (patch)
tree70683f2e31485a747187717ef194a444fef0c131
parent2e40381060794745562c4a26896970406114b07a (diff)
Reverse swap order in DirectWrite typeface.
C++ forbids temporaries to bind to non-const references. VC++ allows you to do so anyway, but it makes clang on Windows sad. R=reed@google.com Author: bungeman@google.com Review URL: https://codereview.chromium.org/487533004
-rw-r--r--src/ports/SkTypeface_win_dw.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp
index 2387def0a8..566f3d166b 100644
--- a/src/ports/SkTypeface_win_dw.cpp
+++ b/src/ports/SkTypeface_win_dw.cpp
@@ -304,7 +304,7 @@ static void populate_glyph_to_unicode(IDWriteFontFace* fontFace,
}
}
- glyphToUnicode->swap(SkTDArray<SkUnichar>(glyphToUni, maxGlyph + 1));
+ SkTDArray<SkUnichar>(glyphToUni, maxGlyph + 1).swap(*glyphToUnicode);
}
static bool getWidthAdvance(IDWriteFontFace* fontFace, int gId, int16_t* advance) {