Fix logspam and incorrect cluster offset

An incorrect cluster offset calculation was causing a lot of log
messages to appear. Separately, a confusion between #if and #ifdef was
causing unintended logging of line breaks. This patch fixes both.

Bug: 22178333
Change-Id: I2b3673ed66c784f5082fd127a8dc10bd3df6ed79

2 files changed, 2 insertions, 2 deletions

diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index 0c8c4ca..bac5fc7 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -757,7 +757,7 @@ void Layout::doLayoutRun(const uint16_t* buf, size_t start, size_t count, size_t
             if (ctx->paint.hyphenEdit.hasHyphen() && srunend > srunstart) {
                 // TODO: check whether this is really the desired semantics. It could have the
                 // effect of assigning the hyphen width to a nonspacing mark
-                unsigned int lastCluster = srunend - 1;
+                unsigned int lastCluster = start + srunend - 1;
 
                 hb_codepoint_t hyphenChar = 0x2010; // HYPHEN
                 hb_codepoint_t glyph;
diff --git a/libs/minikin/LineBreaker.cpp b/libs/minikin/LineBreaker.cpp
index 162d14b..baf2dfa 100644
--- a/libs/minikin/LineBreaker.cpp
+++ b/libs/minikin/LineBreaker.cpp
@@ -383,7 +383,7 @@ void LineBreaker::computeBreaksOptimal(bool isRectangle) {
         mCandidates[i].score = best + mCandidates[i].penalty + mLinePenalty;
         mCandidates[i].prev = bestPrev;
         mCandidates[i].lineNumber = mCandidates[bestPrev].lineNumber + 1;
-#ifdef VERBOSE_DEBUG
+#if VERBOSE_DEBUG
         ALOGD("break %d: score=%g, prev=%d", i, mCandidates[i].score, mCandidates[i].prev);
 #endif
     }