summaryrefslogtreecommitdiffstats
path: root/libs/minikin/Layout.cpp
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2015-10-27 14:56:12 +0900
committerSeigo Nonaka <nona@google.com>2015-10-27 21:18:22 +0900
commit63635cff5861dcaed963c7332eecf51b9d7d920a (patch)
treea1c2f6aaec1c3fa11834efbffab44ac9dce55db2 /libs/minikin/Layout.cpp
parent4b723bf22b1bbc5fcdaa9bd96178c921199905d5 (diff)
downloadandroid_frameworks_minikin-63635cff5861dcaed963c7332eecf51b9d7d920a.tar.gz
android_frameworks_minikin-63635cff5861dcaed963c7332eecf51b9d7d920a.tar.bz2
android_frameworks_minikin-63635cff5861dcaed963c7332eecf51b9d7d920a.zip
Add -Werror -Wall -Wextra to compiler option.
- To suppress noisy unused parameter warnings, comment out unused arguments. - Add -Werror for suppressing further warning. - Add -Wall -Wextra for safety. Change-Id: I30a0914a4633bd93eb60957cdf378770f04d8428
Diffstat (limited to 'libs/minikin/Layout.cpp')
-rw-r--r--libs/minikin/Layout.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index 6d62d5d..9084eba 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -276,16 +276,17 @@ void Layout::setFontCollection(const FontCollection* collection) {
mCollection = collection;
}
-static hb_position_t harfbuzzGetGlyphHorizontalAdvance(hb_font_t* hbFont, void* fontData, hb_codepoint_t glyph, void* userData)
-{
+static hb_position_t harfbuzzGetGlyphHorizontalAdvance(hb_font_t* /* hbFont */, void* fontData,
+ hb_codepoint_t glyph, void* /* userData */) {
MinikinPaint* paint = reinterpret_cast<MinikinPaint*>(fontData);
MinikinFont* font = paint->font;
float advance = font->GetHorizontalAdvance(glyph, *paint);
return 256 * advance + 0.5;
}
-static hb_bool_t harfbuzzGetGlyphHorizontalOrigin(hb_font_t* hbFont, void* fontData, hb_codepoint_t glyph, hb_position_t* x, hb_position_t* y, void* userData)
-{
+static hb_bool_t harfbuzzGetGlyphHorizontalOrigin(hb_font_t* /* hbFont */, void* /* fontData */,
+ hb_codepoint_t /* glyph */, hb_position_t* /* x */, hb_position_t* /* y */,
+ void* /* userData */) {
// Just return true, following the way that Harfbuzz-FreeType
// implementation does.
return true;