fix bug when parsing HEAD

caryll · Jun 5, 2017 · acf0c86 · acf0c86
1 parent 13dfdb3
commit acf0c86
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/dep/extern/emyg-dtoa/emyg-dtoa.c b/dep/extern/emyg-dtoa/emyg-dtoa.c
@@ -120,11 +120,11 @@ static inline DiyFp DiyFp_multiply(const DiyFp lhs, const DiyFp rhs) {
 }
 
 static inline DiyFp Normalize(const DiyFp lhs) {
-#if defined(_MSC_VER) && defined(_M_AMD64)
+#if defined(_MSC_VER) && defined(_M_AMD64) && !defined(__clang__)
 	unsigned long index;
 	_BitScanReverse64(&index, lhs.f);
 	return DiyFp_from_parts(lhs.f << (63 - index), lhs.e - (63 - index));
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && !defined(_MSC_VER)
 	int s = __builtin_clzll(lhs.f);
 	return DiyFp_from_parts(lhs.f << s, lhs.e - s);
 #else
@@ -140,7 +140,7 @@ static inline DiyFp Normalize(const DiyFp lhs) {
 }
 
 static inline DiyFp NormalizeBoundary(const DiyFp lhs) {
-#if defined(_MSC_VER) && defined(_M_AMD64)
+#if defined(_MSC_VER) && defined(_M_AMD64) && !defined(__clang__)
 	unsigned long index;
 	_BitScanReverse64(&index, lhs.f);
 	return DiyFp_from_parts(lhs.f << (63 - index), lhs.e - (63 - index));

diff --git a/lib/table/head.c b/lib/table/head.c
@@ -59,8 +59,10 @@ static const char *headFlagsLabels[] = {"baselineAtY_0",
                                         "fontIsLossless",
                                         "fontIsConverted",
                                         "optimizedForCleartype",
-                                        "lastResortFont"};
-static const char *macStyleLabels[] = {"bold", "italic", "underline", "outline", "shadow", "condensed", "extended"};
+                                        "lastResortFont",
+                                        NULL};
+static const char *macStyleLabels[] = {"bold",   "italic",    "underline", "outline",
+                                       "shadow", "condensed", "extended",  NULL};
 
 void otfcc_dumpHead(const table_head *table, json_value *root, const otfcc_Options *options) {
 	if (!table) return;

diff --git a/premake5.lua b/premake5.lua
@@ -3,7 +3,7 @@ require "dep/premake-modules/ninja"
 
 MAIN_VER = '0'
 SECONDARY_VER = '7'
-PATCH_VER = '1'
+PATCH_VER = '2'
 
 function cbuildoptions()
 	-- Windows