zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Fix warnings.

Browse Source 
Bug: http://b/26936282
Change-Id: I91b3bc246a4a8c45bde223cfc25df18ae9af8c5b
This commit is contained in:
Dan Albert
2016-02-11 20:38:19 -08:00
parent 900a7c36fb
commit 09481597e4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/include/minikin/Layout.h
View File

@@ -59,7 +59,7 @@ struct LayoutGlyph {
};
// Internal state used during layout operation
class LayoutContext;
struct LayoutContext;
enum {
kBidi_LTR = 0,

4
engine/src/flutter/libs/minikin/Android.mk
View File

@@ -48,6 +48,7 @@ minikin_shared_libraries := \
LOCAL_MODULE := libminikin
LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
LOCAL_SRC_FILES := $(minikin_src_files)
LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_C_INCLUDES := $(minikin_c_includes)
LOCAL_SHARED_LIBRARIES := $(minikin_shared_libraries)
LOCAL_CLANG := true
@@ -60,8 +61,8 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libminikin
LOCAL_MODULE_TAGS := optional
LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_SRC_FILES := $(minikin_src_files)
LOCAL_C_INCLUDES := $(minikin_c_includes)
LOCAL_SHARED_LIBRARIES := $(minikin_shared_libraries)
@@ -77,7 +78,6 @@ include $(CLEAR_VARS)
# Reduced library (currently just hyphenation) for host
LOCAL_MODULE := libminikin_host
LOCAL_MODULE_TAGS := optional
LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
LOCAL_C_INCLUDES := $(minikin_c_includes)
LOCAL_SHARED_LIBRARIES := liblog libicuuc-host

4
engine/src/flutter/libs/minikin/Layout.cpp
View File

@@ -302,7 +302,7 @@ hb_blob_t* referenceTable(hb_face_t* face, hb_tag_t tag, void* userData) {
return 0;
}
ok = font->GetTable(tag, reinterpret_cast<uint8_t*>(buffer), &length);
printf("referenceTable %c%c%c%c length=%d %d\n",
printf("referenceTable %c%c%c%c length=%zu %d\n",
(tag >>24) & 0xff, (tag>>16)&0xff, (tag>>8)&0xff, tag&0xff, length, ok);
if (!ok) {
free(buffer);
@@ -810,7 +810,7 @@ void Layout::doLayoutRun(const uint16_t* buf, size_t start, size_t count, size_t
if (info[i].cluster - start < count) {
mAdvances[info[i].cluster - start] += xAdvance;
} else {
ALOGE("cluster %d (start %d) out of bounds of count %d",
ALOGE("cluster %ul (start %zu) out of bounds of count %zu",
info[i].cluster - start, start, count);
}
x += xAdvance;