un-enable debug messages in CMakeLists.txt

Fix subtable break logic (and improve error message) Fix parsing of empty GOADB lines
adobe-type-tools · Jan 20, 2025 · f24c7f9 · f24c7f9
1 parent 5f635d7
commit f24c7f9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,8 +17,8 @@ set(CMAKE_CXX_STANDARD 11)
 find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
 find_program(CYTHON "cython")
 
-add_compile_definitions(HOT_DEBUG)
-add_compile_definitions(STRIP_EXTERN_C)
+# add_compile_definitions(HOT_DEBUG)
+# add_compile_definitions(STRIP_EXTERN_C)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 

diff --git a/c/addfeatures/hotconv/FeatCtx.cpp b/c/addfeatures/hotconv/FeatCtx.cpp
@@ -995,7 +995,7 @@ void FeatCtx::subtableBreak() {
     }
 
     if (retval)
-        featMsg(sWARNING, "subtable break is supported only in class kerning lookups");
+        featMsg(sWARNING, "subtable break is supported only in pair kerning lookups");
 }
 
 // --------------------------------- Lookups -----------------------------------

diff --git a/c/addfeatures/hotconv/GPOS.cpp b/c/addfeatures/hotconv/GPOS.cpp
@@ -652,10 +652,10 @@ void GPOS::SinglePos::Format2::write(OTL *h) {
 bool GPOS::SubtableBreak() {
     if (nw.lkpType != GPOSPair)
         /* xxx for now */
-        return false;
+        return true;
 
     startNewPairPosSubtbl = true;
-    return true;
+    return false;
 }
 
 // when returns true gc needs to be inserted by a subsequent call to insertInClassDef()

diff --git a/c/shared/goadb.cpp b/c/shared/goadb.cpp
@@ -96,7 +96,7 @@ bool GOADB::read(const char *filename) {
             bufs.get(c);
 
         c = bufs.peek();
-        if (c == '\0' || c == '#')
+        if (!bufs.good() || c == '\0' || c == '#')
             continue; /* Skip blank or comment line */
 
         gr.order = ++order;