- Imager::Font->new() for the tt (Freetype 1.x) driver now correctly

[imager.git] / imio.h

diff --git a/imio.h b/imio.h
index 959f09d8c145528b2e3dafc95d52c20d8b0e6808..48a55d5cbb022ece0989f10d2143105ef0fa9776 100644 (file)
--- a/imio.h
+++ b/imio.h
@@ -1,11 +1,7 @@
-#ifndef _IO_H_
-#define _IO_H_
+#ifndef IMAGER_IMIO_H_
+#define IMAGER_IMIO_H_

 #include <stdio.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <sys/stat.h>

-#ifndef _MSC_VER
-#include <unistd.h>
-#include <sys/mman.h>
-#endif

 
 #include "log.h"
 
 
 #include "log.h"
 


@@ -15,34 +11,51 @@
 #ifdef IMAGER_DEBUG_MALLOC
 
 #define mymalloc(x) (mymalloc_file_line((x), __FILE__, __LINE__))
 #ifdef IMAGER_DEBUG_MALLOC
 
 #define mymalloc(x) (mymalloc_file_line((x), __FILE__, __LINE__))

+#define myrealloc(x,y) (myrealloc_file_line((x),(y), __FILE__, __LINE__))

 #define myfree(x) (myfree_file_line((x), __FILE__, __LINE__))
 
 #define myfree(x) (myfree_file_line((x), __FILE__, __LINE__))
 

-void  malloc_state();
-void* mymalloc_file_line(int size,char* file,int line);
-void* mymalloc_comm(int size,char *comm);
-
-void  myfree_file_line(void *p, char*file, int line);
-
-void  bndcheck_all(void);
+void  malloc_state       (void);
+void* mymalloc_file_line (size_t size, char* file, int line);
+void  myfree_file_line   (void *p, char*file, int line);
+void* myrealloc_file_line(void *p, size_t newsize, char* file,int line);
+void* mymalloc_comm      (int size, char *comm);
+void  bndcheck_all       (void);

 
 #else
 
 #define malloc_comm(a,b) (mymalloc(a))
 
 #else
 
 #define malloc_comm(a,b) (mymalloc(a))

-void malloc_state();
+void  malloc_state(void);

 void* mymalloc(int size);
 void* mymalloc(int size);

-void myfree(void *p);
+void  myfree(void *p);
+void* myrealloc(void *p, size_t newsize);

 
 #endif /* IMAGER_MALLOC_DEBUG */
 
 
 
 #endif /* IMAGER_MALLOC_DEBUG */
 
 

+
+typedef struct i_mempool {
+  void **p;
+  unsigned int alloc;
+  unsigned int used;
+} i_mempool;
+
+void  i_mempool_init(i_mempool *mp);
+void  i_mempool_extend(i_mempool *mp);
+void *i_mempool_alloc(i_mempool *mp, size_t size);
+void  i_mempool_destroy(i_mempool *mp);
+
+
+

 #ifdef _MSC_VER
 #undef min
 #undef max
 #endif
 #ifdef _MSC_VER
 #undef min
 #undef max
 #endif

-int min(int a,int b);
-int max(int x,int y);
-int myread(int fd,void *buf,int len);
-int mywrite(int fd,void *buf,int len);
-void interleave(unsigned char *inbuffer,unsigned char *outbuffer,int rowsize,int channels);
+
+extern unsigned long i_utf8_advance(char const **p, int *len);
+
+/* XXX Shouldn't these go away? */
+
+int i_min(int a,int b);
+int i_max(int x,int y);

 
 #endif
 
 #endif