Merge branch 'master' into releases

caryll · Nov 20, 2016 · ce1c01d · ce1c01d
2 parents 0afb4a8 + 87ba120
commit ce1c01d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/lib/font/caryll-font.c b/lib/font/caryll-font.c
@@ -95,6 +95,9 @@ static void deleteFontTable(otfcc_Font *font, const uint32_t tag) {
 		case 'CPAL':
 			if (font->CPAL) DELETE(table_iCPAL.free, font->CPAL);
 			return;
+		case 'COLR':
+			if (font->COLR) DELETE(table_iCOLR.free, font->COLR);
+			return;
 	}
 }
 

diff --git a/lib/libcff/subr.c b/lib/libcff/subr.c
@@ -7,6 +7,13 @@ Kieffer-Yang optimization is unnecessary, given that in almost all payloads, the
 subroutines.
 */
 
+#ifdef DEBUG
+static int nodesCreated = 0;
+static int nodesRemoved = 0;
+static int rulesCreated = 0;
+static int rulesRemoved = 0;
+#endif
+
 static cff_SubrNode *cff_new_Node() {
 	cff_SubrNode *n;
 	NEW(n);
@@ -115,13 +122,6 @@ caryll_standardRefType(cff_SubrGraph, cff_iSubrGraph, initSubrGraph, disposeSubr
 
 static void joinNodes(cff_SubrGraph *g, cff_SubrNode *m, cff_SubrNode *n);
 
-#ifdef DEBUG
-static int nodesCreated = 0;
-static int nodesRemoved = 0;
-static int rulesCreated = 0;
-static int rulesRemoved = 0;
-#endif
-
 static uint8_t *getSingletHashKey(cff_SubrNode *n, size_t *len) {
 	size_t l1;
 	if (n->rule) {

diff --git a/lib/support/element-impl.h b/lib/support/element-impl.h
@@ -108,7 +108,6 @@
 	caryll_nonTrivialCopy(T, __fn_copy);                                                                               \
 	caryll_nonTrivialDispose(T, __fn_dispose);                                                                         \
 	caryll_trivialMove(T);
-
 #define caryll_standardTypeFn5(T, __fn_init, __fn_copy, __fn_dispose, __fn_move)                                       \
 	caryll_nonTrivialInit(T, __fn_init);                                                                               \
 	caryll_nonTrivialCopy(T, __fn_copy);                                                                               \

diff --git a/lib/table/VORG.c b/lib/table/VORG.c
@@ -5,7 +5,8 @@
 static INLINE void disposeVORG(table_VORG *vorg) {
 	FREE(vorg->entries);
 }
-caryll_standardType(table_VORG, table_iVORG, disposeVORG);
+
+caryll_standardRefType(table_VORG, table_iVORG, disposeVORG);
 
 table_VORG *otfcc_readVORG(const otfcc_Packet packet, const otfcc_Options *options) {
 	FOR_TABLE('VORG', table) {
@@ -15,8 +16,7 @@ table_VORG *otfcc_readVORG(const otfcc_Packet packet, const otfcc_Options *optio
 		uint16_t numVertOriginYMetrics = read_16u(data + 6);
 		if (length < 8 + 4 * numVertOriginYMetrics) goto VORG_CORRUPTED;
 
-		table_VORG *vorg;
-		NEW(vorg);
+		table_VORG *vorg = table_iVORG.create();
 		vorg->defaultVerticalOrigin = read_16s(data + 4);
 		vorg->numVertOriginYMetrics = numVertOriginYMetrics;
 		NEW(vorg->entries, numVertOriginYMetrics);

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