diff options
-rw-r--r-- | include/minikin/Layout.h | 11 | ||||
-rw-r--r-- | libs/minikin/Layout.cpp | 9 | ||||
-rw-r--r-- | sample/example.cpp | 4 | ||||
-rw-r--r-- | sample/example_skia.cpp | 4 |
4 files changed, 5 insertions, 23 deletions
diff --git a/include/minikin/Layout.h b/include/minikin/Layout.h index e30f2f2..11e5819 100644 --- a/include/minikin/Layout.h +++ b/include/minikin/Layout.h @@ -68,19 +68,13 @@ public: void dump() const; void setFontCollection(const FontCollection* collection); - // deprecated - missing functionality - void doLayout(const uint16_t* buf, size_t nchars); - void doLayout(const uint16_t* buf, size_t start, size_t count, size_t bufSize, const std::string& css); void draw(Bitmap*, int x0, int y0, float size) const; - // deprecated - pass as argument to doLayout instead - void setProperties(const std::string& css); - // This must be called before any invocations. - // TODO: probably have a factory instead + // TODO: probably have a factory instead static void init(); // public accessors @@ -122,9 +116,6 @@ private: // Append another layout (for example, cached value) into this one void appendLayout(Layout* src, size_t start); - // deprecated - remove when setProperties is removed - std::string mCssString; - std::vector<LayoutGlyph> mGlyphs; std::vector<float> mAdvances; diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp index 5125a32..0715c76 100644 --- a/libs/minikin/Layout.cpp +++ b/libs/minikin/Layout.cpp @@ -490,11 +490,6 @@ static size_t getNextWordBreak(const uint16_t* chars, size_t offset, size_t len) return len; } -// deprecated API, to avoid breaking client -void Layout::doLayout(const uint16_t* buf, size_t nchars) { - doLayout(buf, 0, nchars, nchars, mCssString); -} - static void clearHbFonts(LayoutContext* ctx) { for (size_t i = 0; i < ctx->hbFonts.size(); i++) { hb_font_destroy(ctx->hbFonts[i]); @@ -803,10 +798,6 @@ void Layout::draw(Bitmap* surface, int x0, int y0, float size) const { } } -void Layout::setProperties(const string& css) { - mCssString = css; -} - size_t Layout::nGlyphs() const { return mGlyphs.size(); } diff --git a/sample/example.cpp b/sample/example.cpp index b8bd66f..1247291 100644 --- a/sample/example.cpp +++ b/sample/example.cpp @@ -83,10 +83,10 @@ int runMinikinTest() { FontCollection *collection = makeFontCollection(); Layout layout; layout.setFontCollection(collection); - layout.setProperties("font-size: 32;"); const char *text = "fine world \xe0\xa4\xa8\xe0\xa4\xae\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\xa4\xe0\xa5\x87"; + const char *style = "font-size: 32;"; icu::UnicodeString icuText = icu::UnicodeString::fromUTF8(text); - layout.doLayout(icuText.getBuffer(), icuText.length()); + layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), style); layout.dump(); Bitmap bitmap(250, 50); layout.draw(&bitmap, 10, 40, 32); diff --git a/sample/example_skia.cpp b/sample/example_skia.cpp index 1a6aa23..4eb0a56 100644 --- a/sample/example_skia.cpp +++ b/sample/example_skia.cpp @@ -117,10 +117,10 @@ int runMinikinTest() { FontCollection *collection = makeFontCollection(); Layout layout; layout.setFontCollection(collection); - layout.setProperties("font-size: 32; font-weight: 700;"); const char *text = "fine world \xe0\xa4\xa8\xe0\xa4\xae\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\xa4\xe0\xa5\x87"; + const char *style = "font-size: 32; font-weight: 700;"; icu::UnicodeString icuText = icu::UnicodeString::fromUTF8(text); - layout.doLayout(icuText.getBuffer(), icuText.length()); + layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), style); layout.dump(); SkAutoGraphics ag; |