moved henge.h to ston.h

[henge/apc.git] / src / binaryout.c

diff --git a/src/binaryout.c b/src/binaryout.c
index 5c58a0c..ad9c5cd 100644 (file)
--- a/src/binaryout.c
+++ b/src/binaryout.c
@@ -22,6 +22,7 @@
 #include "../stb/stb_image.h"
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "../stb/stb_image_write.h"
+#include "../ston/ston.h"
 
 /* Public */
 void ir_binout_init(struct ir_class_t*);
@@ -133,7 +134,9 @@ struct bin_pixel_ht_t
   struct bin_pixel_ht_entry_t* hash_entries;
 };
 
+static
 struct bin_attachment_list_t **attachment_stack, **asp; //attachment_stack, attachment_stack_pointer
+static
 FILE* binaryout;
 
 #define  NAMEHASH(name, domain) (XXH32(name, u8_strlen(name), 0XCEED ) & domain) 
@@ -370,14 +373,16 @@ bin_traverse_class
   int num_class_entries, num_rootset_entries;
   uint8_t* class_name;
 
+  class_header.namelen = u8_strlen(class_name);
+  
+
   class_start = ftell(binaryout);
   class_name = ir_class_name(class);
 
   num_class_entries = bin_calculate_ht_entries(bin_class_sibcount(class));
-  num_rootset_entries = bin_calculate_ht_entries(ir_class_rootset(class));
+  num_rootset_entries = bin_calculate_ht_entries(bin_set_sibcount(ir_class_rootset(class)));
 
   /* alloc space (before hash tables) for class header */
-  class_header.namelen = u8_strlen(class_name);
   fseek(binaryout, class_start + sizeof(class_header) + class_header.namelen ,SEEK_SET);
   
   DEF_HT_INIT(classht_start, classht_size, num_class_entries);