--- a/src/dmzlib.h	Fri Feb 27 02:21:57 2015 +0200
+++ b/src/dmzlib.h	Fri Feb 27 03:58:25 2015 +0200
@@ -32,28 +32,23 @@
 
 typedef struct
 {
-    Uint8 *zbuffer, *zbuffer_end;
+    Uint8 *zbuffer, *zbufferEnd;
 
-    int num_bits;
-    Uint32 code_buffer;
+    int numBits;
+    Uint32 codeBuffer;
 
-    char *zout, *zout_start, *zout_end;
-    int z_expandable;
+    Uint8 *zout, *zoutStart, *zoutEnd;
+    BOOL expandable;
 
-    DMZHuffmanContext z_length, z_distance;
+    DMZHuffmanContext zlength, zdistance;
 } DMZLibContext;
 
 
 void dmZLibInit();
+int  dmZLibDecode(DMZLibContext * ctx);
+int  dmZLibParseHeader(DMZLibContext * ctx, BOOL checkPNG);
 
-char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen);
-char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen);
-char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer,
-    int len, int initial_size, int *outlen, BOOL parse_header);
-int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen);
-char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen);
-int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
-
+Uint8 *stbi_zlib_decode_malloc_guesssize(const Uint8 *buffer, const size_t len, const size_t initialSize, size_t *outLen);
 
 #ifdef __cplusplus
 }