Browse Source

moved all headers into sourparse.c

IverMartinson 5 months ago
parent
commit
e2e59aa51c
3 changed files with 17 additions and 31 deletions
  1. 0 19
      src/headers/custom_types.h
  2. 0 9
      src/headers/functions.h
  3. 17 3
      src/headers/sourparse.h

+ 0 - 19
src/headers/custom_types.h

@@ -1,19 +0,0 @@
-#ifndef CUSTOM_TYPES_H
-#define CUSTOM_TYPES_H
-
-#include "stdint.h"
-
-typedef struct {
-    int *x_coords, *y_coords, *contour_end_indicies, number_of_points, number_of_contours;
-    uint8_t *flags;
-} SP_glyph;
-
-typedef struct {
-    int current_byte, number_of_glyphs, *glyph_offsets; 
-    uint16_t *unicode_to_glyph_indicies, units_per_em;
-    uint8_t *buffer;
-    SP_glyph *glyphs;
-    int16_t index_to_loca_format;
-} SP_font;
-
-#endif

+ 0 - 9
src/headers/functions.h

@@ -1,9 +0,0 @@
-#ifndef FUNCTIONS_H
-#define FUNCTIONS_H
-
-#include "custom_types.h"
-
-SP_font SP_load_font(char *filename);
-void SP_free_font(SP_font* font);
-
-#endif

+ 17 - 3
src/headers/sourparse.h

@@ -1,8 +1,22 @@
 #ifndef SOURPARSE_H
 #ifndef SOURPARSE_H
 #define SOURPARSE_H
 #define SOURPARSE_H
 
 
-#include "functions.h"
-#include "values.h"
-#include "custom_types.h"
+#include "stdint.h"
+
+typedef struct {
+    int *x_coords, *y_coords, *contour_end_indicies, number_of_points, number_of_contours;
+    uint8_t *flags;
+} SP_glyph;
+
+typedef struct {
+    int current_byte, number_of_glyphs, *glyph_offsets; 
+    uint16_t *unicode_to_glyph_indicies, units_per_em;
+    uint8_t *buffer;
+    SP_glyph *glyphs;
+    int16_t index_to_loca_format;
+} SP_font;
+
+SP_font SP_load_font(char *filename);
+void SP_free_font(SP_font* font);
 
 
 #endif
 #endif