netsurf: branch master updated. release/3.6-217-g1f52b2d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/1f52b2d514ac12bfbcb97...
...commit http://git.netsurf-browser.org/netsurf.git/commit/1f52b2d514ac12bfbcb97f4...
...tree http://git.netsurf-browser.org/netsurf.git/tree/1f52b2d514ac12bfbcb97f4ed...
The branch, master has been updated
via 1f52b2d514ac12bfbcb97f4ed3eb556d5e38739d (commit)
from b23f55c81bca21de7841111ace809df0f6408d65 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1f52b2d514ac12bfbcb...
commit 1f52b2d514ac12bfbcb97f4ed3eb556d5e38739d
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
remove unused fetch acessor
diff --git a/content/fetch.c b/content/fetch.c
index 7324c30..a1542eb 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -642,13 +642,6 @@ long fetch_http_code(struct fetch *fetch)
return fetch->http_code;
}
-/* exported interface documented in content/fetch.h */
-bool fetch_get_verifiable(struct fetch *fetch)
-{
- assert(fetch);
-
- return fetch->verifiable;
-}
/* exported interface documented in content/fetch.h */
struct fetch_multipart_data *
diff --git a/content/fetch.h b/content/fetch.h
index 51e08cf..5521778 100644
--- a/content/fetch.h
+++ b/content/fetch.h
@@ -158,13 +158,6 @@ void fetch_change_callback(struct fetch *fetch, fetch_callback callback, void *p
*/
long fetch_http_code(struct fetch *fetch);
-/**
- * Determine if a fetch was verifiable
- *
- * \param fetch Fetch to consider
- * \return Verifiable status of fetch
- */
-bool fetch_get_verifiable(struct fetch *fetch);
/**
* Free a linked list of fetch_multipart_data.
-----------------------------------------------------------------------
Summary of changes:
content/fetch.c | 7 -------
content/fetch.h | 7 -------
2 files changed, 14 deletions(-)
diff --git a/content/fetch.c b/content/fetch.c
index 7324c30..a1542eb 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -642,13 +642,6 @@ long fetch_http_code(struct fetch *fetch)
return fetch->http_code;
}
-/* exported interface documented in content/fetch.h */
-bool fetch_get_verifiable(struct fetch *fetch)
-{
- assert(fetch);
-
- return fetch->verifiable;
-}
/* exported interface documented in content/fetch.h */
struct fetch_multipart_data *
diff --git a/content/fetch.h b/content/fetch.h
index 51e08cf..5521778 100644
--- a/content/fetch.h
+++ b/content/fetch.h
@@ -158,13 +158,6 @@ void fetch_change_callback(struct fetch *fetch, fetch_callback callback, void *p
*/
long fetch_http_code(struct fetch *fetch);
-/**
- * Determine if a fetch was verifiable
- *
- * \param fetch Fetch to consider
- * \return Verifiable status of fetch
- */
-bool fetch_get_verifiable(struct fetch *fetch);
/**
* Free a linked list of fetch_multipart_data.
--
NetSurf Browser
6 years, 10 months
- 1
- 0
libnsgif: branch master updated. release/0.1.4-11-g3db59ff
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libnsgif.git/shortlog/3db59ff9dd4257f9ee0a...
...commit http://git.netsurf-browser.org/libnsgif.git/commit/3db59ff9dd4257f9ee0a7c...
...tree http://git.netsurf-browser.org/libnsgif.git/tree/3db59ff9dd4257f9ee0a7c02...
The branch, master has been updated
via 3db59ff9dd4257f9ee0a7c027b508bef32c2f2e3 (commit)
via e22e25143d985025d9c6d8811784280ee7d9302b (commit)
via 38c65283c2303516e792591721ce2091c44231dc (commit)
from aa6d8064c05f5a45132b154c266b5e2360a84dff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=3db59ff9dd4257f9ee...
commit 3db59ff9dd4257f9ee0a7c027b508bef32c2f2e3
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
isolate LZW initialisation
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 9045bbd..fe91111 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -222,6 +222,29 @@ static gif_result gif_clear_codes_LZW(gif_animation *gif)
/**
+ * Initialise LZW
+ *
+ * This initialises a LZW context ready to commence decompression.
+ *
+ * \param initial_code_size The size of codes used on clearing of code dictionary
+ */
+static gif_result gif_initialise_LZW(gif_animation *gif, int initial_code_size)
+{
+ lzw->set_code_size = initial_code_size;
+ lzw->code_size = lzw->set_code_size + 1;
+ lzw->clear_code = (1 << lzw->set_code_size);
+ lzw->end_code = lzw->clear_code + 1;
+ lzw->max_code_size = lzw->clear_code << 1;
+ lzw->max_code = lzw->clear_code + 2;
+ lzw->curbit = lzw->lastbit = 0;
+ lzw->last_byte = 2;
+ lzw->get_done = false;
+ lzw->direct = lzw->buf;
+
+ return gif_clear_codes_LZW(gif);
+}
+
+/**
* fill the LZW stack with decompressed data
*
* \param gif The GIF context.
@@ -1065,22 +1088,10 @@ gif_internal_decode_frame(gif_animation *gif,
}
}
gif->decoded_frame = frame;
-
- /* Initialise the LZW decoding */
- lzw->set_code_size = gif_data[0];
gif->buffer_position = (gif_data - gif->gif_data) + 1;
- /* Set our code variables */
- lzw->code_size = lzw->set_code_size + 1;
- lzw->clear_code = (1 << lzw->set_code_size);
- lzw->end_code = lzw->clear_code + 1;
- lzw->max_code_size = lzw->clear_code << 1;
- lzw->max_code = lzw->clear_code + 2;
- lzw->curbit = lzw->lastbit = 0;
- lzw->last_byte = 2;
- lzw->get_done = false;
- lzw->direct = lzw->buf;
- gif->current_error = gif_clear_codes_LZW(gif);
+ /* Initialise the LZW decoding */
+ gif->current_error = gif_initialise_LZW(gif, gif_data[0]);
if (gif->current_error != GIF_OK) {
return gif->current_error;
}
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=e22e25143d985025d9...
commit e22e25143d985025d9c6d8811784280ee7d9302b
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
make doxygen output contain static functions
diff --git a/docs/Doxyfile b/docs/Doxyfile
index fbbf523..4a30545 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -369,7 +369,7 @@ EXTRACT_PACKAGE = NO
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
-EXTRACT_STATIC = NO
+EXTRACT_STATIC = YES
# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
# defined locally in source files will be included in the documentation.
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=38c65283c2303516e7...
commit 38c65283c2303516e792591721ce2091c44231dc
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
remove use of magic number for header size
diff --git a/src/libnsgif.c b/src/libnsgif.c
index b6d69e4..9045bbd 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -1195,7 +1195,7 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
/* Check for sufficient data to be a GIF (6-byte header + 7-byte
* logical screen descriptor)
*/
- if (gif->buffer_size < 13) {
+ if (gif->buffer_size < GIF_STANDARD_HEADER_SIZE) {
return GIF_INSUFFICIENT_DATA;
}
-----------------------------------------------------------------------
Summary of changes:
docs/Doxyfile | 2 +-
src/libnsgif.c | 41 ++++++++++++++++++++++++++---------------
2 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/docs/Doxyfile b/docs/Doxyfile
index fbbf523..4a30545 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -369,7 +369,7 @@ EXTRACT_PACKAGE = NO
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
-EXTRACT_STATIC = NO
+EXTRACT_STATIC = YES
# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
# defined locally in source files will be included in the documentation.
diff --git a/src/libnsgif.c b/src/libnsgif.c
index b6d69e4..fe91111 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -222,6 +222,29 @@ static gif_result gif_clear_codes_LZW(gif_animation *gif)
/**
+ * Initialise LZW
+ *
+ * This initialises a LZW context ready to commence decompression.
+ *
+ * \param initial_code_size The size of codes used on clearing of code dictionary
+ */
+static gif_result gif_initialise_LZW(gif_animation *gif, int initial_code_size)
+{
+ lzw->set_code_size = initial_code_size;
+ lzw->code_size = lzw->set_code_size + 1;
+ lzw->clear_code = (1 << lzw->set_code_size);
+ lzw->end_code = lzw->clear_code + 1;
+ lzw->max_code_size = lzw->clear_code << 1;
+ lzw->max_code = lzw->clear_code + 2;
+ lzw->curbit = lzw->lastbit = 0;
+ lzw->last_byte = 2;
+ lzw->get_done = false;
+ lzw->direct = lzw->buf;
+
+ return gif_clear_codes_LZW(gif);
+}
+
+/**
* fill the LZW stack with decompressed data
*
* \param gif The GIF context.
@@ -1065,22 +1088,10 @@ gif_internal_decode_frame(gif_animation *gif,
}
}
gif->decoded_frame = frame;
-
- /* Initialise the LZW decoding */
- lzw->set_code_size = gif_data[0];
gif->buffer_position = (gif_data - gif->gif_data) + 1;
- /* Set our code variables */
- lzw->code_size = lzw->set_code_size + 1;
- lzw->clear_code = (1 << lzw->set_code_size);
- lzw->end_code = lzw->clear_code + 1;
- lzw->max_code_size = lzw->clear_code << 1;
- lzw->max_code = lzw->clear_code + 2;
- lzw->curbit = lzw->lastbit = 0;
- lzw->last_byte = 2;
- lzw->get_done = false;
- lzw->direct = lzw->buf;
- gif->current_error = gif_clear_codes_LZW(gif);
+ /* Initialise the LZW decoding */
+ gif->current_error = gif_initialise_LZW(gif, gif_data[0]);
if (gif->current_error != GIF_OK) {
return gif->current_error;
}
@@ -1195,7 +1206,7 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
/* Check for sufficient data to be a GIF (6-byte header + 7-byte
* logical screen descriptor)
*/
- if (gif->buffer_size < 13) {
+ if (gif->buffer_size < GIF_STANDARD_HEADER_SIZE) {
return GIF_INSUFFICIENT_DATA;
}
--
NetSurf GIF Decoder
6 years, 10 months
- 1
- 0
libnsgif: branch master updated. release/0.1.4-8-gaa6d806
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libnsgif.git/shortlog/aa6d8064c05f5a45132b...
...commit http://git.netsurf-browser.org/libnsgif.git/commit/aa6d8064c05f5a45132b15...
...tree http://git.netsurf-browser.org/libnsgif.git/tree/aa6d8064c05f5a45132b154c...
The branch, master has been updated
via aa6d8064c05f5a45132b154c266b5e2360a84dff (commit)
via 5c5ae3e63a28b5222874017f7ec12d62403063bb (commit)
via f4ccd56c717d4ee3f2f2a0791b5f8134d8a1645e (commit)
via a1617883903bf102af5d6712c9812261efe1ccb9 (commit)
via 83442501788be224b9da56c3c837a9024795ca8c (commit)
from abc6a95ad6a8fd14cce943b4f9643b0a2ad175b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=aa6d8064c05f5a4513...
commit aa6d8064c05f5a45132b154c266b5e2360a84dff
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
make the mast table read only data in the only place it is used
diff --git a/src/libnsgif.c b/src/libnsgif.c
index dc2aabb..b6d69e4 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -69,7 +69,6 @@
struct lzw_s {
unsigned char buf[4];
unsigned char *direct;
- int maskTbl[16];
int table[2][(1 << GIF_MAX_LZW)];
unsigned char stack[(1 << GIF_MAX_LZW) * 2];
unsigned char *stack_pointer;
@@ -95,20 +94,28 @@ struct lzw_s {
* each image which would use an extra 10Kb or so per GIF.
*/
static struct lzw_s lzw_params = {
- .maskTbl = {
- 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
- 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff
- },
.zero_data_block = false,
};
static struct lzw_s *lzw = &lzw_params;
-
+/**
+ * get the next LZW code from the GIF
+ *
+ * reads codes from the input data stream coping with GIF data sub blocking
+ *
+ * \param gif The GIF context
+ * \param code_size The number of bitsin the current LZW code
+ * \return The next code to process or error return code
+ */
static int gif_next_code(gif_animation *gif, int code_size)
{
int i, j, end, count, ret;
unsigned char *b;
+ static const int maskTbl[16] = {
+ 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
+ 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff
+ };
end = lzw->curbit + code_size;
if (end >= lzw->lastbit) {
@@ -123,10 +130,13 @@ static int gif_next_code(gif_animation *gif, int code_size)
if (gif->buffer_position >= gif->buffer_size) {
return GIF_INSUFFICIENT_FRAME_DATA;
}
- lzw->zero_data_block = ((count = lzw->direct[0]) == 0);
+
+ count = lzw->direct[0];
+ lzw->zero_data_block = (count == 0);
if ((gif->buffer_position + count) >= gif->buffer_size) {
return GIF_INSUFFICIENT_FRAME_DATA;
}
+
if (count == 0) {
lzw->get_done = true;
} else {
@@ -161,14 +171,18 @@ static int gif_next_code(gif_animation *gif, int code_size)
ret |= (b[i + 2] << 16);
}
}
- ret = (ret >> (lzw->curbit % 8)) & lzw->maskTbl[code_size];
+ ret = (ret >> (lzw->curbit % 8)) & maskTbl[code_size];
lzw->curbit += code_size;
+
return ret;
}
/**
* Clear LZW code dictionary
+ *
+ * \param gif The GIF context.
+ * \return GIF_OK or error code.
*/
static gif_result gif_clear_codes_LZW(gif_animation *gif)
{
@@ -207,6 +221,12 @@ static gif_result gif_clear_codes_LZW(gif_animation *gif)
}
+/**
+ * fill the LZW stack with decompressed data
+ *
+ * \param gif The GIF context.
+ * \return true on sucessful decode of the next LZW code else false.
+ */
static bool gif_next_LZW(gif_animation *gif)
{
int code, incode;
@@ -256,7 +276,7 @@ static bool gif_next_LZW(gif_animation *gif)
/* The following loop is the most important in the GIF decoding cycle
* as every single pixel passes through it.
*
- * Note: our lzw->stack is always big enough to hold a complete decompressed
+ * Note: our stack is always big enough to hold a complete decompressed
* chunk.
*/
while (code >= lzw->clear_code) {
@@ -291,7 +311,8 @@ static bool gif_next_LZW(gif_animation *gif)
}
*lzw->stack_pointer++ = lzw->firstcode = lzw->table[1][code];
- if ((code = lzw->max_code) < (1 << GIF_MAX_LZW)) {
+ code = lzw->max_code;
+ if (code < (1 << GIF_MAX_LZW)) {
lzw->table[0][code] = lzw->oldcode;
lzw->table[1][code] = lzw->firstcode;
++lzw->max_code;
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=5c5ae3e63a28b52228...
commit 5c5ae3e63a28b5222874017f7ec12d62403063bb
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
remove forward declarations
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 9f9bd8d..dc2aabb 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -62,16 +62,10 @@
#define GIF_BLOCK_TERMINATOR 0x00
#define GIF_TRAILER 0x3b
+/** standard GIF header size */
#define GIF_STANDARD_HEADER_SIZE 13
-/* Internal GIF routines */
-static gif_result gif_initialise_sprite(gif_animation *gif, unsigned int width, unsigned int height);
-static gif_result gif_initialise_frame(gif_animation *gif);
-static gif_result gif_initialise_frame_extensions(gif_animation *gif, const int frame);
-static gif_result gif_skip_frame_extensions(gif_animation *gif);
-static unsigned int gif_interlaced_line(int height, int y);
-
-
+/** LZW parameters */
struct lzw_s {
unsigned char buf[4];
unsigned char *direct;
@@ -358,6 +352,131 @@ gif_initialise_sprite(gif_animation *gif,
/**
+ * Attempts to initialise the frame's extensions
+ *
+ * \param gif The animation context
+ * \param frame The frame number
+ * @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the
+ * frame GIF_OK for successful initialisation.
+ */
+static gif_result
+gif_initialise_frame_extensions(gif_animation *gif, const int frame)
+{
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int block_size;
+
+ /* Get our buffer position etc. */
+ gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
+ gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
+
+ /* Initialise the extensions */
+ while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
+ ++gif_data;
+ if ((gif_bytes = (gif_end - gif_data)) < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Switch on extension label */
+ switch (gif_data[0]) {
+ case GIF_EXTENSION_GRAPHIC_CONTROL:
+ /* 6-byte Graphic Control Extension is:
+ *
+ * +0 CHAR Graphic Control Label
+ * +1 CHAR Block Size
+ * +2 CHAR __Packed Fields__
+ * 3BITS Reserved
+ * 3BITS Disposal Method
+ * 1BIT User Input Flag
+ * 1BIT Transparent Color Flag
+ * +3 SHORT Delay Time
+ * +5 CHAR Transparent Color Index
+ */
+ if (gif_bytes < 6) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ gif->frames[frame].frame_delay = gif_data[3] | (gif_data[4] << 8);
+ if (gif_data[2] & GIF_TRANSPARENCY_MASK) {
+ gif->frames[frame].transparency = true;
+ gif->frames[frame].transparency_index = gif_data[5];
+ }
+ gif->frames[frame].disposal_method = ((gif_data[2] & GIF_DISPOSAL_MASK) >> 2);
+ /* I have encountered documentation and GIFs in the
+ * wild that use 0x04 to restore the previous frame,
+ * rather than the officially documented 0x03. I
+ * believe some (older?) software may even actually
+ * export this way. We handle this as a type of
+ * "quirks" mode.
+ */
+ if (gif->frames[frame].disposal_method == GIF_FRAME_QUIRKS_RESTORE) {
+ gif->frames[frame].disposal_method = GIF_FRAME_RESTORE;
+ }
+ gif_data += (2 + gif_data[1]);
+ break;
+
+ case GIF_EXTENSION_APPLICATION:
+ /* 14-byte+ Application Extension is:
+ *
+ * +0 CHAR Application Extension Label
+ * +1 CHAR Block Size
+ * +2 8CHARS Application Identifier
+ * +10 3CHARS Appl. Authentication Code
+ * +13 1-256 Application Data (Data sub-blocks)
+ */
+ if (gif_bytes < 17) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if ((gif_data[1] == 0x0b) &&
+ (strncmp((const char *) gif_data + 2,
+ "NETSCAPE2.0", 11) == 0) &&
+ (gif_data[13] == 0x03) &&
+ (gif_data[14] == 0x01)) {
+ gif->loop_count = gif_data[15] | (gif_data[16] << 8);
+ }
+ gif_data += (2 + gif_data[1]);
+ break;
+
+ case GIF_EXTENSION_COMMENT:
+ /* Move the pointer to the first data sub-block Skip 1
+ * byte for the extension label
+ */
+ ++gif_data;
+ break;
+
+ default:
+ /* Move the pointer to the first data sub-block Skip 2
+ * bytes for the extension label and size fields Skip
+ * the extension size itself
+ */
+ if (gif_bytes < 2) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += (2 + gif_data[1]);
+ }
+
+ /* Repeatedly skip blocks until we get a zero block or run out
+ * of data This data is ignored by this gif decoder
+ */
+ gif_bytes = (gif_end - gif_data);
+ block_size = 0;
+ while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
+ block_size = gif_data[0] + 1;
+ if ((gif_bytes -= block_size) < 0) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += block_size;
+ }
+ ++gif_data;
+ }
+
+ /* Set buffer position and return */
+ gif->buffer_position = (gif_data - gif->gif_data);
+ return GIF_OK;
+}
+
+
+/**
* Attempts to initialise the next frame
*
* \param gif The animation context
@@ -593,129 +712,6 @@ static gif_result gif_initialise_frame(gif_animation *gif)
}
-/**
- * Attempts to initialise the frame's extensions
- *
- * \param gif The animation context
- * \param frame The frame number
- * @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the
- * frame GIF_OK for successful initialisation.
- */
-static gif_result
-gif_initialise_frame_extensions(gif_animation *gif, const int frame)
-{
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int block_size;
-
- /* Get our buffer position etc. */
- gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
- gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
-
- /* Initialise the extensions */
- while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
- ++gif_data;
- if ((gif_bytes = (gif_end - gif_data)) < 1) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
-
- /* Switch on extension label */
- switch (gif_data[0]) {
- case GIF_EXTENSION_GRAPHIC_CONTROL:
- /* 6-byte Graphic Control Extension is:
- *
- * +0 CHAR Graphic Control Label
- * +1 CHAR Block Size
- * +2 CHAR __Packed Fields__
- * 3BITS Reserved
- * 3BITS Disposal Method
- * 1BIT User Input Flag
- * 1BIT Transparent Color Flag
- * +3 SHORT Delay Time
- * +5 CHAR Transparent Color Index
- */
- if (gif_bytes < 6) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
-
- gif->frames[frame].frame_delay = gif_data[3] | (gif_data[4] << 8);
- if (gif_data[2] & GIF_TRANSPARENCY_MASK) {
- gif->frames[frame].transparency = true;
- gif->frames[frame].transparency_index = gif_data[5];
- }
- gif->frames[frame].disposal_method = ((gif_data[2] & GIF_DISPOSAL_MASK) >> 2);
- /* I have encountered documentation and GIFs in the
- * wild that use 0x04 to restore the previous frame,
- * rather than the officially documented 0x03. I
- * believe some (older?) software may even actually
- * export this way. We handle this as a type of
- * "quirks" mode.
- */
- if (gif->frames[frame].disposal_method == GIF_FRAME_QUIRKS_RESTORE) {
- gif->frames[frame].disposal_method = GIF_FRAME_RESTORE;
- }
- gif_data += (2 + gif_data[1]);
- break;
-
- case GIF_EXTENSION_APPLICATION:
- /* 14-byte+ Application Extension is:
- *
- * +0 CHAR Application Extension Label
- * +1 CHAR Block Size
- * +2 8CHARS Application Identifier
- * +10 3CHARS Appl. Authentication Code
- * +13 1-256 Application Data (Data sub-blocks)
- */
- if (gif_bytes < 17) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- if ((gif_data[1] == 0x0b) &&
- (strncmp((const char *) gif_data + 2,
- "NETSCAPE2.0", 11) == 0) &&
- (gif_data[13] == 0x03) &&
- (gif_data[14] == 0x01)) {
- gif->loop_count = gif_data[15] | (gif_data[16] << 8);
- }
- gif_data += (2 + gif_data[1]);
- break;
-
- case GIF_EXTENSION_COMMENT:
- /* Move the pointer to the first data sub-block Skip 1
- * byte for the extension label
- */
- ++gif_data;
- break;
-
- default:
- /* Move the pointer to the first data sub-block Skip 2
- * bytes for the extension label and size fields Skip
- * the extension size itself
- */
- if (gif_bytes < 2) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- gif_data += (2 + gif_data[1]);
- }
-
- /* Repeatedly skip blocks until we get a zero block or run out
- * of data This data is ignored by this gif decoder
- */
- gif_bytes = (gif_end - gif_data);
- block_size = 0;
- while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
- block_size = gif_data[0] + 1;
- if ((gif_bytes -= block_size) < 0) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- gif_data += block_size;
- }
- ++gif_data;
- }
-
- /* Set buffer position and return */
- gif->buffer_position = (gif_data - gif->gif_data);
- return GIF_OK;
-}
/**
@@ -1278,7 +1274,7 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
* termination block) Although generally useless, the GIF
* specification does not expressly prohibit this
*/
- if (gif->buffer_size == 14) {
+ if (gif->buffer_size == (GIF_STANDARD_HEADER_SIZE + 1)) {
if (gif_data[0] == GIF_TRAILER) {
return GIF_OK;
} else {
@@ -1286,7 +1282,7 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
}
}
- /* Initialise enough workspace for 4 frames initially */
+ /* Initialise enough workspace for a frame */
if ((gif->frames = (gif_frame *)malloc(sizeof(gif_frame))) == NULL) {
gif_finalise(gif);
return GIF_INSUFFICIENT_MEMORY;
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=f4ccd56c717d4ee3f2...
commit f4ccd56c717d4ee3f2f2a0791b5f8134d8a1645e
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix the colour table size check to be correct
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 8422563..9f9bd8d 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -62,6 +62,8 @@
#define GIF_BLOCK_TERMINATOR 0x00
#define GIF_TRAILER 0x3b
+#define GIF_STANDARD_HEADER_SIZE 13
+
/* Internal GIF routines */
static gif_result gif_initialise_sprite(gif_animation *gif, unsigned int width, unsigned int height);
static gif_result gif_initialise_frame(gif_animation *gif);
@@ -1310,7 +1312,7 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
if (gif->global_colour_table[0] == GIF_PROCESS_COLOURS) {
/* Check for a global colour map signified by bit 7 */
if (gif->global_colours) {
- if (gif->buffer_size < (gif->colour_table_size * 3 + 12)) {
+ if (gif->buffer_size < (gif->colour_table_size * 3 + GIF_STANDARD_HEADER_SIZE)) {
return GIF_INSUFFICIENT_DATA;
}
for (index = 0; index < gif->colour_table_size; index++) {
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=a1617883903bf102af...
commit a1617883903bf102af5d6712c9812261efe1ccb9
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix buffer overrun due to LZW code clearing
The LZW code clearing function was not dealing with errors when
obtaining the next code from the gif. this resulted in input buffer
overruns and occasional segmentation faults.
diff --git a/src/libnsgif.c b/src/libnsgif.c
index f241145..8422563 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -177,6 +177,7 @@ static int gif_next_code(gif_animation *gif, int code_size)
static gif_result gif_clear_codes_LZW(gif_animation *gif)
{
int i;
+ int code;
if (lzw->clear_code >= (1 << GIF_MAX_LZW)) {
lzw->stack_pointer = lzw->stack;
@@ -197,8 +198,13 @@ static gif_result gif_clear_codes_LZW(gif_animation *gif)
/* process repeated clear codes */
do {
- lzw->firstcode = lzw->oldcode = gif_next_code(gif, lzw->code_size);
- } while (lzw->firstcode == lzw->clear_code);
+ code = gif_next_code(gif, lzw->code_size);
+ if (code < 0) {
+ return code;
+ }
+ } while (code == lzw->clear_code);
+ lzw->firstcode = lzw->oldcode = code;
+
*lzw->stack_pointer++ = lzw->firstcode;
return GIF_OK;
@@ -219,6 +225,9 @@ static bool gif_next_LZW(gif_animation *gif)
if (code == lzw->clear_code) {
gif->current_error = gif_clear_codes_LZW(gif);
+ if (gif->current_error != GIF_OK) {
+ return false;
+ }
return true;
}
@@ -1053,6 +1062,9 @@ gif_internal_decode_frame(gif_animation *gif,
lzw->get_done = false;
lzw->direct = lzw->buf;
gif->current_error = gif_clear_codes_LZW(gif);
+ if (gif->current_error != GIF_OK) {
+ return gif->current_error;
+ }
/* Decompress the data */
for (y = 0; y < height; y++) {
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=83442501788be224b9...
commit 83442501788be224b9da56c3c837a9024795ca8c
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
move lzw parameters to a struct
Make all the lzw parameters members of a structure instead of being
random globals. This allows for a future change to making the library
safe when decompressing multiple GIF.
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 412c67a..f241145 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -69,32 +69,236 @@ static gif_result gif_initialise_frame_extensions(gif_animation *gif, const int
static gif_result gif_skip_frame_extensions(gif_animation *gif);
static unsigned int gif_interlaced_line(int height, int y);
-/* Internal LZW routines */
-static void gif_init_LZW(gif_animation *gif);
-static bool gif_next_LZW(gif_animation *gif);
-static int gif_next_code(gif_animation *gif, int code_size);
+
+struct lzw_s {
+ unsigned char buf[4];
+ unsigned char *direct;
+ int maskTbl[16];
+ int table[2][(1 << GIF_MAX_LZW)];
+ unsigned char stack[(1 << GIF_MAX_LZW) * 2];
+ unsigned char *stack_pointer;
+
+ int code_size, set_code_size;
+
+ int max_code, max_code_size;
+
+ int clear_code, end_code;
+
+ int curbit, lastbit, last_byte;
+
+ int firstcode;
+ int oldcode;
+
+ bool zero_data_block;
+ bool get_done;
+};
+
/* General LZW values. They are shared for all GIFs being decoded, and thus we
* can't handle progressive decoding efficiently without having the data for
* each image which would use an extra 10Kb or so per GIF.
*/
-static unsigned char buf[4];
-static unsigned char *direct;
-static int maskTbl[16] = {
+static struct lzw_s lzw_params = {
+ .maskTbl = {
0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff
+ },
+ .zero_data_block = false,
};
-static int table[2][(1 << GIF_MAX_LZW)];
-static unsigned char stack[(1 << GIF_MAX_LZW) * 2];
-static unsigned char *stack_pointer;
-static int code_size, set_code_size;
-static int max_code, max_code_size;
-static int clear_code, end_code;
-static int curbit, lastbit, last_byte;
-static int firstcode, oldcode;
-static bool zero_data_block = false;
-static bool get_done;
+static struct lzw_s *lzw = &lzw_params;
+
+
+static int gif_next_code(gif_animation *gif, int code_size)
+{
+ int i, j, end, count, ret;
+ unsigned char *b;
+
+ end = lzw->curbit + code_size;
+ if (end >= lzw->lastbit) {
+ if (lzw->get_done) {
+ return GIF_END_OF_FRAME;
+ }
+ lzw->buf[0] = lzw->direct[lzw->last_byte - 2];
+ lzw->buf[1] = lzw->direct[lzw->last_byte - 1];
+
+ /* get the next block */
+ lzw->direct = gif->gif_data + gif->buffer_position;
+ if (gif->buffer_position >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ lzw->zero_data_block = ((count = lzw->direct[0]) == 0);
+ if ((gif->buffer_position + count) >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if (count == 0) {
+ lzw->get_done = true;
+ } else {
+ if (gif->buffer_position + 3 >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ lzw->direct -= 1;
+ lzw->buf[2] = lzw->direct[2];
+ lzw->buf[3] = lzw->direct[3];
+ }
+ gif->buffer_position += count + 1;
+
+ /* update our variables */
+ lzw->last_byte = 2 + count;
+ lzw->curbit = (lzw->curbit - lzw->lastbit) + 16;
+ lzw->lastbit = (2 + count) << 3;
+ end = lzw->curbit + code_size;
+ }
+
+ i = lzw->curbit >> 3;
+ if (i < 2) {
+ b = lzw->buf;
+ } else {
+ b = lzw->direct;
+ }
+
+ ret = b[i];
+ j = (end >> 3) - 1;
+ if (i <= j) {
+ ret |= (b[i + 1] << 8);
+ if (i < j) {
+ ret |= (b[i + 2] << 16);
+ }
+ }
+ ret = (ret >> (lzw->curbit % 8)) & lzw->maskTbl[code_size];
+ lzw->curbit += code_size;
+ return ret;
+}
+
+
+/**
+ * Clear LZW code dictionary
+ */
+static gif_result gif_clear_codes_LZW(gif_animation *gif)
+{
+ int i;
+
+ if (lzw->clear_code >= (1 << GIF_MAX_LZW)) {
+ lzw->stack_pointer = lzw->stack;
+ return GIF_FRAME_DATA_ERROR;
+ }
+
+ /* initialise our table */
+ memset(lzw->table, 0x00, (1 << GIF_MAX_LZW) * 8);
+ for (i = 0; i < lzw->clear_code; ++i) {
+ lzw->table[1][i] = i;
+ }
+
+ /* reset LZW parameters */
+ lzw->code_size = lzw->set_code_size + 1;
+ lzw->max_code_size = lzw->clear_code << 1;
+ lzw->max_code = lzw->clear_code + 2;
+ lzw->stack_pointer = lzw->stack;
+
+ /* process repeated clear codes */
+ do {
+ lzw->firstcode = lzw->oldcode = gif_next_code(gif, lzw->code_size);
+ } while (lzw->firstcode == lzw->clear_code);
+ *lzw->stack_pointer++ = lzw->firstcode;
+
+ return GIF_OK;
+}
+
+
+static bool gif_next_LZW(gif_animation *gif)
+{
+ int code, incode;
+ int block_size;
+ int new_code;
+
+ code = gif_next_code(gif, lzw->code_size);
+ if (code < 0) {
+ gif->current_error = code;
+ return false;
+ }
+
+ if (code == lzw->clear_code) {
+ gif->current_error = gif_clear_codes_LZW(gif);
+ return true;
+ }
+
+ if (code == lzw->end_code) {
+ /* skip to the end of our data so multi-image GIFs work */
+ if (lzw->zero_data_block) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ block_size = 0;
+ while (block_size != 1 &&
+ gif->buffer_position < gif->buffer_size) {
+ block_size = gif->gif_data[gif->buffer_position] + 1;
+ gif->buffer_position += block_size;
+ }
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+
+ incode = code;
+ if (code >= lzw->max_code) {
+ if (lzw->stack_pointer >= lzw->stack + ((1 << GIF_MAX_LZW) * 2)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *lzw->stack_pointer++ = lzw->firstcode;
+ code = lzw->oldcode;
+ }
+
+ /* The following loop is the most important in the GIF decoding cycle
+ * as every single pixel passes through it.
+ *
+ * Note: our lzw->stack is always big enough to hold a complete decompressed
+ * chunk.
+ */
+ while (code >= lzw->clear_code) {
+ if (lzw->stack_pointer >= lzw->stack + ((1 << GIF_MAX_LZW) * 2) ||
+ code >= (1 << GIF_MAX_LZW)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *lzw->stack_pointer++ = lzw->table[1][code];
+ new_code = lzw->table[0][code];
+ if (new_code < lzw->clear_code) {
+ code = new_code;
+ break;
+ }
+
+ if (lzw->stack_pointer >= lzw->stack + ((1 << GIF_MAX_LZW) * 2) ||
+ new_code >= (1 << GIF_MAX_LZW)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *lzw->stack_pointer++ = lzw->table[1][new_code];
+ code = lzw->table[0][new_code];
+ if (code == new_code) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ }
+
+ if (lzw->stack_pointer >= lzw->stack + ((1 << GIF_MAX_LZW) * 2)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *lzw->stack_pointer++ = lzw->firstcode = lzw->table[1][code];
+
+ if ((code = lzw->max_code) < (1 << GIF_MAX_LZW)) {
+ lzw->table[0][code] = lzw->oldcode;
+ lzw->table[1][code] = lzw->firstcode;
+ ++lzw->max_code;
+ if ((lzw->max_code >= lzw->max_code_size) &&
+ (lzw->max_code_size < (1 << GIF_MAX_LZW))) {
+ lzw->max_code_size = lzw->max_code_size << 1;
+ ++lzw->code_size;
+ }
+ }
+ lzw->oldcode = incode;
+ return true;
+}
/**
@@ -585,189 +789,7 @@ static unsigned int gif_interlaced_line(int height, int y) {
}
-/**
- * Initialise LZW decoding
- */
-void gif_init_LZW(gif_animation *gif)
-{
- int i;
-
- gif->current_error = 0;
- if (clear_code >= (1 << GIF_MAX_LZW)) {
- stack_pointer = stack;
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return;
- }
-
- /* initialise our table */
- memset(table, 0x00, (1 << GIF_MAX_LZW) * 8);
- for (i = 0; i < clear_code; ++i) {
- table[1][i] = i;
- }
-
- /* update our LZW parameters */
- code_size = set_code_size + 1;
- max_code_size = clear_code << 1;
- max_code = clear_code + 2;
- stack_pointer = stack;
- do {
- firstcode = oldcode = gif_next_code(gif, code_size);
- } while (firstcode == clear_code);
- *stack_pointer++ =firstcode;
-}
-
-
-static bool gif_next_LZW(gif_animation *gif)
-{
- int code, incode;
- int block_size;
- int new_code;
- code = gif_next_code(gif, code_size);
- if (code < 0) {
- gif->current_error = code;
- return false;
- } else if (code == clear_code) {
- gif_init_LZW(gif);
- return true;
- } else if (code == end_code) {
- /* skip to the end of our data so multi-image GIFs work */
- if (zero_data_block) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- block_size = 0;
- while (block_size != 1 &&
- gif->buffer_position < gif->buffer_size) {
- block_size = gif->gif_data[gif->buffer_position] + 1;
- gif->buffer_position += block_size;
- }
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
-
- incode = code;
- if (code >= max_code) {
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = firstcode;
- code = oldcode;
- }
-
- /* The following loop is the most important in the GIF decoding cycle
- * as every single pixel passes through it.
- *
- * Note: our stack is always big enough to hold a complete decompressed
- * chunk.
- */
- while (code >= clear_code) {
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
- code >= (1 << GIF_MAX_LZW)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = table[1][code];
- new_code = table[0][code];
- if (new_code < clear_code) {
- code = new_code;
- break;
- }
-
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
- new_code >= (1 << GIF_MAX_LZW)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = table[1][new_code];
- code = table[0][new_code];
- if (code == new_code) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- }
-
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = firstcode = table[1][code];
-
- if ((code = max_code) < (1 << GIF_MAX_LZW)) {
- table[0][code] = oldcode;
- table[1][code] = firstcode;
- ++max_code;
- if ((max_code >= max_code_size) &&
- (max_code_size < (1 << GIF_MAX_LZW))) {
- max_code_size = max_code_size << 1;
- ++code_size;
- }
- }
- oldcode = incode;
- return true;
-}
-
-static int gif_next_code(gif_animation *gif, int code_size)
-{
- int i, j, end, count, ret;
- unsigned char *b;
-
- end = curbit + code_size;
- if (end >= lastbit) {
- if (get_done) {
- return GIF_END_OF_FRAME;
- }
- buf[0] = direct[last_byte - 2];
- buf[1] = direct[last_byte - 1];
-
- /* get the next block */
- direct = gif->gif_data + gif->buffer_position;
- if (gif->buffer_position >= gif->buffer_size) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- zero_data_block = ((count = direct[0]) == 0);
- if ((gif->buffer_position + count) >= gif->buffer_size) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- if (count == 0) {
- get_done = true;
- } else {
- if (gif->buffer_position + 3 >= gif->buffer_size) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- direct -= 1;
- buf[2] = direct[2];
- buf[3] = direct[3];
- }
- gif->buffer_position += count + 1;
-
- /* update our variables */
- last_byte = 2 + count;
- curbit = (curbit - lastbit) + 16;
- lastbit = (2 + count) << 3;
- end = curbit + code_size;
- }
-
- i = curbit >> 3;
- if (i < 2) {
- b = buf;
- } else {
- b = direct;
- }
-
- ret = b[i];
- j = (end >> 3) - 1;
- if (i <= j) {
- ret |= (b[i + 1] << 8);
- if (i < j) {
- ret |= (b[i + 2] << 16);
- }
- }
- ret = (ret >> (curbit % 8)) & maskTbl[code_size];
- curbit += code_size;
- return ret;
-}
/**
@@ -1017,20 +1039,20 @@ gif_internal_decode_frame(gif_animation *gif,
gif->decoded_frame = frame;
/* Initialise the LZW decoding */
- set_code_size = gif_data[0];
+ lzw->set_code_size = gif_data[0];
gif->buffer_position = (gif_data - gif->gif_data) + 1;
/* Set our code variables */
- code_size = set_code_size + 1;
- clear_code = (1 << set_code_size);
- end_code = clear_code + 1;
- max_code_size = clear_code << 1;
- max_code = clear_code + 2;
- curbit = lastbit = 0;
- last_byte = 2;
- get_done = false;
- direct = buf;
- gif_init_LZW(gif);
+ lzw->code_size = lzw->set_code_size + 1;
+ lzw->clear_code = (1 << lzw->set_code_size);
+ lzw->end_code = lzw->clear_code + 1;
+ lzw->max_code_size = lzw->clear_code << 1;
+ lzw->max_code = lzw->clear_code + 2;
+ lzw->curbit = lzw->lastbit = 0;
+ lzw->last_byte = 2;
+ lzw->get_done = false;
+ lzw->direct = lzw->buf;
+ gif->current_error = gif_clear_codes_LZW(gif);
/* Decompress the data */
for (y = 0; y < height; y++) {
@@ -1047,14 +1069,14 @@ gif_internal_decode_frame(gif_animation *gif,
*/
x = width;
while (x > 0) {
- burst_bytes = (stack_pointer - stack);
+ burst_bytes = (lzw->stack_pointer - lzw->stack);
if (burst_bytes > 0) {
if (burst_bytes > x) {
burst_bytes = x;
}
x -= burst_bytes;
while (burst_bytes-- > 0) {
- colour = *--stack_pointer;
+ colour = *--lzw->stack_pointer;
if (((gif->frames[frame].transparency) &&
(colour != gif->frames[frame].transparency_index)) ||
(!gif->frames[frame].transparency)) {
-----------------------------------------------------------------------
Summary of changes:
src/libnsgif.c | 763 ++++++++++++++++++++++++++++++--------------------------
1 file changed, 408 insertions(+), 355 deletions(-)
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 412c67a..b6d69e4 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -62,39 +62,269 @@
#define GIF_BLOCK_TERMINATOR 0x00
#define GIF_TRAILER 0x3b
-/* Internal GIF routines */
-static gif_result gif_initialise_sprite(gif_animation *gif, unsigned int width, unsigned int height);
-static gif_result gif_initialise_frame(gif_animation *gif);
-static gif_result gif_initialise_frame_extensions(gif_animation *gif, const int frame);
-static gif_result gif_skip_frame_extensions(gif_animation *gif);
-static unsigned int gif_interlaced_line(int height, int y);
-
-/* Internal LZW routines */
-static void gif_init_LZW(gif_animation *gif);
-static bool gif_next_LZW(gif_animation *gif);
-static int gif_next_code(gif_animation *gif, int code_size);
+/** standard GIF header size */
+#define GIF_STANDARD_HEADER_SIZE 13
+
+/** LZW parameters */
+struct lzw_s {
+ unsigned char buf[4];
+ unsigned char *direct;
+ int table[2][(1 << GIF_MAX_LZW)];
+ unsigned char stack[(1 << GIF_MAX_LZW) * 2];
+ unsigned char *stack_pointer;
+
+ int code_size, set_code_size;
+
+ int max_code, max_code_size;
+
+ int clear_code, end_code;
+
+ int curbit, lastbit, last_byte;
+
+ int firstcode;
+ int oldcode;
+
+ bool zero_data_block;
+ bool get_done;
+};
+
/* General LZW values. They are shared for all GIFs being decoded, and thus we
* can't handle progressive decoding efficiently without having the data for
* each image which would use an extra 10Kb or so per GIF.
*/
-static unsigned char buf[4];
-static unsigned char *direct;
-static int maskTbl[16] = {
- 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
- 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff
+static struct lzw_s lzw_params = {
+ .zero_data_block = false,
};
-static int table[2][(1 << GIF_MAX_LZW)];
-static unsigned char stack[(1 << GIF_MAX_LZW) * 2];
-static unsigned char *stack_pointer;
-static int code_size, set_code_size;
-static int max_code, max_code_size;
-static int clear_code, end_code;
-static int curbit, lastbit, last_byte;
-static int firstcode, oldcode;
-static bool zero_data_block = false;
-static bool get_done;
+static struct lzw_s *lzw = &lzw_params;
+
+/**
+ * get the next LZW code from the GIF
+ *
+ * reads codes from the input data stream coping with GIF data sub blocking
+ *
+ * \param gif The GIF context
+ * \param code_size The number of bitsin the current LZW code
+ * \return The next code to process or error return code
+ */
+static int gif_next_code(gif_animation *gif, int code_size)
+{
+ int i, j, end, count, ret;
+ unsigned char *b;
+ static const int maskTbl[16] = {
+ 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
+ 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff
+ };
+
+ end = lzw->curbit + code_size;
+ if (end >= lzw->lastbit) {
+ if (lzw->get_done) {
+ return GIF_END_OF_FRAME;
+ }
+ lzw->buf[0] = lzw->direct[lzw->last_byte - 2];
+ lzw->buf[1] = lzw->direct[lzw->last_byte - 1];
+
+ /* get the next block */
+ lzw->direct = gif->gif_data + gif->buffer_position;
+ if (gif->buffer_position >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ count = lzw->direct[0];
+ lzw->zero_data_block = (count == 0);
+ if ((gif->buffer_position + count) >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ if (count == 0) {
+ lzw->get_done = true;
+ } else {
+ if (gif->buffer_position + 3 >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ lzw->direct -= 1;
+ lzw->buf[2] = lzw->direct[2];
+ lzw->buf[3] = lzw->direct[3];
+ }
+ gif->buffer_position += count + 1;
+
+ /* update our variables */
+ lzw->last_byte = 2 + count;
+ lzw->curbit = (lzw->curbit - lzw->lastbit) + 16;
+ lzw->lastbit = (2 + count) << 3;
+ end = lzw->curbit + code_size;
+ }
+
+ i = lzw->curbit >> 3;
+ if (i < 2) {
+ b = lzw->buf;
+ } else {
+ b = lzw->direct;
+ }
+
+ ret = b[i];
+ j = (end >> 3) - 1;
+ if (i <= j) {
+ ret |= (b[i + 1] << 8);
+ if (i < j) {
+ ret |= (b[i + 2] << 16);
+ }
+ }
+ ret = (ret >> (lzw->curbit % 8)) & maskTbl[code_size];
+ lzw->curbit += code_size;
+
+ return ret;
+}
+
+
+/**
+ * Clear LZW code dictionary
+ *
+ * \param gif The GIF context.
+ * \return GIF_OK or error code.
+ */
+static gif_result gif_clear_codes_LZW(gif_animation *gif)
+{
+ int i;
+ int code;
+
+ if (lzw->clear_code >= (1 << GIF_MAX_LZW)) {
+ lzw->stack_pointer = lzw->stack;
+ return GIF_FRAME_DATA_ERROR;
+ }
+
+ /* initialise our table */
+ memset(lzw->table, 0x00, (1 << GIF_MAX_LZW) * 8);
+ for (i = 0; i < lzw->clear_code; ++i) {
+ lzw->table[1][i] = i;
+ }
+
+ /* reset LZW parameters */
+ lzw->code_size = lzw->set_code_size + 1;
+ lzw->max_code_size = lzw->clear_code << 1;
+ lzw->max_code = lzw->clear_code + 2;
+ lzw->stack_pointer = lzw->stack;
+
+ /* process repeated clear codes */
+ do {
+ code = gif_next_code(gif, lzw->code_size);
+ if (code < 0) {
+ return code;
+ }
+ } while (code == lzw->clear_code);
+ lzw->firstcode = lzw->oldcode = code;
+
+ *lzw->stack_pointer++ = lzw->firstcode;
+
+ return GIF_OK;
+}
+
+
+/**
+ * fill the LZW stack with decompressed data
+ *
+ * \param gif The GIF context.
+ * \return true on sucessful decode of the next LZW code else false.
+ */
+static bool gif_next_LZW(gif_animation *gif)
+{
+ int code, incode;
+ int block_size;
+ int new_code;
+
+ code = gif_next_code(gif, lzw->code_size);
+ if (code < 0) {
+ gif->current_error = code;
+ return false;
+ }
+
+ if (code == lzw->clear_code) {
+ gif->current_error = gif_clear_codes_LZW(gif);
+ if (gif->current_error != GIF_OK) {
+ return false;
+ }
+ return true;
+ }
+
+ if (code == lzw->end_code) {
+ /* skip to the end of our data so multi-image GIFs work */
+ if (lzw->zero_data_block) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ block_size = 0;
+ while (block_size != 1 &&
+ gif->buffer_position < gif->buffer_size) {
+ block_size = gif->gif_data[gif->buffer_position] + 1;
+ gif->buffer_position += block_size;
+ }
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+
+ incode = code;
+ if (code >= lzw->max_code) {
+ if (lzw->stack_pointer >= lzw->stack + ((1 << GIF_MAX_LZW) * 2)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *lzw->stack_pointer++ = lzw->firstcode;
+ code = lzw->oldcode;
+ }
+
+ /* The following loop is the most important in the GIF decoding cycle
+ * as every single pixel passes through it.
+ *
+ * Note: our stack is always big enough to hold a complete decompressed
+ * chunk.
+ */
+ while (code >= lzw->clear_code) {
+ if (lzw->stack_pointer >= lzw->stack + ((1 << GIF_MAX_LZW) * 2) ||
+ code >= (1 << GIF_MAX_LZW)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *lzw->stack_pointer++ = lzw->table[1][code];
+ new_code = lzw->table[0][code];
+ if (new_code < lzw->clear_code) {
+ code = new_code;
+ break;
+ }
+
+ if (lzw->stack_pointer >= lzw->stack + ((1 << GIF_MAX_LZW) * 2) ||
+ new_code >= (1 << GIF_MAX_LZW)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *lzw->stack_pointer++ = lzw->table[1][new_code];
+ code = lzw->table[0][new_code];
+ if (code == new_code) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ }
+
+ if (lzw->stack_pointer >= lzw->stack + ((1 << GIF_MAX_LZW) * 2)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *lzw->stack_pointer++ = lzw->firstcode = lzw->table[1][code];
+
+ code = lzw->max_code;
+ if (code < (1 << GIF_MAX_LZW)) {
+ lzw->table[0][code] = lzw->oldcode;
+ lzw->table[1][code] = lzw->firstcode;
+ ++lzw->max_code;
+ if ((lzw->max_code >= lzw->max_code_size) &&
+ (lzw->max_code_size < (1 << GIF_MAX_LZW))) {
+ lzw->max_code_size = lzw->max_code_size << 1;
+ ++lzw->code_size;
+ }
+ }
+ lzw->oldcode = incode;
+ return true;
+}
/**
@@ -130,14 +360,139 @@ gif_initialise_sprite(gif_animation *gif,
return GIF_INSUFFICIENT_MEMORY;
}
- assert(gif->bitmap_callbacks.bitmap_destroy);
- gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
- gif->frame_image = buffer;
- gif->width = max_width;
- gif->height = max_height;
-
- /* Invalidate our currently decoded image */
- gif->decoded_frame = GIF_INVALID_FRAME;
+ assert(gif->bitmap_callbacks.bitmap_destroy);
+ gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
+ gif->frame_image = buffer;
+ gif->width = max_width;
+ gif->height = max_height;
+
+ /* Invalidate our currently decoded image */
+ gif->decoded_frame = GIF_INVALID_FRAME;
+ return GIF_OK;
+}
+
+
+/**
+ * Attempts to initialise the frame's extensions
+ *
+ * \param gif The animation context
+ * \param frame The frame number
+ * @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the
+ * frame GIF_OK for successful initialisation.
+ */
+static gif_result
+gif_initialise_frame_extensions(gif_animation *gif, const int frame)
+{
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int block_size;
+
+ /* Get our buffer position etc. */
+ gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
+ gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
+
+ /* Initialise the extensions */
+ while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
+ ++gif_data;
+ if ((gif_bytes = (gif_end - gif_data)) < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Switch on extension label */
+ switch (gif_data[0]) {
+ case GIF_EXTENSION_GRAPHIC_CONTROL:
+ /* 6-byte Graphic Control Extension is:
+ *
+ * +0 CHAR Graphic Control Label
+ * +1 CHAR Block Size
+ * +2 CHAR __Packed Fields__
+ * 3BITS Reserved
+ * 3BITS Disposal Method
+ * 1BIT User Input Flag
+ * 1BIT Transparent Color Flag
+ * +3 SHORT Delay Time
+ * +5 CHAR Transparent Color Index
+ */
+ if (gif_bytes < 6) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ gif->frames[frame].frame_delay = gif_data[3] | (gif_data[4] << 8);
+ if (gif_data[2] & GIF_TRANSPARENCY_MASK) {
+ gif->frames[frame].transparency = true;
+ gif->frames[frame].transparency_index = gif_data[5];
+ }
+ gif->frames[frame].disposal_method = ((gif_data[2] & GIF_DISPOSAL_MASK) >> 2);
+ /* I have encountered documentation and GIFs in the
+ * wild that use 0x04 to restore the previous frame,
+ * rather than the officially documented 0x03. I
+ * believe some (older?) software may even actually
+ * export this way. We handle this as a type of
+ * "quirks" mode.
+ */
+ if (gif->frames[frame].disposal_method == GIF_FRAME_QUIRKS_RESTORE) {
+ gif->frames[frame].disposal_method = GIF_FRAME_RESTORE;
+ }
+ gif_data += (2 + gif_data[1]);
+ break;
+
+ case GIF_EXTENSION_APPLICATION:
+ /* 14-byte+ Application Extension is:
+ *
+ * +0 CHAR Application Extension Label
+ * +1 CHAR Block Size
+ * +2 8CHARS Application Identifier
+ * +10 3CHARS Appl. Authentication Code
+ * +13 1-256 Application Data (Data sub-blocks)
+ */
+ if (gif_bytes < 17) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if ((gif_data[1] == 0x0b) &&
+ (strncmp((const char *) gif_data + 2,
+ "NETSCAPE2.0", 11) == 0) &&
+ (gif_data[13] == 0x03) &&
+ (gif_data[14] == 0x01)) {
+ gif->loop_count = gif_data[15] | (gif_data[16] << 8);
+ }
+ gif_data += (2 + gif_data[1]);
+ break;
+
+ case GIF_EXTENSION_COMMENT:
+ /* Move the pointer to the first data sub-block Skip 1
+ * byte for the extension label
+ */
+ ++gif_data;
+ break;
+
+ default:
+ /* Move the pointer to the first data sub-block Skip 2
+ * bytes for the extension label and size fields Skip
+ * the extension size itself
+ */
+ if (gif_bytes < 2) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += (2 + gif_data[1]);
+ }
+
+ /* Repeatedly skip blocks until we get a zero block or run out
+ * of data This data is ignored by this gif decoder
+ */
+ gif_bytes = (gif_end - gif_data);
+ block_size = 0;
+ while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
+ block_size = gif_data[0] + 1;
+ if ((gif_bytes -= block_size) < 0) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += block_size;
+ }
+ ++gif_data;
+ }
+
+ /* Set buffer position and return */
+ gif->buffer_position = (gif_data - gif->gif_data);
return GIF_OK;
}
@@ -378,129 +733,6 @@ static gif_result gif_initialise_frame(gif_animation *gif)
}
-/**
- * Attempts to initialise the frame's extensions
- *
- * \param gif The animation context
- * \param frame The frame number
- * @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the
- * frame GIF_OK for successful initialisation.
- */
-static gif_result
-gif_initialise_frame_extensions(gif_animation *gif, const int frame)
-{
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int block_size;
-
- /* Get our buffer position etc. */
- gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
- gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
-
- /* Initialise the extensions */
- while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
- ++gif_data;
- if ((gif_bytes = (gif_end - gif_data)) < 1) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
-
- /* Switch on extension label */
- switch (gif_data[0]) {
- case GIF_EXTENSION_GRAPHIC_CONTROL:
- /* 6-byte Graphic Control Extension is:
- *
- * +0 CHAR Graphic Control Label
- * +1 CHAR Block Size
- * +2 CHAR __Packed Fields__
- * 3BITS Reserved
- * 3BITS Disposal Method
- * 1BIT User Input Flag
- * 1BIT Transparent Color Flag
- * +3 SHORT Delay Time
- * +5 CHAR Transparent Color Index
- */
- if (gif_bytes < 6) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
-
- gif->frames[frame].frame_delay = gif_data[3] | (gif_data[4] << 8);
- if (gif_data[2] & GIF_TRANSPARENCY_MASK) {
- gif->frames[frame].transparency = true;
- gif->frames[frame].transparency_index = gif_data[5];
- }
- gif->frames[frame].disposal_method = ((gif_data[2] & GIF_DISPOSAL_MASK) >> 2);
- /* I have encountered documentation and GIFs in the
- * wild that use 0x04 to restore the previous frame,
- * rather than the officially documented 0x03. I
- * believe some (older?) software may even actually
- * export this way. We handle this as a type of
- * "quirks" mode.
- */
- if (gif->frames[frame].disposal_method == GIF_FRAME_QUIRKS_RESTORE) {
- gif->frames[frame].disposal_method = GIF_FRAME_RESTORE;
- }
- gif_data += (2 + gif_data[1]);
- break;
-
- case GIF_EXTENSION_APPLICATION:
- /* 14-byte+ Application Extension is:
- *
- * +0 CHAR Application Extension Label
- * +1 CHAR Block Size
- * +2 8CHARS Application Identifier
- * +10 3CHARS Appl. Authentication Code
- * +13 1-256 Application Data (Data sub-blocks)
- */
- if (gif_bytes < 17) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- if ((gif_data[1] == 0x0b) &&
- (strncmp((const char *) gif_data + 2,
- "NETSCAPE2.0", 11) == 0) &&
- (gif_data[13] == 0x03) &&
- (gif_data[14] == 0x01)) {
- gif->loop_count = gif_data[15] | (gif_data[16] << 8);
- }
- gif_data += (2 + gif_data[1]);
- break;
-
- case GIF_EXTENSION_COMMENT:
- /* Move the pointer to the first data sub-block Skip 1
- * byte for the extension label
- */
- ++gif_data;
- break;
-
- default:
- /* Move the pointer to the first data sub-block Skip 2
- * bytes for the extension label and size fields Skip
- * the extension size itself
- */
- if (gif_bytes < 2) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- gif_data += (2 + gif_data[1]);
- }
-
- /* Repeatedly skip blocks until we get a zero block or run out
- * of data This data is ignored by this gif decoder
- */
- gif_bytes = (gif_end - gif_data);
- block_size = 0;
- while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
- block_size = gif_data[0] + 1;
- if ((gif_bytes -= block_size) < 0) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- gif_data += block_size;
- }
- ++gif_data;
- }
-
- /* Set buffer position and return */
- gif->buffer_position = (gif_data - gif->gif_data);
- return GIF_OK;
-}
/**
@@ -585,189 +817,7 @@ static unsigned int gif_interlaced_line(int height, int y) {
}
-/**
- * Initialise LZW decoding
- */
-void gif_init_LZW(gif_animation *gif)
-{
- int i;
-
- gif->current_error = 0;
- if (clear_code >= (1 << GIF_MAX_LZW)) {
- stack_pointer = stack;
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return;
- }
-
- /* initialise our table */
- memset(table, 0x00, (1 << GIF_MAX_LZW) * 8);
- for (i = 0; i < clear_code; ++i) {
- table[1][i] = i;
- }
-
- /* update our LZW parameters */
- code_size = set_code_size + 1;
- max_code_size = clear_code << 1;
- max_code = clear_code + 2;
- stack_pointer = stack;
- do {
- firstcode = oldcode = gif_next_code(gif, code_size);
- } while (firstcode == clear_code);
- *stack_pointer++ =firstcode;
-}
-
-
-static bool gif_next_LZW(gif_animation *gif)
-{
- int code, incode;
- int block_size;
- int new_code;
-
- code = gif_next_code(gif, code_size);
- if (code < 0) {
- gif->current_error = code;
- return false;
- } else if (code == clear_code) {
- gif_init_LZW(gif);
- return true;
- } else if (code == end_code) {
- /* skip to the end of our data so multi-image GIFs work */
- if (zero_data_block) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- block_size = 0;
- while (block_size != 1 &&
- gif->buffer_position < gif->buffer_size) {
- block_size = gif->gif_data[gif->buffer_position] + 1;
- gif->buffer_position += block_size;
- }
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
-
- incode = code;
- if (code >= max_code) {
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = firstcode;
- code = oldcode;
- }
-
- /* The following loop is the most important in the GIF decoding cycle
- * as every single pixel passes through it.
- *
- * Note: our stack is always big enough to hold a complete decompressed
- * chunk.
- */
- while (code >= clear_code) {
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
- code >= (1 << GIF_MAX_LZW)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = table[1][code];
- new_code = table[0][code];
- if (new_code < clear_code) {
- code = new_code;
- break;
- }
-
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
- new_code >= (1 << GIF_MAX_LZW)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = table[1][new_code];
- code = table[0][new_code];
- if (code == new_code) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- }
-
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = firstcode = table[1][code];
-
- if ((code = max_code) < (1 << GIF_MAX_LZW)) {
- table[0][code] = oldcode;
- table[1][code] = firstcode;
- ++max_code;
- if ((max_code >= max_code_size) &&
- (max_code_size < (1 << GIF_MAX_LZW))) {
- max_code_size = max_code_size << 1;
- ++code_size;
- }
- }
- oldcode = incode;
- return true;
-}
-
-static int gif_next_code(gif_animation *gif, int code_size)
-{
- int i, j, end, count, ret;
- unsigned char *b;
-
- end = curbit + code_size;
- if (end >= lastbit) {
- if (get_done) {
- return GIF_END_OF_FRAME;
- }
- buf[0] = direct[last_byte - 2];
- buf[1] = direct[last_byte - 1];
-
- /* get the next block */
- direct = gif->gif_data + gif->buffer_position;
- if (gif->buffer_position >= gif->buffer_size) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- zero_data_block = ((count = direct[0]) == 0);
- if ((gif->buffer_position + count) >= gif->buffer_size) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- if (count == 0) {
- get_done = true;
- } else {
- if (gif->buffer_position + 3 >= gif->buffer_size) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
- direct -= 1;
- buf[2] = direct[2];
- buf[3] = direct[3];
- }
- gif->buffer_position += count + 1;
-
- /* update our variables */
- last_byte = 2 + count;
- curbit = (curbit - lastbit) + 16;
- lastbit = (2 + count) << 3;
- end = curbit + code_size;
- }
-
- i = curbit >> 3;
- if (i < 2) {
- b = buf;
- } else {
- b = direct;
- }
- ret = b[i];
- j = (end >> 3) - 1;
- if (i <= j) {
- ret |= (b[i + 1] << 8);
- if (i < j) {
- ret |= (b[i + 2] << 16);
- }
- }
- ret = (ret >> (curbit % 8)) & maskTbl[code_size];
- curbit += code_size;
- return ret;
-}
/**
@@ -1017,20 +1067,23 @@ gif_internal_decode_frame(gif_animation *gif,
gif->decoded_frame = frame;
/* Initialise the LZW decoding */
- set_code_size = gif_data[0];
+ lzw->set_code_size = gif_data[0];
gif->buffer_position = (gif_data - gif->gif_data) + 1;
/* Set our code variables */
- code_size = set_code_size + 1;
- clear_code = (1 << set_code_size);
- end_code = clear_code + 1;
- max_code_size = clear_code << 1;
- max_code = clear_code + 2;
- curbit = lastbit = 0;
- last_byte = 2;
- get_done = false;
- direct = buf;
- gif_init_LZW(gif);
+ lzw->code_size = lzw->set_code_size + 1;
+ lzw->clear_code = (1 << lzw->set_code_size);
+ lzw->end_code = lzw->clear_code + 1;
+ lzw->max_code_size = lzw->clear_code << 1;
+ lzw->max_code = lzw->clear_code + 2;
+ lzw->curbit = lzw->lastbit = 0;
+ lzw->last_byte = 2;
+ lzw->get_done = false;
+ lzw->direct = lzw->buf;
+ gif->current_error = gif_clear_codes_LZW(gif);
+ if (gif->current_error != GIF_OK) {
+ return gif->current_error;
+ }
/* Decompress the data */
for (y = 0; y < height; y++) {
@@ -1047,14 +1100,14 @@ gif_internal_decode_frame(gif_animation *gif,
*/
x = width;
while (x > 0) {
- burst_bytes = (stack_pointer - stack);
+ burst_bytes = (lzw->stack_pointer - lzw->stack);
if (burst_bytes > 0) {
if (burst_bytes > x) {
burst_bytes = x;
}
x -= burst_bytes;
while (burst_bytes-- > 0) {
- colour = *--stack_pointer;
+ colour = *--lzw->stack_pointer;
if (((gif->frames[frame].transparency) &&
(colour != gif->frames[frame].transparency_index)) ||
(!gif->frames[frame].transparency)) {
@@ -1242,7 +1295,7 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
* termination block) Although generally useless, the GIF
* specification does not expressly prohibit this
*/
- if (gif->buffer_size == 14) {
+ if (gif->buffer_size == (GIF_STANDARD_HEADER_SIZE + 1)) {
if (gif_data[0] == GIF_TRAILER) {
return GIF_OK;
} else {
@@ -1250,7 +1303,7 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
}
}
- /* Initialise enough workspace for 4 frames initially */
+ /* Initialise enough workspace for a frame */
if ((gif->frames = (gif_frame *)malloc(sizeof(gif_frame))) == NULL) {
gif_finalise(gif);
return GIF_INSUFFICIENT_MEMORY;
@@ -1276,7 +1329,7 @@ gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
if (gif->global_colour_table[0] == GIF_PROCESS_COLOURS) {
/* Check for a global colour map signified by bit 7 */
if (gif->global_colours) {
- if (gif->buffer_size < (gif->colour_table_size * 3 + 12)) {
+ if (gif->buffer_size < (gif->colour_table_size * 3 + GIF_STANDARD_HEADER_SIZE)) {
return GIF_INSUFFICIENT_DATA;
}
for (index = 0; index < gif->colour_table_size; index++) {
--
NetSurf GIF Decoder
6 years, 10 months
- 1
- 0
toolchains: branch master updated. 69bc0ecf5598487fd5c2179d47ea3293ec6b6c04
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/69bc0ecf5598487fd5...
...commit http://git.netsurf-browser.org/toolchains.git/commit/69bc0ecf5598487fd5c2...
...tree http://git.netsurf-browser.org/toolchains.git/tree/69bc0ecf5598487fd5c217...
The branch, master has been updated
via 69bc0ecf5598487fd5c2179d47ea3293ec6b6c04 (commit)
from 67bd95a2584b6278e8a7c70daa24d67e2a47a6d9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=69bc0ecf5598487f...
commit 69bc0ecf5598487fd5c2179d47ea3293ec6b6c04
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
Move to OpenSSL 1.0.2
diff --git a/sdk/Makefile b/sdk/Makefile
index dc8d52a..2f8801d 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -26,7 +26,7 @@ endif
VERSION_ZLIB := 1.2.11
VERSION_LIBICONV := 1.14
VERSION_LIBTRE := 0.8.0
-VERSION_OPENSSL := 1.0.1u
+VERSION_OPENSSL := 1.0.2k
VERSION_LIBPNG := 1.6.28
VERSION_LIBJPEG := 8d
VERSION_LIBJPEG_TURBO := 1.5.1
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index dc8d52a..2f8801d 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -26,7 +26,7 @@ endif
VERSION_ZLIB := 1.2.11
VERSION_LIBICONV := 1.14
VERSION_LIBTRE := 0.8.0
-VERSION_OPENSSL := 1.0.1u
+VERSION_OPENSSL := 1.0.2k
VERSION_LIBPNG := 1.6.28
VERSION_LIBJPEG := 8d
VERSION_LIBJPEG_TURBO := 1.5.1
--
Cross-compilation toolchains and environments
6 years, 10 months
- 1
- 0
libnsgif: branch master updated. release/0.1.4-3-gabc6a95
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libnsgif.git/shortlog/abc6a95ad6a8fd14cce9...
...commit http://git.netsurf-browser.org/libnsgif.git/commit/abc6a95ad6a8fd14cce943...
...tree http://git.netsurf-browser.org/libnsgif.git/tree/abc6a95ad6a8fd14cce943b4...
The branch, master has been updated
via abc6a95ad6a8fd14cce943b4f9643b0a2ad175b4 (commit)
via a5ff5ae14c6aff6398187c22e92c2136b9861f2e (commit)
via 33981c486fc6b660ee1ad8c48a38b2028c2b716e (commit)
from 944ea7acb8c8e894b84f4c9545cd93339c23c350 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=abc6a95ad6a8fd14cc...
commit abc6a95ad6a8fd14cce943b4f9643b0a2ad175b4
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
when searching previous frames for disposal type stay in bounds
When searching back through frames looking for a non restore frame
disposal type the array index would go out of bounds off the front of
the frames block causing a segfault.
Fixes issue #2515 reported in bugtracker
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 081ea9f..412c67a 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -793,7 +793,6 @@ gif_internal_decode_frame(gif_animation *gif,
unsigned int save_buffer_position;
unsigned int return_value = 0;
unsigned int x, y, decode_y, burst_bytes;
- int last_undisposed_frame = (frame - 1);
register unsigned char colour;
/* Ensure this frame is supposed to be decoded */
@@ -980,20 +979,25 @@ gif_internal_decode_frame(gif_animation *gif,
if (return_value != GIF_OK) {
goto gif_decode_frame_exit;
}
+
+ } else if ((frame != 0) &&
+ (gif->frames[frame - 1].disposal_method == GIF_FRAME_RESTORE)) {
/*
* If the previous frame's disposal method requires we
* restore the previous image, find the last image set
* to "do not dispose" and get that frame data
*/
- } else if ((frame != 0) &&
- (gif->frames[frame - 1].disposal_method == GIF_FRAME_RESTORE)) {
- while ((last_undisposed_frame != -1) &&
- (gif->frames[--last_undisposed_frame].disposal_method == GIF_FRAME_RESTORE));
+ int last_undisposed_frame = frame - 2;
+ while ((last_undisposed_frame >= 0) &&
+ (gif->frames[last_undisposed_frame].disposal_method == GIF_FRAME_RESTORE)) {
+ last_undisposed_frame--;
+ }
/* If we don't find one, clear the frame data */
if (last_undisposed_frame == -1) {
/* see notes above on transparency
- * vs. background color */
+ * vs. background color
+ */
memset((char*)frame_data,
GIF_TRANSPARENT_COLOUR,
gif->width * gif->height * sizeof(int));
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=a5ff5ae14c6aff6398...
commit a5ff5ae14c6aff6398187c22e92c2136b9861f2e
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
remove global clear_image flag and pass values instead
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 69c54ea..081ea9f 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -95,8 +95,6 @@ static int firstcode, oldcode;
static bool zero_data_block = false;
static bool get_done;
-/* Whether to clear the decoded image rather than plot */
-static bool clear_image = false;
/**
@@ -772,223 +770,17 @@ static int gif_next_code(gif_animation *gif, int code_size)
}
-/* exported function documented in libnsgif.h */
-void gif_create(gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks)
-{
- memset(gif, 0, sizeof(gif_animation));
- gif->bitmap_callbacks = *bitmap_callbacks;
- gif->decoded_frame = GIF_INVALID_FRAME;
-}
-
-
-/* exported function documented in libnsgif.h */
-gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
-{
- unsigned char *gif_data;
- unsigned int index;
- gif_result return_value;
-
- /* Initialize values */
- gif->buffer_size = size;
- gif->gif_data = data;
-
- /* Check for sufficient data to be a GIF (6-byte header + 7-byte
- * logical screen descriptor)
- */
- if (gif->buffer_size < 13) {
- return GIF_INSUFFICIENT_DATA;
- }
-
- /* Get our current processing position */
- gif_data = gif->gif_data + gif->buffer_position;
-
- /* See if we should initialise the GIF */
- if (gif->buffer_position == 0) {
- /* We want everything to be NULL before we start so we've no
- * chance of freeing bad pointers (paranoia)
- */
- gif->frame_image = NULL;
- gif->frames = NULL;
- gif->local_colour_table = NULL;
- gif->global_colour_table = NULL;
-
- /* The caller may have been lazy and not reset any values */
- gif->frame_count = 0;
- gif->frame_count_partial = 0;
- gif->decoded_frame = GIF_INVALID_FRAME;
-
- /* 6-byte GIF file header is:
- *
- * +0 3CHARS Signature ('GIF')
- * +3 3CHARS Version ('87a' or '89a')
- */
- if (strncmp((const char *) gif_data, "GIF", 3) != 0) {
- return GIF_DATA_ERROR;
- }
- gif_data += 3;
-
- /* Ensure GIF reports version 87a or 89a */
- /*
- if ((strncmp(gif_data, "87a", 3) != 0) &&
- (strncmp(gif_data, "89a", 3) != 0))
- LOG(("Unknown GIF format - proceeding anyway"));
- */
- gif_data += 3;
-
- /* 7-byte Logical Screen Descriptor is:
- *
- * +0 SHORT Logical Screen Width
- * +2 SHORT Logical Screen Height
- * +4 CHAR __Packed Fields__
- * 1BIT Global Colour Table Flag
- * 3BITS Colour Resolution
- * 1BIT Sort Flag
- * 3BITS Size of Global Colour Table
- * +5 CHAR Background Colour Index
- * +6 CHAR Pixel Aspect Ratio
- */
- gif->width = gif_data[0] | (gif_data[1] << 8);
- gif->height = gif_data[2] | (gif_data[3] << 8);
- gif->global_colours = (gif_data[4] & GIF_COLOUR_TABLE_MASK);
- gif->colour_table_size = (2 << (gif_data[4] & GIF_COLOUR_TABLE_SIZE_MASK));
- gif->background_index = gif_data[5];
- gif->aspect_ratio = gif_data[6];
- gif->loop_count = 1;
- gif_data += 7;
-
- /* Some broken GIFs report the size as the screen size they
- * were created in. As such, we detect for the common cases and
- * set the sizes as 0 if they are found which results in the
- * GIF being the maximum size of the frames.
- */
- if (((gif->width == 640) && (gif->height == 480)) ||
- ((gif->width == 640) && (gif->height == 512)) ||
- ((gif->width == 800) && (gif->height == 600)) ||
- ((gif->width == 1024) && (gif->height == 768)) ||
- ((gif->width == 1280) && (gif->height == 1024)) ||
- ((gif->width == 1600) && (gif->height == 1200)) ||
- ((gif->width == 0) || (gif->height == 0)) ||
- ((gif->width > 2048) || (gif->height > 2048))) {
- gif->width = 1;
- gif->height = 1;
- }
-
- /* Allocate some data irrespective of whether we've got any
- * colour tables. We always get the maximum size in case a GIF
- * is lying to us. It's far better to give the wrong colours
- * than to trample over some memory somewhere.
- */
- gif->global_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
- gif->local_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
- if ((gif->global_colour_table == NULL) ||
- (gif->local_colour_table == NULL)) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
-
- /* Set the first colour to a value that will never occur in
- * reality so we know if we've processed it
- */
- gif->global_colour_table[0] = GIF_PROCESS_COLOURS;
-
- /* Check if the GIF has no frame data (13-byte header + 1-byte
- * termination block) Although generally useless, the GIF
- * specification does not expressly prohibit this
- */
- if (gif->buffer_size == 14) {
- if (gif_data[0] == GIF_TRAILER) {
- return GIF_OK;
- } else {
- return GIF_INSUFFICIENT_DATA;
- }
- }
-
- /* Initialise enough workspace for 4 frames initially */
- if ((gif->frames = (gif_frame *)malloc(sizeof(gif_frame))) == NULL) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
- gif->frame_holders = 1;
-
- /* Initialise the bitmap header */
- assert(gif->bitmap_callbacks.bitmap_create);
- gif->frame_image = gif->bitmap_callbacks.bitmap_create(gif->width, gif->height);
- if (gif->frame_image == NULL) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
-
- /* Remember we've done this now */
- gif->buffer_position = gif_data - gif->gif_data;
- }
-
- /* Do the colour map if we haven't already. As the top byte is always
- * 0xff or 0x00 depending on the transparency we know if it's been
- * filled in.
- */
- if (gif->global_colour_table[0] == GIF_PROCESS_COLOURS) {
- /* Check for a global colour map signified by bit 7 */
- if (gif->global_colours) {
- if (gif->buffer_size < (gif->colour_table_size * 3 + 12)) {
- return GIF_INSUFFICIENT_DATA;
- }
- for (index = 0; index < gif->colour_table_size; index++) {
- /* Gif colour map contents are r,g,b.
- *
- * We want to pack them bytewise into the
- * colour table, such that the red component
- * is in byte 0 and the alpha component is in
- * byte 3.
- */
- unsigned char *entry = (unsigned char *) &gif->
- global_colour_table[index];
-
- entry[0] = gif_data[0]; /* r */
- entry[1] = gif_data[1]; /* g */
- entry[2] = gif_data[2]; /* b */
- entry[3] = 0xff; /* a */
-
- gif_data += 3;
- }
- gif->buffer_position = (gif_data - gif->gif_data);
- } else {
- /* Create a default colour table with the first two
- * colours as black and white
- */
- unsigned int *entry = gif->global_colour_table;
-
- entry[0] = 0x00000000;
- /* Force Alpha channel to opaque */
- ((unsigned char *) entry)[3] = 0xff;
-
- entry[1] = 0xffffffff;
- }
- }
-
- /* Repeatedly try to initialise frames */
- while ((return_value = gif_initialise_frame(gif)) == GIF_WORKING);
-
- /* If there was a memory error tell the caller */
- if ((return_value == GIF_INSUFFICIENT_MEMORY) ||
- (return_value == GIF_DATA_ERROR)) {
- return return_value;
- }
-
- /* If we didn't have some frames then a GIF_INSUFFICIENT_DATA becomes a
- * GIF_INSUFFICIENT_FRAME_DATA
- */
- if ((return_value == GIF_INSUFFICIENT_DATA) &&
- (gif->frame_count_partial > 0)) {
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
-
- /* Return how many we got */
- return return_value;
-}
-
-
-/* exported function documented in libnsgif.h */
-gif_result gif_decode_frame(gif_animation *gif, unsigned int frame)
+/**
+ * decode a gif frame
+ *
+ * \param gif gif animation context.
+ * \param frame The frame number to decode.
+ * \param clear_image flag for image data being cleared instead of plotted.
+ */
+static gif_result
+gif_internal_decode_frame(gif_animation *gif,
+ unsigned int frame,
+ bool clear_image)
{
unsigned int index = 0;
unsigned char *gif_data, *gif_end;
@@ -1182,11 +974,12 @@ gif_result gif_decode_frame(gif_animation *gif, unsigned int frame)
/* memset((char*)frame_data, colour_table[gif->background_index], gif->width * gif->height * sizeof(int)); */
} else if ((frame != 0) &&
(gif->frames[frame - 1].disposal_method == GIF_FRAME_CLEAR)) {
- clear_image = true;
- if ((return_value = gif_decode_frame(gif, (frame - 1))) != GIF_OK) {
+ return_value = gif_internal_decode_frame(gif,
+ (frame - 1),
+ true);
+ if (return_value != GIF_OK) {
goto gif_decode_frame_exit;
}
- clear_image = false;
/*
* If the previous frame's disposal method requires we
* restore the previous image, find the last image set
@@ -1205,7 +998,8 @@ gif_result gif_decode_frame(gif_animation *gif, unsigned int frame)
GIF_TRANSPARENT_COLOUR,
gif->width * gif->height * sizeof(int));
} else {
- if ((return_value = gif_decode_frame(gif, last_undisposed_frame)) != GIF_OK) {
+ return_value = gif_internal_decode_frame(gif, last_undisposed_frame, false);
+ if (return_value != GIF_OK) {
goto gif_decode_frame_exit;
}
/* Get this frame's data */
@@ -1322,6 +1116,228 @@ gif_decode_frame_exit:
/* exported function documented in libnsgif.h */
+void gif_create(gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks)
+{
+ memset(gif, 0, sizeof(gif_animation));
+ gif->bitmap_callbacks = *bitmap_callbacks;
+ gif->decoded_frame = GIF_INVALID_FRAME;
+}
+
+
+/* exported function documented in libnsgif.h */
+gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
+{
+ unsigned char *gif_data;
+ unsigned int index;
+ gif_result return_value;
+
+ /* Initialize values */
+ gif->buffer_size = size;
+ gif->gif_data = data;
+
+ /* Check for sufficient data to be a GIF (6-byte header + 7-byte
+ * logical screen descriptor)
+ */
+ if (gif->buffer_size < 13) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+
+ /* Get our current processing position */
+ gif_data = gif->gif_data + gif->buffer_position;
+
+ /* See if we should initialise the GIF */
+ if (gif->buffer_position == 0) {
+ /* We want everything to be NULL before we start so we've no
+ * chance of freeing bad pointers (paranoia)
+ */
+ gif->frame_image = NULL;
+ gif->frames = NULL;
+ gif->local_colour_table = NULL;
+ gif->global_colour_table = NULL;
+
+ /* The caller may have been lazy and not reset any values */
+ gif->frame_count = 0;
+ gif->frame_count_partial = 0;
+ gif->decoded_frame = GIF_INVALID_FRAME;
+
+ /* 6-byte GIF file header is:
+ *
+ * +0 3CHARS Signature ('GIF')
+ * +3 3CHARS Version ('87a' or '89a')
+ */
+ if (strncmp((const char *) gif_data, "GIF", 3) != 0) {
+ return GIF_DATA_ERROR;
+ }
+ gif_data += 3;
+
+ /* Ensure GIF reports version 87a or 89a */
+ /*
+ if ((strncmp(gif_data, "87a", 3) != 0) &&
+ (strncmp(gif_data, "89a", 3) != 0))
+ LOG(("Unknown GIF format - proceeding anyway"));
+ */
+ gif_data += 3;
+
+ /* 7-byte Logical Screen Descriptor is:
+ *
+ * +0 SHORT Logical Screen Width
+ * +2 SHORT Logical Screen Height
+ * +4 CHAR __Packed Fields__
+ * 1BIT Global Colour Table Flag
+ * 3BITS Colour Resolution
+ * 1BIT Sort Flag
+ * 3BITS Size of Global Colour Table
+ * +5 CHAR Background Colour Index
+ * +6 CHAR Pixel Aspect Ratio
+ */
+ gif->width = gif_data[0] | (gif_data[1] << 8);
+ gif->height = gif_data[2] | (gif_data[3] << 8);
+ gif->global_colours = (gif_data[4] & GIF_COLOUR_TABLE_MASK);
+ gif->colour_table_size = (2 << (gif_data[4] & GIF_COLOUR_TABLE_SIZE_MASK));
+ gif->background_index = gif_data[5];
+ gif->aspect_ratio = gif_data[6];
+ gif->loop_count = 1;
+ gif_data += 7;
+
+ /* Some broken GIFs report the size as the screen size they
+ * were created in. As such, we detect for the common cases and
+ * set the sizes as 0 if they are found which results in the
+ * GIF being the maximum size of the frames.
+ */
+ if (((gif->width == 640) && (gif->height == 480)) ||
+ ((gif->width == 640) && (gif->height == 512)) ||
+ ((gif->width == 800) && (gif->height == 600)) ||
+ ((gif->width == 1024) && (gif->height == 768)) ||
+ ((gif->width == 1280) && (gif->height == 1024)) ||
+ ((gif->width == 1600) && (gif->height == 1200)) ||
+ ((gif->width == 0) || (gif->height == 0)) ||
+ ((gif->width > 2048) || (gif->height > 2048))) {
+ gif->width = 1;
+ gif->height = 1;
+ }
+
+ /* Allocate some data irrespective of whether we've got any
+ * colour tables. We always get the maximum size in case a GIF
+ * is lying to us. It's far better to give the wrong colours
+ * than to trample over some memory somewhere.
+ */
+ gif->global_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
+ gif->local_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
+ if ((gif->global_colour_table == NULL) ||
+ (gif->local_colour_table == NULL)) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* Set the first colour to a value that will never occur in
+ * reality so we know if we've processed it
+ */
+ gif->global_colour_table[0] = GIF_PROCESS_COLOURS;
+
+ /* Check if the GIF has no frame data (13-byte header + 1-byte
+ * termination block) Although generally useless, the GIF
+ * specification does not expressly prohibit this
+ */
+ if (gif->buffer_size == 14) {
+ if (gif_data[0] == GIF_TRAILER) {
+ return GIF_OK;
+ } else {
+ return GIF_INSUFFICIENT_DATA;
+ }
+ }
+
+ /* Initialise enough workspace for 4 frames initially */
+ if ((gif->frames = (gif_frame *)malloc(sizeof(gif_frame))) == NULL) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+ gif->frame_holders = 1;
+
+ /* Initialise the bitmap header */
+ assert(gif->bitmap_callbacks.bitmap_create);
+ gif->frame_image = gif->bitmap_callbacks.bitmap_create(gif->width, gif->height);
+ if (gif->frame_image == NULL) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* Remember we've done this now */
+ gif->buffer_position = gif_data - gif->gif_data;
+ }
+
+ /* Do the colour map if we haven't already. As the top byte is always
+ * 0xff or 0x00 depending on the transparency we know if it's been
+ * filled in.
+ */
+ if (gif->global_colour_table[0] == GIF_PROCESS_COLOURS) {
+ /* Check for a global colour map signified by bit 7 */
+ if (gif->global_colours) {
+ if (gif->buffer_size < (gif->colour_table_size * 3 + 12)) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+ for (index = 0; index < gif->colour_table_size; index++) {
+ /* Gif colour map contents are r,g,b.
+ *
+ * We want to pack them bytewise into the
+ * colour table, such that the red component
+ * is in byte 0 and the alpha component is in
+ * byte 3.
+ */
+ unsigned char *entry = (unsigned char *) &gif->
+ global_colour_table[index];
+
+ entry[0] = gif_data[0]; /* r */
+ entry[1] = gif_data[1]; /* g */
+ entry[2] = gif_data[2]; /* b */
+ entry[3] = 0xff; /* a */
+
+ gif_data += 3;
+ }
+ gif->buffer_position = (gif_data - gif->gif_data);
+ } else {
+ /* Create a default colour table with the first two
+ * colours as black and white
+ */
+ unsigned int *entry = gif->global_colour_table;
+
+ entry[0] = 0x00000000;
+ /* Force Alpha channel to opaque */
+ ((unsigned char *) entry)[3] = 0xff;
+
+ entry[1] = 0xffffffff;
+ }
+ }
+
+ /* Repeatedly try to initialise frames */
+ while ((return_value = gif_initialise_frame(gif)) == GIF_WORKING);
+
+ /* If there was a memory error tell the caller */
+ if ((return_value == GIF_INSUFFICIENT_MEMORY) ||
+ (return_value == GIF_DATA_ERROR)) {
+ return return_value;
+ }
+
+ /* If we didn't have some frames then a GIF_INSUFFICIENT_DATA becomes a
+ * GIF_INSUFFICIENT_FRAME_DATA
+ */
+ if ((return_value == GIF_INSUFFICIENT_DATA) &&
+ (gif->frame_count_partial > 0)) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Return how many we got */
+ return return_value;
+}
+
+
+/* exported function documented in libnsgif.h */
+gif_result gif_decode_frame(gif_animation *gif, unsigned int frame)
+{
+ return gif_internal_decode_frame(gif, frame, false);
+}
+
+
+/* exported function documented in libnsgif.h */
void gif_finalise(gif_animation *gif)
{
/* Release all our memory blocks */
commitdiff http://git.netsurf-browser.org/libnsgif.git/commit/?id=33981c486fc6b660ee...
commit 33981c486fc6b660ee1ad8c48a38b2028c2b716e
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Add doxygen config and update formatting and doc comments
diff --git a/.gitignore b/.gitignore
index 179b224..0f7e72c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+Makefile.config.override
build-*
-
+docs/html
+*~
diff --git a/README b/README
new file mode 100644
index 0000000..498ee46
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+libnsgif - Decoding GIF files
+=============================
+
+The functions provided by this library allow for efficient progressive
+GIF decoding. Whilst the initialisation does not ensure that there is
+sufficient image data to complete the entire frame, it does ensure
+that the information provided is valid. Any subsequent attempts to
+decode an initialised GIF are guaranteed to succeed, and any bytes of
+the image not present are assumed to be totally transparent.
+
+To begin decoding a GIF, the 'gif' structure must be initialised with
+the 'gif_data' and 'buffer_size' set to their initial values. The
+'buffer_position' should initially be 0, and will be internally
+updated as the decoding commences. The caller should then repeatedly
+call gif_initialise() with the structure until the function returns 1,
+or no more data is avaliable.
+
+Once the initialisation has begun, the decoder completes the variables
+'frame_count' and 'frame_count_partial'. The former being the total
+number of frames that have been successfully initialised, and the
+latter being the number of frames that a partial amount of data is
+available for. This assists the caller in managing the animation
+whilst decoding is continuing.
+
+To decode a frame, the caller must use gif_decode_frame() which
+updates the current 'frame_image' to reflect the desired frame. The
+required 'disposal_method' is also updated to reflect how the frame
+should be plotted. The caller must not assume that the current
+'frame_image' will be valid between calls if initialisation is still
+occuring, and should either always request that the frame is decoded
+(no processing will occur if the 'decoded_frame' has not been
+invalidated by initialisation) or perform the check itself.
+
+It should be noted that gif_finalise() should always be called, even
+if no frames were initialised. Additionally, it is the responsibility
+of the caller to free 'gif_data'.
diff --git a/docs/Doxyfile b/docs/Doxyfile
new file mode 100644
index 0000000..fbbf523
--- /dev/null
+++ b/docs/Doxyfile
@@ -0,0 +1,1792 @@
+# Doxyfile 1.8.1.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME = "libnsgif"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+5A# if some version control system is used.
+
+PROJECT_NUMBER =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = docs/
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path.
+
+CITE_BIB_FILES =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT =
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# style sheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load style sheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
diff --git a/include/libnsgif.h b/include/libnsgif.h
index 462c354..33b4b19 100644
--- a/include/libnsgif.h
+++ b/include/libnsgif.h
@@ -7,8 +7,9 @@
* http://www.opensource.org/licenses/mit-license.php
*/
-/** \file
- * Progressive animated GIF file decoding (interface).
+/**
+ * \file
+ * Interface to progressive animated GIF file decoding.
*/
#ifndef _LIBNSGIF_H_
@@ -17,42 +18,53 @@
#include <stdbool.h>
#include <inttypes.h>
-/* Error return values
-*/
+/* Error return values */
typedef enum {
- GIF_WORKING = 1,
- GIF_OK = 0,
- GIF_INSUFFICIENT_FRAME_DATA = -1,
- GIF_FRAME_DATA_ERROR = -2,
- GIF_INSUFFICIENT_DATA = -3,
- GIF_DATA_ERROR = -4,
- GIF_INSUFFICIENT_MEMORY = -5,
- GIF_FRAME_NO_DISPLAY = -6,
- GIF_END_OF_FRAME = -7
+ GIF_WORKING = 1,
+ GIF_OK = 0,
+ GIF_INSUFFICIENT_FRAME_DATA = -1,
+ GIF_FRAME_DATA_ERROR = -2,
+ GIF_INSUFFICIENT_DATA = -3,
+ GIF_DATA_ERROR = -4,
+ GIF_INSUFFICIENT_MEMORY = -5,
+ GIF_FRAME_NO_DISPLAY = -6,
+ GIF_END_OF_FRAME = -7
} gif_result;
-/* The GIF frame data
-*/
+/** GIF frame data */
typedef struct gif_frame {
- bool display; /**< whether the frame should be displayed/animated */
- unsigned int frame_delay; /**< delay (in cs) before animating the frame */
- /** Internal members are listed below
- */
- unsigned int frame_pointer; /**< offset (in bytes) to the GIF frame data */
- bool virgin; /**< whether the frame has previously been used */
- bool opaque; /**< whether the frame is totally opaque */
- bool redraw_required; /**< whether a forcable screen redraw is required */
- unsigned char disposal_method; /**< how the previous frame should be disposed; affects plotting */
- bool transparency; /**< whether we acknoledge transparency */
- unsigned char transparency_index; /**< the index designating a transparent pixel */
- unsigned int redraw_x; /**< x co-ordinate of redraw rectangle */
- unsigned int redraw_y; /**< y co-ordinate of redraw rectangle */
- unsigned int redraw_width; /**< width of redraw rectangle */
- unsigned int redraw_height; /**< height of redraw rectangle */
+ /** whether the frame should be displayed/animated */
+ bool display;
+ /** delay (in cs) before animating the frame */
+ unsigned int frame_delay;
+
+ /* Internal members are listed below */
+
+ /** offset (in bytes) to the GIF frame data */
+ unsigned int frame_pointer;
+ /** whether the frame has previously been used */
+ bool virgin;
+ /** whether the frame is totally opaque */
+ bool opaque;
+ /** whether a forcable screen redraw is required */
+ bool redraw_required;
+ /** how the previous frame should be disposed; affects plotting */
+ unsigned char disposal_method;
+ /** whether we acknoledge transparency */
+ bool transparency;
+ /** the index designating a transparent pixel */
+ unsigned char transparency_index;
+ /** x co-ordinate of redraw rectangle */
+ unsigned int redraw_x;
+ /** y co-ordinate of redraw rectangle */
+ unsigned int redraw_y;
+ /** width of redraw rectangle */
+ unsigned int redraw_width;
+ /** height of redraw rectangle */
+ unsigned int redraw_height;
} gif_frame;
-/* API for Bitmap callbacks
-*/
+/* API for Bitmap callbacks */
typedef void* (*gif_bitmap_cb_create)(int width, int height);
typedef void (*gif_bitmap_cb_destroy)(void *bitmap);
typedef unsigned char* (*gif_bitmap_cb_get_buffer)(void *bitmap);
@@ -60,49 +72,112 @@ typedef void (*gif_bitmap_cb_set_opaque)(void *bitmap, bool opaque);
typedef bool (*gif_bitmap_cb_test_opaque)(void *bitmap);
typedef void (*gif_bitmap_cb_modified)(void *bitmap);
-/* The Bitmap callbacks function table
-*/
+/** Bitmap callbacks function table */
typedef struct gif_bitmap_callback_vt {
- gif_bitmap_cb_create bitmap_create; /**< Create a bitmap. */
- gif_bitmap_cb_destroy bitmap_destroy; /**< Free a bitmap. */
- gif_bitmap_cb_get_buffer bitmap_get_buffer; /**< Return a pointer to the pixel data in a bitmap. */
- /** Members below are optional
- */
- gif_bitmap_cb_set_opaque bitmap_set_opaque; /**< Sets whether a bitmap should be plotted opaque. */
- gif_bitmap_cb_test_opaque bitmap_test_opaque; /**< Tests whether a bitmap has an opaque alpha channel. */
- gif_bitmap_cb_modified bitmap_modified; /**< The bitmap image has changed, so flush any persistant cache. */
+ /** Create a bitmap. */
+ gif_bitmap_cb_create bitmap_create;
+ /** Free a bitmap. */
+ gif_bitmap_cb_destroy bitmap_destroy;
+ /** Return a pointer to the pixel data in a bitmap. */
+ gif_bitmap_cb_get_buffer bitmap_get_buffer;
+
+ /* Members below are optional */
+
+ /** Sets whether a bitmap should be plotted opaque. */
+ gif_bitmap_cb_set_opaque bitmap_set_opaque;
+ /** Tests whether a bitmap has an opaque alpha channel. */
+ gif_bitmap_cb_test_opaque bitmap_test_opaque;
+ /** The bitmap image has changed, so flush any persistant cache. */
+ gif_bitmap_cb_modified bitmap_modified;
} gif_bitmap_callback_vt;
-/* The GIF animation data
-*/
+/** GIF animation data */
typedef struct gif_animation {
- gif_bitmap_callback_vt bitmap_callbacks; /**< callbacks for bitmap functions */
- unsigned char *gif_data; /**< pointer to GIF data */
- unsigned int width; /**< width of GIF (may increase during decoding) */
- unsigned int height; /**< heigth of GIF (may increase during decoding) */
- unsigned int frame_count; /**< number of frames decoded */
- unsigned int frame_count_partial; /**< number of frames partially decoded */
- gif_frame *frames; /**< decoded frames */
- int decoded_frame; /**< current frame decoded to bitmap */
- void *frame_image; /**< currently decoded image; stored as bitmap from bitmap_create callback */
- int loop_count; /**< number of times to loop animation */
- gif_result current_error; /**< current error type, or 0 for none*/
- /** Internal members are listed below
- */
- unsigned int buffer_position; /**< current index into GIF data */
- unsigned int buffer_size; /**< total number of bytes of GIF data available */
- unsigned int frame_holders; /**< current number of frame holders */
- unsigned int background_index; /**< index in the colour table for the background colour */
- unsigned int aspect_ratio; /**< image aspect ratio (ignored) */
- unsigned int colour_table_size; /**< size of colour table (in entries) */
- bool global_colours; /**< whether the GIF has a global colour table */
- unsigned int *global_colour_table; /**< global colour table */
- unsigned int *local_colour_table; /**< local colour table */
+ /** callbacks for bitmap functions */
+ gif_bitmap_callback_vt bitmap_callbacks;
+ /** pointer to GIF data */
+ unsigned char *gif_data;
+ /** width of GIF (may increase during decoding) */
+ unsigned int width;
+ /** heigth of GIF (may increase during decoding) */
+ unsigned int height;
+ /** number of frames decoded */
+ unsigned int frame_count;
+ /** number of frames partially decoded */
+ unsigned int frame_count_partial;
+ /** decoded frames */
+ gif_frame *frames;
+ /** current frame decoded to bitmap */
+ int decoded_frame;
+ /** currently decoded image; stored as bitmap from bitmap_create callback */
+ void *frame_image;
+ /** number of times to loop animation */
+ int loop_count;
+ /** current error type, or 0 for none */
+ gif_result current_error;
+
+ /* Internal members are listed below */
+
+ /** current index into GIF data */
+ unsigned int buffer_position;
+ /** total number of bytes of GIF data available */
+ unsigned int buffer_size;
+ /** current number of frame holders */
+ unsigned int frame_holders;
+ /** index in the colour table for the background colour */
+ unsigned int background_index;
+ /** image aspect ratio (ignored) */
+ unsigned int aspect_ratio;
+ /** size of colour table (in entries) */
+ unsigned int colour_table_size;
+ /** whether the GIF has a global colour table */
+ bool global_colours;
+ /** global colour table */
+ unsigned int *global_colour_table;
+ /** local colour table */
+ unsigned int *local_colour_table;
} gif_animation;
+/**
+ * Initialises necessary gif_animation members.
+ */
void gif_create(gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks);
+
+/**
+ * Initialises any workspace held by the animation and attempts to decode
+ * any information that hasn't already been decoded.
+ * If an error occurs, all previously decoded frames are retained.
+ *
+ * @return Error return value.
+ * - GIF_FRAME_DATA_ERROR for GIF frame data error
+ * - GIF_INSUFFICIENT_FRAME_DATA for insufficient data to process
+ * any more frames
+ * - GIF_INSUFFICIENT_MEMORY for memory error
+ * - GIF_DATA_ERROR for GIF error
+ * - GIF_INSUFFICIENT_DATA for insufficient data to do anything
+ * - GIF_OK for successful decoding
+ * - GIF_WORKING for successful decoding if more frames are expected
+ */
gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data);
+
+/**
+ * Decodes a GIF frame.
+ *
+ * @return Error return value. If a frame does not contain any image data,
+ * GIF_OK is returned and gif->current_error is set to
+ * GIF_FRAME_NO_DISPLAY
+ * - GIF_FRAME_DATA_ERROR for GIF frame data error
+ * - GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
+ * - GIF_DATA_ERROR for GIF error (invalid frame header)
+ * - GIF_INSUFFICIENT_DATA for insufficient data to do anything
+ * - GIF_INSUFFICIENT_MEMORY for insufficient memory to process
+ * - GIF_OK for successful decoding
+ */
gif_result gif_decode_frame(gif_animation *gif, unsigned int frame);
+
+/**
+ * Releases any workspace held by a gif
+ */
void gif_finalise(gif_animation *gif);
#endif
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 87371f2..69c54ea 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -15,82 +15,39 @@
#include "libnsgif.h"
#include "utils/log.h"
-/* READING GIF FILES
- =================
-
- The functions provided by this file allow for efficient progressive GIF
- decoding. Whilst the initialisation does not ensure that there is
- sufficient image data to complete the entire frame, it does ensure that
- the information provided is valid. Any subsequent attempts to decode an
- initialised GIF are guaranteed to succeed, and any bytes of the image
- not present are assumed to be totally transparent.
-
- To begin decoding a GIF, the 'gif' structure must be initialised with
- the 'gif_data' and 'buffer_size' set to their initial values. The
- 'buffer_position' should initially be 0, and will be internally updated
- as the decoding commences. The caller should then repeatedly call
- gif_initialise() with the structure until the function returns 1, or
- no more data is avaliable.
-
- Once the initialisation has begun, the decoder completes the variables
- 'frame_count' and 'frame_count_partial'. The former being the total
- number of frames that have been successfully initialised, and the
- latter being the number of frames that a partial amount of data is
- available for. This assists the caller in managing the animation whilst
- decoding is continuing.
-
- To decode a frame, the caller must use gif_decode_frame() which updates
- the current 'frame_image' to reflect the desired frame. The required
- 'disposal_method' is also updated to reflect how the frame should be
- plotted. The caller must not assume that the current 'frame_image' will
- be valid between calls if initialisation is still occuring, and should
- either always request that the frame is decoded (no processing will
- occur if the 'decoded_frame' has not been invalidated by initialisation)
- or perform the check itself.
-
- It should be noted that gif_finalise() should always be called, even if
- no frames were initialised. Additionally, it is the responsibility of
- the caller to free 'gif_data'.
-
- [rjw] - Fri 2nd April 2004
-*/
-
-/* TO-DO LIST
- =================
-
- + Plain text and comment extensions could be implemented if there is any
- interest in doing so.
-*/
-
-
+/**
+ *
+ * \file
+ * \brief GIF image decoder
+ *
+ * The GIF format is thoroughly documented; a full description can be found at
+ * http://www.w3.org/Graphics/GIF/spec-gif89a.txt
+ *
+ * \todo Plain text and comment extensions should be implemented.
+ */
-/* Maximum colour table size
-*/
+/** Maximum colour table size */
#define GIF_MAX_COLOURS 256
-/* Internal flag that the colour table needs to be processed
-*/
+/** Internal flag that the colour table needs to be processed */
#define GIF_PROCESS_COLOURS 0xaa000000
-/* Internal flag that a frame is invalid/unprocessed
-*/
+/** Internal flag that a frame is invalid/unprocessed */
#define GIF_INVALID_FRAME -1
-/* Maximum LZW bits available
-*/
+/** Maximum LZW bits available */
#define GIF_MAX_LZW 12
-/* Transparent colour
-*/
+/** Transparent colour */
#define GIF_TRANSPARENT_COLOUR 0x00
-/* GIF Flags
-*/
+/* GIF Flags */
#define GIF_FRAME_COMBINE 1
#define GIF_FRAME_CLEAR 2
#define GIF_FRAME_RESTORE 3
#define GIF_FRAME_QUIRKS_RESTORE 4
+
#define GIF_IMAGE_SEPARATOR 0x2c
#define GIF_INTERLACE_MASK 0x40
#define GIF_COLOUR_TABLE_MASK 0x80
@@ -105,30 +62,28 @@
#define GIF_BLOCK_TERMINATOR 0x00
#define GIF_TRAILER 0x3b
-/* Internal GIF routines
-*/
+/* Internal GIF routines */
static gif_result gif_initialise_sprite(gif_animation *gif, unsigned int width, unsigned int height);
static gif_result gif_initialise_frame(gif_animation *gif);
static gif_result gif_initialise_frame_extensions(gif_animation *gif, const int frame);
static gif_result gif_skip_frame_extensions(gif_animation *gif);
static unsigned int gif_interlaced_line(int height, int y);
-
-
-/* Internal LZW routines
-*/
+/* Internal LZW routines */
static void gif_init_LZW(gif_animation *gif);
static bool gif_next_LZW(gif_animation *gif);
static int gif_next_code(gif_animation *gif, int code_size);
-/* General LZW values. They are shared for all GIFs being decoded, and
- thus we can't handle progressive decoding efficiently without having
- the data for each image which would use an extra 10Kb or so per GIF.
-*/
+/* General LZW values. They are shared for all GIFs being decoded, and thus we
+ * can't handle progressive decoding efficiently without having the data for
+ * each image which would use an extra 10Kb or so per GIF.
+ */
static unsigned char buf[4];
static unsigned char *direct;
-static int maskTbl[16] = {0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
- 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff};
+static int maskTbl[16] = {
+ 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
+ 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff
+};
static int table[2][(1 << GIF_MAX_LZW)];
static unsigned char stack[(1 << GIF_MAX_LZW) * 2];
static unsigned char *stack_pointer;
@@ -140,1181 +95,1246 @@ static int firstcode, oldcode;
static bool zero_data_block = false;
static bool get_done;
-/* Whether to clear the decoded image rather than plot
-*/
+/* Whether to clear the decoded image rather than plot */
static bool clear_image = false;
-
-/** Initialises necessary gif_animation members.
-*/
-void gif_create(gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks) {
- memset(gif, 0, sizeof(gif_animation));
- gif->bitmap_callbacks = *bitmap_callbacks;
- gif->decoded_frame = GIF_INVALID_FRAME;
+/**
+ * Updates the sprite memory size
+ *
+ * \param gif The animation context
+ * \param width The width of the sprite
+ * \param height The height of the sprite
+ * \return GIF_INSUFFICIENT_MEMORY for a memory error GIF_OK for success
+ */
+static gif_result
+gif_initialise_sprite(gif_animation *gif,
+ unsigned int width,
+ unsigned int height)
+{
+ unsigned int max_width;
+ unsigned int max_height;
+ struct bitmap *buffer;
+
+ /* Check if we've changed */
+ if ((width <= gif->width) && (height <= gif->height)) {
+ return GIF_OK;
+ }
+
+ /* Get our maximum values */
+ max_width = (width > gif->width) ? width : gif->width;
+ max_height = (height > gif->height) ? height : gif->height;
+
+ /* Allocate some more memory */
+ assert(gif->bitmap_callbacks.bitmap_create);
+ buffer = gif->bitmap_callbacks.bitmap_create(max_width, max_height);
+ if (buffer == NULL) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ assert(gif->bitmap_callbacks.bitmap_destroy);
+ gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
+ gif->frame_image = buffer;
+ gif->width = max_width;
+ gif->height = max_height;
+
+ /* Invalidate our currently decoded image */
+ gif->decoded_frame = GIF_INVALID_FRAME;
+ return GIF_OK;
}
-/** Initialises any workspace held by the animation and attempts to decode
- any information that hasn't already been decoded.
- If an error occurs, all previously decoded frames are retained.
-
- @return GIF_FRAME_DATA_ERROR for GIF frame data error
- GIF_INSUFFICIENT_FRAME_DATA for insufficient data to process
- any more frames
- GIF_INSUFFICIENT_MEMORY for memory error
- GIF_DATA_ERROR for GIF error
- GIF_INSUFFICIENT_DATA for insufficient data to do anything
- GIF_OK for successful decoding
- GIF_WORKING for successful decoding if more frames are expected
+/**
+ * Attempts to initialise the next frame
+ *
+ * \param gif The animation context
+ * \return error code
+ * - GIF_INSUFFICIENT_DATA for insufficient data to do anything
+ * - GIF_FRAME_DATA_ERROR for GIF frame data error
+ * - GIF_INSUFFICIENT_MEMORY for insufficient memory to process
+ * - GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
+ * - GIF_DATA_ERROR for GIF error (invalid frame header)
+ * - GIF_OK for successful decoding
+ * - GIF_WORKING for successful decoding if more frames are expected
*/
-gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data) {
- unsigned char *gif_data;
- unsigned int index;
- gif_result return_value;
-
- /* The GIF format is thoroughly documented; a full description
- * can be found at http://www.w3.org/Graphics/GIF/spec-gif89a.txt
- */
-
- /* Initialize values
- */
- gif->buffer_size = size;
- gif->gif_data = data;
-
- /* Check for sufficient data to be a GIF (6-byte header + 7-byte logical screen descriptor)
- */
- if (gif->buffer_size < 13) return GIF_INSUFFICIENT_DATA;
-
- /* Get our current processing position
- */
- gif_data = gif->gif_data + gif->buffer_position;
-
- /* See if we should initialise the GIF
- */
- if (gif->buffer_position == 0) {
-
- /* We want everything to be NULL before we start so we've no chance
- of freeing bad pointers (paranoia)
- */
- gif->frame_image = NULL;
- gif->frames = NULL;
- gif->local_colour_table = NULL;
- gif->global_colour_table = NULL;
-
- /* The caller may have been lazy and not reset any values
- */
- gif->frame_count = 0;
- gif->frame_count_partial = 0;
- gif->decoded_frame = GIF_INVALID_FRAME;
-
- /* 6-byte GIF file header is:
- *
- * +0 3CHARS Signature ('GIF')
- * +3 3CHARS Version ('87a' or '89a')
- */
- if (strncmp((const char *) gif_data, "GIF", 3) != 0)
- return GIF_DATA_ERROR;
- gif_data += 3;
-
- /* Ensure GIF reports version 87a or 89a
- */
-/* if ((strncmp(gif_data, "87a", 3) != 0) &&
- (strncmp(gif_data, "89a", 3) != 0))
- LOG(("Unknown GIF format - proceeding anyway"));
-*/ gif_data += 3;
-
- /* 7-byte Logical Screen Descriptor is:
- *
- * +0 SHORT Logical Screen Width
- * +2 SHORT Logical Screen Height
- * +4 CHAR __Packed Fields__
- * 1BIT Global Colour Table Flag
- * 3BITS Colour Resolution
- * 1BIT Sort Flag
- * 3BITS Size of Global Colour Table
- * +5 CHAR Background Colour Index
- * +6 CHAR Pixel Aspect Ratio
- */
- gif->width = gif_data[0] | (gif_data[1] << 8);
- gif->height = gif_data[2] | (gif_data[3] << 8);
- gif->global_colours = (gif_data[4] & GIF_COLOUR_TABLE_MASK);
- gif->colour_table_size = (2 << (gif_data[4] & GIF_COLOUR_TABLE_SIZE_MASK));
- gif->background_index = gif_data[5];
- gif->aspect_ratio = gif_data[6];
- gif->loop_count = 1;
- gif_data += 7;
-
- /* Some broken GIFs report the size as the screen size they were created in. As
- such, we detect for the common cases and set the sizes as 0 if they are found
- which results in the GIF being the maximum size of the frames.
- */
- if (((gif->width == 640) && (gif->height == 480)) ||
- ((gif->width == 640) && (gif->height == 512)) ||
- ((gif->width == 800) && (gif->height == 600)) ||
- ((gif->width == 1024) && (gif->height == 768)) ||
- ((gif->width == 1280) && (gif->height == 1024)) ||
- ((gif->width == 1600) && (gif->height == 1200)) ||
- ((gif->width == 0) || (gif->height == 0)) ||
- ((gif->width > 2048) || (gif->height > 2048))) {
- gif->width = 1;
- gif->height = 1;
- }
-
- /* Allocate some data irrespective of whether we've got any colour tables. We
- always get the maximum size in case a GIF is lying to us. It's far better
- to give the wrong colours than to trample over some memory somewhere.
- */
- gif->global_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
- gif->local_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
- if ((gif->global_colour_table == NULL) || (gif->local_colour_table == NULL)) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
-
- /* Set the first colour to a value that will never occur in reality so we
- know if we've processed it
- */
- gif->global_colour_table[0] = GIF_PROCESS_COLOURS;
-
- /* Check if the GIF has no frame data (13-byte header + 1-byte termination block)
- * Although generally useless, the GIF specification does not expressly prohibit this
- */
- if (gif->buffer_size == 14) {
- if (gif_data[0] == GIF_TRAILER)
- return GIF_OK;
- else
- return GIF_INSUFFICIENT_DATA;
- }
-
- /* Initialise enough workspace for 4 frames initially
- */
- if ((gif->frames = (gif_frame *)malloc(sizeof(gif_frame))) == NULL) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
- gif->frame_holders = 1;
-
- /* Initialise the sprite header
- */
- assert(gif->bitmap_callbacks.bitmap_create);
- if ((gif->frame_image = gif->bitmap_callbacks.bitmap_create(gif->width, gif->height)) == NULL) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
-
- /* Remember we've done this now
- */
- gif->buffer_position = gif_data - gif->gif_data;
- }
-
- /* Do the colour map if we haven't already. As the top byte is always 0xff or 0x00
- depending on the transparency we know if it's been filled in.
- */
- if (gif->global_colour_table[0] == GIF_PROCESS_COLOURS) {
- /* Check for a global colour map signified by bit 7
- */
- if (gif->global_colours) {
- if (gif->buffer_size < (gif->colour_table_size * 3 + 12)) {
- return GIF_INSUFFICIENT_DATA;
- }
- for (index = 0; index < gif->colour_table_size; index++) {
- /* Gif colour map contents are r,g,b.
- *
- * We want to pack them bytewise into the
- * colour table, such that the red component
- * is in byte 0 and the alpha component is in
- * byte 3.
- */
- unsigned char *entry = (unsigned char *) &gif->
- global_colour_table[index];
-
- entry[0] = gif_data[0]; /* r */
- entry[1] = gif_data[1]; /* g */
- entry[2] = gif_data[2]; /* b */
- entry[3] = 0xff; /* a */
-
- gif_data += 3;
- }
- gif->buffer_position = (gif_data - gif->gif_data);
- } else {
- /* Create a default colour table with the first two colours as black and white
- */
- unsigned int *entry = gif->global_colour_table;
-
- entry[0] = 0x00000000;
- /* Force Alpha channel to opaque */
- ((unsigned char *) entry)[3] = 0xff;
-
- entry[1] = 0xffffffff;
- }
- }
-
- /* Repeatedly try to initialise frames
- */
- while ((return_value = gif_initialise_frame(gif)) == GIF_WORKING);
-
- /* If there was a memory error tell the caller
- */
- if ((return_value == GIF_INSUFFICIENT_MEMORY) ||
- (return_value == GIF_DATA_ERROR))
- return return_value;
-
- /* If we didn't have some frames then a GIF_INSUFFICIENT_DATA becomes a
- GIF_INSUFFICIENT_FRAME_DATA
- */
- if ((return_value == GIF_INSUFFICIENT_DATA) && (gif->frame_count_partial > 0))
- return GIF_INSUFFICIENT_FRAME_DATA;
-
- /* Return how many we got
- */
- return return_value;
+static gif_result gif_initialise_frame(gif_animation *gif)
+{
+ int frame;
+ gif_frame *temp_buf;
+
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int flags = 0;
+ unsigned int width, height, offset_x, offset_y;
+ unsigned int block_size, colour_table_size;
+ bool first_image = true;
+ gif_result return_value;
+
+ /* Get the frame to decode and our data position */
+ frame = gif->frame_count;
+
+ /* Get our buffer position etc. */
+ gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
+ gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
+ gif_bytes = (gif_end - gif_data);
+
+ /* Check if we've finished */
+ if ((gif_bytes > 0) && (gif_data[0] == GIF_TRAILER)) {
+ return GIF_OK;
+ }
+
+ /* Check if there is enough data remaining. The shortest block of data
+ * is a 4-byte comment extension + 1-byte block terminator + 1-byte gif
+ * trailer
+ */
+ if (gif_bytes < 6) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+
+ /* We could theoretically get some junk data that gives us millions of
+ * frames, so we ensure that we don't have a silly number
+ */
+ if (frame > 4096) {
+ return GIF_FRAME_DATA_ERROR;
+ }
+
+ /* Get some memory to store our pointers in etc. */
+ if ((int)gif->frame_holders <= frame) {
+ /* Allocate more memory */
+ temp_buf = (gif_frame *)realloc(gif->frames, (frame + 1) * sizeof(gif_frame));
+ if (temp_buf == NULL) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+ gif->frames = temp_buf;
+ gif->frame_holders = frame + 1;
+ }
+
+ /* Store our frame pointer. We would do it when allocating except we
+ * start off with one frame allocated so we can always use realloc.
+ */
+ gif->frames[frame].frame_pointer = gif->buffer_position;
+ gif->frames[frame].display = false;
+ gif->frames[frame].virgin = true;
+ gif->frames[frame].disposal_method = 0;
+ gif->frames[frame].transparency = false;
+ gif->frames[frame].frame_delay = 100;
+ gif->frames[frame].redraw_required = false;
+
+ /* Invalidate any previous decoding we have of this frame */
+ if (gif->decoded_frame == frame) {
+ gif->decoded_frame = GIF_INVALID_FRAME;
+ }
+
+ /* We pretend to initialise the frames, but really we just skip over
+ * all the data contained within. This is all basically a cut down
+ * version of gif_decode_frame that doesn't have any of the LZW bits in
+ * it.
+ */
+
+ /* Initialise any extensions */
+ gif->buffer_position = gif_data - gif->gif_data;
+ return_value = gif_initialise_frame_extensions(gif, frame);
+ if (return_value != GIF_OK) {
+ return return_value;
+ }
+ gif_data = (gif->gif_data + gif->buffer_position);
+ gif_bytes = (gif_end - gif_data);
+
+ /* Check if we've finished */
+ if ((gif_bytes = (gif_end - gif_data)) < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ if (gif_data[0] == GIF_TRAILER) {
+ gif->buffer_position = (gif_data - gif->gif_data);
+ gif->frame_count = frame + 1;
+ return GIF_OK;
+ }
+
+ /* If we're not done, there should be an image descriptor */
+ if (gif_data[0] != GIF_IMAGE_SEPARATOR) {
+ return GIF_FRAME_DATA_ERROR;
+ }
+
+ /* Do some simple boundary checking */
+ if (gif_bytes < 10) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ offset_x = gif_data[1] | (gif_data[2] << 8);
+ offset_y = gif_data[3] | (gif_data[4] << 8);
+ width = gif_data[5] | (gif_data[6] << 8);
+ height = gif_data[7] | (gif_data[8] << 8);
+
+ /* Set up the redraw characteristics. We have to check for extending
+ * the area due to multi-image frames.
+ */
+ if (!first_image) {
+ if (gif->frames[frame].redraw_x > offset_x) {
+ gif->frames[frame].redraw_width += (gif->frames[frame].redraw_x - offset_x);
+ gif->frames[frame].redraw_x = offset_x;
+ }
+
+ if (gif->frames[frame].redraw_y > offset_y) {
+ gif->frames[frame].redraw_height += (gif->frames[frame].redraw_y - offset_y);
+ gif->frames[frame].redraw_y = offset_y;
+ }
+
+ if ((offset_x + width) > (gif->frames[frame].redraw_x + gif->frames[frame].redraw_width)) {
+ gif->frames[frame].redraw_width = (offset_x + width) - gif->frames[frame].redraw_x;
+ }
+
+ if ((offset_y + height) > (gif->frames[frame].redraw_y + gif->frames[frame].redraw_height)) {
+ gif->frames[frame].redraw_height = (offset_y + height) - gif->frames[frame].redraw_y;
+ }
+ } else {
+ first_image = false;
+ gif->frames[frame].redraw_x = offset_x;
+ gif->frames[frame].redraw_y = offset_y;
+ gif->frames[frame].redraw_width = width;
+ gif->frames[frame].redraw_height = height;
+ }
+
+ /* if we are clearing the background then we need to redraw enough to
+ * cover the previous frame too
+ */
+ gif->frames[frame].redraw_required = ((gif->frames[frame].disposal_method == GIF_FRAME_CLEAR) ||
+ (gif->frames[frame].disposal_method == GIF_FRAME_RESTORE));
+
+ /* Boundary checking - shouldn't ever happen except with junk data */
+ if (gif_initialise_sprite(gif, (offset_x + width), (offset_y + height))) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* Decode the flags */
+ flags = gif_data[9];
+ colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
+
+ /* Move our data onwards and remember we've got a bit of this frame */
+ gif_data += 10;
+ gif_bytes = (gif_end - gif_data);
+ gif->frame_count_partial = frame + 1;
+
+ /* Skip the local colour table */
+ if (flags & GIF_COLOUR_TABLE_MASK) {
+ gif_data += 3 * colour_table_size;
+ if ((gif_bytes = (gif_end - gif_data)) < 0) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ }
+
+ /* Ensure we have a correct code size */
+ if (gif_bytes < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if (gif_data[0] > GIF_MAX_LZW) {
+ return GIF_DATA_ERROR;
+ }
+
+ /* Move our pointer to the actual image data */
+ gif_data++;
+ --gif_bytes;
+
+ /* Repeatedly skip blocks until we get a zero block or run out of data
+ * These blocks of image data are processed later by gif_decode_frame()
+ */
+ block_size = 0;
+ while (block_size != 1) {
+ if (gif_bytes < 1) return GIF_INSUFFICIENT_FRAME_DATA;
+ block_size = gif_data[0] + 1;
+ /* Check if the frame data runs off the end of the file */
+ if ((int)(gif_bytes - block_size) < 0) {
+ /* Try to recover by signaling the end of the gif.
+ * Once we get garbage data, there is no logical way to
+ * determine where the next frame is. It's probably
+ * better to partially load the gif than not at all.
+ */
+ if (gif_bytes >= 2) {
+ gif_data[0] = 0;
+ gif_data[1] = GIF_TRAILER;
+ gif_bytes = 1;
+ ++gif_data;
+ break;
+ } else {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ } else {
+ gif_bytes -= block_size;
+ gif_data += block_size;
+ }
+ }
+
+ /* Add the frame and set the display flag */
+ gif->buffer_position = gif_data - gif->gif_data;
+ gif->frame_count = frame + 1;
+ gif->frames[frame].display = true;
+
+ /* Check if we've finished */
+ if (gif_bytes < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ } else {
+ if (gif_data[0] == GIF_TRAILER) {
+ return GIF_OK;
+ }
+ }
+ return GIF_WORKING;
}
-/** Updates the sprite memory size
-
- @return GIF_INSUFFICIENT_MEMORY for a memory error
- GIF_OK for success
-*/
-static gif_result gif_initialise_sprite(gif_animation *gif, unsigned int width, unsigned int height) {
- unsigned int max_width;
- unsigned int max_height;
- struct bitmap *buffer;
-
- /* Check if we've changed
- */
- if ((width <= gif->width) && (height <= gif->height))
- return GIF_OK;
-
- /* Get our maximum values
- */
- max_width = (width > gif->width) ? width : gif->width;
- max_height = (height > gif->height) ? height : gif->height;
-
- /* Allocate some more memory
- */
- assert(gif->bitmap_callbacks.bitmap_create);
- if ((buffer = gif->bitmap_callbacks.bitmap_create(max_width, max_height)) == NULL)
- return GIF_INSUFFICIENT_MEMORY;
- assert(gif->bitmap_callbacks.bitmap_destroy);
- gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
- gif->frame_image = buffer;
- gif->width = max_width;
- gif->height = max_height;
-
- /* Invalidate our currently decoded image
- */
- gif->decoded_frame = GIF_INVALID_FRAME;
- return GIF_OK;
+/**
+ * Attempts to initialise the frame's extensions
+ *
+ * \param gif The animation context
+ * \param frame The frame number
+ * @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the
+ * frame GIF_OK for successful initialisation.
+ */
+static gif_result
+gif_initialise_frame_extensions(gif_animation *gif, const int frame)
+{
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int block_size;
+
+ /* Get our buffer position etc. */
+ gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
+ gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
+
+ /* Initialise the extensions */
+ while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
+ ++gif_data;
+ if ((gif_bytes = (gif_end - gif_data)) < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Switch on extension label */
+ switch (gif_data[0]) {
+ case GIF_EXTENSION_GRAPHIC_CONTROL:
+ /* 6-byte Graphic Control Extension is:
+ *
+ * +0 CHAR Graphic Control Label
+ * +1 CHAR Block Size
+ * +2 CHAR __Packed Fields__
+ * 3BITS Reserved
+ * 3BITS Disposal Method
+ * 1BIT User Input Flag
+ * 1BIT Transparent Color Flag
+ * +3 SHORT Delay Time
+ * +5 CHAR Transparent Color Index
+ */
+ if (gif_bytes < 6) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ gif->frames[frame].frame_delay = gif_data[3] | (gif_data[4] << 8);
+ if (gif_data[2] & GIF_TRANSPARENCY_MASK) {
+ gif->frames[frame].transparency = true;
+ gif->frames[frame].transparency_index = gif_data[5];
+ }
+ gif->frames[frame].disposal_method = ((gif_data[2] & GIF_DISPOSAL_MASK) >> 2);
+ /* I have encountered documentation and GIFs in the
+ * wild that use 0x04 to restore the previous frame,
+ * rather than the officially documented 0x03. I
+ * believe some (older?) software may even actually
+ * export this way. We handle this as a type of
+ * "quirks" mode.
+ */
+ if (gif->frames[frame].disposal_method == GIF_FRAME_QUIRKS_RESTORE) {
+ gif->frames[frame].disposal_method = GIF_FRAME_RESTORE;
+ }
+ gif_data += (2 + gif_data[1]);
+ break;
+
+ case GIF_EXTENSION_APPLICATION:
+ /* 14-byte+ Application Extension is:
+ *
+ * +0 CHAR Application Extension Label
+ * +1 CHAR Block Size
+ * +2 8CHARS Application Identifier
+ * +10 3CHARS Appl. Authentication Code
+ * +13 1-256 Application Data (Data sub-blocks)
+ */
+ if (gif_bytes < 17) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if ((gif_data[1] == 0x0b) &&
+ (strncmp((const char *) gif_data + 2,
+ "NETSCAPE2.0", 11) == 0) &&
+ (gif_data[13] == 0x03) &&
+ (gif_data[14] == 0x01)) {
+ gif->loop_count = gif_data[15] | (gif_data[16] << 8);
+ }
+ gif_data += (2 + gif_data[1]);
+ break;
+
+ case GIF_EXTENSION_COMMENT:
+ /* Move the pointer to the first data sub-block Skip 1
+ * byte for the extension label
+ */
+ ++gif_data;
+ break;
+
+ default:
+ /* Move the pointer to the first data sub-block Skip 2
+ * bytes for the extension label and size fields Skip
+ * the extension size itself
+ */
+ if (gif_bytes < 2) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += (2 + gif_data[1]);
+ }
+
+ /* Repeatedly skip blocks until we get a zero block or run out
+ * of data This data is ignored by this gif decoder
+ */
+ gif_bytes = (gif_end - gif_data);
+ block_size = 0;
+ while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
+ block_size = gif_data[0] + 1;
+ if ((gif_bytes -= block_size) < 0) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += block_size;
+ }
+ ++gif_data;
+ }
+
+ /* Set buffer position and return */
+ gif->buffer_position = (gif_data - gif->gif_data);
+ return GIF_OK;
}
-/** Attempts to initialise the next frame
+/**
+ * Skips the frame's extensions (which have been previously initialised)
+ *
+ * \param gif The animation context
+ * \return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the
+ * frame GIF_OK for successful decoding
+ */
+static gif_result gif_skip_frame_extensions(gif_animation *gif)
+{
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int block_size;
+
+ /* Get our buffer position etc. */
+ gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
+ gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
+ gif_bytes = (gif_end - gif_data);
+
+ /* Skip the extensions */
+ while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
+ ++gif_data;
+ if (gif_data >= gif_end) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Switch on extension label */
+ switch(gif_data[0]) {
+ case GIF_EXTENSION_COMMENT:
+ /* Move the pointer to the first data sub-block
+ * 1 byte for the extension label
+ */
+ ++gif_data;
+ break;
+
+ default:
+ /* Move the pointer to the first data sub-block 2 bytes
+ * for the extension label and size fields Skip the
+ * extension size itself
+ */
+ if (gif_data + 1 >= gif_end) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += (2 + gif_data[1]);
+ }
+
+ /* Repeatedly skip blocks until we get a zero block or run out
+ * of data This data is ignored by this gif decoder
+ */
+ gif_bytes = (gif_end - gif_data);
+ block_size = 0;
+ while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
+ block_size = gif_data[0] + 1;
+ if ((gif_bytes -= block_size) < 0) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += block_size;
+ }
+ ++gif_data;
+ }
+
+ /* Set buffer position and return */
+ gif->buffer_position = (gif_data - gif->gif_data);
+ return GIF_OK;
+}
- @return GIF_INSUFFICIENT_DATA for insufficient data to do anything
- GIF_FRAME_DATA_ERROR for GIF frame data error
- GIF_INSUFFICIENT_MEMORY for insufficient memory to process
- GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
- GIF_DATA_ERROR for GIF error (invalid frame header)
- GIF_OK for successful decoding
- GIF_WORKING for successful decoding if more frames are expected
-*/
-static gif_result gif_initialise_frame(gif_animation *gif) {
- int frame;
- gif_frame *temp_buf;
-
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int flags = 0;
- unsigned int width, height, offset_x, offset_y;
- unsigned int block_size, colour_table_size;
- bool first_image = true;
- gif_result return_value;
-
- /* Get the frame to decode and our data position
- */
- frame = gif->frame_count;
-
- /* Get our buffer position etc.
- */
- gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
- gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
- gif_bytes = (gif_end - gif_data);
-
- /* Check if we've finished
- */
- if ((gif_bytes > 0) && (gif_data[0] == GIF_TRAILER)) return GIF_OK;
-
- /* Check if we have enough data
- * The shortest block of data is a 4-byte comment extension + 1-byte block terminator + 1-byte gif trailer
- */
- if (gif_bytes < 6) return GIF_INSUFFICIENT_DATA;
-
- /* We could theoretically get some junk data that gives us millions of frames, so
- we ensure that we don't have a silly number
- */
- if (frame > 4096) return GIF_FRAME_DATA_ERROR;
-
- /* Get some memory to store our pointers in etc.
- */
- if ((int)gif->frame_holders <= frame) {
- /* Allocate more memory
- */
- if ((temp_buf = (gif_frame *)realloc(gif->frames,
- (frame + 1) * sizeof(gif_frame))) == NULL)
- return GIF_INSUFFICIENT_MEMORY;
- gif->frames = temp_buf;
- gif->frame_holders = frame + 1;
- }
-
- /* Store our frame pointer. We would do it when allocating except we
- start off with one frame allocated so we can always use realloc.
- */
- gif->frames[frame].frame_pointer = gif->buffer_position;
- gif->frames[frame].display = false;
- gif->frames[frame].virgin = true;
- gif->frames[frame].disposal_method = 0;
- gif->frames[frame].transparency = false;
- gif->frames[frame].frame_delay = 100;
- gif->frames[frame].redraw_required = false;
-
- /* Invalidate any previous decoding we have of this frame
- */
- if (gif->decoded_frame == frame)
- gif->decoded_frame = GIF_INVALID_FRAME;
-
- /* We pretend to initialise the frames, but really we just skip over all
- the data contained within. This is all basically a cut down version of
- gif_decode_frame that doesn't have any of the LZW bits in it.
- */
-
- /* Initialise any extensions
- */
- gif->buffer_position = gif_data - gif->gif_data;
- if ((return_value = gif_initialise_frame_extensions(gif, frame)) != GIF_OK)
- return return_value;
- gif_data = (gif->gif_data + gif->buffer_position);
- gif_bytes = (gif_end - gif_data);
-
- /* Check if we've finished
- */
- if ((gif_bytes = (gif_end - gif_data)) < 1)
- return GIF_INSUFFICIENT_FRAME_DATA;
- else if (gif_data[0] == GIF_TRAILER) {
- gif->buffer_position = (gif_data - gif->gif_data);
- gif->frame_count = frame + 1;
- return GIF_OK;
- }
-
- /* If we're not done, there should be an image descriptor
- */
- if (gif_data[0] != GIF_IMAGE_SEPARATOR) return GIF_FRAME_DATA_ERROR;
-
- /* Do some simple boundary checking
- */
- if (gif_bytes < 10) return GIF_INSUFFICIENT_FRAME_DATA;
- offset_x = gif_data[1] | (gif_data[2] << 8);
- offset_y = gif_data[3] | (gif_data[4] << 8);
- width = gif_data[5] | (gif_data[6] << 8);
- height = gif_data[7] | (gif_data[8] << 8);
-
- /* Set up the redraw characteristics. We have to check for extending the area
- due to multi-image frames.
- */
- if (!first_image) {
- if (gif->frames[frame].redraw_x > offset_x) {
- gif->frames[frame].redraw_width += (gif->frames[frame].redraw_x - offset_x);
- gif->frames[frame].redraw_x = offset_x;
- }
- if (gif->frames[frame].redraw_y > offset_y) {
- gif->frames[frame].redraw_height += (gif->frames[frame].redraw_y - offset_y);
- gif->frames[frame].redraw_y = offset_y;
- }
- if ((offset_x + width) > (gif->frames[frame].redraw_x + gif->frames[frame].redraw_width))
- gif->frames[frame].redraw_width = (offset_x + width) - gif->frames[frame].redraw_x;
- if ((offset_y + height) > (gif->frames[frame].redraw_y + gif->frames[frame].redraw_height))
- gif->frames[frame].redraw_height = (offset_y + height) - gif->frames[frame].redraw_y;
- } else {
- first_image = false;
- gif->frames[frame].redraw_x = offset_x;
- gif->frames[frame].redraw_y = offset_y;
- gif->frames[frame].redraw_width = width;
- gif->frames[frame].redraw_height = height;
- }
-
- /* if we are clearing the background then we need to redraw enough to cover the previous
- frame too
- */
- gif->frames[frame].redraw_required = ((gif->frames[frame].disposal_method == GIF_FRAME_CLEAR) ||
- (gif->frames[frame].disposal_method == GIF_FRAME_RESTORE));
-
- /* Boundary checking - shouldn't ever happen except with junk data
- */
- if (gif_initialise_sprite(gif, (offset_x + width), (offset_y + height)))
- return GIF_INSUFFICIENT_MEMORY;
-
- /* Decode the flags
- */
- flags = gif_data[9];
- colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
-
- /* Move our data onwards and remember we've got a bit of this frame
- */
- gif_data += 10;
- gif_bytes = (gif_end - gif_data);
- gif->frame_count_partial = frame + 1;
-
- /* Skip the local colour table
- */
- if (flags & GIF_COLOUR_TABLE_MASK) {
- gif_data += 3 * colour_table_size;
- if ((gif_bytes = (gif_end - gif_data)) < 0)
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
-
- /* Ensure we have a correct code size
- */
- if (gif_bytes < 1)
- return GIF_INSUFFICIENT_FRAME_DATA;
- if (gif_data[0] > GIF_MAX_LZW)
- return GIF_DATA_ERROR;
-
- /* Move our pointer to the actual image data
- */
- gif_data++;
- --gif_bytes;
-
- /* Repeatedly skip blocks until we get a zero block or run out of data
- * These blocks of image data are processed later by gif_decode_frame()
- */
- block_size = 0;
- while (block_size != 1) {
- if (gif_bytes < 1) return GIF_INSUFFICIENT_FRAME_DATA;
- block_size = gif_data[0] + 1;
- /* Check if the frame data runs off the end of the file
- */
- if ((int)(gif_bytes - block_size) < 0) {
- /* Try to recover by signaling the end of the gif.
- * Once we get garbage data, there is no logical
- * way to determine where the next frame is.
- * It's probably better to partially load the gif
- * than not at all.
- */
- if (gif_bytes >= 2) {
- gif_data[0] = 0;
- gif_data[1] = GIF_TRAILER;
- gif_bytes = 1;
- ++gif_data;
- break;
- } else
- return GIF_INSUFFICIENT_FRAME_DATA;
- } else {
- gif_bytes -= block_size;
- gif_data += block_size;
- }
- }
-
- /* Add the frame and set the display flag
- */
- gif->buffer_position = gif_data - gif->gif_data;
- gif->frame_count = frame + 1;
- gif->frames[frame].display = true;
-
- /* Check if we've finished
- */
- if (gif_bytes < 1)
- return GIF_INSUFFICIENT_FRAME_DATA;
- else
- if (gif_data[0] == GIF_TRAILER) return GIF_OK;
- return GIF_WORKING;
+static unsigned int gif_interlaced_line(int height, int y) {
+ if ((y << 3) < height) {
+ return (y << 3);
+ }
+ y -= ((height + 7) >> 3);
+ if ((y << 3) < (height - 4)) {
+ return (y << 3) + 4;
+ }
+ y -= ((height + 3) >> 3);
+ if ((y << 2) < (height - 2)) {
+ return (y << 2) + 2;
+ }
+ y -= ((height + 1) >> 2);
+ return (y << 1) + 1;
}
-/** Attempts to initialise the frame's extensions
- @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
- GIF_OK for successful initialisation
-*/
-static gif_result gif_initialise_frame_extensions(gif_animation *gif, const int frame) {
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int block_size;
-
- /* Get our buffer position etc.
- */
- gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
- gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
-
- /* Initialise the extensions
- */
- while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
- ++gif_data;
- if ((gif_bytes = (gif_end - gif_data)) < 1)
- return GIF_INSUFFICIENT_FRAME_DATA;
-
- /* Switch on extension label
- */
- switch(gif_data[0]) {
- /* 6-byte Graphic Control Extension is:
- *
- * +0 CHAR Graphic Control Label
- * +1 CHAR Block Size
- * +2 CHAR __Packed Fields__
- * 3BITS Reserved
- * 3BITS Disposal Method
- * 1BIT User Input Flag
- * 1BIT Transparent Color Flag
- * +3 SHORT Delay Time
- * +5 CHAR Transparent Color Index
- */
- case GIF_EXTENSION_GRAPHIC_CONTROL:
- if (gif_bytes < 6) return GIF_INSUFFICIENT_FRAME_DATA;
- gif->frames[frame].frame_delay = gif_data[3] | (gif_data[4] << 8);
- if (gif_data[2] & GIF_TRANSPARENCY_MASK) {
- gif->frames[frame].transparency = true;
- gif->frames[frame].transparency_index = gif_data[5];
- }
- gif->frames[frame].disposal_method = ((gif_data[2] & GIF_DISPOSAL_MASK) >> 2);
- /* I have encountered documentation and GIFs in the wild that use
- * 0x04 to restore the previous frame, rather than the officially
- * documented 0x03. I believe some (older?) software may even actually
- * export this way. We handle this as a type of "quirks" mode.
- */
- if (gif->frames[frame].disposal_method == GIF_FRAME_QUIRKS_RESTORE)
- gif->frames[frame].disposal_method = GIF_FRAME_RESTORE;
- gif_data += (2 + gif_data[1]);
- break;
-
- /* 14-byte+ Application Extension is:
- *
- * +0 CHAR Application Extension Label
- * +1 CHAR Block Size
- * +2 8CHARS Application Identifier
- * +10 3CHARS Appl. Authentication Code
- * +13 1-256 Application Data (Data sub-blocks)
- */
- case GIF_EXTENSION_APPLICATION:
- if (gif_bytes < 17) return GIF_INSUFFICIENT_FRAME_DATA;
- if ((gif_data[1] == 0x0b) &&
- (strncmp((const char *) gif_data + 2,
- "NETSCAPE2.0", 11) == 0) &&
- (gif_data[13] == 0x03) &&
- (gif_data[14] == 0x01)) {
- gif->loop_count = gif_data[15] | (gif_data[16] << 8);
- }
- gif_data += (2 + gif_data[1]);
- break;
-
- /* Move the pointer to the first data sub-block
- * Skip 1 byte for the extension label
- */
- case GIF_EXTENSION_COMMENT:
- ++gif_data;
- break;
-
- /* Move the pointer to the first data sub-block
- * Skip 2 bytes for the extension label and size fields
- * Skip the extension size itself
- */
- default:
- if (gif_bytes < 2) return GIF_INSUFFICIENT_FRAME_DATA;
- gif_data += (2 + gif_data[1]);
- }
-
- /* Repeatedly skip blocks until we get a zero block or run out of data
- * This data is ignored by this gif decoder
- */
- gif_bytes = (gif_end - gif_data);
- block_size = 0;
- while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
- block_size = gif_data[0] + 1;
- if ((gif_bytes -= block_size) < 0)
- return GIF_INSUFFICIENT_FRAME_DATA;
- gif_data += block_size;
- }
- ++gif_data;
- }
-
- /* Set buffer position and return
- */
- gif->buffer_position = (gif_data - gif->gif_data);
- return GIF_OK;
+/**
+ * Initialise LZW decoding
+ */
+void gif_init_LZW(gif_animation *gif)
+{
+ int i;
+
+ gif->current_error = 0;
+ if (clear_code >= (1 << GIF_MAX_LZW)) {
+ stack_pointer = stack;
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return;
+ }
+
+ /* initialise our table */
+ memset(table, 0x00, (1 << GIF_MAX_LZW) * 8);
+ for (i = 0; i < clear_code; ++i) {
+ table[1][i] = i;
+ }
+
+ /* update our LZW parameters */
+ code_size = set_code_size + 1;
+ max_code_size = clear_code << 1;
+ max_code = clear_code + 2;
+ stack_pointer = stack;
+ do {
+ firstcode = oldcode = gif_next_code(gif, code_size);
+ } while (firstcode == clear_code);
+ *stack_pointer++ =firstcode;
}
-/** Decodes a GIF frame.
+static bool gif_next_LZW(gif_animation *gif)
+{
+ int code, incode;
+ int block_size;
+ int new_code;
+
+ code = gif_next_code(gif, code_size);
+ if (code < 0) {
+ gif->current_error = code;
+ return false;
+ } else if (code == clear_code) {
+ gif_init_LZW(gif);
+ return true;
+ } else if (code == end_code) {
+ /* skip to the end of our data so multi-image GIFs work */
+ if (zero_data_block) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ block_size = 0;
+ while (block_size != 1 &&
+ gif->buffer_position < gif->buffer_size) {
+ block_size = gif->gif_data[gif->buffer_position] + 1;
+ gif->buffer_position += block_size;
+ }
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+
+ incode = code;
+ if (code >= max_code) {
+ if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *stack_pointer++ = firstcode;
+ code = oldcode;
+ }
+
+ /* The following loop is the most important in the GIF decoding cycle
+ * as every single pixel passes through it.
+ *
+ * Note: our stack is always big enough to hold a complete decompressed
+ * chunk.
+ */
+ while (code >= clear_code) {
+ if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
+ code >= (1 << GIF_MAX_LZW)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *stack_pointer++ = table[1][code];
+ new_code = table[0][code];
+ if (new_code < clear_code) {
+ code = new_code;
+ break;
+ }
+
+ if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
+ new_code >= (1 << GIF_MAX_LZW)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *stack_pointer++ = table[1][new_code];
+ code = table[0][new_code];
+ if (code == new_code) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ }
+
+ if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *stack_pointer++ = firstcode = table[1][code];
+
+ if ((code = max_code) < (1 << GIF_MAX_LZW)) {
+ table[0][code] = oldcode;
+ table[1][code] = firstcode;
+ ++max_code;
+ if ((max_code >= max_code_size) &&
+ (max_code_size < (1 << GIF_MAX_LZW))) {
+ max_code_size = max_code_size << 1;
+ ++code_size;
+ }
+ }
+ oldcode = incode;
+ return true;
+}
- @return GIF_FRAME_DATA_ERROR for GIF frame data error
- GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
- GIF_DATA_ERROR for GIF error (invalid frame header)
- GIF_INSUFFICIENT_DATA for insufficient data to do anything
- GIF_INSUFFICIENT_MEMORY for insufficient memory to process
- GIF_OK for successful decoding
- If a frame does not contain any image data, GIF_OK is returned and
- gif->current_error is set to GIF_FRAME_NO_DISPLAY
-*/
-gif_result gif_decode_frame(gif_animation *gif, unsigned int frame) {
- unsigned int index = 0;
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int width, height, offset_x, offset_y;
- unsigned int flags, colour_table_size, interlace;
- unsigned int *colour_table;
- unsigned int *frame_data = 0; // Set to 0 for no warnings
- unsigned int *frame_scanline;
- unsigned int save_buffer_position;
- unsigned int return_value = 0;
- unsigned int x, y, decode_y, burst_bytes;
- int last_undisposed_frame = (frame - 1);
- register unsigned char colour;
-
- /* Ensure this frame is supposed to be decoded
- */
- if (gif->frames[frame].display == false) {
- gif->current_error = GIF_FRAME_NO_DISPLAY;
- return GIF_OK;
- }
-
- /* Ensure we have a frame to decode
- */
- if (frame > gif->frame_count_partial)
- return GIF_INSUFFICIENT_DATA;
- if ((!clear_image) && ((int)frame == gif->decoded_frame))
- return GIF_OK;
-
- /* Get the start of our frame data and the end of the GIF data
- */
- gif_data = gif->gif_data + gif->frames[frame].frame_pointer;
- gif_end = gif->gif_data + gif->buffer_size;
- gif_bytes = (gif_end - gif_data);
-
- /* Check if we have enough data
- * The shortest block of data is a 10-byte image descriptor + 1-byte gif trailer
- */
- if (gif_bytes < 12) return GIF_INSUFFICIENT_FRAME_DATA;
-
- /* Save the buffer position
- */
- save_buffer_position = gif->buffer_position;
- gif->buffer_position = gif_data - gif->gif_data;
-
- /* Skip any extensions because we all ready processed them
- */
- if ((return_value = gif_skip_frame_extensions(gif)) != GIF_OK)
- goto gif_decode_frame_exit;
- gif_data = (gif->gif_data + gif->buffer_position);
- gif_bytes = (gif_end - gif_data);
-
- /* Ensure we have enough data for the 10-byte image descriptor + 1-byte gif trailer
- */
- if (gif_bytes < 12) {
- return_value = GIF_INSUFFICIENT_FRAME_DATA;
- goto gif_decode_frame_exit;
- }
-
- /* 10-byte Image Descriptor is:
- *
- * +0 CHAR Image Separator (0x2c)
- * +1 SHORT Image Left Position
- * +3 SHORT Image Top Position
- * +5 SHORT Width
- * +7 SHORT Height
- * +9 CHAR __Packed Fields__
- * 1BIT Local Colour Table Flag
- * 1BIT Interlace Flag
- * 1BIT Sort Flag
- * 2BITS Reserved
- * 3BITS Size of Local Colour Table
- */
- if (gif_data[0] != GIF_IMAGE_SEPARATOR) {
- return_value = GIF_DATA_ERROR;
- goto gif_decode_frame_exit;
- }
- offset_x = gif_data[1] | (gif_data[2] << 8);
- offset_y = gif_data[3] | (gif_data[4] << 8);
- width = gif_data[5] | (gif_data[6] << 8);
- height = gif_data[7] | (gif_data[8] << 8);
-
- /* Boundary checking - shouldn't ever happen except unless the data has been
- modified since initialisation.
- */
- if ((offset_x + width > gif->width) || (offset_y + height > gif->height)) {
- return_value = GIF_DATA_ERROR;
- goto gif_decode_frame_exit;
- }
-
- /* Decode the flags
- */
- flags = gif_data[9];
- colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
- interlace = flags & GIF_INTERLACE_MASK;
-
- /* Move our pointer to the colour table or image data (if no colour table is given)
- */
- gif_data += 10;
- gif_bytes = (gif_end - gif_data);
-
- /* Set up the colour table
- */
- if (flags & GIF_COLOUR_TABLE_MASK) {
- if (gif_bytes < (int)(3 * colour_table_size)) {
- return_value = GIF_INSUFFICIENT_FRAME_DATA;
- goto gif_decode_frame_exit;
- }
- colour_table = gif->local_colour_table;
- if (!clear_image) {
- for (index = 0; index < colour_table_size; index++) {
- /* Gif colour map contents are r,g,b.
- *
- * We want to pack them bytewise into the
- * colour table, such that the red component
- * is in byte 0 and the alpha component is in
- * byte 3.
- */
- unsigned char *entry =
- (unsigned char *) &colour_table[index];
-
- entry[0] = gif_data[0]; /* r */
- entry[1] = gif_data[1]; /* g */
- entry[2] = gif_data[2]; /* b */
- entry[3] = 0xff; /* a */
-
- gif_data += 3;
- }
- } else {
- gif_data += 3 * colour_table_size;
- }
- gif_bytes = (gif_end - gif_data);
- } else {
- colour_table = gif->global_colour_table;
- }
-
- /* Check if we've finished
- */
- if (gif_bytes < 1) {
- return_value = GIF_INSUFFICIENT_FRAME_DATA;
- goto gif_decode_frame_exit;
- } else if (gif_data[0] == GIF_TRAILER) {
- return_value = GIF_OK;
- goto gif_decode_frame_exit;
- }
-
- /* Get the frame data
- */
- assert(gif->bitmap_callbacks.bitmap_get_buffer);
- frame_data = (void *)gif->bitmap_callbacks.bitmap_get_buffer(gif->frame_image);
- if (!frame_data)
- return GIF_INSUFFICIENT_MEMORY;
-
- /* If we are clearing the image we just clear, if not decode
- */
- if (!clear_image) {
- /* Ensure we have enough data for a 1-byte LZW code size + 1-byte gif trailer
- */
- if (gif_bytes < 2) {
- return_value = GIF_INSUFFICIENT_FRAME_DATA;
- goto gif_decode_frame_exit;
- /* If we only have a 1-byte LZW code size + 1-byte gif trailer, we're finished
- */
- } else if ((gif_bytes == 2) && (gif_data[1] == GIF_TRAILER)) {
- return_value = GIF_OK;
- goto gif_decode_frame_exit;
- }
-
- /* If the previous frame's disposal method requires we restore the background
- * colour or this is the first frame, clear the frame data
- */
- if ((frame == 0) || (gif->decoded_frame == GIF_INVALID_FRAME)) {
- memset((char*)frame_data, GIF_TRANSPARENT_COLOUR, gif->width * gif->height * sizeof(int));
- gif->decoded_frame = frame;
- /* The line below would fill the image with its background color, but because GIFs support
- * transparency we likely wouldn't want to do that. */
- /* memset((char*)frame_data, colour_table[gif->background_index], gif->width * gif->height * sizeof(int)); */
- } else if ((frame != 0) && (gif->frames[frame - 1].disposal_method == GIF_FRAME_CLEAR)) {
- clear_image = true;
- if ((return_value = gif_decode_frame(gif, (frame - 1))) != GIF_OK)
- goto gif_decode_frame_exit;
- clear_image = false;
- /* If the previous frame's disposal method requires we restore the previous
- * image, find the last image set to "do not dispose" and get that frame data
- */
- } else if ((frame != 0) && (gif->frames[frame - 1].disposal_method == GIF_FRAME_RESTORE)) {
- while ((last_undisposed_frame != -1) && (gif->frames[--last_undisposed_frame].disposal_method == GIF_FRAME_RESTORE))
- ;
-
- /* If we don't find one, clear the frame data
- */
- if (last_undisposed_frame == -1) {
- /* see notes above on transparency vs. background color */
- memset((char*)frame_data, GIF_TRANSPARENT_COLOUR, gif->width * gif->height * sizeof(int));
- } else {
- if ((return_value = gif_decode_frame(gif, last_undisposed_frame)) != GIF_OK)
- goto gif_decode_frame_exit;
- /* Get this frame's data
- */
- assert(gif->bitmap_callbacks.bitmap_get_buffer);
- frame_data = (void *)gif->bitmap_callbacks.bitmap_get_buffer(gif->frame_image);
- if (!frame_data)
- return GIF_INSUFFICIENT_MEMORY;
- }
- }
- gif->decoded_frame = frame;
-
- /* Initialise the LZW decoding
- */
- set_code_size = gif_data[0];
- gif->buffer_position = (gif_data - gif->gif_data) + 1;
-
- /* Set our code variables
- */
- code_size = set_code_size + 1;
- clear_code = (1 << set_code_size);
- end_code = clear_code + 1;
- max_code_size = clear_code << 1;
- max_code = clear_code + 2;
- curbit = lastbit = 0;
- last_byte = 2;
- get_done = false;
- direct = buf;
- gif_init_LZW(gif);
-
- /* Decompress the data
- */
- for (y = 0; y < height; y++) {
- if (interlace)
- decode_y = gif_interlaced_line(height, y) + offset_y;
- else
- decode_y = y + offset_y;
- frame_scanline = frame_data + offset_x + (decode_y * gif->width);
-
- /* Rather than decoding pixel by pixel, we try to burst out streams
- of data to remove the need for end-of data checks every pixel.
- */
- x = width;
- while (x > 0) {
- burst_bytes = (stack_pointer - stack);
- if (burst_bytes > 0) {
- if (burst_bytes > x)
- burst_bytes = x;
- x -= burst_bytes;
- while (burst_bytes-- > 0) {
- colour = *--stack_pointer;
- if (((gif->frames[frame].transparency) &&
- (colour != gif->frames[frame].transparency_index)) ||
- (!gif->frames[frame].transparency))
- *frame_scanline = colour_table[colour];
- frame_scanline++;
- }
- } else {
- if (!gif_next_LZW(gif)) {
- /* Unexpected end of frame, try to recover
- */
- if (gif->current_error == GIF_END_OF_FRAME)
- return_value = GIF_OK;
- else
- return_value = gif->current_error;
- goto gif_decode_frame_exit;
- }
- }
- }
- }
- } else {
- /* Clear our frame
- */
- if (gif->frames[frame].disposal_method == GIF_FRAME_CLEAR) {
- for (y = 0; y < height; y++) {
- frame_scanline = frame_data + offset_x + ((offset_y + y) * gif->width);
- if (gif->frames[frame].transparency)
- memset(frame_scanline, GIF_TRANSPARENT_COLOUR, width * 4);
- else
- memset(frame_scanline, colour_table[gif->background_index], width * 4);
- }
- }
- }
-gif_decode_frame_exit:
+static int gif_next_code(gif_animation *gif, int code_size)
+{
+ int i, j, end, count, ret;
+ unsigned char *b;
+
+ end = curbit + code_size;
+ if (end >= lastbit) {
+ if (get_done) {
+ return GIF_END_OF_FRAME;
+ }
+ buf[0] = direct[last_byte - 2];
+ buf[1] = direct[last_byte - 1];
+
+ /* get the next block */
+ direct = gif->gif_data + gif->buffer_position;
+ if (gif->buffer_position >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ zero_data_block = ((count = direct[0]) == 0);
+ if ((gif->buffer_position + count) >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if (count == 0) {
+ get_done = true;
+ } else {
+ if (gif->buffer_position + 3 >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ direct -= 1;
+ buf[2] = direct[2];
+ buf[3] = direct[3];
+ }
+ gif->buffer_position += count + 1;
+
+ /* update our variables */
+ last_byte = 2 + count;
+ curbit = (curbit - lastbit) + 16;
+ lastbit = (2 + count) << 3;
+ end = curbit + code_size;
+ }
+
+ i = curbit >> 3;
+ if (i < 2) {
+ b = buf;
+ } else {
+ b = direct;
+ }
+
+ ret = b[i];
+ j = (end >> 3) - 1;
+ if (i <= j) {
+ ret |= (b[i + 1] << 8);
+ if (i < j) {
+ ret |= (b[i + 2] << 16);
+ }
+ }
+ ret = (ret >> (curbit % 8)) & maskTbl[code_size];
+ curbit += code_size;
+ return ret;
+}
- /* Check if we should test for optimisation
- */
- if (gif->frames[frame].virgin) {
- if (gif->bitmap_callbacks.bitmap_test_opaque)
- gif->frames[frame].opaque = gif->bitmap_callbacks.bitmap_test_opaque(gif->frame_image);
- else
- gif->frames[frame].opaque = false;
- gif->frames[frame].virgin = false;
- }
- if (gif->bitmap_callbacks.bitmap_set_opaque)
- gif->bitmap_callbacks.bitmap_set_opaque(gif->frame_image, gif->frames[frame].opaque);
- if (gif->bitmap_callbacks.bitmap_modified)
- gif->bitmap_callbacks.bitmap_modified(gif->frame_image);
-
- /* Restore the buffer position
- */
- gif->buffer_position = save_buffer_position;
-
- /* Success!
- */
- return return_value;
+/* exported function documented in libnsgif.h */
+void gif_create(gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks)
+{
+ memset(gif, 0, sizeof(gif_animation));
+ gif->bitmap_callbacks = *bitmap_callbacks;
+ gif->decoded_frame = GIF_INVALID_FRAME;
}
-/** Skips the frame's extensions (which have been previously initialised)
- @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
- GIF_OK for successful decoding
-*/
-static gif_result gif_skip_frame_extensions(gif_animation *gif) {
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int block_size;
-
- /* Get our buffer position etc.
- */
- gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
- gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
- gif_bytes = (gif_end - gif_data);
-
- /* Skip the extensions
- */
- while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
- ++gif_data;
- if (gif_data >= gif_end)
- return GIF_INSUFFICIENT_FRAME_DATA;
-
- /* Switch on extension label
- */
- switch(gif_data[0]) {
- /* Move the pointer to the first data sub-block
- * 1 byte for the extension label
- */
- case GIF_EXTENSION_COMMENT:
- ++gif_data;
- break;
-
- /* Move the pointer to the first data sub-block
- * 2 bytes for the extension label and size fields
- * Skip the extension size itself
- */
- default:
- if (gif_data + 1 >= gif_end)
- return GIF_INSUFFICIENT_FRAME_DATA;
- gif_data += (2 + gif_data[1]);
- }
-
- /* Repeatedly skip blocks until we get a zero block or run out of data
- * This data is ignored by this gif decoder
- */
- gif_bytes = (gif_end - gif_data);
- block_size = 0;
- while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
- block_size = gif_data[0] + 1;
- if ((gif_bytes -= block_size) < 0)
- return GIF_INSUFFICIENT_FRAME_DATA;
- gif_data += block_size;
- }
- ++gif_data;
- }
-
- /* Set buffer position and return
- */
- gif->buffer_position = (gif_data - gif->gif_data);
- return GIF_OK;
+/* exported function documented in libnsgif.h */
+gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
+{
+ unsigned char *gif_data;
+ unsigned int index;
+ gif_result return_value;
+
+ /* Initialize values */
+ gif->buffer_size = size;
+ gif->gif_data = data;
+
+ /* Check for sufficient data to be a GIF (6-byte header + 7-byte
+ * logical screen descriptor)
+ */
+ if (gif->buffer_size < 13) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+
+ /* Get our current processing position */
+ gif_data = gif->gif_data + gif->buffer_position;
+
+ /* See if we should initialise the GIF */
+ if (gif->buffer_position == 0) {
+ /* We want everything to be NULL before we start so we've no
+ * chance of freeing bad pointers (paranoia)
+ */
+ gif->frame_image = NULL;
+ gif->frames = NULL;
+ gif->local_colour_table = NULL;
+ gif->global_colour_table = NULL;
+
+ /* The caller may have been lazy and not reset any values */
+ gif->frame_count = 0;
+ gif->frame_count_partial = 0;
+ gif->decoded_frame = GIF_INVALID_FRAME;
+
+ /* 6-byte GIF file header is:
+ *
+ * +0 3CHARS Signature ('GIF')
+ * +3 3CHARS Version ('87a' or '89a')
+ */
+ if (strncmp((const char *) gif_data, "GIF", 3) != 0) {
+ return GIF_DATA_ERROR;
+ }
+ gif_data += 3;
+
+ /* Ensure GIF reports version 87a or 89a */
+ /*
+ if ((strncmp(gif_data, "87a", 3) != 0) &&
+ (strncmp(gif_data, "89a", 3) != 0))
+ LOG(("Unknown GIF format - proceeding anyway"));
+ */
+ gif_data += 3;
+
+ /* 7-byte Logical Screen Descriptor is:
+ *
+ * +0 SHORT Logical Screen Width
+ * +2 SHORT Logical Screen Height
+ * +4 CHAR __Packed Fields__
+ * 1BIT Global Colour Table Flag
+ * 3BITS Colour Resolution
+ * 1BIT Sort Flag
+ * 3BITS Size of Global Colour Table
+ * +5 CHAR Background Colour Index
+ * +6 CHAR Pixel Aspect Ratio
+ */
+ gif->width = gif_data[0] | (gif_data[1] << 8);
+ gif->height = gif_data[2] | (gif_data[3] << 8);
+ gif->global_colours = (gif_data[4] & GIF_COLOUR_TABLE_MASK);
+ gif->colour_table_size = (2 << (gif_data[4] & GIF_COLOUR_TABLE_SIZE_MASK));
+ gif->background_index = gif_data[5];
+ gif->aspect_ratio = gif_data[6];
+ gif->loop_count = 1;
+ gif_data += 7;
+
+ /* Some broken GIFs report the size as the screen size they
+ * were created in. As such, we detect for the common cases and
+ * set the sizes as 0 if they are found which results in the
+ * GIF being the maximum size of the frames.
+ */
+ if (((gif->width == 640) && (gif->height == 480)) ||
+ ((gif->width == 640) && (gif->height == 512)) ||
+ ((gif->width == 800) && (gif->height == 600)) ||
+ ((gif->width == 1024) && (gif->height == 768)) ||
+ ((gif->width == 1280) && (gif->height == 1024)) ||
+ ((gif->width == 1600) && (gif->height == 1200)) ||
+ ((gif->width == 0) || (gif->height == 0)) ||
+ ((gif->width > 2048) || (gif->height > 2048))) {
+ gif->width = 1;
+ gif->height = 1;
+ }
+
+ /* Allocate some data irrespective of whether we've got any
+ * colour tables. We always get the maximum size in case a GIF
+ * is lying to us. It's far better to give the wrong colours
+ * than to trample over some memory somewhere.
+ */
+ gif->global_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
+ gif->local_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
+ if ((gif->global_colour_table == NULL) ||
+ (gif->local_colour_table == NULL)) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* Set the first colour to a value that will never occur in
+ * reality so we know if we've processed it
+ */
+ gif->global_colour_table[0] = GIF_PROCESS_COLOURS;
+
+ /* Check if the GIF has no frame data (13-byte header + 1-byte
+ * termination block) Although generally useless, the GIF
+ * specification does not expressly prohibit this
+ */
+ if (gif->buffer_size == 14) {
+ if (gif_data[0] == GIF_TRAILER) {
+ return GIF_OK;
+ } else {
+ return GIF_INSUFFICIENT_DATA;
+ }
+ }
+
+ /* Initialise enough workspace for 4 frames initially */
+ if ((gif->frames = (gif_frame *)malloc(sizeof(gif_frame))) == NULL) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+ gif->frame_holders = 1;
+
+ /* Initialise the bitmap header */
+ assert(gif->bitmap_callbacks.bitmap_create);
+ gif->frame_image = gif->bitmap_callbacks.bitmap_create(gif->width, gif->height);
+ if (gif->frame_image == NULL) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* Remember we've done this now */
+ gif->buffer_position = gif_data - gif->gif_data;
+ }
+
+ /* Do the colour map if we haven't already. As the top byte is always
+ * 0xff or 0x00 depending on the transparency we know if it's been
+ * filled in.
+ */
+ if (gif->global_colour_table[0] == GIF_PROCESS_COLOURS) {
+ /* Check for a global colour map signified by bit 7 */
+ if (gif->global_colours) {
+ if (gif->buffer_size < (gif->colour_table_size * 3 + 12)) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+ for (index = 0; index < gif->colour_table_size; index++) {
+ /* Gif colour map contents are r,g,b.
+ *
+ * We want to pack them bytewise into the
+ * colour table, such that the red component
+ * is in byte 0 and the alpha component is in
+ * byte 3.
+ */
+ unsigned char *entry = (unsigned char *) &gif->
+ global_colour_table[index];
+
+ entry[0] = gif_data[0]; /* r */
+ entry[1] = gif_data[1]; /* g */
+ entry[2] = gif_data[2]; /* b */
+ entry[3] = 0xff; /* a */
+
+ gif_data += 3;
+ }
+ gif->buffer_position = (gif_data - gif->gif_data);
+ } else {
+ /* Create a default colour table with the first two
+ * colours as black and white
+ */
+ unsigned int *entry = gif->global_colour_table;
+
+ entry[0] = 0x00000000;
+ /* Force Alpha channel to opaque */
+ ((unsigned char *) entry)[3] = 0xff;
+
+ entry[1] = 0xffffffff;
+ }
+ }
+
+ /* Repeatedly try to initialise frames */
+ while ((return_value = gif_initialise_frame(gif)) == GIF_WORKING);
+
+ /* If there was a memory error tell the caller */
+ if ((return_value == GIF_INSUFFICIENT_MEMORY) ||
+ (return_value == GIF_DATA_ERROR)) {
+ return return_value;
+ }
+
+ /* If we didn't have some frames then a GIF_INSUFFICIENT_DATA becomes a
+ * GIF_INSUFFICIENT_FRAME_DATA
+ */
+ if ((return_value == GIF_INSUFFICIENT_DATA) &&
+ (gif->frame_count_partial > 0)) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Return how many we got */
+ return return_value;
}
-static unsigned int gif_interlaced_line(int height, int y) {
- if ((y << 3) < height) return (y << 3);
- y -= ((height + 7) >> 3);
- if ((y << 3) < (height - 4)) return (y << 3) + 4;
- y -= ((height + 3) >> 3);
- if ((y << 2) < (height - 2)) return (y << 2) + 2;
- y -= ((height + 1) >> 2);
- return (y << 1) + 1;
-}
-/* Releases any workspace held by the animation
-*/
-void gif_finalise(gif_animation *gif) {
- /* Release all our memory blocks
- */
- if (gif->frame_image) {
- assert(gif->bitmap_callbacks.bitmap_destroy);
- gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
- }
- gif->frame_image = NULL;
- free(gif->frames);
- gif->frames = NULL;
- free(gif->local_colour_table);
- gif->local_colour_table = NULL;
- free(gif->global_colour_table);
- gif->global_colour_table = NULL;
-}
+/* exported function documented in libnsgif.h */
+gif_result gif_decode_frame(gif_animation *gif, unsigned int frame)
+{
+ unsigned int index = 0;
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int width, height, offset_x, offset_y;
+ unsigned int flags, colour_table_size, interlace;
+ unsigned int *colour_table;
+ unsigned int *frame_data = 0; // Set to 0 for no warnings
+ unsigned int *frame_scanline;
+ unsigned int save_buffer_position;
+ unsigned int return_value = 0;
+ unsigned int x, y, decode_y, burst_bytes;
+ int last_undisposed_frame = (frame - 1);
+ register unsigned char colour;
+
+ /* Ensure this frame is supposed to be decoded */
+ if (gif->frames[frame].display == false) {
+ gif->current_error = GIF_FRAME_NO_DISPLAY;
+ return GIF_OK;
+ }
+
+ /* Ensure the frame is in range to decode */
+ if (frame > gif->frame_count_partial) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+
+ /* done if frame is already decoded */
+ if ((!clear_image) &&
+ ((int)frame == gif->decoded_frame)) {
+ return GIF_OK;
+ }
+
+ /* Get the start of our frame data and the end of the GIF data */
+ gif_data = gif->gif_data + gif->frames[frame].frame_pointer;
+ gif_end = gif->gif_data + gif->buffer_size;
+ gif_bytes = (gif_end - gif_data);
+
+ /*
+ * Ensure there is a minimal amount of data to proceed. The shortest
+ * block of data is a 10-byte image descriptor + 1-byte gif trailer
+ */
+ if (gif_bytes < 12) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Save the buffer position */
+ save_buffer_position = gif->buffer_position;
+ gif->buffer_position = gif_data - gif->gif_data;
+
+ /* Skip any extensions because they have allready been processed */
+ if ((return_value = gif_skip_frame_extensions(gif)) != GIF_OK) {
+ goto gif_decode_frame_exit;
+ }
+ gif_data = (gif->gif_data + gif->buffer_position);
+ gif_bytes = (gif_end - gif_data);
+
+ /* Ensure we have enough data for the 10-byte image descriptor + 1-byte
+ * gif trailer
+ */
+ if (gif_bytes < 12) {
+ return_value = GIF_INSUFFICIENT_FRAME_DATA;
+ goto gif_decode_frame_exit;
+ }
+
+ /* 10-byte Image Descriptor is:
+ *
+ * +0 CHAR Image Separator (0x2c)
+ * +1 SHORT Image Left Position
+ * +3 SHORT Image Top Position
+ * +5 SHORT Width
+ * +7 SHORT Height
+ * +9 CHAR __Packed Fields__
+ * 1BIT Local Colour Table Flag
+ * 1BIT Interlace Flag
+ * 1BIT Sort Flag
+ * 2BITS Reserved
+ * 3BITS Size of Local Colour Table
+ */
+ if (gif_data[0] != GIF_IMAGE_SEPARATOR) {
+ return_value = GIF_DATA_ERROR;
+ goto gif_decode_frame_exit;
+ }
+ offset_x = gif_data[1] | (gif_data[2] << 8);
+ offset_y = gif_data[3] | (gif_data[4] << 8);
+ width = gif_data[5] | (gif_data[6] << 8);
+ height = gif_data[7] | (gif_data[8] << 8);
+
+ /* Boundary checking - shouldn't ever happen except unless the data has
+ * been modified since initialisation.
+ */
+ if ((offset_x + width > gif->width) ||
+ (offset_y + height > gif->height)) {
+ return_value = GIF_DATA_ERROR;
+ goto gif_decode_frame_exit;
+ }
+
+ /* Decode the flags */
+ flags = gif_data[9];
+ colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
+ interlace = flags & GIF_INTERLACE_MASK;
+
+ /* Advance data pointer to next block either colour table or image
+ * data.
+ */
+ gif_data += 10;
+ gif_bytes = (gif_end - gif_data);
+
+ /* Set up the colour table */
+ if (flags & GIF_COLOUR_TABLE_MASK) {
+ if (gif_bytes < (int)(3 * colour_table_size)) {
+ return_value = GIF_INSUFFICIENT_FRAME_DATA;
+ goto gif_decode_frame_exit;
+ }
+ colour_table = gif->local_colour_table;
+ if (!clear_image) {
+ for (index = 0; index < colour_table_size; index++) {
+ /* Gif colour map contents are r,g,b.
+ *
+ * We want to pack them bytewise into the
+ * colour table, such that the red component
+ * is in byte 0 and the alpha component is in
+ * byte 3.
+ */
+ unsigned char *entry =
+ (unsigned char *) &colour_table[index];
+
+ entry[0] = gif_data[0]; /* r */
+ entry[1] = gif_data[1]; /* g */
+ entry[2] = gif_data[2]; /* b */
+ entry[3] = 0xff; /* a */
+
+ gif_data += 3;
+ }
+ } else {
+ gif_data += 3 * colour_table_size;
+ }
+ gif_bytes = (gif_end - gif_data);
+ } else {
+ colour_table = gif->global_colour_table;
+ }
+
+ /* Ensure sufficient data remains */
+ if (gif_bytes < 1) {
+ return_value = GIF_INSUFFICIENT_FRAME_DATA;
+ goto gif_decode_frame_exit;
+ }
+
+ /* check for an end marker */
+ if (gif_data[0] == GIF_TRAILER) {
+ return_value = GIF_OK;
+ goto gif_decode_frame_exit;
+ }
+
+ /* Get the frame data */
+ assert(gif->bitmap_callbacks.bitmap_get_buffer);
+ frame_data = (void *)gif->bitmap_callbacks.bitmap_get_buffer(gif->frame_image);
+ if (!frame_data) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* If we are clearing the image we just clear, if not decode */
+ if (!clear_image) {
+ /* Ensure we have enough data for a 1-byte LZW code size +
+ * 1-byte gif trailer
+ */
+ if (gif_bytes < 2) {
+ return_value = GIF_INSUFFICIENT_FRAME_DATA;
+ goto gif_decode_frame_exit;
+ }
+
+ /* If we only have a 1-byte LZW code size + 1-byte gif trailer,
+ * we're finished
+ */
+ if ((gif_bytes == 2) && (gif_data[1] == GIF_TRAILER)) {
+ return_value = GIF_OK;
+ goto gif_decode_frame_exit;
+ }
+
+ /* If the previous frame's disposal method requires we restore
+ * the background colour or this is the first frame, clear
+ * the frame data
+ */
+ if ((frame == 0) || (gif->decoded_frame == GIF_INVALID_FRAME)) {
+ memset((char*)frame_data,
+ GIF_TRANSPARENT_COLOUR,
+ gif->width * gif->height * sizeof(int));
+ gif->decoded_frame = frame;
+ /* The line below would fill the image with its
+ * background color, but because GIFs support
+ * transparency we likely wouldn't want to do that. */
+ /* memset((char*)frame_data, colour_table[gif->background_index], gif->width * gif->height * sizeof(int)); */
+ } else if ((frame != 0) &&
+ (gif->frames[frame - 1].disposal_method == GIF_FRAME_CLEAR)) {
+ clear_image = true;
+ if ((return_value = gif_decode_frame(gif, (frame - 1))) != GIF_OK) {
+ goto gif_decode_frame_exit;
+ }
+ clear_image = false;
+ /*
+ * If the previous frame's disposal method requires we
+ * restore the previous image, find the last image set
+ * to "do not dispose" and get that frame data
+ */
+ } else if ((frame != 0) &&
+ (gif->frames[frame - 1].disposal_method == GIF_FRAME_RESTORE)) {
+ while ((last_undisposed_frame != -1) &&
+ (gif->frames[--last_undisposed_frame].disposal_method == GIF_FRAME_RESTORE));
+
+ /* If we don't find one, clear the frame data */
+ if (last_undisposed_frame == -1) {
+ /* see notes above on transparency
+ * vs. background color */
+ memset((char*)frame_data,
+ GIF_TRANSPARENT_COLOUR,
+ gif->width * gif->height * sizeof(int));
+ } else {
+ if ((return_value = gif_decode_frame(gif, last_undisposed_frame)) != GIF_OK) {
+ goto gif_decode_frame_exit;
+ }
+ /* Get this frame's data */
+ assert(gif->bitmap_callbacks.bitmap_get_buffer);
+ frame_data = (void *)gif->bitmap_callbacks.bitmap_get_buffer(gif->frame_image);
+ if (!frame_data) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+ }
+ }
+ gif->decoded_frame = frame;
+
+ /* Initialise the LZW decoding */
+ set_code_size = gif_data[0];
+ gif->buffer_position = (gif_data - gif->gif_data) + 1;
+
+ /* Set our code variables */
+ code_size = set_code_size + 1;
+ clear_code = (1 << set_code_size);
+ end_code = clear_code + 1;
+ max_code_size = clear_code << 1;
+ max_code = clear_code + 2;
+ curbit = lastbit = 0;
+ last_byte = 2;
+ get_done = false;
+ direct = buf;
+ gif_init_LZW(gif);
+
+ /* Decompress the data */
+ for (y = 0; y < height; y++) {
+ if (interlace) {
+ decode_y = gif_interlaced_line(height, y) + offset_y;
+ } else {
+ decode_y = y + offset_y;
+ }
+ frame_scanline = frame_data + offset_x + (decode_y * gif->width);
+
+ /* Rather than decoding pixel by pixel, we try to burst
+ * out streams of data to remove the need for end-of
+ * data checks every pixel.
+ */
+ x = width;
+ while (x > 0) {
+ burst_bytes = (stack_pointer - stack);
+ if (burst_bytes > 0) {
+ if (burst_bytes > x) {
+ burst_bytes = x;
+ }
+ x -= burst_bytes;
+ while (burst_bytes-- > 0) {
+ colour = *--stack_pointer;
+ if (((gif->frames[frame].transparency) &&
+ (colour != gif->frames[frame].transparency_index)) ||
+ (!gif->frames[frame].transparency)) {
+ *frame_scanline = colour_table[colour];
+ }
+ frame_scanline++;
+ }
+ } else {
+ if (!gif_next_LZW(gif)) {
+ /* Unexpected end of frame, try to recover */
+ if (gif->current_error == GIF_END_OF_FRAME) {
+ return_value = GIF_OK;
+ } else {
+ return_value = gif->current_error;
+ }
+ goto gif_decode_frame_exit;
+ }
+ }
+ }
+ }
+ } else {
+ /* Clear our frame */
+ if (gif->frames[frame].disposal_method == GIF_FRAME_CLEAR) {
+ for (y = 0; y < height; y++) {
+ frame_scanline = frame_data + offset_x + ((offset_y + y) * gif->width);
+ if (gif->frames[frame].transparency) {
+ memset(frame_scanline,
+ GIF_TRANSPARENT_COLOUR,
+ width * 4);
+ } else {
+ memset(frame_scanline,
+ colour_table[gif->background_index],
+ width * 4);
+ }
+ }
+ }
+ }
+gif_decode_frame_exit:
-/**
- * Initialise LZW decoding
- */
-void gif_init_LZW(gif_animation *gif) {
- int i;
-
- gif->current_error = 0;
- if (clear_code >= (1 << GIF_MAX_LZW)) {
- stack_pointer = stack;
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return;
- }
-
- /* initialise our table */
- memset(table, 0x00, (1 << GIF_MAX_LZW) * 8);
- for (i = 0; i < clear_code; ++i)
- table[1][i] = i;
-
- /* update our LZW parameters */
- code_size = set_code_size + 1;
- max_code_size = clear_code << 1;
- max_code = clear_code + 2;
- stack_pointer = stack;
- do {
- firstcode = oldcode = gif_next_code(gif, code_size);
- } while (firstcode == clear_code);
- *stack_pointer++ =firstcode;
-}
+ /* Check if we should test for optimisation */
+ if (gif->frames[frame].virgin) {
+ if (gif->bitmap_callbacks.bitmap_test_opaque) {
+ gif->frames[frame].opaque = gif->bitmap_callbacks.bitmap_test_opaque(gif->frame_image);
+ } else {
+ gif->frames[frame].opaque = false;
+ }
+ gif->frames[frame].virgin = false;
+ }
+
+ if (gif->bitmap_callbacks.bitmap_set_opaque) {
+ gif->bitmap_callbacks.bitmap_set_opaque(gif->frame_image, gif->frames[frame].opaque);
+ }
+ if (gif->bitmap_callbacks.bitmap_modified) {
+ gif->bitmap_callbacks.bitmap_modified(gif->frame_image);
+ }
-static bool gif_next_LZW(gif_animation *gif) {
- int code, incode;
- int block_size;
- int new_code;
-
- code = gif_next_code(gif, code_size);
- if (code < 0) {
- gif->current_error = code;
- return false;
- } else if (code == clear_code) {
- gif_init_LZW(gif);
- return true;
- } else if (code == end_code) {
- /* skip to the end of our data so multi-image GIFs work */
- if (zero_data_block) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- block_size = 0;
- while (block_size != 1 &&
- gif->buffer_position < gif->buffer_size) {
- block_size = gif->gif_data[gif->buffer_position] + 1;
- gif->buffer_position += block_size;
- }
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
-
- incode = code;
- if (code >= max_code) {
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = firstcode;
- code = oldcode;
- }
-
- /* The following loop is the most important in the GIF decoding cycle as every
- * single pixel passes through it.
- *
- * Note: our stack is always big enough to hold a complete decompressed chunk. */
- while (code >= clear_code) {
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
- code >= (1 << GIF_MAX_LZW)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = table[1][code];
- new_code = table[0][code];
- if (new_code < clear_code) {
- code = new_code;
- break;
- }
-
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
- new_code >= (1 << GIF_MAX_LZW)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = table[1][new_code];
- code = table[0][new_code];
- if (code == new_code) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- }
-
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = firstcode = table[1][code];
-
- if ((code = max_code) < (1 << GIF_MAX_LZW)) {
- table[0][code] = oldcode;
- table[1][code] = firstcode;
- ++max_code;
- if ((max_code >= max_code_size) && (max_code_size < (1 << GIF_MAX_LZW))) {
- max_code_size = max_code_size << 1;
- ++code_size;
- }
- }
- oldcode = incode;
- return true;
+ /* Restore the buffer position */
+ gif->buffer_position = save_buffer_position;
+
+ return return_value;
}
-static int gif_next_code(gif_animation *gif, int code_size) {
- int i, j, end, count, ret;
- unsigned char *b;
-
- end = curbit + code_size;
- if (end >= lastbit) {
- if (get_done)
- return GIF_END_OF_FRAME;
- buf[0] = direct[last_byte - 2];
- buf[1] = direct[last_byte - 1];
-
- /* get the next block */
- direct = gif->gif_data + gif->buffer_position;
- if (gif->buffer_position >= gif->buffer_size)
- return GIF_INSUFFICIENT_FRAME_DATA;
- zero_data_block = ((count = direct[0]) == 0);
- if ((gif->buffer_position + count) >= gif->buffer_size)
- return GIF_INSUFFICIENT_FRAME_DATA;
- if (count == 0)
- get_done = true;
- else {
- if (gif->buffer_position + 3 >= gif->buffer_size)
- return GIF_INSUFFICIENT_FRAME_DATA;
- direct -= 1;
- buf[2] = direct[2];
- buf[3] = direct[3];
- }
- gif->buffer_position += count + 1;
-
- /* update our variables */
- last_byte = 2 + count;
- curbit = (curbit - lastbit) + 16;
- lastbit = (2 + count) << 3;
- end = curbit + code_size;
- }
-
- i = curbit >> 3;
- if (i < 2)
- b = buf;
- else
- b = direct;
-
- ret = b[i];
- j = (end >> 3) - 1;
- if (i <= j) {
- ret |= (b[i + 1] << 8);
- if (i < j)
- ret |= (b[i + 2] << 16);
- }
- ret = (ret >> (curbit % 8)) & maskTbl[code_size];
- curbit += code_size;
- return ret;
+
+/* exported function documented in libnsgif.h */
+void gif_finalise(gif_animation *gif)
+{
+ /* Release all our memory blocks */
+ if (gif->frame_image) {
+ assert(gif->bitmap_callbacks.bitmap_destroy);
+ gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
+ }
+
+ gif->frame_image = NULL;
+ free(gif->frames);
+ gif->frames = NULL;
+ free(gif->local_colour_table);
+ gif->local_colour_table = NULL;
+ free(gif->global_colour_table);
+ gif->global_colour_table = NULL;
}
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 +-
README | 36 +
docs/Doxyfile | 1792 ++++++++++++++++++++++++++++++++++++++
include/libnsgif.h | 207 +++--
src/libnsgif.c | 2466 ++++++++++++++++++++++++++--------------------------
5 files changed, 3225 insertions(+), 1280 deletions(-)
create mode 100644 README
create mode 100644 docs/Doxyfile
diff --git a/.gitignore b/.gitignore
index 179b224..0f7e72c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+Makefile.config.override
build-*
-
+docs/html
+*~
diff --git a/README b/README
new file mode 100644
index 0000000..498ee46
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+libnsgif - Decoding GIF files
+=============================
+
+The functions provided by this library allow for efficient progressive
+GIF decoding. Whilst the initialisation does not ensure that there is
+sufficient image data to complete the entire frame, it does ensure
+that the information provided is valid. Any subsequent attempts to
+decode an initialised GIF are guaranteed to succeed, and any bytes of
+the image not present are assumed to be totally transparent.
+
+To begin decoding a GIF, the 'gif' structure must be initialised with
+the 'gif_data' and 'buffer_size' set to their initial values. The
+'buffer_position' should initially be 0, and will be internally
+updated as the decoding commences. The caller should then repeatedly
+call gif_initialise() with the structure until the function returns 1,
+or no more data is avaliable.
+
+Once the initialisation has begun, the decoder completes the variables
+'frame_count' and 'frame_count_partial'. The former being the total
+number of frames that have been successfully initialised, and the
+latter being the number of frames that a partial amount of data is
+available for. This assists the caller in managing the animation
+whilst decoding is continuing.
+
+To decode a frame, the caller must use gif_decode_frame() which
+updates the current 'frame_image' to reflect the desired frame. The
+required 'disposal_method' is also updated to reflect how the frame
+should be plotted. The caller must not assume that the current
+'frame_image' will be valid between calls if initialisation is still
+occuring, and should either always request that the frame is decoded
+(no processing will occur if the 'decoded_frame' has not been
+invalidated by initialisation) or perform the check itself.
+
+It should be noted that gif_finalise() should always be called, even
+if no frames were initialised. Additionally, it is the responsibility
+of the caller to free 'gif_data'.
diff --git a/docs/Doxyfile b/docs/Doxyfile
new file mode 100644
index 0000000..fbbf523
--- /dev/null
+++ b/docs/Doxyfile
@@ -0,0 +1,1792 @@
+# Doxyfile 1.8.1.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME = "libnsgif"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+5A# if some version control system is used.
+
+PROJECT_NUMBER =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = docs/
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path.
+
+CITE_BIB_FILES =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT =
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# style sheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load style sheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
diff --git a/include/libnsgif.h b/include/libnsgif.h
index 462c354..33b4b19 100644
--- a/include/libnsgif.h
+++ b/include/libnsgif.h
@@ -7,8 +7,9 @@
* http://www.opensource.org/licenses/mit-license.php
*/
-/** \file
- * Progressive animated GIF file decoding (interface).
+/**
+ * \file
+ * Interface to progressive animated GIF file decoding.
*/
#ifndef _LIBNSGIF_H_
@@ -17,42 +18,53 @@
#include <stdbool.h>
#include <inttypes.h>
-/* Error return values
-*/
+/* Error return values */
typedef enum {
- GIF_WORKING = 1,
- GIF_OK = 0,
- GIF_INSUFFICIENT_FRAME_DATA = -1,
- GIF_FRAME_DATA_ERROR = -2,
- GIF_INSUFFICIENT_DATA = -3,
- GIF_DATA_ERROR = -4,
- GIF_INSUFFICIENT_MEMORY = -5,
- GIF_FRAME_NO_DISPLAY = -6,
- GIF_END_OF_FRAME = -7
+ GIF_WORKING = 1,
+ GIF_OK = 0,
+ GIF_INSUFFICIENT_FRAME_DATA = -1,
+ GIF_FRAME_DATA_ERROR = -2,
+ GIF_INSUFFICIENT_DATA = -3,
+ GIF_DATA_ERROR = -4,
+ GIF_INSUFFICIENT_MEMORY = -5,
+ GIF_FRAME_NO_DISPLAY = -6,
+ GIF_END_OF_FRAME = -7
} gif_result;
-/* The GIF frame data
-*/
+/** GIF frame data */
typedef struct gif_frame {
- bool display; /**< whether the frame should be displayed/animated */
- unsigned int frame_delay; /**< delay (in cs) before animating the frame */
- /** Internal members are listed below
- */
- unsigned int frame_pointer; /**< offset (in bytes) to the GIF frame data */
- bool virgin; /**< whether the frame has previously been used */
- bool opaque; /**< whether the frame is totally opaque */
- bool redraw_required; /**< whether a forcable screen redraw is required */
- unsigned char disposal_method; /**< how the previous frame should be disposed; affects plotting */
- bool transparency; /**< whether we acknoledge transparency */
- unsigned char transparency_index; /**< the index designating a transparent pixel */
- unsigned int redraw_x; /**< x co-ordinate of redraw rectangle */
- unsigned int redraw_y; /**< y co-ordinate of redraw rectangle */
- unsigned int redraw_width; /**< width of redraw rectangle */
- unsigned int redraw_height; /**< height of redraw rectangle */
+ /** whether the frame should be displayed/animated */
+ bool display;
+ /** delay (in cs) before animating the frame */
+ unsigned int frame_delay;
+
+ /* Internal members are listed below */
+
+ /** offset (in bytes) to the GIF frame data */
+ unsigned int frame_pointer;
+ /** whether the frame has previously been used */
+ bool virgin;
+ /** whether the frame is totally opaque */
+ bool opaque;
+ /** whether a forcable screen redraw is required */
+ bool redraw_required;
+ /** how the previous frame should be disposed; affects plotting */
+ unsigned char disposal_method;
+ /** whether we acknoledge transparency */
+ bool transparency;
+ /** the index designating a transparent pixel */
+ unsigned char transparency_index;
+ /** x co-ordinate of redraw rectangle */
+ unsigned int redraw_x;
+ /** y co-ordinate of redraw rectangle */
+ unsigned int redraw_y;
+ /** width of redraw rectangle */
+ unsigned int redraw_width;
+ /** height of redraw rectangle */
+ unsigned int redraw_height;
} gif_frame;
-/* API for Bitmap callbacks
-*/
+/* API for Bitmap callbacks */
typedef void* (*gif_bitmap_cb_create)(int width, int height);
typedef void (*gif_bitmap_cb_destroy)(void *bitmap);
typedef unsigned char* (*gif_bitmap_cb_get_buffer)(void *bitmap);
@@ -60,49 +72,112 @@ typedef void (*gif_bitmap_cb_set_opaque)(void *bitmap, bool opaque);
typedef bool (*gif_bitmap_cb_test_opaque)(void *bitmap);
typedef void (*gif_bitmap_cb_modified)(void *bitmap);
-/* The Bitmap callbacks function table
-*/
+/** Bitmap callbacks function table */
typedef struct gif_bitmap_callback_vt {
- gif_bitmap_cb_create bitmap_create; /**< Create a bitmap. */
- gif_bitmap_cb_destroy bitmap_destroy; /**< Free a bitmap. */
- gif_bitmap_cb_get_buffer bitmap_get_buffer; /**< Return a pointer to the pixel data in a bitmap. */
- /** Members below are optional
- */
- gif_bitmap_cb_set_opaque bitmap_set_opaque; /**< Sets whether a bitmap should be plotted opaque. */
- gif_bitmap_cb_test_opaque bitmap_test_opaque; /**< Tests whether a bitmap has an opaque alpha channel. */
- gif_bitmap_cb_modified bitmap_modified; /**< The bitmap image has changed, so flush any persistant cache. */
+ /** Create a bitmap. */
+ gif_bitmap_cb_create bitmap_create;
+ /** Free a bitmap. */
+ gif_bitmap_cb_destroy bitmap_destroy;
+ /** Return a pointer to the pixel data in a bitmap. */
+ gif_bitmap_cb_get_buffer bitmap_get_buffer;
+
+ /* Members below are optional */
+
+ /** Sets whether a bitmap should be plotted opaque. */
+ gif_bitmap_cb_set_opaque bitmap_set_opaque;
+ /** Tests whether a bitmap has an opaque alpha channel. */
+ gif_bitmap_cb_test_opaque bitmap_test_opaque;
+ /** The bitmap image has changed, so flush any persistant cache. */
+ gif_bitmap_cb_modified bitmap_modified;
} gif_bitmap_callback_vt;
-/* The GIF animation data
-*/
+/** GIF animation data */
typedef struct gif_animation {
- gif_bitmap_callback_vt bitmap_callbacks; /**< callbacks for bitmap functions */
- unsigned char *gif_data; /**< pointer to GIF data */
- unsigned int width; /**< width of GIF (may increase during decoding) */
- unsigned int height; /**< heigth of GIF (may increase during decoding) */
- unsigned int frame_count; /**< number of frames decoded */
- unsigned int frame_count_partial; /**< number of frames partially decoded */
- gif_frame *frames; /**< decoded frames */
- int decoded_frame; /**< current frame decoded to bitmap */
- void *frame_image; /**< currently decoded image; stored as bitmap from bitmap_create callback */
- int loop_count; /**< number of times to loop animation */
- gif_result current_error; /**< current error type, or 0 for none*/
- /** Internal members are listed below
- */
- unsigned int buffer_position; /**< current index into GIF data */
- unsigned int buffer_size; /**< total number of bytes of GIF data available */
- unsigned int frame_holders; /**< current number of frame holders */
- unsigned int background_index; /**< index in the colour table for the background colour */
- unsigned int aspect_ratio; /**< image aspect ratio (ignored) */
- unsigned int colour_table_size; /**< size of colour table (in entries) */
- bool global_colours; /**< whether the GIF has a global colour table */
- unsigned int *global_colour_table; /**< global colour table */
- unsigned int *local_colour_table; /**< local colour table */
+ /** callbacks for bitmap functions */
+ gif_bitmap_callback_vt bitmap_callbacks;
+ /** pointer to GIF data */
+ unsigned char *gif_data;
+ /** width of GIF (may increase during decoding) */
+ unsigned int width;
+ /** heigth of GIF (may increase during decoding) */
+ unsigned int height;
+ /** number of frames decoded */
+ unsigned int frame_count;
+ /** number of frames partially decoded */
+ unsigned int frame_count_partial;
+ /** decoded frames */
+ gif_frame *frames;
+ /** current frame decoded to bitmap */
+ int decoded_frame;
+ /** currently decoded image; stored as bitmap from bitmap_create callback */
+ void *frame_image;
+ /** number of times to loop animation */
+ int loop_count;
+ /** current error type, or 0 for none */
+ gif_result current_error;
+
+ /* Internal members are listed below */
+
+ /** current index into GIF data */
+ unsigned int buffer_position;
+ /** total number of bytes of GIF data available */
+ unsigned int buffer_size;
+ /** current number of frame holders */
+ unsigned int frame_holders;
+ /** index in the colour table for the background colour */
+ unsigned int background_index;
+ /** image aspect ratio (ignored) */
+ unsigned int aspect_ratio;
+ /** size of colour table (in entries) */
+ unsigned int colour_table_size;
+ /** whether the GIF has a global colour table */
+ bool global_colours;
+ /** global colour table */
+ unsigned int *global_colour_table;
+ /** local colour table */
+ unsigned int *local_colour_table;
} gif_animation;
+/**
+ * Initialises necessary gif_animation members.
+ */
void gif_create(gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks);
+
+/**
+ * Initialises any workspace held by the animation and attempts to decode
+ * any information that hasn't already been decoded.
+ * If an error occurs, all previously decoded frames are retained.
+ *
+ * @return Error return value.
+ * - GIF_FRAME_DATA_ERROR for GIF frame data error
+ * - GIF_INSUFFICIENT_FRAME_DATA for insufficient data to process
+ * any more frames
+ * - GIF_INSUFFICIENT_MEMORY for memory error
+ * - GIF_DATA_ERROR for GIF error
+ * - GIF_INSUFFICIENT_DATA for insufficient data to do anything
+ * - GIF_OK for successful decoding
+ * - GIF_WORKING for successful decoding if more frames are expected
+ */
gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data);
+
+/**
+ * Decodes a GIF frame.
+ *
+ * @return Error return value. If a frame does not contain any image data,
+ * GIF_OK is returned and gif->current_error is set to
+ * GIF_FRAME_NO_DISPLAY
+ * - GIF_FRAME_DATA_ERROR for GIF frame data error
+ * - GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
+ * - GIF_DATA_ERROR for GIF error (invalid frame header)
+ * - GIF_INSUFFICIENT_DATA for insufficient data to do anything
+ * - GIF_INSUFFICIENT_MEMORY for insufficient memory to process
+ * - GIF_OK for successful decoding
+ */
gif_result gif_decode_frame(gif_animation *gif, unsigned int frame);
+
+/**
+ * Releases any workspace held by a gif
+ */
void gif_finalise(gif_animation *gif);
#endif
diff --git a/src/libnsgif.c b/src/libnsgif.c
index 87371f2..412c67a 100644
--- a/src/libnsgif.c
+++ b/src/libnsgif.c
@@ -15,82 +15,39 @@
#include "libnsgif.h"
#include "utils/log.h"
-/* READING GIF FILES
- =================
-
- The functions provided by this file allow for efficient progressive GIF
- decoding. Whilst the initialisation does not ensure that there is
- sufficient image data to complete the entire frame, it does ensure that
- the information provided is valid. Any subsequent attempts to decode an
- initialised GIF are guaranteed to succeed, and any bytes of the image
- not present are assumed to be totally transparent.
-
- To begin decoding a GIF, the 'gif' structure must be initialised with
- the 'gif_data' and 'buffer_size' set to their initial values. The
- 'buffer_position' should initially be 0, and will be internally updated
- as the decoding commences. The caller should then repeatedly call
- gif_initialise() with the structure until the function returns 1, or
- no more data is avaliable.
-
- Once the initialisation has begun, the decoder completes the variables
- 'frame_count' and 'frame_count_partial'. The former being the total
- number of frames that have been successfully initialised, and the
- latter being the number of frames that a partial amount of data is
- available for. This assists the caller in managing the animation whilst
- decoding is continuing.
-
- To decode a frame, the caller must use gif_decode_frame() which updates
- the current 'frame_image' to reflect the desired frame. The required
- 'disposal_method' is also updated to reflect how the frame should be
- plotted. The caller must not assume that the current 'frame_image' will
- be valid between calls if initialisation is still occuring, and should
- either always request that the frame is decoded (no processing will
- occur if the 'decoded_frame' has not been invalidated by initialisation)
- or perform the check itself.
-
- It should be noted that gif_finalise() should always be called, even if
- no frames were initialised. Additionally, it is the responsibility of
- the caller to free 'gif_data'.
-
- [rjw] - Fri 2nd April 2004
-*/
-
-/* TO-DO LIST
- =================
-
- + Plain text and comment extensions could be implemented if there is any
- interest in doing so.
-*/
-
-
+/**
+ *
+ * \file
+ * \brief GIF image decoder
+ *
+ * The GIF format is thoroughly documented; a full description can be found at
+ * http://www.w3.org/Graphics/GIF/spec-gif89a.txt
+ *
+ * \todo Plain text and comment extensions should be implemented.
+ */
-/* Maximum colour table size
-*/
+/** Maximum colour table size */
#define GIF_MAX_COLOURS 256
-/* Internal flag that the colour table needs to be processed
-*/
+/** Internal flag that the colour table needs to be processed */
#define GIF_PROCESS_COLOURS 0xaa000000
-/* Internal flag that a frame is invalid/unprocessed
-*/
+/** Internal flag that a frame is invalid/unprocessed */
#define GIF_INVALID_FRAME -1
-/* Maximum LZW bits available
-*/
+/** Maximum LZW bits available */
#define GIF_MAX_LZW 12
-/* Transparent colour
-*/
+/** Transparent colour */
#define GIF_TRANSPARENT_COLOUR 0x00
-/* GIF Flags
-*/
+/* GIF Flags */
#define GIF_FRAME_COMBINE 1
#define GIF_FRAME_CLEAR 2
#define GIF_FRAME_RESTORE 3
#define GIF_FRAME_QUIRKS_RESTORE 4
+
#define GIF_IMAGE_SEPARATOR 0x2c
#define GIF_INTERLACE_MASK 0x40
#define GIF_COLOUR_TABLE_MASK 0x80
@@ -105,30 +62,28 @@
#define GIF_BLOCK_TERMINATOR 0x00
#define GIF_TRAILER 0x3b
-/* Internal GIF routines
-*/
+/* Internal GIF routines */
static gif_result gif_initialise_sprite(gif_animation *gif, unsigned int width, unsigned int height);
static gif_result gif_initialise_frame(gif_animation *gif);
static gif_result gif_initialise_frame_extensions(gif_animation *gif, const int frame);
static gif_result gif_skip_frame_extensions(gif_animation *gif);
static unsigned int gif_interlaced_line(int height, int y);
-
-
-/* Internal LZW routines
-*/
+/* Internal LZW routines */
static void gif_init_LZW(gif_animation *gif);
static bool gif_next_LZW(gif_animation *gif);
static int gif_next_code(gif_animation *gif, int code_size);
-/* General LZW values. They are shared for all GIFs being decoded, and
- thus we can't handle progressive decoding efficiently without having
- the data for each image which would use an extra 10Kb or so per GIF.
-*/
+/* General LZW values. They are shared for all GIFs being decoded, and thus we
+ * can't handle progressive decoding efficiently without having the data for
+ * each image which would use an extra 10Kb or so per GIF.
+ */
static unsigned char buf[4];
static unsigned char *direct;
-static int maskTbl[16] = {0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
- 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff};
+static int maskTbl[16] = {
+ 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f,
+ 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff
+};
static int table[2][(1 << GIF_MAX_LZW)];
static unsigned char stack[(1 << GIF_MAX_LZW) * 2];
static unsigned char *stack_pointer;
@@ -140,1181 +95,1266 @@ static int firstcode, oldcode;
static bool zero_data_block = false;
static bool get_done;
-/* Whether to clear the decoded image rather than plot
-*/
-static bool clear_image = false;
-
-/** Initialises necessary gif_animation members.
-*/
-void gif_create(gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks) {
- memset(gif, 0, sizeof(gif_animation));
- gif->bitmap_callbacks = *bitmap_callbacks;
- gif->decoded_frame = GIF_INVALID_FRAME;
+/**
+ * Updates the sprite memory size
+ *
+ * \param gif The animation context
+ * \param width The width of the sprite
+ * \param height The height of the sprite
+ * \return GIF_INSUFFICIENT_MEMORY for a memory error GIF_OK for success
+ */
+static gif_result
+gif_initialise_sprite(gif_animation *gif,
+ unsigned int width,
+ unsigned int height)
+{
+ unsigned int max_width;
+ unsigned int max_height;
+ struct bitmap *buffer;
+
+ /* Check if we've changed */
+ if ((width <= gif->width) && (height <= gif->height)) {
+ return GIF_OK;
+ }
+
+ /* Get our maximum values */
+ max_width = (width > gif->width) ? width : gif->width;
+ max_height = (height > gif->height) ? height : gif->height;
+
+ /* Allocate some more memory */
+ assert(gif->bitmap_callbacks.bitmap_create);
+ buffer = gif->bitmap_callbacks.bitmap_create(max_width, max_height);
+ if (buffer == NULL) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ assert(gif->bitmap_callbacks.bitmap_destroy);
+ gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
+ gif->frame_image = buffer;
+ gif->width = max_width;
+ gif->height = max_height;
+
+ /* Invalidate our currently decoded image */
+ gif->decoded_frame = GIF_INVALID_FRAME;
+ return GIF_OK;
}
-/** Initialises any workspace held by the animation and attempts to decode
- any information that hasn't already been decoded.
- If an error occurs, all previously decoded frames are retained.
-
- @return GIF_FRAME_DATA_ERROR for GIF frame data error
- GIF_INSUFFICIENT_FRAME_DATA for insufficient data to process
- any more frames
- GIF_INSUFFICIENT_MEMORY for memory error
- GIF_DATA_ERROR for GIF error
- GIF_INSUFFICIENT_DATA for insufficient data to do anything
- GIF_OK for successful decoding
- GIF_WORKING for successful decoding if more frames are expected
+/**
+ * Attempts to initialise the next frame
+ *
+ * \param gif The animation context
+ * \return error code
+ * - GIF_INSUFFICIENT_DATA for insufficient data to do anything
+ * - GIF_FRAME_DATA_ERROR for GIF frame data error
+ * - GIF_INSUFFICIENT_MEMORY for insufficient memory to process
+ * - GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
+ * - GIF_DATA_ERROR for GIF error (invalid frame header)
+ * - GIF_OK for successful decoding
+ * - GIF_WORKING for successful decoding if more frames are expected
*/
-gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data) {
- unsigned char *gif_data;
- unsigned int index;
- gif_result return_value;
-
- /* The GIF format is thoroughly documented; a full description
- * can be found at http://www.w3.org/Graphics/GIF/spec-gif89a.txt
- */
-
- /* Initialize values
- */
- gif->buffer_size = size;
- gif->gif_data = data;
-
- /* Check for sufficient data to be a GIF (6-byte header + 7-byte logical screen descriptor)
- */
- if (gif->buffer_size < 13) return GIF_INSUFFICIENT_DATA;
-
- /* Get our current processing position
- */
- gif_data = gif->gif_data + gif->buffer_position;
-
- /* See if we should initialise the GIF
- */
- if (gif->buffer_position == 0) {
-
- /* We want everything to be NULL before we start so we've no chance
- of freeing bad pointers (paranoia)
- */
- gif->frame_image = NULL;
- gif->frames = NULL;
- gif->local_colour_table = NULL;
- gif->global_colour_table = NULL;
-
- /* The caller may have been lazy and not reset any values
- */
- gif->frame_count = 0;
- gif->frame_count_partial = 0;
- gif->decoded_frame = GIF_INVALID_FRAME;
-
- /* 6-byte GIF file header is:
- *
- * +0 3CHARS Signature ('GIF')
- * +3 3CHARS Version ('87a' or '89a')
- */
- if (strncmp((const char *) gif_data, "GIF", 3) != 0)
- return GIF_DATA_ERROR;
- gif_data += 3;
-
- /* Ensure GIF reports version 87a or 89a
- */
-/* if ((strncmp(gif_data, "87a", 3) != 0) &&
- (strncmp(gif_data, "89a", 3) != 0))
- LOG(("Unknown GIF format - proceeding anyway"));
-*/ gif_data += 3;
-
- /* 7-byte Logical Screen Descriptor is:
- *
- * +0 SHORT Logical Screen Width
- * +2 SHORT Logical Screen Height
- * +4 CHAR __Packed Fields__
- * 1BIT Global Colour Table Flag
- * 3BITS Colour Resolution
- * 1BIT Sort Flag
- * 3BITS Size of Global Colour Table
- * +5 CHAR Background Colour Index
- * +6 CHAR Pixel Aspect Ratio
- */
- gif->width = gif_data[0] | (gif_data[1] << 8);
- gif->height = gif_data[2] | (gif_data[3] << 8);
- gif->global_colours = (gif_data[4] & GIF_COLOUR_TABLE_MASK);
- gif->colour_table_size = (2 << (gif_data[4] & GIF_COLOUR_TABLE_SIZE_MASK));
- gif->background_index = gif_data[5];
- gif->aspect_ratio = gif_data[6];
- gif->loop_count = 1;
- gif_data += 7;
-
- /* Some broken GIFs report the size as the screen size they were created in. As
- such, we detect for the common cases and set the sizes as 0 if they are found
- which results in the GIF being the maximum size of the frames.
- */
- if (((gif->width == 640) && (gif->height == 480)) ||
- ((gif->width == 640) && (gif->height == 512)) ||
- ((gif->width == 800) && (gif->height == 600)) ||
- ((gif->width == 1024) && (gif->height == 768)) ||
- ((gif->width == 1280) && (gif->height == 1024)) ||
- ((gif->width == 1600) && (gif->height == 1200)) ||
- ((gif->width == 0) || (gif->height == 0)) ||
- ((gif->width > 2048) || (gif->height > 2048))) {
- gif->width = 1;
- gif->height = 1;
- }
-
- /* Allocate some data irrespective of whether we've got any colour tables. We
- always get the maximum size in case a GIF is lying to us. It's far better
- to give the wrong colours than to trample over some memory somewhere.
- */
- gif->global_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
- gif->local_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
- if ((gif->global_colour_table == NULL) || (gif->local_colour_table == NULL)) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
-
- /* Set the first colour to a value that will never occur in reality so we
- know if we've processed it
- */
- gif->global_colour_table[0] = GIF_PROCESS_COLOURS;
-
- /* Check if the GIF has no frame data (13-byte header + 1-byte termination block)
- * Although generally useless, the GIF specification does not expressly prohibit this
- */
- if (gif->buffer_size == 14) {
- if (gif_data[0] == GIF_TRAILER)
- return GIF_OK;
- else
- return GIF_INSUFFICIENT_DATA;
- }
-
- /* Initialise enough workspace for 4 frames initially
- */
- if ((gif->frames = (gif_frame *)malloc(sizeof(gif_frame))) == NULL) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
- gif->frame_holders = 1;
-
- /* Initialise the sprite header
- */
- assert(gif->bitmap_callbacks.bitmap_create);
- if ((gif->frame_image = gif->bitmap_callbacks.bitmap_create(gif->width, gif->height)) == NULL) {
- gif_finalise(gif);
- return GIF_INSUFFICIENT_MEMORY;
- }
-
- /* Remember we've done this now
- */
- gif->buffer_position = gif_data - gif->gif_data;
- }
-
- /* Do the colour map if we haven't already. As the top byte is always 0xff or 0x00
- depending on the transparency we know if it's been filled in.
- */
- if (gif->global_colour_table[0] == GIF_PROCESS_COLOURS) {
- /* Check for a global colour map signified by bit 7
- */
- if (gif->global_colours) {
- if (gif->buffer_size < (gif->colour_table_size * 3 + 12)) {
- return GIF_INSUFFICIENT_DATA;
- }
- for (index = 0; index < gif->colour_table_size; index++) {
- /* Gif colour map contents are r,g,b.
- *
- * We want to pack them bytewise into the
- * colour table, such that the red component
- * is in byte 0 and the alpha component is in
- * byte 3.
- */
- unsigned char *entry = (unsigned char *) &gif->
- global_colour_table[index];
-
- entry[0] = gif_data[0]; /* r */
- entry[1] = gif_data[1]; /* g */
- entry[2] = gif_data[2]; /* b */
- entry[3] = 0xff; /* a */
-
- gif_data += 3;
- }
- gif->buffer_position = (gif_data - gif->gif_data);
- } else {
- /* Create a default colour table with the first two colours as black and white
- */
- unsigned int *entry = gif->global_colour_table;
-
- entry[0] = 0x00000000;
- /* Force Alpha channel to opaque */
- ((unsigned char *) entry)[3] = 0xff;
-
- entry[1] = 0xffffffff;
- }
- }
-
- /* Repeatedly try to initialise frames
- */
- while ((return_value = gif_initialise_frame(gif)) == GIF_WORKING);
-
- /* If there was a memory error tell the caller
- */
- if ((return_value == GIF_INSUFFICIENT_MEMORY) ||
- (return_value == GIF_DATA_ERROR))
- return return_value;
-
- /* If we didn't have some frames then a GIF_INSUFFICIENT_DATA becomes a
- GIF_INSUFFICIENT_FRAME_DATA
- */
- if ((return_value == GIF_INSUFFICIENT_DATA) && (gif->frame_count_partial > 0))
- return GIF_INSUFFICIENT_FRAME_DATA;
-
- /* Return how many we got
- */
- return return_value;
+static gif_result gif_initialise_frame(gif_animation *gif)
+{
+ int frame;
+ gif_frame *temp_buf;
+
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int flags = 0;
+ unsigned int width, height, offset_x, offset_y;
+ unsigned int block_size, colour_table_size;
+ bool first_image = true;
+ gif_result return_value;
+
+ /* Get the frame to decode and our data position */
+ frame = gif->frame_count;
+
+ /* Get our buffer position etc. */
+ gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
+ gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
+ gif_bytes = (gif_end - gif_data);
+
+ /* Check if we've finished */
+ if ((gif_bytes > 0) && (gif_data[0] == GIF_TRAILER)) {
+ return GIF_OK;
+ }
+
+ /* Check if there is enough data remaining. The shortest block of data
+ * is a 4-byte comment extension + 1-byte block terminator + 1-byte gif
+ * trailer
+ */
+ if (gif_bytes < 6) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+
+ /* We could theoretically get some junk data that gives us millions of
+ * frames, so we ensure that we don't have a silly number
+ */
+ if (frame > 4096) {
+ return GIF_FRAME_DATA_ERROR;
+ }
+
+ /* Get some memory to store our pointers in etc. */
+ if ((int)gif->frame_holders <= frame) {
+ /* Allocate more memory */
+ temp_buf = (gif_frame *)realloc(gif->frames, (frame + 1) * sizeof(gif_frame));
+ if (temp_buf == NULL) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+ gif->frames = temp_buf;
+ gif->frame_holders = frame + 1;
+ }
+
+ /* Store our frame pointer. We would do it when allocating except we
+ * start off with one frame allocated so we can always use realloc.
+ */
+ gif->frames[frame].frame_pointer = gif->buffer_position;
+ gif->frames[frame].display = false;
+ gif->frames[frame].virgin = true;
+ gif->frames[frame].disposal_method = 0;
+ gif->frames[frame].transparency = false;
+ gif->frames[frame].frame_delay = 100;
+ gif->frames[frame].redraw_required = false;
+
+ /* Invalidate any previous decoding we have of this frame */
+ if (gif->decoded_frame == frame) {
+ gif->decoded_frame = GIF_INVALID_FRAME;
+ }
+
+ /* We pretend to initialise the frames, but really we just skip over
+ * all the data contained within. This is all basically a cut down
+ * version of gif_decode_frame that doesn't have any of the LZW bits in
+ * it.
+ */
+
+ /* Initialise any extensions */
+ gif->buffer_position = gif_data - gif->gif_data;
+ return_value = gif_initialise_frame_extensions(gif, frame);
+ if (return_value != GIF_OK) {
+ return return_value;
+ }
+ gif_data = (gif->gif_data + gif->buffer_position);
+ gif_bytes = (gif_end - gif_data);
+
+ /* Check if we've finished */
+ if ((gif_bytes = (gif_end - gif_data)) < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ if (gif_data[0] == GIF_TRAILER) {
+ gif->buffer_position = (gif_data - gif->gif_data);
+ gif->frame_count = frame + 1;
+ return GIF_OK;
+ }
+
+ /* If we're not done, there should be an image descriptor */
+ if (gif_data[0] != GIF_IMAGE_SEPARATOR) {
+ return GIF_FRAME_DATA_ERROR;
+ }
+
+ /* Do some simple boundary checking */
+ if (gif_bytes < 10) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ offset_x = gif_data[1] | (gif_data[2] << 8);
+ offset_y = gif_data[3] | (gif_data[4] << 8);
+ width = gif_data[5] | (gif_data[6] << 8);
+ height = gif_data[7] | (gif_data[8] << 8);
+
+ /* Set up the redraw characteristics. We have to check for extending
+ * the area due to multi-image frames.
+ */
+ if (!first_image) {
+ if (gif->frames[frame].redraw_x > offset_x) {
+ gif->frames[frame].redraw_width += (gif->frames[frame].redraw_x - offset_x);
+ gif->frames[frame].redraw_x = offset_x;
+ }
+
+ if (gif->frames[frame].redraw_y > offset_y) {
+ gif->frames[frame].redraw_height += (gif->frames[frame].redraw_y - offset_y);
+ gif->frames[frame].redraw_y = offset_y;
+ }
+
+ if ((offset_x + width) > (gif->frames[frame].redraw_x + gif->frames[frame].redraw_width)) {
+ gif->frames[frame].redraw_width = (offset_x + width) - gif->frames[frame].redraw_x;
+ }
+
+ if ((offset_y + height) > (gif->frames[frame].redraw_y + gif->frames[frame].redraw_height)) {
+ gif->frames[frame].redraw_height = (offset_y + height) - gif->frames[frame].redraw_y;
+ }
+ } else {
+ first_image = false;
+ gif->frames[frame].redraw_x = offset_x;
+ gif->frames[frame].redraw_y = offset_y;
+ gif->frames[frame].redraw_width = width;
+ gif->frames[frame].redraw_height = height;
+ }
+
+ /* if we are clearing the background then we need to redraw enough to
+ * cover the previous frame too
+ */
+ gif->frames[frame].redraw_required = ((gif->frames[frame].disposal_method == GIF_FRAME_CLEAR) ||
+ (gif->frames[frame].disposal_method == GIF_FRAME_RESTORE));
+
+ /* Boundary checking - shouldn't ever happen except with junk data */
+ if (gif_initialise_sprite(gif, (offset_x + width), (offset_y + height))) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* Decode the flags */
+ flags = gif_data[9];
+ colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
+
+ /* Move our data onwards and remember we've got a bit of this frame */
+ gif_data += 10;
+ gif_bytes = (gif_end - gif_data);
+ gif->frame_count_partial = frame + 1;
+
+ /* Skip the local colour table */
+ if (flags & GIF_COLOUR_TABLE_MASK) {
+ gif_data += 3 * colour_table_size;
+ if ((gif_bytes = (gif_end - gif_data)) < 0) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ }
+
+ /* Ensure we have a correct code size */
+ if (gif_bytes < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if (gif_data[0] > GIF_MAX_LZW) {
+ return GIF_DATA_ERROR;
+ }
+
+ /* Move our pointer to the actual image data */
+ gif_data++;
+ --gif_bytes;
+
+ /* Repeatedly skip blocks until we get a zero block or run out of data
+ * These blocks of image data are processed later by gif_decode_frame()
+ */
+ block_size = 0;
+ while (block_size != 1) {
+ if (gif_bytes < 1) return GIF_INSUFFICIENT_FRAME_DATA;
+ block_size = gif_data[0] + 1;
+ /* Check if the frame data runs off the end of the file */
+ if ((int)(gif_bytes - block_size) < 0) {
+ /* Try to recover by signaling the end of the gif.
+ * Once we get garbage data, there is no logical way to
+ * determine where the next frame is. It's probably
+ * better to partially load the gif than not at all.
+ */
+ if (gif_bytes >= 2) {
+ gif_data[0] = 0;
+ gif_data[1] = GIF_TRAILER;
+ gif_bytes = 1;
+ ++gif_data;
+ break;
+ } else {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ } else {
+ gif_bytes -= block_size;
+ gif_data += block_size;
+ }
+ }
+
+ /* Add the frame and set the display flag */
+ gif->buffer_position = gif_data - gif->gif_data;
+ gif->frame_count = frame + 1;
+ gif->frames[frame].display = true;
+
+ /* Check if we've finished */
+ if (gif_bytes < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ } else {
+ if (gif_data[0] == GIF_TRAILER) {
+ return GIF_OK;
+ }
+ }
+ return GIF_WORKING;
}
-/** Updates the sprite memory size
+/**
+ * Attempts to initialise the frame's extensions
+ *
+ * \param gif The animation context
+ * \param frame The frame number
+ * @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the
+ * frame GIF_OK for successful initialisation.
+ */
+static gif_result
+gif_initialise_frame_extensions(gif_animation *gif, const int frame)
+{
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int block_size;
+
+ /* Get our buffer position etc. */
+ gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
+ gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
+
+ /* Initialise the extensions */
+ while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
+ ++gif_data;
+ if ((gif_bytes = (gif_end - gif_data)) < 1) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Switch on extension label */
+ switch (gif_data[0]) {
+ case GIF_EXTENSION_GRAPHIC_CONTROL:
+ /* 6-byte Graphic Control Extension is:
+ *
+ * +0 CHAR Graphic Control Label
+ * +1 CHAR Block Size
+ * +2 CHAR __Packed Fields__
+ * 3BITS Reserved
+ * 3BITS Disposal Method
+ * 1BIT User Input Flag
+ * 1BIT Transparent Color Flag
+ * +3 SHORT Delay Time
+ * +5 CHAR Transparent Color Index
+ */
+ if (gif_bytes < 6) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ gif->frames[frame].frame_delay = gif_data[3] | (gif_data[4] << 8);
+ if (gif_data[2] & GIF_TRANSPARENCY_MASK) {
+ gif->frames[frame].transparency = true;
+ gif->frames[frame].transparency_index = gif_data[5];
+ }
+ gif->frames[frame].disposal_method = ((gif_data[2] & GIF_DISPOSAL_MASK) >> 2);
+ /* I have encountered documentation and GIFs in the
+ * wild that use 0x04 to restore the previous frame,
+ * rather than the officially documented 0x03. I
+ * believe some (older?) software may even actually
+ * export this way. We handle this as a type of
+ * "quirks" mode.
+ */
+ if (gif->frames[frame].disposal_method == GIF_FRAME_QUIRKS_RESTORE) {
+ gif->frames[frame].disposal_method = GIF_FRAME_RESTORE;
+ }
+ gif_data += (2 + gif_data[1]);
+ break;
+
+ case GIF_EXTENSION_APPLICATION:
+ /* 14-byte+ Application Extension is:
+ *
+ * +0 CHAR Application Extension Label
+ * +1 CHAR Block Size
+ * +2 8CHARS Application Identifier
+ * +10 3CHARS Appl. Authentication Code
+ * +13 1-256 Application Data (Data sub-blocks)
+ */
+ if (gif_bytes < 17) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if ((gif_data[1] == 0x0b) &&
+ (strncmp((const char *) gif_data + 2,
+ "NETSCAPE2.0", 11) == 0) &&
+ (gif_data[13] == 0x03) &&
+ (gif_data[14] == 0x01)) {
+ gif->loop_count = gif_data[15] | (gif_data[16] << 8);
+ }
+ gif_data += (2 + gif_data[1]);
+ break;
+
+ case GIF_EXTENSION_COMMENT:
+ /* Move the pointer to the first data sub-block Skip 1
+ * byte for the extension label
+ */
+ ++gif_data;
+ break;
+
+ default:
+ /* Move the pointer to the first data sub-block Skip 2
+ * bytes for the extension label and size fields Skip
+ * the extension size itself
+ */
+ if (gif_bytes < 2) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += (2 + gif_data[1]);
+ }
+
+ /* Repeatedly skip blocks until we get a zero block or run out
+ * of data This data is ignored by this gif decoder
+ */
+ gif_bytes = (gif_end - gif_data);
+ block_size = 0;
+ while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
+ block_size = gif_data[0] + 1;
+ if ((gif_bytes -= block_size) < 0) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += block_size;
+ }
+ ++gif_data;
+ }
+
+ /* Set buffer position and return */
+ gif->buffer_position = (gif_data - gif->gif_data);
+ return GIF_OK;
+}
- @return GIF_INSUFFICIENT_MEMORY for a memory error
- GIF_OK for success
-*/
-static gif_result gif_initialise_sprite(gif_animation *gif, unsigned int width, unsigned int height) {
- unsigned int max_width;
- unsigned int max_height;
- struct bitmap *buffer;
-
- /* Check if we've changed
- */
- if ((width <= gif->width) && (height <= gif->height))
- return GIF_OK;
-
- /* Get our maximum values
- */
- max_width = (width > gif->width) ? width : gif->width;
- max_height = (height > gif->height) ? height : gif->height;
-
- /* Allocate some more memory
- */
- assert(gif->bitmap_callbacks.bitmap_create);
- if ((buffer = gif->bitmap_callbacks.bitmap_create(max_width, max_height)) == NULL)
- return GIF_INSUFFICIENT_MEMORY;
- assert(gif->bitmap_callbacks.bitmap_destroy);
- gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
- gif->frame_image = buffer;
- gif->width = max_width;
- gif->height = max_height;
-
- /* Invalidate our currently decoded image
- */
- gif->decoded_frame = GIF_INVALID_FRAME;
- return GIF_OK;
+
+/**
+ * Skips the frame's extensions (which have been previously initialised)
+ *
+ * \param gif The animation context
+ * \return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the
+ * frame GIF_OK for successful decoding
+ */
+static gif_result gif_skip_frame_extensions(gif_animation *gif)
+{
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int block_size;
+
+ /* Get our buffer position etc. */
+ gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
+ gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
+ gif_bytes = (gif_end - gif_data);
+
+ /* Skip the extensions */
+ while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
+ ++gif_data;
+ if (gif_data >= gif_end) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Switch on extension label */
+ switch(gif_data[0]) {
+ case GIF_EXTENSION_COMMENT:
+ /* Move the pointer to the first data sub-block
+ * 1 byte for the extension label
+ */
+ ++gif_data;
+ break;
+
+ default:
+ /* Move the pointer to the first data sub-block 2 bytes
+ * for the extension label and size fields Skip the
+ * extension size itself
+ */
+ if (gif_data + 1 >= gif_end) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += (2 + gif_data[1]);
+ }
+
+ /* Repeatedly skip blocks until we get a zero block or run out
+ * of data This data is ignored by this gif decoder
+ */
+ gif_bytes = (gif_end - gif_data);
+ block_size = 0;
+ while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
+ block_size = gif_data[0] + 1;
+ if ((gif_bytes -= block_size) < 0) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ gif_data += block_size;
+ }
+ ++gif_data;
+ }
+
+ /* Set buffer position and return */
+ gif->buffer_position = (gif_data - gif->gif_data);
+ return GIF_OK;
}
+static unsigned int gif_interlaced_line(int height, int y) {
+ if ((y << 3) < height) {
+ return (y << 3);
+ }
+ y -= ((height + 7) >> 3);
+ if ((y << 3) < (height - 4)) {
+ return (y << 3) + 4;
+ }
+ y -= ((height + 3) >> 3);
+ if ((y << 2) < (height - 2)) {
+ return (y << 2) + 2;
+ }
+ y -= ((height + 1) >> 2);
+ return (y << 1) + 1;
+}
-/** Attempts to initialise the next frame
- @return GIF_INSUFFICIENT_DATA for insufficient data to do anything
- GIF_FRAME_DATA_ERROR for GIF frame data error
- GIF_INSUFFICIENT_MEMORY for insufficient memory to process
- GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
- GIF_DATA_ERROR for GIF error (invalid frame header)
- GIF_OK for successful decoding
- GIF_WORKING for successful decoding if more frames are expected
-*/
-static gif_result gif_initialise_frame(gif_animation *gif) {
- int frame;
- gif_frame *temp_buf;
-
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int flags = 0;
- unsigned int width, height, offset_x, offset_y;
- unsigned int block_size, colour_table_size;
- bool first_image = true;
- gif_result return_value;
-
- /* Get the frame to decode and our data position
- */
- frame = gif->frame_count;
-
- /* Get our buffer position etc.
- */
- gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
- gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
- gif_bytes = (gif_end - gif_data);
-
- /* Check if we've finished
- */
- if ((gif_bytes > 0) && (gif_data[0] == GIF_TRAILER)) return GIF_OK;
-
- /* Check if we have enough data
- * The shortest block of data is a 4-byte comment extension + 1-byte block terminator + 1-byte gif trailer
- */
- if (gif_bytes < 6) return GIF_INSUFFICIENT_DATA;
-
- /* We could theoretically get some junk data that gives us millions of frames, so
- we ensure that we don't have a silly number
- */
- if (frame > 4096) return GIF_FRAME_DATA_ERROR;
-
- /* Get some memory to store our pointers in etc.
- */
- if ((int)gif->frame_holders <= frame) {
- /* Allocate more memory
- */
- if ((temp_buf = (gif_frame *)realloc(gif->frames,
- (frame + 1) * sizeof(gif_frame))) == NULL)
- return GIF_INSUFFICIENT_MEMORY;
- gif->frames = temp_buf;
- gif->frame_holders = frame + 1;
- }
-
- /* Store our frame pointer. We would do it when allocating except we
- start off with one frame allocated so we can always use realloc.
- */
- gif->frames[frame].frame_pointer = gif->buffer_position;
- gif->frames[frame].display = false;
- gif->frames[frame].virgin = true;
- gif->frames[frame].disposal_method = 0;
- gif->frames[frame].transparency = false;
- gif->frames[frame].frame_delay = 100;
- gif->frames[frame].redraw_required = false;
-
- /* Invalidate any previous decoding we have of this frame
- */
- if (gif->decoded_frame == frame)
- gif->decoded_frame = GIF_INVALID_FRAME;
-
- /* We pretend to initialise the frames, but really we just skip over all
- the data contained within. This is all basically a cut down version of
- gif_decode_frame that doesn't have any of the LZW bits in it.
- */
-
- /* Initialise any extensions
- */
- gif->buffer_position = gif_data - gif->gif_data;
- if ((return_value = gif_initialise_frame_extensions(gif, frame)) != GIF_OK)
- return return_value;
- gif_data = (gif->gif_data + gif->buffer_position);
- gif_bytes = (gif_end - gif_data);
-
- /* Check if we've finished
- */
- if ((gif_bytes = (gif_end - gif_data)) < 1)
- return GIF_INSUFFICIENT_FRAME_DATA;
- else if (gif_data[0] == GIF_TRAILER) {
- gif->buffer_position = (gif_data - gif->gif_data);
- gif->frame_count = frame + 1;
- return GIF_OK;
- }
-
- /* If we're not done, there should be an image descriptor
- */
- if (gif_data[0] != GIF_IMAGE_SEPARATOR) return GIF_FRAME_DATA_ERROR;
-
- /* Do some simple boundary checking
- */
- if (gif_bytes < 10) return GIF_INSUFFICIENT_FRAME_DATA;
- offset_x = gif_data[1] | (gif_data[2] << 8);
- offset_y = gif_data[3] | (gif_data[4] << 8);
- width = gif_data[5] | (gif_data[6] << 8);
- height = gif_data[7] | (gif_data[8] << 8);
-
- /* Set up the redraw characteristics. We have to check for extending the area
- due to multi-image frames.
- */
- if (!first_image) {
- if (gif->frames[frame].redraw_x > offset_x) {
- gif->frames[frame].redraw_width += (gif->frames[frame].redraw_x - offset_x);
- gif->frames[frame].redraw_x = offset_x;
- }
- if (gif->frames[frame].redraw_y > offset_y) {
- gif->frames[frame].redraw_height += (gif->frames[frame].redraw_y - offset_y);
- gif->frames[frame].redraw_y = offset_y;
- }
- if ((offset_x + width) > (gif->frames[frame].redraw_x + gif->frames[frame].redraw_width))
- gif->frames[frame].redraw_width = (offset_x + width) - gif->frames[frame].redraw_x;
- if ((offset_y + height) > (gif->frames[frame].redraw_y + gif->frames[frame].redraw_height))
- gif->frames[frame].redraw_height = (offset_y + height) - gif->frames[frame].redraw_y;
- } else {
- first_image = false;
- gif->frames[frame].redraw_x = offset_x;
- gif->frames[frame].redraw_y = offset_y;
- gif->frames[frame].redraw_width = width;
- gif->frames[frame].redraw_height = height;
- }
-
- /* if we are clearing the background then we need to redraw enough to cover the previous
- frame too
- */
- gif->frames[frame].redraw_required = ((gif->frames[frame].disposal_method == GIF_FRAME_CLEAR) ||
- (gif->frames[frame].disposal_method == GIF_FRAME_RESTORE));
-
- /* Boundary checking - shouldn't ever happen except with junk data
- */
- if (gif_initialise_sprite(gif, (offset_x + width), (offset_y + height)))
- return GIF_INSUFFICIENT_MEMORY;
-
- /* Decode the flags
- */
- flags = gif_data[9];
- colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
-
- /* Move our data onwards and remember we've got a bit of this frame
- */
- gif_data += 10;
- gif_bytes = (gif_end - gif_data);
- gif->frame_count_partial = frame + 1;
-
- /* Skip the local colour table
- */
- if (flags & GIF_COLOUR_TABLE_MASK) {
- gif_data += 3 * colour_table_size;
- if ((gif_bytes = (gif_end - gif_data)) < 0)
- return GIF_INSUFFICIENT_FRAME_DATA;
- }
-
- /* Ensure we have a correct code size
- */
- if (gif_bytes < 1)
- return GIF_INSUFFICIENT_FRAME_DATA;
- if (gif_data[0] > GIF_MAX_LZW)
- return GIF_DATA_ERROR;
-
- /* Move our pointer to the actual image data
- */
- gif_data++;
- --gif_bytes;
-
- /* Repeatedly skip blocks until we get a zero block or run out of data
- * These blocks of image data are processed later by gif_decode_frame()
- */
- block_size = 0;
- while (block_size != 1) {
- if (gif_bytes < 1) return GIF_INSUFFICIENT_FRAME_DATA;
- block_size = gif_data[0] + 1;
- /* Check if the frame data runs off the end of the file
- */
- if ((int)(gif_bytes - block_size) < 0) {
- /* Try to recover by signaling the end of the gif.
- * Once we get garbage data, there is no logical
- * way to determine where the next frame is.
- * It's probably better to partially load the gif
- * than not at all.
- */
- if (gif_bytes >= 2) {
- gif_data[0] = 0;
- gif_data[1] = GIF_TRAILER;
- gif_bytes = 1;
- ++gif_data;
- break;
- } else
- return GIF_INSUFFICIENT_FRAME_DATA;
- } else {
- gif_bytes -= block_size;
- gif_data += block_size;
- }
- }
-
- /* Add the frame and set the display flag
- */
- gif->buffer_position = gif_data - gif->gif_data;
- gif->frame_count = frame + 1;
- gif->frames[frame].display = true;
-
- /* Check if we've finished
- */
- if (gif_bytes < 1)
- return GIF_INSUFFICIENT_FRAME_DATA;
- else
- if (gif_data[0] == GIF_TRAILER) return GIF_OK;
- return GIF_WORKING;
+/**
+ * Initialise LZW decoding
+ */
+void gif_init_LZW(gif_animation *gif)
+{
+ int i;
+
+ gif->current_error = 0;
+ if (clear_code >= (1 << GIF_MAX_LZW)) {
+ stack_pointer = stack;
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return;
+ }
+
+ /* initialise our table */
+ memset(table, 0x00, (1 << GIF_MAX_LZW) * 8);
+ for (i = 0; i < clear_code; ++i) {
+ table[1][i] = i;
+ }
+
+ /* update our LZW parameters */
+ code_size = set_code_size + 1;
+ max_code_size = clear_code << 1;
+ max_code = clear_code + 2;
+ stack_pointer = stack;
+ do {
+ firstcode = oldcode = gif_next_code(gif, code_size);
+ } while (firstcode == clear_code);
+ *stack_pointer++ =firstcode;
}
-/** Attempts to initialise the frame's extensions
- @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
- GIF_OK for successful initialisation
-*/
-static gif_result gif_initialise_frame_extensions(gif_animation *gif, const int frame) {
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int block_size;
-
- /* Get our buffer position etc.
- */
- gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
- gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
-
- /* Initialise the extensions
- */
- while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
- ++gif_data;
- if ((gif_bytes = (gif_end - gif_data)) < 1)
- return GIF_INSUFFICIENT_FRAME_DATA;
-
- /* Switch on extension label
- */
- switch(gif_data[0]) {
- /* 6-byte Graphic Control Extension is:
- *
- * +0 CHAR Graphic Control Label
- * +1 CHAR Block Size
- * +2 CHAR __Packed Fields__
- * 3BITS Reserved
- * 3BITS Disposal Method
- * 1BIT User Input Flag
- * 1BIT Transparent Color Flag
- * +3 SHORT Delay Time
- * +5 CHAR Transparent Color Index
- */
- case GIF_EXTENSION_GRAPHIC_CONTROL:
- if (gif_bytes < 6) return GIF_INSUFFICIENT_FRAME_DATA;
- gif->frames[frame].frame_delay = gif_data[3] | (gif_data[4] << 8);
- if (gif_data[2] & GIF_TRANSPARENCY_MASK) {
- gif->frames[frame].transparency = true;
- gif->frames[frame].transparency_index = gif_data[5];
- }
- gif->frames[frame].disposal_method = ((gif_data[2] & GIF_DISPOSAL_MASK) >> 2);
- /* I have encountered documentation and GIFs in the wild that use
- * 0x04 to restore the previous frame, rather than the officially
- * documented 0x03. I believe some (older?) software may even actually
- * export this way. We handle this as a type of "quirks" mode.
- */
- if (gif->frames[frame].disposal_method == GIF_FRAME_QUIRKS_RESTORE)
- gif->frames[frame].disposal_method = GIF_FRAME_RESTORE;
- gif_data += (2 + gif_data[1]);
- break;
-
- /* 14-byte+ Application Extension is:
- *
- * +0 CHAR Application Extension Label
- * +1 CHAR Block Size
- * +2 8CHARS Application Identifier
- * +10 3CHARS Appl. Authentication Code
- * +13 1-256 Application Data (Data sub-blocks)
- */
- case GIF_EXTENSION_APPLICATION:
- if (gif_bytes < 17) return GIF_INSUFFICIENT_FRAME_DATA;
- if ((gif_data[1] == 0x0b) &&
- (strncmp((const char *) gif_data + 2,
- "NETSCAPE2.0", 11) == 0) &&
- (gif_data[13] == 0x03) &&
- (gif_data[14] == 0x01)) {
- gif->loop_count = gif_data[15] | (gif_data[16] << 8);
- }
- gif_data += (2 + gif_data[1]);
- break;
-
- /* Move the pointer to the first data sub-block
- * Skip 1 byte for the extension label
- */
- case GIF_EXTENSION_COMMENT:
- ++gif_data;
- break;
-
- /* Move the pointer to the first data sub-block
- * Skip 2 bytes for the extension label and size fields
- * Skip the extension size itself
- */
- default:
- if (gif_bytes < 2) return GIF_INSUFFICIENT_FRAME_DATA;
- gif_data += (2 + gif_data[1]);
- }
-
- /* Repeatedly skip blocks until we get a zero block or run out of data
- * This data is ignored by this gif decoder
- */
- gif_bytes = (gif_end - gif_data);
- block_size = 0;
- while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
- block_size = gif_data[0] + 1;
- if ((gif_bytes -= block_size) < 0)
- return GIF_INSUFFICIENT_FRAME_DATA;
- gif_data += block_size;
- }
- ++gif_data;
- }
-
- /* Set buffer position and return
- */
- gif->buffer_position = (gif_data - gif->gif_data);
- return GIF_OK;
+static bool gif_next_LZW(gif_animation *gif)
+{
+ int code, incode;
+ int block_size;
+ int new_code;
+
+ code = gif_next_code(gif, code_size);
+ if (code < 0) {
+ gif->current_error = code;
+ return false;
+ } else if (code == clear_code) {
+ gif_init_LZW(gif);
+ return true;
+ } else if (code == end_code) {
+ /* skip to the end of our data so multi-image GIFs work */
+ if (zero_data_block) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ block_size = 0;
+ while (block_size != 1 &&
+ gif->buffer_position < gif->buffer_size) {
+ block_size = gif->gif_data[gif->buffer_position] + 1;
+ gif->buffer_position += block_size;
+ }
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+
+ incode = code;
+ if (code >= max_code) {
+ if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *stack_pointer++ = firstcode;
+ code = oldcode;
+ }
+
+ /* The following loop is the most important in the GIF decoding cycle
+ * as every single pixel passes through it.
+ *
+ * Note: our stack is always big enough to hold a complete decompressed
+ * chunk.
+ */
+ while (code >= clear_code) {
+ if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
+ code >= (1 << GIF_MAX_LZW)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *stack_pointer++ = table[1][code];
+ new_code = table[0][code];
+ if (new_code < clear_code) {
+ code = new_code;
+ break;
+ }
+
+ if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
+ new_code >= (1 << GIF_MAX_LZW)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *stack_pointer++ = table[1][new_code];
+ code = table[0][new_code];
+ if (code == new_code) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ }
+
+ if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
+ gif->current_error = GIF_FRAME_DATA_ERROR;
+ return false;
+ }
+ *stack_pointer++ = firstcode = table[1][code];
+
+ if ((code = max_code) < (1 << GIF_MAX_LZW)) {
+ table[0][code] = oldcode;
+ table[1][code] = firstcode;
+ ++max_code;
+ if ((max_code >= max_code_size) &&
+ (max_code_size < (1 << GIF_MAX_LZW))) {
+ max_code_size = max_code_size << 1;
+ ++code_size;
+ }
+ }
+ oldcode = incode;
+ return true;
}
+static int gif_next_code(gif_animation *gif, int code_size)
+{
+ int i, j, end, count, ret;
+ unsigned char *b;
+
+ end = curbit + code_size;
+ if (end >= lastbit) {
+ if (get_done) {
+ return GIF_END_OF_FRAME;
+ }
+ buf[0] = direct[last_byte - 2];
+ buf[1] = direct[last_byte - 1];
+
+ /* get the next block */
+ direct = gif->gif_data + gif->buffer_position;
+ if (gif->buffer_position >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ zero_data_block = ((count = direct[0]) == 0);
+ if ((gif->buffer_position + count) >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ if (count == 0) {
+ get_done = true;
+ } else {
+ if (gif->buffer_position + 3 >= gif->buffer_size) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+ direct -= 1;
+ buf[2] = direct[2];
+ buf[3] = direct[3];
+ }
+ gif->buffer_position += count + 1;
+
+ /* update our variables */
+ last_byte = 2 + count;
+ curbit = (curbit - lastbit) + 16;
+ lastbit = (2 + count) << 3;
+ end = curbit + code_size;
+ }
+
+ i = curbit >> 3;
+ if (i < 2) {
+ b = buf;
+ } else {
+ b = direct;
+ }
+
+ ret = b[i];
+ j = (end >> 3) - 1;
+ if (i <= j) {
+ ret |= (b[i + 1] << 8);
+ if (i < j) {
+ ret |= (b[i + 2] << 16);
+ }
+ }
+ ret = (ret >> (curbit % 8)) & maskTbl[code_size];
+ curbit += code_size;
+ return ret;
+}
-/** Decodes a GIF frame.
- @return GIF_FRAME_DATA_ERROR for GIF frame data error
- GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
- GIF_DATA_ERROR for GIF error (invalid frame header)
- GIF_INSUFFICIENT_DATA for insufficient data to do anything
- GIF_INSUFFICIENT_MEMORY for insufficient memory to process
- GIF_OK for successful decoding
- If a frame does not contain any image data, GIF_OK is returned and
- gif->current_error is set to GIF_FRAME_NO_DISPLAY
-*/
-gif_result gif_decode_frame(gif_animation *gif, unsigned int frame) {
- unsigned int index = 0;
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int width, height, offset_x, offset_y;
- unsigned int flags, colour_table_size, interlace;
- unsigned int *colour_table;
- unsigned int *frame_data = 0; // Set to 0 for no warnings
- unsigned int *frame_scanline;
- unsigned int save_buffer_position;
- unsigned int return_value = 0;
- unsigned int x, y, decode_y, burst_bytes;
- int last_undisposed_frame = (frame - 1);
- register unsigned char colour;
-
- /* Ensure this frame is supposed to be decoded
- */
- if (gif->frames[frame].display == false) {
- gif->current_error = GIF_FRAME_NO_DISPLAY;
- return GIF_OK;
- }
-
- /* Ensure we have a frame to decode
- */
- if (frame > gif->frame_count_partial)
- return GIF_INSUFFICIENT_DATA;
- if ((!clear_image) && ((int)frame == gif->decoded_frame))
- return GIF_OK;
-
- /* Get the start of our frame data and the end of the GIF data
- */
- gif_data = gif->gif_data + gif->frames[frame].frame_pointer;
- gif_end = gif->gif_data + gif->buffer_size;
- gif_bytes = (gif_end - gif_data);
-
- /* Check if we have enough data
- * The shortest block of data is a 10-byte image descriptor + 1-byte gif trailer
- */
- if (gif_bytes < 12) return GIF_INSUFFICIENT_FRAME_DATA;
-
- /* Save the buffer position
- */
- save_buffer_position = gif->buffer_position;
- gif->buffer_position = gif_data - gif->gif_data;
-
- /* Skip any extensions because we all ready processed them
- */
- if ((return_value = gif_skip_frame_extensions(gif)) != GIF_OK)
- goto gif_decode_frame_exit;
- gif_data = (gif->gif_data + gif->buffer_position);
- gif_bytes = (gif_end - gif_data);
-
- /* Ensure we have enough data for the 10-byte image descriptor + 1-byte gif trailer
- */
- if (gif_bytes < 12) {
- return_value = GIF_INSUFFICIENT_FRAME_DATA;
- goto gif_decode_frame_exit;
- }
-
- /* 10-byte Image Descriptor is:
- *
- * +0 CHAR Image Separator (0x2c)
- * +1 SHORT Image Left Position
- * +3 SHORT Image Top Position
- * +5 SHORT Width
- * +7 SHORT Height
- * +9 CHAR __Packed Fields__
- * 1BIT Local Colour Table Flag
- * 1BIT Interlace Flag
- * 1BIT Sort Flag
- * 2BITS Reserved
- * 3BITS Size of Local Colour Table
- */
- if (gif_data[0] != GIF_IMAGE_SEPARATOR) {
- return_value = GIF_DATA_ERROR;
- goto gif_decode_frame_exit;
- }
- offset_x = gif_data[1] | (gif_data[2] << 8);
- offset_y = gif_data[3] | (gif_data[4] << 8);
- width = gif_data[5] | (gif_data[6] << 8);
- height = gif_data[7] | (gif_data[8] << 8);
-
- /* Boundary checking - shouldn't ever happen except unless the data has been
- modified since initialisation.
- */
- if ((offset_x + width > gif->width) || (offset_y + height > gif->height)) {
- return_value = GIF_DATA_ERROR;
- goto gif_decode_frame_exit;
- }
-
- /* Decode the flags
- */
- flags = gif_data[9];
- colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
- interlace = flags & GIF_INTERLACE_MASK;
-
- /* Move our pointer to the colour table or image data (if no colour table is given)
- */
- gif_data += 10;
- gif_bytes = (gif_end - gif_data);
-
- /* Set up the colour table
- */
- if (flags & GIF_COLOUR_TABLE_MASK) {
- if (gif_bytes < (int)(3 * colour_table_size)) {
- return_value = GIF_INSUFFICIENT_FRAME_DATA;
- goto gif_decode_frame_exit;
- }
- colour_table = gif->local_colour_table;
- if (!clear_image) {
- for (index = 0; index < colour_table_size; index++) {
- /* Gif colour map contents are r,g,b.
- *
- * We want to pack them bytewise into the
- * colour table, such that the red component
- * is in byte 0 and the alpha component is in
- * byte 3.
- */
- unsigned char *entry =
- (unsigned char *) &colour_table[index];
-
- entry[0] = gif_data[0]; /* r */
- entry[1] = gif_data[1]; /* g */
- entry[2] = gif_data[2]; /* b */
- entry[3] = 0xff; /* a */
-
- gif_data += 3;
- }
- } else {
- gif_data += 3 * colour_table_size;
- }
- gif_bytes = (gif_end - gif_data);
- } else {
- colour_table = gif->global_colour_table;
- }
-
- /* Check if we've finished
- */
- if (gif_bytes < 1) {
- return_value = GIF_INSUFFICIENT_FRAME_DATA;
- goto gif_decode_frame_exit;
- } else if (gif_data[0] == GIF_TRAILER) {
- return_value = GIF_OK;
- goto gif_decode_frame_exit;
- }
-
- /* Get the frame data
- */
- assert(gif->bitmap_callbacks.bitmap_get_buffer);
- frame_data = (void *)gif->bitmap_callbacks.bitmap_get_buffer(gif->frame_image);
- if (!frame_data)
- return GIF_INSUFFICIENT_MEMORY;
-
- /* If we are clearing the image we just clear, if not decode
- */
- if (!clear_image) {
- /* Ensure we have enough data for a 1-byte LZW code size + 1-byte gif trailer
- */
- if (gif_bytes < 2) {
- return_value = GIF_INSUFFICIENT_FRAME_DATA;
- goto gif_decode_frame_exit;
- /* If we only have a 1-byte LZW code size + 1-byte gif trailer, we're finished
- */
- } else if ((gif_bytes == 2) && (gif_data[1] == GIF_TRAILER)) {
- return_value = GIF_OK;
- goto gif_decode_frame_exit;
- }
-
- /* If the previous frame's disposal method requires we restore the background
- * colour or this is the first frame, clear the frame data
- */
- if ((frame == 0) || (gif->decoded_frame == GIF_INVALID_FRAME)) {
- memset((char*)frame_data, GIF_TRANSPARENT_COLOUR, gif->width * gif->height * sizeof(int));
- gif->decoded_frame = frame;
- /* The line below would fill the image with its background color, but because GIFs support
- * transparency we likely wouldn't want to do that. */
- /* memset((char*)frame_data, colour_table[gif->background_index], gif->width * gif->height * sizeof(int)); */
- } else if ((frame != 0) && (gif->frames[frame - 1].disposal_method == GIF_FRAME_CLEAR)) {
- clear_image = true;
- if ((return_value = gif_decode_frame(gif, (frame - 1))) != GIF_OK)
- goto gif_decode_frame_exit;
- clear_image = false;
- /* If the previous frame's disposal method requires we restore the previous
- * image, find the last image set to "do not dispose" and get that frame data
- */
- } else if ((frame != 0) && (gif->frames[frame - 1].disposal_method == GIF_FRAME_RESTORE)) {
- while ((last_undisposed_frame != -1) && (gif->frames[--last_undisposed_frame].disposal_method == GIF_FRAME_RESTORE))
- ;
-
- /* If we don't find one, clear the frame data
- */
- if (last_undisposed_frame == -1) {
- /* see notes above on transparency vs. background color */
- memset((char*)frame_data, GIF_TRANSPARENT_COLOUR, gif->width * gif->height * sizeof(int));
- } else {
- if ((return_value = gif_decode_frame(gif, last_undisposed_frame)) != GIF_OK)
- goto gif_decode_frame_exit;
- /* Get this frame's data
- */
- assert(gif->bitmap_callbacks.bitmap_get_buffer);
- frame_data = (void *)gif->bitmap_callbacks.bitmap_get_buffer(gif->frame_image);
- if (!frame_data)
- return GIF_INSUFFICIENT_MEMORY;
- }
- }
- gif->decoded_frame = frame;
-
- /* Initialise the LZW decoding
- */
- set_code_size = gif_data[0];
- gif->buffer_position = (gif_data - gif->gif_data) + 1;
-
- /* Set our code variables
- */
- code_size = set_code_size + 1;
- clear_code = (1 << set_code_size);
- end_code = clear_code + 1;
- max_code_size = clear_code << 1;
- max_code = clear_code + 2;
- curbit = lastbit = 0;
- last_byte = 2;
- get_done = false;
- direct = buf;
- gif_init_LZW(gif);
-
- /* Decompress the data
- */
- for (y = 0; y < height; y++) {
- if (interlace)
- decode_y = gif_interlaced_line(height, y) + offset_y;
- else
- decode_y = y + offset_y;
- frame_scanline = frame_data + offset_x + (decode_y * gif->width);
-
- /* Rather than decoding pixel by pixel, we try to burst out streams
- of data to remove the need for end-of data checks every pixel.
- */
- x = width;
- while (x > 0) {
- burst_bytes = (stack_pointer - stack);
- if (burst_bytes > 0) {
- if (burst_bytes > x)
- burst_bytes = x;
- x -= burst_bytes;
- while (burst_bytes-- > 0) {
- colour = *--stack_pointer;
- if (((gif->frames[frame].transparency) &&
- (colour != gif->frames[frame].transparency_index)) ||
- (!gif->frames[frame].transparency))
- *frame_scanline = colour_table[colour];
- frame_scanline++;
- }
- } else {
- if (!gif_next_LZW(gif)) {
- /* Unexpected end of frame, try to recover
- */
- if (gif->current_error == GIF_END_OF_FRAME)
- return_value = GIF_OK;
- else
- return_value = gif->current_error;
- goto gif_decode_frame_exit;
- }
- }
- }
- }
- } else {
- /* Clear our frame
- */
- if (gif->frames[frame].disposal_method == GIF_FRAME_CLEAR) {
- for (y = 0; y < height; y++) {
- frame_scanline = frame_data + offset_x + ((offset_y + y) * gif->width);
- if (gif->frames[frame].transparency)
- memset(frame_scanline, GIF_TRANSPARENT_COLOUR, width * 4);
- else
- memset(frame_scanline, colour_table[gif->background_index], width * 4);
- }
- }
- }
+/**
+ * decode a gif frame
+ *
+ * \param gif gif animation context.
+ * \param frame The frame number to decode.
+ * \param clear_image flag for image data being cleared instead of plotted.
+ */
+static gif_result
+gif_internal_decode_frame(gif_animation *gif,
+ unsigned int frame,
+ bool clear_image)
+{
+ unsigned int index = 0;
+ unsigned char *gif_data, *gif_end;
+ int gif_bytes;
+ unsigned int width, height, offset_x, offset_y;
+ unsigned int flags, colour_table_size, interlace;
+ unsigned int *colour_table;
+ unsigned int *frame_data = 0; // Set to 0 for no warnings
+ unsigned int *frame_scanline;
+ unsigned int save_buffer_position;
+ unsigned int return_value = 0;
+ unsigned int x, y, decode_y, burst_bytes;
+ register unsigned char colour;
+
+ /* Ensure this frame is supposed to be decoded */
+ if (gif->frames[frame].display == false) {
+ gif->current_error = GIF_FRAME_NO_DISPLAY;
+ return GIF_OK;
+ }
+
+ /* Ensure the frame is in range to decode */
+ if (frame > gif->frame_count_partial) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+
+ /* done if frame is already decoded */
+ if ((!clear_image) &&
+ ((int)frame == gif->decoded_frame)) {
+ return GIF_OK;
+ }
+
+ /* Get the start of our frame data and the end of the GIF data */
+ gif_data = gif->gif_data + gif->frames[frame].frame_pointer;
+ gif_end = gif->gif_data + gif->buffer_size;
+ gif_bytes = (gif_end - gif_data);
+
+ /*
+ * Ensure there is a minimal amount of data to proceed. The shortest
+ * block of data is a 10-byte image descriptor + 1-byte gif trailer
+ */
+ if (gif_bytes < 12) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Save the buffer position */
+ save_buffer_position = gif->buffer_position;
+ gif->buffer_position = gif_data - gif->gif_data;
+
+ /* Skip any extensions because they have allready been processed */
+ if ((return_value = gif_skip_frame_extensions(gif)) != GIF_OK) {
+ goto gif_decode_frame_exit;
+ }
+ gif_data = (gif->gif_data + gif->buffer_position);
+ gif_bytes = (gif_end - gif_data);
+
+ /* Ensure we have enough data for the 10-byte image descriptor + 1-byte
+ * gif trailer
+ */
+ if (gif_bytes < 12) {
+ return_value = GIF_INSUFFICIENT_FRAME_DATA;
+ goto gif_decode_frame_exit;
+ }
+
+ /* 10-byte Image Descriptor is:
+ *
+ * +0 CHAR Image Separator (0x2c)
+ * +1 SHORT Image Left Position
+ * +3 SHORT Image Top Position
+ * +5 SHORT Width
+ * +7 SHORT Height
+ * +9 CHAR __Packed Fields__
+ * 1BIT Local Colour Table Flag
+ * 1BIT Interlace Flag
+ * 1BIT Sort Flag
+ * 2BITS Reserved
+ * 3BITS Size of Local Colour Table
+ */
+ if (gif_data[0] != GIF_IMAGE_SEPARATOR) {
+ return_value = GIF_DATA_ERROR;
+ goto gif_decode_frame_exit;
+ }
+ offset_x = gif_data[1] | (gif_data[2] << 8);
+ offset_y = gif_data[3] | (gif_data[4] << 8);
+ width = gif_data[5] | (gif_data[6] << 8);
+ height = gif_data[7] | (gif_data[8] << 8);
+
+ /* Boundary checking - shouldn't ever happen except unless the data has
+ * been modified since initialisation.
+ */
+ if ((offset_x + width > gif->width) ||
+ (offset_y + height > gif->height)) {
+ return_value = GIF_DATA_ERROR;
+ goto gif_decode_frame_exit;
+ }
+
+ /* Decode the flags */
+ flags = gif_data[9];
+ colour_table_size = 2 << (flags & GIF_COLOUR_TABLE_SIZE_MASK);
+ interlace = flags & GIF_INTERLACE_MASK;
+
+ /* Advance data pointer to next block either colour table or image
+ * data.
+ */
+ gif_data += 10;
+ gif_bytes = (gif_end - gif_data);
+
+ /* Set up the colour table */
+ if (flags & GIF_COLOUR_TABLE_MASK) {
+ if (gif_bytes < (int)(3 * colour_table_size)) {
+ return_value = GIF_INSUFFICIENT_FRAME_DATA;
+ goto gif_decode_frame_exit;
+ }
+ colour_table = gif->local_colour_table;
+ if (!clear_image) {
+ for (index = 0; index < colour_table_size; index++) {
+ /* Gif colour map contents are r,g,b.
+ *
+ * We want to pack them bytewise into the
+ * colour table, such that the red component
+ * is in byte 0 and the alpha component is in
+ * byte 3.
+ */
+ unsigned char *entry =
+ (unsigned char *) &colour_table[index];
+
+ entry[0] = gif_data[0]; /* r */
+ entry[1] = gif_data[1]; /* g */
+ entry[2] = gif_data[2]; /* b */
+ entry[3] = 0xff; /* a */
+
+ gif_data += 3;
+ }
+ } else {
+ gif_data += 3 * colour_table_size;
+ }
+ gif_bytes = (gif_end - gif_data);
+ } else {
+ colour_table = gif->global_colour_table;
+ }
+
+ /* Ensure sufficient data remains */
+ if (gif_bytes < 1) {
+ return_value = GIF_INSUFFICIENT_FRAME_DATA;
+ goto gif_decode_frame_exit;
+ }
+
+ /* check for an end marker */
+ if (gif_data[0] == GIF_TRAILER) {
+ return_value = GIF_OK;
+ goto gif_decode_frame_exit;
+ }
+
+ /* Get the frame data */
+ assert(gif->bitmap_callbacks.bitmap_get_buffer);
+ frame_data = (void *)gif->bitmap_callbacks.bitmap_get_buffer(gif->frame_image);
+ if (!frame_data) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* If we are clearing the image we just clear, if not decode */
+ if (!clear_image) {
+ /* Ensure we have enough data for a 1-byte LZW code size +
+ * 1-byte gif trailer
+ */
+ if (gif_bytes < 2) {
+ return_value = GIF_INSUFFICIENT_FRAME_DATA;
+ goto gif_decode_frame_exit;
+ }
+
+ /* If we only have a 1-byte LZW code size + 1-byte gif trailer,
+ * we're finished
+ */
+ if ((gif_bytes == 2) && (gif_data[1] == GIF_TRAILER)) {
+ return_value = GIF_OK;
+ goto gif_decode_frame_exit;
+ }
+
+ /* If the previous frame's disposal method requires we restore
+ * the background colour or this is the first frame, clear
+ * the frame data
+ */
+ if ((frame == 0) || (gif->decoded_frame == GIF_INVALID_FRAME)) {
+ memset((char*)frame_data,
+ GIF_TRANSPARENT_COLOUR,
+ gif->width * gif->height * sizeof(int));
+ gif->decoded_frame = frame;
+ /* The line below would fill the image with its
+ * background color, but because GIFs support
+ * transparency we likely wouldn't want to do that. */
+ /* memset((char*)frame_data, colour_table[gif->background_index], gif->width * gif->height * sizeof(int)); */
+ } else if ((frame != 0) &&
+ (gif->frames[frame - 1].disposal_method == GIF_FRAME_CLEAR)) {
+ return_value = gif_internal_decode_frame(gif,
+ (frame - 1),
+ true);
+ if (return_value != GIF_OK) {
+ goto gif_decode_frame_exit;
+ }
+
+ } else if ((frame != 0) &&
+ (gif->frames[frame - 1].disposal_method == GIF_FRAME_RESTORE)) {
+ /*
+ * If the previous frame's disposal method requires we
+ * restore the previous image, find the last image set
+ * to "do not dispose" and get that frame data
+ */
+ int last_undisposed_frame = frame - 2;
+ while ((last_undisposed_frame >= 0) &&
+ (gif->frames[last_undisposed_frame].disposal_method == GIF_FRAME_RESTORE)) {
+ last_undisposed_frame--;
+ }
+
+ /* If we don't find one, clear the frame data */
+ if (last_undisposed_frame == -1) {
+ /* see notes above on transparency
+ * vs. background color
+ */
+ memset((char*)frame_data,
+ GIF_TRANSPARENT_COLOUR,
+ gif->width * gif->height * sizeof(int));
+ } else {
+ return_value = gif_internal_decode_frame(gif, last_undisposed_frame, false);
+ if (return_value != GIF_OK) {
+ goto gif_decode_frame_exit;
+ }
+ /* Get this frame's data */
+ assert(gif->bitmap_callbacks.bitmap_get_buffer);
+ frame_data = (void *)gif->bitmap_callbacks.bitmap_get_buffer(gif->frame_image);
+ if (!frame_data) {
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+ }
+ }
+ gif->decoded_frame = frame;
+
+ /* Initialise the LZW decoding */
+ set_code_size = gif_data[0];
+ gif->buffer_position = (gif_data - gif->gif_data) + 1;
+
+ /* Set our code variables */
+ code_size = set_code_size + 1;
+ clear_code = (1 << set_code_size);
+ end_code = clear_code + 1;
+ max_code_size = clear_code << 1;
+ max_code = clear_code + 2;
+ curbit = lastbit = 0;
+ last_byte = 2;
+ get_done = false;
+ direct = buf;
+ gif_init_LZW(gif);
+
+ /* Decompress the data */
+ for (y = 0; y < height; y++) {
+ if (interlace) {
+ decode_y = gif_interlaced_line(height, y) + offset_y;
+ } else {
+ decode_y = y + offset_y;
+ }
+ frame_scanline = frame_data + offset_x + (decode_y * gif->width);
+
+ /* Rather than decoding pixel by pixel, we try to burst
+ * out streams of data to remove the need for end-of
+ * data checks every pixel.
+ */
+ x = width;
+ while (x > 0) {
+ burst_bytes = (stack_pointer - stack);
+ if (burst_bytes > 0) {
+ if (burst_bytes > x) {
+ burst_bytes = x;
+ }
+ x -= burst_bytes;
+ while (burst_bytes-- > 0) {
+ colour = *--stack_pointer;
+ if (((gif->frames[frame].transparency) &&
+ (colour != gif->frames[frame].transparency_index)) ||
+ (!gif->frames[frame].transparency)) {
+ *frame_scanline = colour_table[colour];
+ }
+ frame_scanline++;
+ }
+ } else {
+ if (!gif_next_LZW(gif)) {
+ /* Unexpected end of frame, try to recover */
+ if (gif->current_error == GIF_END_OF_FRAME) {
+ return_value = GIF_OK;
+ } else {
+ return_value = gif->current_error;
+ }
+ goto gif_decode_frame_exit;
+ }
+ }
+ }
+ }
+ } else {
+ /* Clear our frame */
+ if (gif->frames[frame].disposal_method == GIF_FRAME_CLEAR) {
+ for (y = 0; y < height; y++) {
+ frame_scanline = frame_data + offset_x + ((offset_y + y) * gif->width);
+ if (gif->frames[frame].transparency) {
+ memset(frame_scanline,
+ GIF_TRANSPARENT_COLOUR,
+ width * 4);
+ } else {
+ memset(frame_scanline,
+ colour_table[gif->background_index],
+ width * 4);
+ }
+ }
+ }
+ }
gif_decode_frame_exit:
- /* Check if we should test for optimisation
- */
- if (gif->frames[frame].virgin) {
- if (gif->bitmap_callbacks.bitmap_test_opaque)
- gif->frames[frame].opaque = gif->bitmap_callbacks.bitmap_test_opaque(gif->frame_image);
- else
- gif->frames[frame].opaque = false;
- gif->frames[frame].virgin = false;
- }
- if (gif->bitmap_callbacks.bitmap_set_opaque)
- gif->bitmap_callbacks.bitmap_set_opaque(gif->frame_image, gif->frames[frame].opaque);
- if (gif->bitmap_callbacks.bitmap_modified)
- gif->bitmap_callbacks.bitmap_modified(gif->frame_image);
-
- /* Restore the buffer position
- */
- gif->buffer_position = save_buffer_position;
-
- /* Success!
- */
- return return_value;
+ /* Check if we should test for optimisation */
+ if (gif->frames[frame].virgin) {
+ if (gif->bitmap_callbacks.bitmap_test_opaque) {
+ gif->frames[frame].opaque = gif->bitmap_callbacks.bitmap_test_opaque(gif->frame_image);
+ } else {
+ gif->frames[frame].opaque = false;
+ }
+ gif->frames[frame].virgin = false;
+ }
-}
+ if (gif->bitmap_callbacks.bitmap_set_opaque) {
+ gif->bitmap_callbacks.bitmap_set_opaque(gif->frame_image, gif->frames[frame].opaque);
+ }
-/** Skips the frame's extensions (which have been previously initialised)
+ if (gif->bitmap_callbacks.bitmap_modified) {
+ gif->bitmap_callbacks.bitmap_modified(gif->frame_image);
+ }
- @return GIF_INSUFFICIENT_FRAME_DATA for insufficient data to complete the frame
- GIF_OK for successful decoding
-*/
-static gif_result gif_skip_frame_extensions(gif_animation *gif) {
- unsigned char *gif_data, *gif_end;
- int gif_bytes;
- unsigned int block_size;
-
- /* Get our buffer position etc.
- */
- gif_data = (unsigned char *)(gif->gif_data + gif->buffer_position);
- gif_end = (unsigned char *)(gif->gif_data + gif->buffer_size);
- gif_bytes = (gif_end - gif_data);
-
- /* Skip the extensions
- */
- while (gif_data < gif_end && gif_data[0] == GIF_EXTENSION_INTRODUCER) {
- ++gif_data;
- if (gif_data >= gif_end)
- return GIF_INSUFFICIENT_FRAME_DATA;
-
- /* Switch on extension label
- */
- switch(gif_data[0]) {
- /* Move the pointer to the first data sub-block
- * 1 byte for the extension label
- */
- case GIF_EXTENSION_COMMENT:
- ++gif_data;
- break;
-
- /* Move the pointer to the first data sub-block
- * 2 bytes for the extension label and size fields
- * Skip the extension size itself
- */
- default:
- if (gif_data + 1 >= gif_end)
- return GIF_INSUFFICIENT_FRAME_DATA;
- gif_data += (2 + gif_data[1]);
- }
-
- /* Repeatedly skip blocks until we get a zero block or run out of data
- * This data is ignored by this gif decoder
- */
- gif_bytes = (gif_end - gif_data);
- block_size = 0;
- while (gif_data < gif_end && gif_data[0] != GIF_BLOCK_TERMINATOR) {
- block_size = gif_data[0] + 1;
- if ((gif_bytes -= block_size) < 0)
- return GIF_INSUFFICIENT_FRAME_DATA;
- gif_data += block_size;
- }
- ++gif_data;
- }
-
- /* Set buffer position and return
- */
- gif->buffer_position = (gif_data - gif->gif_data);
- return GIF_OK;
-}
+ /* Restore the buffer position */
+ gif->buffer_position = save_buffer_position;
-static unsigned int gif_interlaced_line(int height, int y) {
- if ((y << 3) < height) return (y << 3);
- y -= ((height + 7) >> 3);
- if ((y << 3) < (height - 4)) return (y << 3) + 4;
- y -= ((height + 3) >> 3);
- if ((y << 2) < (height - 2)) return (y << 2) + 2;
- y -= ((height + 1) >> 2);
- return (y << 1) + 1;
+ return return_value;
}
-/* Releases any workspace held by the animation
-*/
-void gif_finalise(gif_animation *gif) {
- /* Release all our memory blocks
- */
- if (gif->frame_image) {
- assert(gif->bitmap_callbacks.bitmap_destroy);
- gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
- }
- gif->frame_image = NULL;
- free(gif->frames);
- gif->frames = NULL;
- free(gif->local_colour_table);
- gif->local_colour_table = NULL;
- free(gif->global_colour_table);
- gif->global_colour_table = NULL;
+
+/* exported function documented in libnsgif.h */
+void gif_create(gif_animation *gif, gif_bitmap_callback_vt *bitmap_callbacks)
+{
+ memset(gif, 0, sizeof(gif_animation));
+ gif->bitmap_callbacks = *bitmap_callbacks;
+ gif->decoded_frame = GIF_INVALID_FRAME;
}
-/**
- * Initialise LZW decoding
- */
-void gif_init_LZW(gif_animation *gif) {
- int i;
-
- gif->current_error = 0;
- if (clear_code >= (1 << GIF_MAX_LZW)) {
- stack_pointer = stack;
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return;
- }
-
- /* initialise our table */
- memset(table, 0x00, (1 << GIF_MAX_LZW) * 8);
- for (i = 0; i < clear_code; ++i)
- table[1][i] = i;
-
- /* update our LZW parameters */
- code_size = set_code_size + 1;
- max_code_size = clear_code << 1;
- max_code = clear_code + 2;
- stack_pointer = stack;
- do {
- firstcode = oldcode = gif_next_code(gif, code_size);
- } while (firstcode == clear_code);
- *stack_pointer++ =firstcode;
+
+/* exported function documented in libnsgif.h */
+gif_result gif_initialise(gif_animation *gif, size_t size, unsigned char *data)
+{
+ unsigned char *gif_data;
+ unsigned int index;
+ gif_result return_value;
+
+ /* Initialize values */
+ gif->buffer_size = size;
+ gif->gif_data = data;
+
+ /* Check for sufficient data to be a GIF (6-byte header + 7-byte
+ * logical screen descriptor)
+ */
+ if (gif->buffer_size < 13) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+
+ /* Get our current processing position */
+ gif_data = gif->gif_data + gif->buffer_position;
+
+ /* See if we should initialise the GIF */
+ if (gif->buffer_position == 0) {
+ /* We want everything to be NULL before we start so we've no
+ * chance of freeing bad pointers (paranoia)
+ */
+ gif->frame_image = NULL;
+ gif->frames = NULL;
+ gif->local_colour_table = NULL;
+ gif->global_colour_table = NULL;
+
+ /* The caller may have been lazy and not reset any values */
+ gif->frame_count = 0;
+ gif->frame_count_partial = 0;
+ gif->decoded_frame = GIF_INVALID_FRAME;
+
+ /* 6-byte GIF file header is:
+ *
+ * +0 3CHARS Signature ('GIF')
+ * +3 3CHARS Version ('87a' or '89a')
+ */
+ if (strncmp((const char *) gif_data, "GIF", 3) != 0) {
+ return GIF_DATA_ERROR;
+ }
+ gif_data += 3;
+
+ /* Ensure GIF reports version 87a or 89a */
+ /*
+ if ((strncmp(gif_data, "87a", 3) != 0) &&
+ (strncmp(gif_data, "89a", 3) != 0))
+ LOG(("Unknown GIF format - proceeding anyway"));
+ */
+ gif_data += 3;
+
+ /* 7-byte Logical Screen Descriptor is:
+ *
+ * +0 SHORT Logical Screen Width
+ * +2 SHORT Logical Screen Height
+ * +4 CHAR __Packed Fields__
+ * 1BIT Global Colour Table Flag
+ * 3BITS Colour Resolution
+ * 1BIT Sort Flag
+ * 3BITS Size of Global Colour Table
+ * +5 CHAR Background Colour Index
+ * +6 CHAR Pixel Aspect Ratio
+ */
+ gif->width = gif_data[0] | (gif_data[1] << 8);
+ gif->height = gif_data[2] | (gif_data[3] << 8);
+ gif->global_colours = (gif_data[4] & GIF_COLOUR_TABLE_MASK);
+ gif->colour_table_size = (2 << (gif_data[4] & GIF_COLOUR_TABLE_SIZE_MASK));
+ gif->background_index = gif_data[5];
+ gif->aspect_ratio = gif_data[6];
+ gif->loop_count = 1;
+ gif_data += 7;
+
+ /* Some broken GIFs report the size as the screen size they
+ * were created in. As such, we detect for the common cases and
+ * set the sizes as 0 if they are found which results in the
+ * GIF being the maximum size of the frames.
+ */
+ if (((gif->width == 640) && (gif->height == 480)) ||
+ ((gif->width == 640) && (gif->height == 512)) ||
+ ((gif->width == 800) && (gif->height == 600)) ||
+ ((gif->width == 1024) && (gif->height == 768)) ||
+ ((gif->width == 1280) && (gif->height == 1024)) ||
+ ((gif->width == 1600) && (gif->height == 1200)) ||
+ ((gif->width == 0) || (gif->height == 0)) ||
+ ((gif->width > 2048) || (gif->height > 2048))) {
+ gif->width = 1;
+ gif->height = 1;
+ }
+
+ /* Allocate some data irrespective of whether we've got any
+ * colour tables. We always get the maximum size in case a GIF
+ * is lying to us. It's far better to give the wrong colours
+ * than to trample over some memory somewhere.
+ */
+ gif->global_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
+ gif->local_colour_table = calloc(GIF_MAX_COLOURS, sizeof(unsigned int));
+ if ((gif->global_colour_table == NULL) ||
+ (gif->local_colour_table == NULL)) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* Set the first colour to a value that will never occur in
+ * reality so we know if we've processed it
+ */
+ gif->global_colour_table[0] = GIF_PROCESS_COLOURS;
+
+ /* Check if the GIF has no frame data (13-byte header + 1-byte
+ * termination block) Although generally useless, the GIF
+ * specification does not expressly prohibit this
+ */
+ if (gif->buffer_size == 14) {
+ if (gif_data[0] == GIF_TRAILER) {
+ return GIF_OK;
+ } else {
+ return GIF_INSUFFICIENT_DATA;
+ }
+ }
+
+ /* Initialise enough workspace for 4 frames initially */
+ if ((gif->frames = (gif_frame *)malloc(sizeof(gif_frame))) == NULL) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+ gif->frame_holders = 1;
+
+ /* Initialise the bitmap header */
+ assert(gif->bitmap_callbacks.bitmap_create);
+ gif->frame_image = gif->bitmap_callbacks.bitmap_create(gif->width, gif->height);
+ if (gif->frame_image == NULL) {
+ gif_finalise(gif);
+ return GIF_INSUFFICIENT_MEMORY;
+ }
+
+ /* Remember we've done this now */
+ gif->buffer_position = gif_data - gif->gif_data;
+ }
+
+ /* Do the colour map if we haven't already. As the top byte is always
+ * 0xff or 0x00 depending on the transparency we know if it's been
+ * filled in.
+ */
+ if (gif->global_colour_table[0] == GIF_PROCESS_COLOURS) {
+ /* Check for a global colour map signified by bit 7 */
+ if (gif->global_colours) {
+ if (gif->buffer_size < (gif->colour_table_size * 3 + 12)) {
+ return GIF_INSUFFICIENT_DATA;
+ }
+ for (index = 0; index < gif->colour_table_size; index++) {
+ /* Gif colour map contents are r,g,b.
+ *
+ * We want to pack them bytewise into the
+ * colour table, such that the red component
+ * is in byte 0 and the alpha component is in
+ * byte 3.
+ */
+ unsigned char *entry = (unsigned char *) &gif->
+ global_colour_table[index];
+
+ entry[0] = gif_data[0]; /* r */
+ entry[1] = gif_data[1]; /* g */
+ entry[2] = gif_data[2]; /* b */
+ entry[3] = 0xff; /* a */
+
+ gif_data += 3;
+ }
+ gif->buffer_position = (gif_data - gif->gif_data);
+ } else {
+ /* Create a default colour table with the first two
+ * colours as black and white
+ */
+ unsigned int *entry = gif->global_colour_table;
+
+ entry[0] = 0x00000000;
+ /* Force Alpha channel to opaque */
+ ((unsigned char *) entry)[3] = 0xff;
+
+ entry[1] = 0xffffffff;
+ }
+ }
+
+ /* Repeatedly try to initialise frames */
+ while ((return_value = gif_initialise_frame(gif)) == GIF_WORKING);
+
+ /* If there was a memory error tell the caller */
+ if ((return_value == GIF_INSUFFICIENT_MEMORY) ||
+ (return_value == GIF_DATA_ERROR)) {
+ return return_value;
+ }
+
+ /* If we didn't have some frames then a GIF_INSUFFICIENT_DATA becomes a
+ * GIF_INSUFFICIENT_FRAME_DATA
+ */
+ if ((return_value == GIF_INSUFFICIENT_DATA) &&
+ (gif->frame_count_partial > 0)) {
+ return GIF_INSUFFICIENT_FRAME_DATA;
+ }
+
+ /* Return how many we got */
+ return return_value;
}
-static bool gif_next_LZW(gif_animation *gif) {
- int code, incode;
- int block_size;
- int new_code;
-
- code = gif_next_code(gif, code_size);
- if (code < 0) {
- gif->current_error = code;
- return false;
- } else if (code == clear_code) {
- gif_init_LZW(gif);
- return true;
- } else if (code == end_code) {
- /* skip to the end of our data so multi-image GIFs work */
- if (zero_data_block) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- block_size = 0;
- while (block_size != 1 &&
- gif->buffer_position < gif->buffer_size) {
- block_size = gif->gif_data[gif->buffer_position] + 1;
- gif->buffer_position += block_size;
- }
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
-
- incode = code;
- if (code >= max_code) {
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = firstcode;
- code = oldcode;
- }
-
- /* The following loop is the most important in the GIF decoding cycle as every
- * single pixel passes through it.
- *
- * Note: our stack is always big enough to hold a complete decompressed chunk. */
- while (code >= clear_code) {
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
- code >= (1 << GIF_MAX_LZW)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = table[1][code];
- new_code = table[0][code];
- if (new_code < clear_code) {
- code = new_code;
- break;
- }
-
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2) ||
- new_code >= (1 << GIF_MAX_LZW)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = table[1][new_code];
- code = table[0][new_code];
- if (code == new_code) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- }
-
- if (stack_pointer >= stack + ((1 << GIF_MAX_LZW) * 2)) {
- gif->current_error = GIF_FRAME_DATA_ERROR;
- return false;
- }
- *stack_pointer++ = firstcode = table[1][code];
-
- if ((code = max_code) < (1 << GIF_MAX_LZW)) {
- table[0][code] = oldcode;
- table[1][code] = firstcode;
- ++max_code;
- if ((max_code >= max_code_size) && (max_code_size < (1 << GIF_MAX_LZW))) {
- max_code_size = max_code_size << 1;
- ++code_size;
- }
- }
- oldcode = incode;
- return true;
+/* exported function documented in libnsgif.h */
+gif_result gif_decode_frame(gif_animation *gif, unsigned int frame)
+{
+ return gif_internal_decode_frame(gif, frame, false);
}
-static int gif_next_code(gif_animation *gif, int code_size) {
- int i, j, end, count, ret;
- unsigned char *b;
-
- end = curbit + code_size;
- if (end >= lastbit) {
- if (get_done)
- return GIF_END_OF_FRAME;
- buf[0] = direct[last_byte - 2];
- buf[1] = direct[last_byte - 1];
-
- /* get the next block */
- direct = gif->gif_data + gif->buffer_position;
- if (gif->buffer_position >= gif->buffer_size)
- return GIF_INSUFFICIENT_FRAME_DATA;
- zero_data_block = ((count = direct[0]) == 0);
- if ((gif->buffer_position + count) >= gif->buffer_size)
- return GIF_INSUFFICIENT_FRAME_DATA;
- if (count == 0)
- get_done = true;
- else {
- if (gif->buffer_position + 3 >= gif->buffer_size)
- return GIF_INSUFFICIENT_FRAME_DATA;
- direct -= 1;
- buf[2] = direct[2];
- buf[3] = direct[3];
- }
- gif->buffer_position += count + 1;
-
- /* update our variables */
- last_byte = 2 + count;
- curbit = (curbit - lastbit) + 16;
- lastbit = (2 + count) << 3;
- end = curbit + code_size;
- }
-
- i = curbit >> 3;
- if (i < 2)
- b = buf;
- else
- b = direct;
-
- ret = b[i];
- j = (end >> 3) - 1;
- if (i <= j) {
- ret |= (b[i + 1] << 8);
- if (i < j)
- ret |= (b[i + 2] << 16);
- }
- ret = (ret >> (curbit % 8)) & maskTbl[code_size];
- curbit += code_size;
- return ret;
+
+/* exported function documented in libnsgif.h */
+void gif_finalise(gif_animation *gif)
+{
+ /* Release all our memory blocks */
+ if (gif->frame_image) {
+ assert(gif->bitmap_callbacks.bitmap_destroy);
+ gif->bitmap_callbacks.bitmap_destroy(gif->frame_image);
+ }
+
+ gif->frame_image = NULL;
+ free(gif->frames);
+ gif->frames = NULL;
+ free(gif->local_colour_table);
+ gif->local_colour_table = NULL;
+ free(gif->global_colour_table);
+ gif->global_colour_table = NULL;
}
--
NetSurf GIF Decoder
6 years, 10 months
- 1
- 0
netsurf: branch tlsa/nsurl created. release/3.6-198-ge1f12ee
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e1f12eeaa22c529cfd96a...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e1f12eeaa22c529cfd96a53...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e1f12eeaa22c529cfd96a53ee...
The branch, tlsa/nsurl has been created
at e1f12eeaa22c529cfd96a53ee26976e6a5c71a52 (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e1f12eeaa22c529cfd9...
commit e1f12eeaa22c529cfd96a53ee26976e6a5c71a52
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
nsurl: Tidy up shared components code.
diff --git a/utils/nsurl/nsurl.c b/utils/nsurl/nsurl.c
index 68188fb..7166a27 100644
--- a/utils/nsurl/nsurl.c
+++ b/utils/nsurl/nsurl.c
@@ -63,39 +63,6 @@
}
-/**
- * Destroy components
- *
- * \param c url components
- */
-static void nsurl_destroy_components(struct nsurl_components *c)
-{
- if (c->scheme)
- lwc_string_unref(c->scheme);
-
- if (c->username)
- lwc_string_unref(c->username);
-
- if (c->password)
- lwc_string_unref(c->password);
-
- if (c->host)
- lwc_string_unref(c->host);
-
- if (c->port)
- lwc_string_unref(c->port);
-
- if (c->path)
- lwc_string_unref(c->path);
-
- if (c->query)
- lwc_string_unref(c->query);
-
- if (c->fragment)
- lwc_string_unref(c->fragment);
-}
-
-
/******************************************************************************
* NetSurf URL Public API *
@@ -126,7 +93,7 @@ void nsurl_unref(nsurl *url)
#endif
/* Release lwc strings */
- nsurl_destroy_components(&url->components);
+ nsurl__components_destroy(&url->components);
/* Free the NetSurf URL */
free(url);
@@ -219,7 +186,8 @@ nserror nsurl_get(const nsurl *url, nsurl_component parts,
{
assert(url != NULL);
- return nsurl__string(&(url->components), parts, 0, url_s, url_l);
+ return nsurl__components_to_string(&(url->components), parts, 0,
+ url_s, url_l);
}
diff --git a/utils/nsurl/parse.c b/utils/nsurl/parse.c
index 6ec02fc..89a10d2 100644
--- a/utils/nsurl/parse.c
+++ b/utils/nsurl/parse.c
@@ -1169,7 +1169,7 @@ static void nsurl__get_string(const struct nsurl_components *url, char *url_s,
/* exported interface, documented in nsurl.h */
-nserror nsurl__string(
+nserror nsurl__components_to_string(
const struct nsurl_components *components,
nsurl_component parts, size_t pre_padding,
char **url_s_out, size_t *url_l_out)
@@ -1239,39 +1239,6 @@ void nsurl__calc_hash(nsurl *url)
}
-/**
- * Destroy components
- *
- * \param c url components
- */
-static void nsurl_destroy_components(struct nsurl_components *c)
-{
- if (c->scheme)
- lwc_string_unref(c->scheme);
-
- if (c->username)
- lwc_string_unref(c->username);
-
- if (c->password)
- lwc_string_unref(c->password);
-
- if (c->host)
- lwc_string_unref(c->host);
-
- if (c->port)
- lwc_string_unref(c->port);
-
- if (c->path)
- lwc_string_unref(c->path);
-
- if (c->query)
- lwc_string_unref(c->query);
-
- if (c->fragment)
- lwc_string_unref(c->fragment);
-}
-
-
/******************************************************************************
* NetSurf URL Public API *
******************************************************************************/
@@ -1314,7 +1281,7 @@ nserror nsurl_create(const char * const url_s, nsurl **url)
free(buff);
if (e != NSERROR_OK) {
- nsurl_destroy_components(&c);
+ nsurl__components_destroy(&c);
return NSERROR_NOMEM;
}
@@ -1325,12 +1292,12 @@ nserror nsurl_create(const char * const url_s, nsurl **url)
&match) == lwc_error_ok && match == true)) {
/* http, https must have host */
if (c.host == NULL) {
- nsurl_destroy_components(&c);
+ nsurl__components_destroy(&c);
return NSERROR_BAD_URL;
}
}
- e = nsurl__string(&c, NSURL_WITH_FRAGMENT,
+ e = nsurl__components_to_string(&c, NSURL_WITH_FRAGMENT,
sizeof(nsurl), (char **)url, &length);
if (e != NSERROR_OK) {
return e;
@@ -1568,7 +1535,7 @@ nserror nsurl_join(const nsurl *base, const char *rel, nsurl **joined)
return error;
}
- error = nsurl__string(&c, NSURL_WITH_FRAGMENT,
+ error = nsurl__components_to_string(&c, NSURL_WITH_FRAGMENT,
sizeof(nsurl), (char **)joined, &length);
if (error != NSERROR_OK) {
return error;
diff --git a/utils/nsurl/private.h b/utils/nsurl/private.h
index 67945e2..e78f830 100644
--- a/utils/nsurl/private.h
+++ b/utils/nsurl/private.h
@@ -128,7 +128,7 @@ enum nsurl_string_flags {
* \param[out] url_l_out Returns byte length of string, excluding pre_padding.
* \return NSERROR_OK on success, appropriate error otherwise.
*/
-nserror nsurl__string(
+nserror nsurl__components_to_string(
const struct nsurl_components *components,
nsurl_component parts, size_t pre_padding,
char **url_s_out, size_t *url_l_out);
@@ -142,6 +142,41 @@ void nsurl__calc_hash(nsurl *url);
+
+/**
+ * Destroy components
+ *
+ * \param c url components
+ */
+static inline void nsurl__components_destroy(struct nsurl_components *c)
+{
+ if (c->scheme)
+ lwc_string_unref(c->scheme);
+
+ if (c->username)
+ lwc_string_unref(c->username);
+
+ if (c->password)
+ lwc_string_unref(c->password);
+
+ if (c->host)
+ lwc_string_unref(c->host);
+
+ if (c->port)
+ lwc_string_unref(c->port);
+
+ if (c->path)
+ lwc_string_unref(c->path);
+
+ if (c->query)
+ lwc_string_unref(c->query);
+
+ if (c->fragment)
+ lwc_string_unref(c->fragment);
+}
+
+
+
#ifdef NSURL_DEBUG
/**
* Dump a NetSurf URL's internal components
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3c4906859fe457fc489...
commit 3c4906859fe457fc4890889a3b88368e0b355995
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
nsurl: Rationalise debug build option.
diff --git a/utils/nsurl/nsurl.c b/utils/nsurl/nsurl.c
index 137a5ac..68188fb 100644
--- a/utils/nsurl/nsurl.c
+++ b/utils/nsurl/nsurl.c
@@ -46,9 +46,6 @@
#include "utils/nsurl.h"
#include "utils/utils.h"
-/* Define to enable NSURL debugging */
-#undef NSURL_DEBUG
-
/**
* Compare two component values.
@@ -99,39 +96,6 @@ static void nsurl_destroy_components(struct nsurl_components *c)
}
-#ifdef NSURL_DEBUG
-/**
- * Dump a NetSurf URL's internal components
- *
- * \param url The NetSurf URL to dump components of
- */
-static void nsurl__dump(const nsurl *url)
-{
- if (url->components.scheme)
- LOG(" Scheme: %s", lwc_string_data(url->components.scheme));
-
- if (url->components.username)
- LOG("Username: %s", lwc_string_data(url->components.username));
-
- if (url->components.password)
- LOG("Password: %s", lwc_string_data(url->components.password));
-
- if (url->components.host)
- LOG(" Host: %s", lwc_string_data(url->components.host));
-
- if (url->components.port)
- LOG(" Port: %s", lwc_string_data(url->components.port));
-
- if (url->components.path)
- LOG(" Path: %s", lwc_string_data(url->components.path));
-
- if (url->components.query)
- LOG(" Query: %s", lwc_string_data(url->components.query));
-
- if (url->components.fragment)
- LOG("Fragment: %s", lwc_string_data(url->components.fragment));
-}
-#endif
/******************************************************************************
* NetSurf URL Public API *
diff --git a/utils/nsurl/parse.c b/utils/nsurl/parse.c
index 2d74ea9..6ec02fc 100644
--- a/utils/nsurl/parse.c
+++ b/utils/nsurl/parse.c
@@ -46,9 +46,6 @@
#include "utils/nsurl/private.h"
#include "utils/utils.h"
-/* Define to enable NSURL debugging */
-#undef NSURL_DEBUG
-
/** Marker set, indicating positions of sections within a URL string */
struct url_markers {
@@ -1275,40 +1272,6 @@ static void nsurl_destroy_components(struct nsurl_components *c)
}
-#ifdef NSURL_DEBUG
-/**
- * Dump a NetSurf URL's internal components
- *
- * \param url The NetSurf URL to dump components of
- */
-static void nsurl__dump(const nsurl *url)
-{
- if (url->components.scheme)
- LOG(" Scheme: %s", lwc_string_data(url->components.scheme));
-
- if (url->components.username)
- LOG("Username: %s", lwc_string_data(url->components.username));
-
- if (url->components.password)
- LOG("Password: %s", lwc_string_data(url->components.password));
-
- if (url->components.host)
- LOG(" Host: %s", lwc_string_data(url->components.host));
-
- if (url->components.port)
- LOG(" Port: %s", lwc_string_data(url->components.port));
-
- if (url->components.path)
- LOG(" Path: %s", lwc_string_data(url->components.path));
-
- if (url->components.query)
- LOG(" Query: %s", lwc_string_data(url->components.query));
-
- if (url->components.fragment)
- LOG("Fragment: %s", lwc_string_data(url->components.fragment));
-}
-#endif
-
/******************************************************************************
* NetSurf URL Public API *
******************************************************************************/
diff --git a/utils/nsurl/private.h b/utils/nsurl/private.h
index a5291af..67945e2 100644
--- a/utils/nsurl/private.h
+++ b/utils/nsurl/private.h
@@ -24,6 +24,11 @@
#include "utils/nsurl.h"
#include "utils/utils.h"
+
+/* Define to enable NSURL debugging */
+#undef NSURL_DEBUG
+
+
/** A type for URL schemes */
enum nsurl_scheme_type {
NSURL_SCHEME_OTHER,
@@ -135,4 +140,41 @@ nserror nsurl__string(
*/
void nsurl__calc_hash(nsurl *url);
+
+
+#ifdef NSURL_DEBUG
+/**
+ * Dump a NetSurf URL's internal components
+ *
+ * \param url The NetSurf URL to dump components of
+ */
+static inline void nsurl__dump(const nsurl *url)
+{
+ if (url->components.scheme)
+ LOG(" Scheme: %s", lwc_string_data(url->components.scheme));
+
+ if (url->components.username)
+ LOG("Username: %s", lwc_string_data(url->components.username));
+
+ if (url->components.password)
+ LOG("Password: %s", lwc_string_data(url->components.password));
+
+ if (url->components.host)
+ LOG(" Host: %s", lwc_string_data(url->components.host));
+
+ if (url->components.port)
+ LOG(" Port: %s", lwc_string_data(url->components.port));
+
+ if (url->components.path)
+ LOG(" Path: %s", lwc_string_data(url->components.path));
+
+ if (url->components.query)
+ LOG(" Query: %s", lwc_string_data(url->components.query));
+
+ if (url->components.fragment)
+ LOG("Fragment: %s", lwc_string_data(url->components.fragment));
+}
+#endif
+
+
#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e9768b4d0c9093a4b70...
commit e9768b4d0c9093a4b70089ac942ee26d6603d5d1
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
nsurl: Tidy up component helper macros.
diff --git a/utils/nsurl/nsurl.c b/utils/nsurl/nsurl.c
index 79dc716..137a5ac 100644
--- a/utils/nsurl/nsurl.c
+++ b/utils/nsurl/nsurl.c
@@ -50,8 +50,13 @@
#undef NSURL_DEBUG
-#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
-
+/**
+ * Compare two component values.
+ *
+ * Sets match to false if the components are not the same.
+ * Does nothing if the components are the same, so ensure match is
+ * preset to true.
+ */
#define nsurl__component_compare(c1, c2, match) \
if (c1 && c2 && lwc_error_ok == \
lwc_string_isequal(c1, c2, match)) { \
diff --git a/utils/nsurl/parse.c b/utils/nsurl/parse.c
index e242689..2d74ea9 100644
--- a/utils/nsurl/parse.c
+++ b/utils/nsurl/parse.c
@@ -81,16 +81,6 @@ enum url_sections {
};
-#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
-
-#define nsurl__component_compare(c1, c2, match) \
- if (c1 && c2 && lwc_error_ok == \
- lwc_string_isequal(c1, c2, match)) { \
- /* do nothing */ \
- } else if (c1 || c2) { \
- *match = false; \
- }
-
/**
* Return a hex digit for the given numerical value.
*
diff --git a/utils/nsurl/private.h b/utils/nsurl/private.h
index bc3eb8c..a5291af 100644
--- a/utils/nsurl/private.h
+++ b/utils/nsurl/private.h
@@ -107,6 +107,11 @@ enum nsurl_string_flags {
NSURL_F_FRAGMENT = (1 << 11)
};
+/**
+ * NULL-safe lwc_string_ref
+ */
+#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
+
/**
* Convert a set of nsurl components to a single string
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=fdd9fae30549f5321aa...
commit fdd9fae30549f5321aada39c7696107392bd6afd
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
nsurl: Consolidate conversion to string.
diff --git a/test/Makefile b/test/Makefile
index fd54fb9..34d8c93 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -13,12 +13,19 @@ TESTS := \
time #llcache
# nsurl sources
-nsurl_SRCS := utils/corestrings.c utils/nsurl.c utils/idna.c \
- test/log.c test/nsurl.c
+nsurl_SRCS := \
+ utils/corestrings.c \
+ utils/nsurl/nsurl.c \
+ utils/nsurl/parse.c \
+ utils/idna.c \
+ test/log.c \
+ test/nsurl.c
# url database test sources
urldbtest_SRCS := content/urldb.c \
- utils/idna.c utils/bloom.c utils/nsoption.c utils/nsurl.c \
+ utils/idna.c utils/bloom.c utils/nsoption.c \
+ utils/nsurl/nsurl.c \
+ utils/nsurl/parse.c \
utils/corestrings.c \
utils/hashtable.c utils/messages.c utils/time.c utils/utils.c \
test/log.c test/urldbtest.c
@@ -30,7 +37,9 @@ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
content/urldb.c \
image/image_cache.c \
utils/base64.c utils/corestrings.c utils/hashtable.c \
- utils/nsurl.c utils/messages.c utils/url.c utils/useragent.c \
+ utils/nsurl/nsurl.c \
+ utils/nsurl/parse.c \
+ utils/messages.c utils/url.c utils/useragent.c \
utils/utils.c \
test/log.c test/llcache.c
@@ -51,7 +60,9 @@ urlescape_SRCS := utils/url.c test/log.c test/urlescape.c
# utility test sources
utils_SRCS := utils/utils.c utils/messages.c utils/hashtable.c \
- utils/corestrings.c utils/nsurl.c utils/idna.c \
+ utils/corestrings.c utils/idna.c \
+ utils/nsurl/nsurl.c \
+ utils/nsurl/parse.c \
test/log.c test/utils.c
# time test sources
diff --git a/utils/nsurl/nsurl.c b/utils/nsurl/nsurl.c
index b60eb07..79dc716 100644
--- a/utils/nsurl/nsurl.c
+++ b/utils/nsurl/nsurl.c
@@ -248,29 +248,9 @@ bool nsurl_compare(const nsurl *url1, const nsurl *url2, nsurl_component parts)
nserror nsurl_get(const nsurl *url, nsurl_component parts,
char **url_s, size_t *url_l)
{
- struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
- enum nsurl_string_flags str_flags = 0;
-
assert(url != NULL);
- /* Get the string length and find which parts of url need copied */
- nsurl__get_string_data(&(url->components), parts, url_l,
- &str_len, &str_flags);
-
- if (*url_l == 0) {
- return NSERROR_BAD_URL;
- }
-
- /* Allocate memory for url string */
- *url_s = malloc(*url_l + 1); /* adding 1 for '\0' */
- if (*url_s == NULL) {
- return NSERROR_NOMEM;
- }
-
- /* Copy the required parts into the url string */
- nsurl__get_string(&(url->components), *url_s, &str_len, str_flags);
-
- return NSERROR_OK;
+ return nsurl__string(&(url->components), parts, 0, url_s, url_l);
}
diff --git a/utils/nsurl/parse.c b/utils/nsurl/parse.c
index 0cdbbd4..e242689 100644
--- a/utils/nsurl/parse.c
+++ b/utils/nsurl/parse.c
@@ -997,8 +997,16 @@ static nserror nsurl__create_from_section(const char * const url_s,
}
-/* Exported function, documented in utils/nsurl/private.h */
-void nsurl__get_string_data(const struct nsurl_components *url,
+/**
+ * Get nsurl string info; total length, component lengths, & components present
+ *
+ * \param url NetSurf URL components
+ * \param parts Which parts of the URL are required in the string
+ * \param url_l Updated to total string length
+ * \param lengths Updated with individual component lengths
+ * \param pflags Updated to contain relevant string flags
+ */
+static void nsurl__get_string_data(const struct nsurl_components *url,
nsurl_component parts, size_t *url_l,
struct nsurl_component_lengths *lengths,
enum nsurl_string_flags *pflags)
@@ -1095,8 +1103,15 @@ void nsurl__get_string_data(const struct nsurl_components *url,
}
-/* Exported function, documented in utils/nsurl/private.h */
-void nsurl__get_string(const struct nsurl_components *url, char *url_s,
+/**
+ * Copy url string into provided buffer
+ *
+ * \param url NetSurf URL components
+ * \param url_s Updated to contain the string
+ * \param l Individual component lengths
+ * \param flags String flags
+ */
+static void nsurl__get_string(const struct nsurl_components *url, char *url_s,
struct nsurl_component_lengths *l,
enum nsurl_string_flags flags)
{
@@ -1166,6 +1181,43 @@ void nsurl__get_string(const struct nsurl_components *url, char *url_s,
}
+/* exported interface, documented in nsurl.h */
+nserror nsurl__string(
+ const struct nsurl_components *components,
+ nsurl_component parts, size_t pre_padding,
+ char **url_s_out, size_t *url_l_out)
+{
+ struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ enum nsurl_string_flags str_flags = 0;
+ size_t url_l;
+ char *url_s;
+
+ assert(components != NULL);
+
+ /* Get the string length and find which parts of url need copied */
+ nsurl__get_string_data(components, parts, &url_l,
+ &str_len, &str_flags);
+
+ if (url_l == 0) {
+ return NSERROR_BAD_URL;
+ }
+
+ /* Allocate memory for url string */
+ url_s = malloc(pre_padding + url_l + 1); /* adding 1 for '\0' */
+ if (url_s == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ /* Copy the required parts into the url string */
+ nsurl__get_string(components, url_s + pre_padding, &str_len, str_flags);
+
+ *url_s_out = url_s;
+ *url_l_out = url_l;
+
+ return NSERROR_OK;
+}
+
+
/**
* Calculate hash value
*
@@ -1278,8 +1330,6 @@ nserror nsurl_create(const char * const url_s, nsurl **url)
struct nsurl_components c;
size_t length;
char *buff;
- struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
- enum nsurl_string_flags str_flags = 0;
nserror e = NSERROR_OK;
bool match;
@@ -1327,23 +1377,15 @@ nserror nsurl_create(const char * const url_s, nsurl **url)
}
}
- /* Get the string length and find which parts of url are present */
- nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
- &str_len, &str_flags);
-
- /* Create NetSurf URL object */
- *url = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
- if (*url == NULL) {
- nsurl_destroy_components(&c);
- return NSERROR_NOMEM;
+ e = nsurl__string(&c, NSURL_WITH_FRAGMENT,
+ sizeof(nsurl), (char **)url, &length);
+ if (e != NSERROR_OK) {
+ return e;
}
(*url)->components = c;
(*url)->length = length;
- /* Fill out the url string */
- nsurl__get_string(&c, (*url)->string, &str_len, str_flags);
-
/* Get the nsurl's hash */
nsurl__calc_hash(*url);
@@ -1363,8 +1405,6 @@ nserror nsurl_join(const nsurl *base, const char *rel, nsurl **joined)
char *buff;
char *buff_pos;
char *buff_start;
- struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
- enum nsurl_string_flags str_flags = 0;
nserror error = 0;
enum {
NSURL_F_REL = 0,
@@ -1575,22 +1615,15 @@ nserror nsurl_join(const nsurl *base, const char *rel, nsurl **joined)
return error;
}
- /* Get the string length and find which parts of url are present */
- nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
- &str_len, &str_flags);
-
- /* Create NetSurf URL object */
- *joined = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
- if (*joined == NULL) {
- return NSERROR_NOMEM;
+ error = nsurl__string(&c, NSURL_WITH_FRAGMENT,
+ sizeof(nsurl), (char **)joined, &length);
+ if (error != NSERROR_OK) {
+ return error;
}
(*joined)->components = c;
(*joined)->length = length;
- /* Fill out the url string */
- nsurl__get_string(&c, (*joined)->string, &str_len, str_flags);
-
/* Get the nsurl's hash */
nsurl__calc_hash(*joined);
diff --git a/utils/nsurl/private.h b/utils/nsurl/private.h
index f8ba51f..bc3eb8c 100644
--- a/utils/nsurl/private.h
+++ b/utils/nsurl/private.h
@@ -107,31 +107,21 @@ enum nsurl_string_flags {
NSURL_F_FRAGMENT = (1 << 11)
};
-/**
- * Get nsurl string info; total length, component lengths, & components present
- *
- * \param url NetSurf URL components
- * \param url_s Updated to contain the string
- * \param l Individual component lengths
- * \param flags String flags
- */
-void nsurl__get_string(const struct nsurl_components *url, char *url_s,
- struct nsurl_component_lengths *l,
- enum nsurl_string_flags flags);
/**
- * Get nsurl string info; total length, component lengths, & components present
+ * Convert a set of nsurl components to a single string
*
- * \param url NetSurf URL components
- * \param parts Which parts of the URL are required in the string
- * \param url_l Updated to total string length
- * \param lengths Updated with individual component lengths
- * \param pflags Updated to contain relevant string flags
+ * \param[in] components The URL components to stitch together.
+ * \param[in] parts The set of parts wanted in the string.
+ * \param[in] pre_padding Amount in bytes to pad the start of the string by.
+ * \param[out] url_s_out Returns allocated URL string.
+ * \param[out] url_l_out Returns byte length of string, excluding pre_padding.
+ * \return NSERROR_OK on success, appropriate error otherwise.
*/
-void nsurl__get_string_data(const struct nsurl_components *url,
- nsurl_component parts, size_t *url_l,
- struct nsurl_component_lengths *lengths,
- enum nsurl_string_flags *pflags);
+nserror nsurl__string(
+ const struct nsurl_components *components,
+ nsurl_component parts, size_t pre_padding,
+ char **url_s_out, size_t *url_l_out);
/**
* Calculate hash value
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=400c6e658f284c95d9b...
commit 400c6e658f284c95d9b1cd18dd1d5841305b8ddc
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
nsurl: Split out URL parsing.
diff --git a/utils/nsurl/Makefile b/utils/nsurl/Makefile
index 08656f3..71304b2 100644
--- a/utils/nsurl/Makefile
+++ b/utils/nsurl/Makefile
@@ -1,6 +1,7 @@
# nsurl utils sources
S_NSURL := \
- nsurl.c
+ nsurl.c \
+ parse.c
S_NSURL := $(addprefix utils/nsurl/,$(S_NSURL))
\ No newline at end of file
diff --git a/utils/nsurl/nsurl.c b/utils/nsurl/nsurl.c
index bc77c58..b60eb07 100644
--- a/utils/nsurl/nsurl.c
+++ b/utils/nsurl/nsurl.c
@@ -50,71 +50,6 @@
#undef NSURL_DEBUG
-/** Marker set, indicating positions of sections within a URL string */
-struct url_markers {
- size_t start; /** start of URL */
- size_t scheme_end;
- size_t authority;
-
- size_t colon_first;
- size_t at;
- size_t colon_last;
-
- size_t path;
- size_t query;
- size_t fragment;
-
- size_t end; /** end of URL */
-
- enum nsurl_scheme_type scheme_type;
-};
-
-
-/** Marker set, indicating positions of sections within a URL string */
-struct nsurl_component_lengths {
- size_t scheme;
- size_t username;
- size_t password;
- size_t host;
- size_t port;
- size_t path;
- size_t query;
- size_t fragment;
-};
-
-
-/** Flags indicating which parts of a URL string are required for a nsurl */
-enum nsurl_string_flags {
- NSURL_F_SCHEME = (1 << 0),
- NSURL_F_SCHEME_PUNCTUATION = (1 << 1),
- NSURL_F_AUTHORITY_PUNCTUATION = (1 << 2),
- NSURL_F_USERNAME = (1 << 3),
- NSURL_F_PASSWORD = (1 << 4),
- NSURL_F_CREDENTIALS_PUNCTUATION = (1 << 5),
- NSURL_F_HOST = (1 << 6),
- NSURL_F_PORT = (1 << 7),
- NSURL_F_AUTHORITY = (NSURL_F_USERNAME |
- NSURL_F_PASSWORD |
- NSURL_F_HOST |
- NSURL_F_PORT),
- NSURL_F_PATH = (1 << 8),
- NSURL_F_QUERY = (1 << 9),
- NSURL_F_FRAGMENT_PUNCTUATION = (1 << 10),
- NSURL_F_FRAGMENT = (1 << 11)
-};
-
-
-/** Sections of a URL */
-enum url_sections {
- URL_SCHEME,
- URL_CREDENTIALS,
- URL_HOST,
- URL_PATH,
- URL_QUERY,
- URL_FRAGMENT
-};
-
-
#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
#define nsurl__component_compare(c1, c2, match) \
@@ -125,1129 +60,6 @@ enum url_sections {
*match = false; \
}
-/**
- * Return a hex digit for the given numerical value.
- *
- * \param digit the value to get the hex digit for.
- * \return character in range 0-9A-F
- */
-inline static char digit2uppercase_hex(unsigned char digit) {
- assert(digit < 16);
- return "0123456789ABCDEF"[digit];
-}
-
-/**
- * determine if a character is unreserved
- *
- * \param c character to classify.
- * \return true if the character is unreserved else false.
- */
-static bool nsurl__is_unreserved(unsigned char c)
-{
- /* From RFC3986 section 2.3 (unreserved characters)
- *
- * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
- *
- */
- static const bool unreserved[256] = {
- false, false, false, false, false, false, false, false, /* 00 */
- false, false, false, false, false, false, false, false, /* 08 */
- false, false, false, false, false, false, false, false, /* 10 */
- false, false, false, false, false, false, false, false, /* 18 */
- false, false, false, false, false, false, false, false, /* 20 */
- false, false, false, false, false, true, true, false, /* 28 */
- true, true, true, true, true, true, true, true, /* 30 */
- true, true, false, false, false, false, false, false, /* 38 */
- false, true, true, true, true, true, true, true, /* 40 */
- true, true, true, true, true, true, true, true, /* 48 */
- true, true, true, true, true, true, true, true, /* 50 */
- true, true, true, false, false, false, false, true, /* 58 */
- false, true, true, true, true, true, true, true, /* 60 */
- true, true, true, true, true, true, true, true, /* 68 */
- true, true, true, true, true, true, true, true, /* 70 */
- true, true, true, false, false, false, true, false, /* 78 */
- false, false, false, false, false, false, false, false, /* 80 */
- false, false, false, false, false, false, false, false, /* 88 */
- false, false, false, false, false, false, false, false, /* 90 */
- false, false, false, false, false, false, false, false, /* 98 */
- false, false, false, false, false, false, false, false, /* A0 */
- false, false, false, false, false, false, false, false, /* A8 */
- false, false, false, false, false, false, false, false, /* B0 */
- false, false, false, false, false, false, false, false, /* B8 */
- false, false, false, false, false, false, false, false, /* C0 */
- false, false, false, false, false, false, false, false, /* C8 */
- false, false, false, false, false, false, false, false, /* D0 */
- false, false, false, false, false, false, false, false, /* D8 */
- false, false, false, false, false, false, false, false, /* E0 */
- false, false, false, false, false, false, false, false, /* E8 */
- false, false, false, false, false, false, false, false, /* F0 */
- false, false, false, false, false, false, false, false /* F8 */
- };
- return unreserved[c];
-}
-
-/**
- * determine if a character should be percent escaped.
- *
- * The ASCII codes which should not be percent escaped
- *
- * \param c character to classify.
- * \return true if the character should not be escaped else false.
- */
-static bool nsurl__is_no_escape(unsigned char c)
-{
- static const bool no_escape[256] = {
- false, false, false, false, false, false, false, false, /* 00 */
- false, false, false, false, false, false, false, false, /* 08 */
- false, false, false, false, false, false, false, false, /* 10 */
- false, false, false, false, false, false, false, false, /* 18 */
- false, true, false, true, true, false, true, true, /* 20 */
- true, true, true, true, true, true, true, true, /* 28 */
- true, true, true, true, true, true, true, true, /* 30 */
- true, true, true, true, false, true, false, true, /* 38 */
- true, true, true, true, true, true, true, true, /* 40 */
- true, true, true, true, true, true, true, true, /* 48 */
- true, true, true, true, true, true, true, true, /* 50 */
- true, true, true, true, false, true, false, true, /* 58 */
- false, true, true, true, true, true, true, true, /* 60 */
- true, true, true, true, true, true, true, true, /* 68 */
- true, true, true, true, true, true, true, true, /* 70 */
- true, true, true, false, true, false, true, false, /* 78 */
- false, false, false, false, false, false, false, false, /* 80 */
- false, false, false, false, false, false, false, false, /* 88 */
- false, false, false, false, false, false, false, false, /* 90 */
- false, false, false, false, false, false, false, false, /* 98 */
- false, false, false, false, false, false, false, false, /* A0 */
- false, false, false, false, false, false, false, false, /* A8 */
- false, false, false, false, false, false, false, false, /* B0 */
- false, false, false, false, false, false, false, false, /* B8 */
- false, false, false, false, false, false, false, false, /* C0 */
- false, false, false, false, false, false, false, false, /* C8 */
- false, false, false, false, false, false, false, false, /* D0 */
- false, false, false, false, false, false, false, false, /* D8 */
- false, false, false, false, false, false, false, false, /* E0 */
- false, false, false, false, false, false, false, false, /* E8 */
- false, false, false, false, false, false, false, false, /* F0 */
- false, false, false, false, false, false, false, false, /* F8 */
- };
- return no_escape[c];
-}
-
-
-/**
- * Obtains a set of markers delimiting sections in a URL string
- *
- * \param url_s URL string
- * \param markers Updated to mark sections in the URL string
- * \param joining True iff URL string is a relative URL for joining
- */
-static void nsurl__get_string_markers(const char * const url_s,
- struct url_markers *markers, bool joining)
-{
- const char *pos = url_s; /** current position in url_s */
- bool is_http = false;
- bool trailing_whitespace = false;
-
- /* Initialise marker set */
- struct url_markers marker = { 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, NSURL_SCHEME_OTHER };
-
- /* Skip any leading whitespace in url_s */
- while (ascii_is_space(*pos))
- pos++;
-
- /* Record start point */
- marker.start = pos - url_s;
-
- marker.scheme_end = marker.authority = marker.colon_first = marker.at =
- marker.colon_last = marker.path = marker.start;
-
- if (*pos == '\0') {
- /* Nothing but whitespace, early exit */
- marker.query = marker.fragment = marker.end = marker.path;
- *markers = marker;
- return;
- }
-
- /* Get scheme */
- if (ascii_is_alpha(*pos)) {
- pos++;
-
- while (*pos != ':' && *pos != '\0') {
- if (!ascii_is_alphanumerical(*pos) && (*pos != '+') &&
- (*pos != '-') && (*pos != '.')) {
- /* This character is not valid in the
- * scheme */
- break;
- }
- pos++;
- }
-
- if (*pos == ':') {
- /* This delimits the end of the scheme */
- size_t off;
-
- marker.scheme_end = pos - url_s;
-
- off = marker.scheme_end - marker.start;
-
- /* Detect http(s) and mailto for scheme specifc
- * normalisation */
- if (off == SLEN("http") &&
- (((*(pos - off + 0) == 'h') ||
- (*(pos - off + 0) == 'H')) &&
- ((*(pos - off + 1) == 't') ||
- (*(pos - off + 1) == 'T')) &&
- ((*(pos - off + 2) == 't') ||
- (*(pos - off + 2) == 'T')) &&
- ((*(pos - off + 3) == 'p') ||
- (*(pos - off + 3) == 'P')))) {
- marker.scheme_type = NSURL_SCHEME_HTTP;
- is_http = true;
- } else if (off == SLEN("https") &&
- (((*(pos - off + 0) == 'h') ||
- (*(pos - off + 0) == 'H')) &&
- ((*(pos - off + 1) == 't') ||
- (*(pos - off + 1) == 'T')) &&
- ((*(pos - off + 2) == 't') ||
- (*(pos - off + 2) == 'T')) &&
- ((*(pos - off + 3) == 'p') ||
- (*(pos - off + 3) == 'P')) &&
- ((*(pos - off + 4) == 's') ||
- (*(pos - off + 4) == 'S')))) {
- marker.scheme_type = NSURL_SCHEME_HTTPS;
- is_http = true;
- } else if (off == SLEN("ftp") &&
- (((*(pos - off + 0) == 'f') ||
- (*(pos - off + 0) == 'F')) &&
- ((*(pos - off + 1) == 't') ||
- (*(pos - off + 1) == 'T')) &&
- ((*(pos - off + 2) == 'p') ||
- (*(pos - off + 2) == 'P')))) {
- marker.scheme_type = NSURL_SCHEME_FTP;
- } else if (off == SLEN("mailto") &&
- (((*(pos - off + 0) == 'm') ||
- (*(pos - off + 0) == 'M')) &&
- ((*(pos - off + 1) == 'a') ||
- (*(pos - off + 1) == 'A')) &&
- ((*(pos - off + 2) == 'i') ||
- (*(pos - off + 2) == 'I')) &&
- ((*(pos - off + 3) == 'l') ||
- (*(pos - off + 3) == 'L')) &&
- ((*(pos - off + 4) == 't') ||
- (*(pos - off + 4) == 'T')) &&
- ((*(pos - off + 5) == 'o') ||
- (*(pos - off + 5) == 'O')))) {
- marker.scheme_type = NSURL_SCHEME_MAILTO;
- }
-
- /* Skip over colon */
- pos++;
-
- /* Mark place as start of authority */
- marker.authority = marker.colon_first = marker.at =
- marker.colon_last = marker.path =
- pos - url_s;
-
- } else {
- /* Not found a scheme */
- if (joining == false) {
- /* Assuming no scheme == http */
- marker.scheme_type = NSURL_SCHEME_HTTP;
- is_http = true;
- }
- }
- }
-
- /* Get authority
- *
- * Two slashes always indicates the start of an authority.
- *
- * We are more relaxed in the case of http:
- * a. when joining, one or more slashes indicates start of authority
- * b. when not joining, we assume authority if no scheme was present
- * and in the case of mailto: when we assume there is an authority.
- */
- if ((*pos == '/' && *(pos + 1) == '/') ||
- (is_http && ((joining && *pos == '/') ||
- (joining == false &&
- marker.scheme_end != marker.start))) ||
- marker.scheme_type == NSURL_SCHEME_MAILTO) {
-
- /* Skip over leading slashes */
- if (*pos == '/') {
- if (is_http == false) {
- if (*pos == '/') pos++;
- if (*pos == '/') pos++;
- } else {
- while (*pos == '/')
- pos++;
- }
-
- marker.authority = marker.colon_first = marker.at =
- marker.colon_last = marker.path =
- pos - url_s;
- }
-
- /* Need to get (or complete) the authority */
- while (*pos != '\0') {
- if (*pos == '/' || *pos == '?' || *pos == '#') {
- /* End of the authority */
- break;
-
- } else if (marker.scheme_type != NSURL_SCHEME_MAILTO &&
- *pos == ':' && marker.colon_first ==
- marker.authority) {
- /* could be username:password or host:port
- * separator */
- marker.colon_first = pos - url_s;
-
- } else if (marker.scheme_type != NSURL_SCHEME_MAILTO &&
- *pos == ':' && marker.colon_first !=
- marker.authority) {
- /* could be host:port separator */
- marker.colon_last = pos - url_s;
-
- } else if (*pos == '@' && marker.at ==
- marker.authority) {
- /* Credentials @ host separator */
- marker.at = pos - url_s;
- }
-
- pos++;
- }
-
- marker.path = pos - url_s;
-
- } else if ((*pos == '\0' || *pos == '/') &&
- joining == false && is_http == true) {
- marker.path = pos - url_s;
- }
-
- /* Get path
- *
- * Needs to start with '/' if there's no authority
- */
- if (*pos == '/' || ((marker.path == marker.authority) &&
- (*pos != '?') && (*pos != '#') && (*pos != '\0'))) {
- while (*(++pos) != '\0') {
- if (*pos == '?' || *pos == '#') {
- /* End of the path */
- break;
- }
- }
- }
-
- marker.query = pos - url_s;
-
- /* Get query */
- if (*pos == '?') {
- while (*(++pos) != '\0') {
- if (*pos == '#') {
- /* End of the query */
- break;
- }
- }
- }
-
- marker.fragment = pos - url_s;
-
- /* Get fragment */
- if (*pos == '#') {
- while (*(++pos) != '\0')
- ;
- }
-
- /* We got to the end of url_s.
- * Need to skip back over trailing whitespace to find end of URL */
- pos--;
- if (pos >= url_s && ascii_is_space(*pos)) {
- trailing_whitespace = true;
- while (pos >= url_s && ascii_is_space(*pos))
- pos--;
- }
-
- marker.end = pos + 1 - url_s;
-
- if (trailing_whitespace == true) {
- /* Ensure last url section doesn't pass end */
- if (marker.fragment > marker.end)
- marker.fragment = marker.end;
- if (marker.query > marker.end)
- marker.query = marker.end;
- if (marker.path > marker.end)
- marker.path = marker.end;
- if (marker.colon_last > marker.end)
- marker.colon_last = marker.end;
- if (marker.at > marker.end)
- marker.at = marker.end;
- if (marker.colon_last > marker.end)
- marker.colon_last = marker.end;
- if (marker.fragment > marker.end)
- marker.fragment = marker.end;
- }
-
-#ifdef NSURL_DEBUG
- LOG("marker.start: %i", marker.start);
- LOG("marker.scheme_end: %i", marker.scheme_end);
- LOG("marker.authority: %i", marker.authority);
-
- LOG("marker.colon_first: %i", marker.colon_first);
- LOG("marker.at: %i", marker.at);
- LOG("marker.colon_last: %i", marker.colon_last);
-
- LOG("marker.path: %i", marker.path);
- LOG("marker.query: %i", marker.query);
- LOG("marker.fragment: %i", marker.fragment);
-
- LOG("marker.end: %i", marker.end);
-#endif
-
- /* Got all the URL components pegged out now */
- *markers = marker;
-}
-
-
-/**
- * Remove dot segments from a path, as per rfc 3986, 5.2.4
- *
- * \param path path to remove dot segments from ('\0' terminated)
- * \param output path with dot segments removed
- * \return size of output
- */
-static size_t nsurl__remove_dot_segments(char *path, char *output)
-{
- char *path_pos = path;
- char *output_pos = output;
-
- while (*path_pos != '\0') {
-#ifdef NSURL_DEBUG
- LOG(" in:%s", path_pos);
- LOG("out:%.*s", output_pos - output, output);
-#endif
- if (*path_pos == '.') {
- if (*(path_pos + 1) == '.' &&
- *(path_pos + 2) == '/') {
- /* Found prefix of "../" */
- path_pos += SLEN("../");
- continue;
-
- } else if (*(path_pos + 1) == '/') {
- /* Found prefix of "./" */
- path_pos += SLEN("./");
- continue;
- }
- } else if (*path_pos == '/' && *(path_pos + 1) == '.') {
- if (*(path_pos + 2) == '/') {
- /* Found prefix of "/./" */
- path_pos += SLEN("/.");
- continue;
-
- } else if (*(path_pos + 2) == '\0') {
- /* Found "/." at end of path */
- *(output_pos++) = '/';
-
- /* End of input path */
- break;
-
- } else if (*(path_pos + 2) == '.') {
- if (*(path_pos + 3) == '/') {
- /* Found prefix of "/../" */
- path_pos += SLEN("/..");
-
- if (output_pos > output)
- output_pos--;
- while (output_pos > output &&
- *output_pos != '/')
- output_pos--;
-
- continue;
-
- } else if (*(path_pos + 3) == '\0') {
- /* Found "/.." at end of path */
-
- while (output_pos > output &&
- *(output_pos -1 ) !='/')
- output_pos--;
-
- /* End of input path */
- break;
- }
- }
- } else if (*path_pos == '.') {
- if (*(path_pos + 1) == '\0') {
- /* Found "." at end of path */
-
- /* End of input path */
- break;
-
- } else if (*(path_pos + 1) == '.' &&
- *(path_pos + 2) == '\0') {
- /* Found ".." at end of path */
-
- /* End of input path */
- break;
- }
- }
- /* Copy first character into output path */
- *output_pos++ = *path_pos++;
-
- /* Copy up to but not including next '/' */
- while ((*path_pos != '/') && (*path_pos != '\0'))
- *output_pos++ = *path_pos++;
- }
-
- return output_pos - output;
-}
-
-
-/**
- * Get the length of the longest section
- *
- * \param m markers delimiting url sections in a string
- * \return the length of the longest section
- */
-static size_t nsurl__get_longest_section(struct url_markers *m)
-{
- size_t length = m->scheme_end - m->start; /* scheme */
-
- if (length < m->at - m->authority) /* credentials */
- length = m->at - m->authority;
-
- if (length < m->path - m->at) /* host */
- length = m->path - m->at;
-
- if (length < m->query - m->path) /* path */
- length = m->query - m->path;
-
- if (length < m->fragment - m->query) /* query */
- length = m->fragment - m->query;
-
- if (length < m->end - m->fragment) /* fragment */
- length = m->end - m->fragment;
-
- return length;
-}
-
-
-/**
- * Converts two hexadecimal digits to a single number
- *
- * \param c1 most significant hex digit
- * \param c2 least significant hex digit
- * \return the total value of the two digit hex number, or -ve if input not hex
- *
- * For unescaping url encoded characters.
- */
-static inline int nsurl__get_ascii_offset(char c1, char c2)
-{
- int offset;
-
- /* Use 1st char as most significant hex digit */
- if (ascii_is_digit(c1))
- offset = 16 * (c1 - '0');
- else if (c1 >= 'a' && c1 <= 'f')
- offset = 16 * (c1 - 'a' + 10);
- else if (c1 >= 'A' && c1 <= 'F')
- offset = 16 * (c1 - 'A' + 10);
- else
- /* Not valid hex */
- return -1;
-
- /* Use 2nd char as least significant hex digit and sum */
- if (ascii_is_digit(c2))
- offset += c2 - '0';
- else if (c2 >= 'a' && c2 <= 'f')
- offset += c2 - 'a' + 10;
- else if (c2 >= 'A' && c2 <= 'F')
- offset += c2 - 'A' + 10;
- else
- /* Not valid hex */
- return -1;
-
- return offset;
-}
-
-
-/**
- * Create the components of a NetSurf URL object for a section of a URL string
- *
- * \param url_s URL string
- * \param section Sets which section of URL string is to be normalised
- * \param pegs Set of markers delimiting the URL string's sections
- * \param pos_norm A buffer large enough for the normalised string (*3 + 1)
- * \param url A NetSurf URL object, to which components may be added
- * \return NSERROR_OK on success, appropriate error otherwise
- *
- * The section of url_s is normalised appropriately.
- */
-static nserror nsurl__create_from_section(const char * const url_s,
- const enum url_sections section,
- const struct url_markers *pegs,
- char *pos_norm,
- struct nsurl_components *url)
-{
- nserror ret;
- int ascii_offset;
- int start = 0;
- int end = 0;
- const char *pos;
- const char *pos_url_s;
- char *norm_start = pos_norm;
- char *host;
- size_t copy_len;
- size_t length;
- size_t host_len;
- enum {
- NSURL_F_NO_PORT = (1 << 0)
- } flags = 0;
-
- switch (section) {
- case URL_SCHEME:
- start = pegs->start;
- end = pegs->scheme_end;
- break;
-
- case URL_CREDENTIALS:
- start = pegs->authority;
- end = pegs->at;
- break;
-
- case URL_HOST:
- start = (pegs->at == pegs->authority &&
- *(url_s + pegs->at) != '@') ?
- pegs->at :
- pegs->at + 1;
- end = pegs->path;
- break;
-
- case URL_PATH:
- start = pegs->path;
- end = pegs->query;
- break;
-
- case URL_QUERY:
- start = pegs->query;
- end = pegs->fragment;
- break;
-
- case URL_FRAGMENT:
- start = (*(url_s + pegs->fragment) != '#') ?
- pegs->fragment :
- pegs->fragment + 1;
- end = pegs->end;
- break;
- }
-
- if (end < start)
- end = start;
-
- length = end - start;
-
- /* Stage 1: Normalise the required section */
-
- pos = pos_url_s = url_s + start;
- copy_len = 0;
- for (; pos < url_s + end; pos++) {
- if (*pos == '%' && (pos + 2 < url_s + end)) {
- /* Might be an escaped character needing unescaped */
-
- /* Find which character which was escaped */
- ascii_offset = nsurl__get_ascii_offset(*(pos + 1),
- *(pos + 2));
-
- if (ascii_offset < 0) {
- /* % with invalid hex digits. */
- copy_len++;
- continue;
- }
-
- if ((section != URL_SCHEME && section != URL_HOST) &&
- (nsurl__is_unreserved(ascii_offset) == false)) {
- /* This character should be escaped after all,
- * just let it get copied */
- copy_len += 3;
- pos += 2;
- continue;
- }
-
- if (copy_len > 0) {
- /* Copy up to here */
- memcpy(pos_norm, pos_url_s, copy_len);
- pos_norm += copy_len;
- copy_len = 0;
- }
-
- /* Put the unescaped character in the normalised URL */
- *(pos_norm++) = (char)ascii_offset;
- pos += 2;
- pos_url_s = pos + 1;
-
- length -= 2;
-
- } else if ((section != URL_SCHEME && section != URL_HOST) &&
- (nsurl__is_no_escape(*pos) == false)) {
-
- /* This needs to be escaped */
- if (copy_len > 0) {
- /* Copy up to here */
- memcpy(pos_norm, pos_url_s, copy_len);
- pos_norm += copy_len;
- copy_len = 0;
- }
-
- /* escape */
- *(pos_norm++) = '%';
- *(pos_norm++) = digit2uppercase_hex(
- ((unsigned char)*pos) >> 4);
- *(pos_norm++) = digit2uppercase_hex(
- ((unsigned char)*pos) & 0xf);
- pos_url_s = pos + 1;
-
- length += 2;
-
- } else if ((section == URL_SCHEME || section == URL_HOST) &&
- ascii_is_alpha_upper(*pos)) {
- /* Lower case this letter */
-
- if (copy_len > 0) {
- /* Copy up to here */
- memcpy(pos_norm, pos_url_s, copy_len);
- pos_norm += copy_len;
- copy_len = 0;
- }
- /* Copy lower cased letter into normalised URL */
- *(pos_norm++) = ascii_to_lower(*pos);
- pos_url_s = pos + 1;
-
- } else {
- /* This character is safe in normalised URL */
- copy_len++;
- }
- }
-
- if (copy_len > 0) {
- /* Copy up to here */
- memcpy(pos_norm, pos_url_s, copy_len);
- pos_norm += copy_len;
- }
-
- /* Mark end of section */
- (*pos_norm) = '\0';
-
- /* Stage 2: Create the URL components for the required section */
- switch (section) {
- case URL_SCHEME:
- if (length == 0) {
- /* No scheme, assuming http */
- url->scheme = lwc_string_ref(corestring_lwc_http);
- } else {
- /* Add scheme to URL */
- if (lwc_intern_string(norm_start, length,
- &url->scheme) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- }
-
- break;
-
- case URL_CREDENTIALS:
- url->username = NULL;
- url->password = NULL;
-
- if (length != 0 && *norm_start != ':') {
- char *sec_start = norm_start;
- if (pegs->colon_first != pegs->authority &&
- pegs->at > pegs->colon_first + 1) {
- /* there's a password */
- sec_start += pegs->colon_first -
- pegs->authority + 1;
- if (lwc_intern_string(sec_start,
- pegs->at - pegs->colon_first -1,
- &url->password) !=
- lwc_error_ok) {
- return NSERROR_NOMEM;
- }
-
- /* update start pos and length for username */
- sec_start = norm_start;
- length -= pegs->at - pegs->colon_first;
- } else if (pegs->colon_first != pegs->authority &&
- pegs->at == pegs->colon_first + 1) {
- /* strip username colon */
- length--;
- }
-
- /* Username */
- if (lwc_intern_string(sec_start, length,
- &url->username) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- }
-
- break;
-
- case URL_HOST:
- url->host = NULL;
- url->port = NULL;
-
- if (length != 0) {
- size_t colon = 0;
- char *sec_start = norm_start;
- if (pegs->at < pegs->colon_first &&
- pegs->colon_last == pegs->authority) {
- /* There's one colon and it's after @ marker */
- colon = pegs->colon_first;
- } else if (pegs->colon_last != pegs->authority) {
- /* There's more than one colon */
- colon = pegs->colon_last;
- } else {
- /* There's no colon that could be a port
- * separator */
- flags |= NSURL_F_NO_PORT;
- }
-
- if (!(flags & NSURL_F_NO_PORT)) {
- /* Determine whether colon is a port separator
- */
- sec_start += colon - pegs->at;
- while (++sec_start < norm_start + length) {
- if (!ascii_is_digit(*sec_start)) {
- /* Character after port isn't a
- * digit; not a port separator
- */
- flags |= NSURL_F_NO_PORT;
- break;
- }
- }
- }
-
- if (!(flags & NSURL_F_NO_PORT)) {
- /* There's a port */
- size_t skip = (pegs->at == pegs->authority) ?
- 1 : 0;
- sec_start = norm_start + colon - pegs->at +
- skip;
- if (url->scheme != NULL &&
- url->scheme_type ==
- NSURL_SCHEME_HTTP &&
- length -
- (colon - pegs->at + skip) == 2 &&
- *sec_start == '8' &&
- *(sec_start + 1) == '0') {
- /* Scheme is http, and port is default
- * (80) */
- flags |= NSURL_F_NO_PORT;
- }
-
- if (length <= (colon - pegs->at + skip)) {
- /* No space for a port after the colon
- */
- flags |= NSURL_F_NO_PORT;
- }
-
- /* Add non-redundant ports to NetSurf URL */
- sec_start = norm_start + colon - pegs->at +
- skip;
- if (!(flags & NSURL_F_NO_PORT) &&
- lwc_intern_string(sec_start,
- length -
- (colon - pegs->at + skip),
- &url->port) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
-
- /* update length for host */
- skip = (pegs->at == pegs->authority) ? 0 : 1;
- length = colon - pegs->at - skip;
- }
-
- /* host */
- /* Encode host according to IDNA2008 */
- ret = idna_encode(norm_start, length, &host, &host_len);
- if (ret == NSERROR_OK) {
- /* valid idna encoding */
- if (lwc_intern_string(host, host_len,
- &url->host) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- free(host);
- } else {
- /* fall back to straight interning */
- if (lwc_intern_string(norm_start, length,
- &url->host) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- }
- }
-
- break;
-
- case URL_PATH:
- if (length != 0) {
- if (lwc_intern_string(norm_start, length,
- &url->path) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- } else if (url->host != NULL &&
- url->scheme_type != NSURL_SCHEME_MAILTO) {
- /* Set empty path to "/", if there's a host */
- if (lwc_intern_string("/", SLEN("/"),
- &url->path) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- } else {
- url->path = NULL;
- }
-
- break;
-
- case URL_QUERY:
- if (length != 0) {
- if (lwc_intern_string(norm_start, length,
- &url->query) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- } else {
- url->query = NULL;
- }
-
- break;
-
- case URL_FRAGMENT:
- if (length != 0) {
- if (lwc_intern_string(norm_start, length,
- &url->fragment) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- } else {
- url->fragment = NULL;
- }
-
- break;
- }
-
- return NSERROR_OK;
-}
-
-
-/**
- * Get nsurl string info; total length, component lengths, & components present
- *
- * \param url NetSurf URL components
- * \param parts Which parts of the URL are required in the string
- * \param url_l Updated to total string length
- * \param lengths Updated with individual component lengths
- * \param pflags Updated to contain relevant string flags
- */
-static void nsurl__get_string_data(const struct nsurl_components *url,
- nsurl_component parts, size_t *url_l,
- struct nsurl_component_lengths *lengths,
- enum nsurl_string_flags *pflags)
-{
- enum nsurl_string_flags flags = *pflags;
- *url_l = 0;
-
- /* Intersection of required parts and available parts gives
- * the output parts */
- if (url->scheme && parts & NSURL_SCHEME) {
- flags |= NSURL_F_SCHEME;
-
- lengths->scheme = lwc_string_length(url->scheme);
- *url_l += lengths->scheme;
- }
-
- if (url->username && parts & NSURL_USERNAME) {
- flags |= NSURL_F_USERNAME;
-
- lengths->username = lwc_string_length(url->username);
- *url_l += lengths->username;
- }
-
- if (url->password && parts & NSURL_PASSWORD) {
- flags |= NSURL_F_PASSWORD;
-
- lengths->password = lwc_string_length(url->password);
- *url_l += SLEN(":") + lengths->password;
- }
-
- if (url->host && parts & NSURL_HOST) {
- flags |= NSURL_F_HOST;
-
- lengths->host = lwc_string_length(url->host);
- *url_l += lengths->host;
- }
-
- if (url->port && parts & NSURL_PORT) {
- flags |= NSURL_F_PORT;
-
- lengths->port = lwc_string_length(url->port);
- *url_l += SLEN(":") + lengths->port;
- }
-
- if (url->path && parts & NSURL_PATH) {
- flags |= NSURL_F_PATH;
-
- lengths->path = lwc_string_length(url->path);
- *url_l += lengths->path;
- }
-
- if (url->query && parts & NSURL_QUERY) {
- flags |= NSURL_F_QUERY;
-
- lengths->query = lwc_string_length(url->query);
- *url_l += lengths->query;
- }
-
- if (url->fragment && parts & NSURL_FRAGMENT) {
- flags |= NSURL_F_FRAGMENT;
-
- lengths->fragment = lwc_string_length(url->fragment);
- *url_l += lengths->fragment;
- }
-
- /* Turn on any spanned punctuation */
- if ((flags & NSURL_F_SCHEME) && (parts > NSURL_SCHEME)) {
- flags |= NSURL_F_SCHEME_PUNCTUATION;
-
- *url_l += SLEN(":");
- }
-
- if ((flags & NSURL_F_SCHEME) && (flags > NSURL_F_SCHEME) &&
- url->path && lwc_string_data(url->path)[0] == '/') {
- flags |= NSURL_F_AUTHORITY_PUNCTUATION;
-
- *url_l += SLEN("//");
- }
-
- if ((flags & (NSURL_F_USERNAME | NSURL_F_PASSWORD)) &&
- flags & NSURL_F_HOST) {
- flags |= NSURL_F_CREDENTIALS_PUNCTUATION;
-
- *url_l += SLEN("@");
- }
-
- if ((flags & ~NSURL_F_FRAGMENT) && (flags & NSURL_F_FRAGMENT)) {
- flags |= NSURL_F_FRAGMENT_PUNCTUATION;
-
- *url_l += SLEN("#");
- }
-
- *pflags = flags;
-}
-
-
-/**
- * Get nsurl string info; total length, component lengths, & components present
- *
- * \param url NetSurf URL components
- * \param url_s Updated to contain the string
- * \param l Individual component lengths
- * \param flags String flags
- */
-static void nsurl_get_string(const struct nsurl_components *url, char *url_s,
- struct nsurl_component_lengths *l,
- enum nsurl_string_flags flags)
-{
- char *pos;
-
- /* Copy the required parts into the url string */
- pos = url_s;
-
- if (flags & NSURL_F_SCHEME) {
- memcpy(pos, lwc_string_data(url->scheme), l->scheme);
- pos += l->scheme;
- }
-
- if (flags & NSURL_F_SCHEME_PUNCTUATION) {
- *(pos++) = ':';
- }
-
- if (flags & NSURL_F_AUTHORITY_PUNCTUATION) {
- *(pos++) = '/';
- *(pos++) = '/';
- }
-
- if (flags & NSURL_F_USERNAME) {
- memcpy(pos, lwc_string_data(url->username), l->username);
- pos += l->username;
- }
-
- if (flags & NSURL_F_PASSWORD) {
- *(pos++) = ':';
- memcpy(pos, lwc_string_data(url->password), l->password);
- pos += l->password;
- }
-
- if (flags & NSURL_F_CREDENTIALS_PUNCTUATION) {
- *(pos++) = '@';
- }
-
- if (flags & NSURL_F_HOST) {
- memcpy(pos, lwc_string_data(url->host), l->host);
- pos += l->host;
- }
-
- if (flags & NSURL_F_PORT) {
- *(pos++) = ':';
- memcpy(pos, lwc_string_data(url->port), l->port);
- pos += l->port;
- }
-
- if (flags & NSURL_F_PATH) {
- memcpy(pos, lwc_string_data(url->path), l->path);
- pos += l->path;
- }
-
- if (flags & NSURL_F_QUERY) {
- memcpy(pos, lwc_string_data(url->query), l->query);
- pos += l->query;
- }
-
- if (flags & NSURL_F_FRAGMENT) {
- if (flags & NSURL_F_FRAGMENT_PUNCTUATION)
- *(pos++) = '#';
- memcpy(pos, lwc_string_data(url->fragment), l->fragment);
- pos += l->fragment;
- }
-
- *pos = '\0';
-}
-
-
-/**
- * Calculate hash value
- *
- * \param url NetSurf URL object to set hash value for
- */
-static void nsurl_calc_hash(nsurl *url)
-{
- uint32_t hash = 0;
-
- if (url->components.scheme)
- hash ^= lwc_string_hash_value(url->components.scheme);
-
- if (url->components.username)
- hash ^= lwc_string_hash_value(url->components.username);
-
- if (url->components.password)
- hash ^= lwc_string_hash_value(url->components.password);
-
- if (url->components.host)
- hash ^= lwc_string_hash_value(url->components.host);
-
- if (url->components.port)
- hash ^= lwc_string_hash_value(url->components.port);
-
- if (url->components.path)
- hash ^= lwc_string_hash_value(url->components.path);
-
- if (url->components.query)
- hash ^= lwc_string_hash_value(url->components.query);
-
- url->hash = hash;
-}
-
/**
* Destroy components
@@ -1321,89 +133,6 @@ static void nsurl__dump(const nsurl *url)
******************************************************************************/
/* exported interface, documented in nsurl.h */
-nserror nsurl_create(const char * const url_s, nsurl **url)
-{
- struct url_markers m;
- struct nsurl_components c;
- size_t length;
- char *buff;
- struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
- enum nsurl_string_flags str_flags = 0;
- nserror e = NSERROR_OK;
- bool match;
-
- assert(url_s != NULL);
-
- /* Peg out the URL sections */
- nsurl__get_string_markers(url_s, &m, false);
-
- /* Get the length of the longest section */
- length = nsurl__get_longest_section(&m);
-
- /* Allocate enough memory to url escape the longest section */
- buff = malloc(length * 3 + 1);
- if (buff == NULL)
- return NSERROR_NOMEM;
-
- /* Set scheme type */
- c.scheme_type = m.scheme_type;
-
- /* Build NetSurf URL object from sections */
- e |= nsurl__create_from_section(url_s, URL_SCHEME, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_CREDENTIALS, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_HOST, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_PATH, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_QUERY, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_FRAGMENT, &m, buff, &c);
-
- /* Finished with buffer */
- free(buff);
-
- if (e != NSERROR_OK) {
- nsurl_destroy_components(&c);
- return NSERROR_NOMEM;
- }
-
- /* Validate URL */
- if ((lwc_string_isequal(c.scheme, corestring_lwc_http,
- &match) == lwc_error_ok && match == true) ||
- (lwc_string_isequal(c.scheme, corestring_lwc_https,
- &match) == lwc_error_ok && match == true)) {
- /* http, https must have host */
- if (c.host == NULL) {
- nsurl_destroy_components(&c);
- return NSERROR_BAD_URL;
- }
- }
-
- /* Get the string length and find which parts of url are present */
- nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
- &str_len, &str_flags);
-
- /* Create NetSurf URL object */
- *url = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
- if (*url == NULL) {
- nsurl_destroy_components(&c);
- return NSERROR_NOMEM;
- }
-
- (*url)->components = c;
- (*url)->length = length;
-
- /* Fill out the url string */
- nsurl_get_string(&c, (*url)->string, &str_len, str_flags);
-
- /* Get the nsurl's hash */
- nsurl_calc_hash(*url);
-
- /* Give the URL a reference */
- (*url)->count = 1;
-
- return NSERROR_OK;
-}
-
-
-/* exported interface, documented in nsurl.h */
nsurl *nsurl_ref(nsurl *url)
{
assert(url != NULL);
@@ -1539,7 +268,7 @@ nserror nsurl_get(const nsurl *url, nsurl_component parts,
}
/* Copy the required parts into the url string */
- nsurl_get_string(&(url->components), *url_s, &str_len, str_flags);
+ nsurl__get_string(&(url->components), *url_s, &str_len, str_flags);
return NSERROR_OK;
}
@@ -1780,253 +509,6 @@ uint32_t nsurl_hash(const nsurl *url)
/* exported interface, documented in nsurl.h */
-nserror nsurl_join(const nsurl *base, const char *rel, nsurl **joined)
-{
- struct url_markers m;
- struct nsurl_components c;
- size_t length;
- char *buff;
- char *buff_pos;
- char *buff_start;
- struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
- enum nsurl_string_flags str_flags = 0;
- nserror error = 0;
- enum {
- NSURL_F_REL = 0,
- NSURL_F_BASE_SCHEME = (1 << 0),
- NSURL_F_BASE_AUTHORITY = (1 << 1),
- NSURL_F_BASE_PATH = (1 << 2),
- NSURL_F_MERGED_PATH = (1 << 3),
- NSURL_F_BASE_QUERY = (1 << 4)
- } joined_parts;
-
- assert(base != NULL);
- assert(rel != NULL);
-
-#ifdef NSURL_DEBUG
- LOG("base: \"%s\", rel: \"%s\"", nsurl_access(base), rel);
-#endif
-
- /* Peg out the URL sections */
- nsurl__get_string_markers(rel, &m, true);
-
- /* Get the length of the longest section */
- length = nsurl__get_longest_section(&m);
-
- /* Initially assume that the joined URL can be formed entierly from
- * the relative URL.
- */
- joined_parts = NSURL_F_REL;
-
- /* Update joined_compnents to indicate any required parts from the
- * base URL.
- */
- if (m.scheme_end - m.start <= 0) {
- /* The relative url has no scheme.
- * Use base URL's scheme. */
- joined_parts |= NSURL_F_BASE_SCHEME;
-
- if (m.path - m.authority <= 0) {
- /* The relative URL has no authority.
- * Use base URL's authority. */
- joined_parts |= NSURL_F_BASE_AUTHORITY;
-
- if (m.query - m.path <= 0) {
- /* The relative URL has no path.
- * Use base URL's path. */
- joined_parts |= NSURL_F_BASE_PATH;
-
- if (m.fragment - m.query <= 0) {
- /* The relative URL has no query.
- * Use base URL's query. */
- joined_parts |= NSURL_F_BASE_QUERY;
- }
-
- } else if (*(rel + m.path) != '/') {
- /* Relative URL has relative path */
- joined_parts |= NSURL_F_MERGED_PATH;
- }
- }
- }
-
- /* Allocate enough memory to url escape the longest section, plus
- * space for path merging (if required).
- */
- if (joined_parts & NSURL_F_MERGED_PATH) {
- /* Need to merge paths */
- length += (base->components.path != NULL) ?
- lwc_string_length(base->components.path) : 0;
- }
- length *= 4;
- /* Plus space for removing dots from path */
- length += (m.query - m.path) + ((base->components.path != NULL) ?
- lwc_string_length(base->components.path) : 0);
-
- buff = malloc(length + 5);
- if (buff == NULL) {
- return NSERROR_NOMEM;
- }
-
- buff_pos = buff;
-
- /* Form joined URL from base or rel components, as appropriate */
-
- if (joined_parts & NSURL_F_BASE_SCHEME) {
- c.scheme_type = base->components.scheme_type;
-
- c.scheme = nsurl__component_copy(base->components.scheme);
- } else {
- c.scheme_type = m.scheme_type;
-
- error = nsurl__create_from_section(rel, URL_SCHEME, &m, buff, &c);
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
- }
-
- if (joined_parts & NSURL_F_BASE_AUTHORITY) {
- c.username = nsurl__component_copy(base->components.username);
- c.password = nsurl__component_copy(base->components.password);
- c.host = nsurl__component_copy(base->components.host);
- c.port = nsurl__component_copy(base->components.port);
- } else {
- error = nsurl__create_from_section(rel, URL_CREDENTIALS, &m,
- buff, &c);
- if (error == NSERROR_OK) {
- error = nsurl__create_from_section(rel, URL_HOST, &m,
- buff, &c);
- }
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
- }
-
- if (joined_parts & NSURL_F_BASE_PATH) {
- c.path = nsurl__component_copy(base->components.path);
-
- } else if (joined_parts & NSURL_F_MERGED_PATH) {
- struct url_markers m_path;
- size_t new_length;
-
- if (base->components.host != NULL &&
- base->components.path == NULL) {
- /* Append relative path to "/". */
- *(buff_pos++) = '/';
- memcpy(buff_pos, rel + m.path, m.query - m.path);
- buff_pos += m.query - m.path;
-
- } else {
- /* Append relative path to all but last segment of
- * base path. */
- size_t path_end = lwc_string_length(
- base->components.path);
- const char *path = lwc_string_data(
- base->components.path);
-
- while (*(path + path_end) != '/' &&
- path_end != 0) {
- path_end--;
- }
- if (*(path + path_end) == '/')
- path_end++;
-
- /* Copy the base part */
- memcpy(buff_pos, path, path_end);
- buff_pos += path_end;
-
- /* Copy the relative part */
- memcpy(buff_pos, rel + m.path, m.query - m.path);
- buff_pos += m.query - m.path;
- }
-
- /* add termination to string */
- *buff_pos++ = '\0';
-
- new_length = nsurl__remove_dot_segments(buff, buff_pos);
-
- m_path.path = 0;
- m_path.query = new_length;
-
- buff_start = buff_pos + new_length;
- error = nsurl__create_from_section(buff_pos, URL_PATH, &m_path,
- buff_start, &c);
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
-
- } else {
- struct url_markers m_path;
- size_t new_length;
-
- memcpy(buff_pos, rel + m.path, m.query - m.path);
- buff_pos += m.query - m.path;
- *(buff_pos++) = '\0';
-
- new_length = nsurl__remove_dot_segments(buff, buff_pos);
-
- m_path.path = 0;
- m_path.query = new_length;
-
- buff_start = buff_pos + new_length;
-
- error = nsurl__create_from_section(buff_pos, URL_PATH, &m_path,
- buff_start, &c);
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
- }
-
- if (joined_parts & NSURL_F_BASE_QUERY) {
- c.query = nsurl__component_copy(base->components.query);
- } else {
- error = nsurl__create_from_section(rel, URL_QUERY, &m,
- buff, &c);
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
- }
-
- error = nsurl__create_from_section(rel, URL_FRAGMENT, &m, buff, &c);
-
- /* Free temporary buffer */
- free(buff);
-
- if (error != NSERROR_OK) {
- return error;
- }
-
- /* Get the string length and find which parts of url are present */
- nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
- &str_len, &str_flags);
-
- /* Create NetSurf URL object */
- *joined = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
- if (*joined == NULL) {
- return NSERROR_NOMEM;
- }
-
- (*joined)->components = c;
- (*joined)->length = length;
-
- /* Fill out the url string */
- nsurl_get_string(&c, (*joined)->string, &str_len, str_flags);
-
- /* Get the nsurl's hash */
- nsurl_calc_hash(*joined);
-
- /* Give the URL a reference */
- (*joined)->count = 1;
-
- return NSERROR_OK;
-}
-
-
-/* exported interface, documented in nsurl.h */
nserror nsurl_defragment(const nsurl *url, nsurl **no_frag)
{
size_t length;
@@ -2083,7 +565,7 @@ nserror nsurl_defragment(const nsurl *url, nsurl **no_frag)
*pos = '\0';
/* Get the nsurl's hash */
- nsurl_calc_hash(*no_frag);
+ nsurl__calc_hash(*no_frag);
/* Give the URL a reference */
(*no_frag)->count = 1;
@@ -2151,7 +633,7 @@ nserror nsurl_refragment(const nsurl *url, lwc_string *frag, nsurl **new_url)
(*new_url)->components.scheme_type = url->components.scheme_type;
/* Get the nsurl's hash */
- nsurl_calc_hash(*new_url);
+ nsurl__calc_hash(*new_url);
/* Give the URL a reference */
(*new_url)->count = 1;
@@ -2238,7 +720,7 @@ nserror nsurl_replace_query(const nsurl *url, const char *query,
(*new_url)->components.scheme_type = url->components.scheme_type;
/* Get the nsurl's hash */
- nsurl_calc_hash(*new_url);
+ nsurl__calc_hash(*new_url);
/* Give the URL a reference */
(*new_url)->count = 1;
@@ -2441,7 +923,7 @@ nserror nsurl_parent(const nsurl *url, nsurl **new_url)
(*new_url)->components.scheme_type = url->components.scheme_type;
/* Get the nsurl's hash */
- nsurl_calc_hash(*new_url);
+ nsurl__calc_hash(*new_url);
/* Give the URL a reference */
(*new_url)->count = 1;
diff --git a/utils/nsurl/parse.c b/utils/nsurl/parse.c
new file mode 100644
index 0000000..0cdbbd4
--- /dev/null
+++ b/utils/nsurl/parse.c
@@ -0,0 +1,1602 @@
+/*
+ * Copyright 2011 Michael Drake <tlsa(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * NetSurf URL handling implementation.
+ *
+ * This is the common implementation of all URL handling within the
+ * browser. This implementation is based upon RFC3986 although this has
+ * been superceeded by https://url.spec.whatwg.org/ which is based on
+ * actual contemporary implementations.
+ *
+ * Care must be taken with character encodings within this module as
+ * the specifications work with specific ascii ranges and must not be
+ * affected by locale. Hence the c library character type functions
+ * are not used.
+ */
+
+#include <assert.h>
+#include <libwapcaplet/libwapcaplet.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#include "utils/ascii.h"
+#include "utils/corestrings.h"
+#include "utils/errors.h"
+#include "utils/idna.h"
+#include "utils/log.h"
+#include "utils/nsurl.h"
+#include "utils/nsurl/private.h"
+#include "utils/utils.h"
+
+/* Define to enable NSURL debugging */
+#undef NSURL_DEBUG
+
+
+/** Marker set, indicating positions of sections within a URL string */
+struct url_markers {
+ size_t start; /** start of URL */
+ size_t scheme_end;
+ size_t authority;
+
+ size_t colon_first;
+ size_t at;
+ size_t colon_last;
+
+ size_t path;
+ size_t query;
+ size_t fragment;
+
+ size_t end; /** end of URL */
+
+ enum nsurl_scheme_type scheme_type;
+};
+
+
+/** Sections of a URL */
+enum url_sections {
+ URL_SCHEME,
+ URL_CREDENTIALS,
+ URL_HOST,
+ URL_PATH,
+ URL_QUERY,
+ URL_FRAGMENT
+};
+
+
+#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
+
+#define nsurl__component_compare(c1, c2, match) \
+ if (c1 && c2 && lwc_error_ok == \
+ lwc_string_isequal(c1, c2, match)) { \
+ /* do nothing */ \
+ } else if (c1 || c2) { \
+ *match = false; \
+ }
+
+/**
+ * Return a hex digit for the given numerical value.
+ *
+ * \param digit the value to get the hex digit for.
+ * \return character in range 0-9A-F
+ */
+inline static char digit2uppercase_hex(unsigned char digit) {
+ assert(digit < 16);
+ return "0123456789ABCDEF"[digit];
+}
+
+/**
+ * determine if a character is unreserved
+ *
+ * \param c character to classify.
+ * \return true if the character is unreserved else false.
+ */
+static bool nsurl__is_unreserved(unsigned char c)
+{
+ /* From RFC3986 section 2.3 (unreserved characters)
+ *
+ * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
+ *
+ */
+ static const bool unreserved[256] = {
+ false, false, false, false, false, false, false, false, /* 00 */
+ false, false, false, false, false, false, false, false, /* 08 */
+ false, false, false, false, false, false, false, false, /* 10 */
+ false, false, false, false, false, false, false, false, /* 18 */
+ false, false, false, false, false, false, false, false, /* 20 */
+ false, false, false, false, false, true, true, false, /* 28 */
+ true, true, true, true, true, true, true, true, /* 30 */
+ true, true, false, false, false, false, false, false, /* 38 */
+ false, true, true, true, true, true, true, true, /* 40 */
+ true, true, true, true, true, true, true, true, /* 48 */
+ true, true, true, true, true, true, true, true, /* 50 */
+ true, true, true, false, false, false, false, true, /* 58 */
+ false, true, true, true, true, true, true, true, /* 60 */
+ true, true, true, true, true, true, true, true, /* 68 */
+ true, true, true, true, true, true, true, true, /* 70 */
+ true, true, true, false, false, false, true, false, /* 78 */
+ false, false, false, false, false, false, false, false, /* 80 */
+ false, false, false, false, false, false, false, false, /* 88 */
+ false, false, false, false, false, false, false, false, /* 90 */
+ false, false, false, false, false, false, false, false, /* 98 */
+ false, false, false, false, false, false, false, false, /* A0 */
+ false, false, false, false, false, false, false, false, /* A8 */
+ false, false, false, false, false, false, false, false, /* B0 */
+ false, false, false, false, false, false, false, false, /* B8 */
+ false, false, false, false, false, false, false, false, /* C0 */
+ false, false, false, false, false, false, false, false, /* C8 */
+ false, false, false, false, false, false, false, false, /* D0 */
+ false, false, false, false, false, false, false, false, /* D8 */
+ false, false, false, false, false, false, false, false, /* E0 */
+ false, false, false, false, false, false, false, false, /* E8 */
+ false, false, false, false, false, false, false, false, /* F0 */
+ false, false, false, false, false, false, false, false /* F8 */
+ };
+ return unreserved[c];
+}
+
+/**
+ * determine if a character should be percent escaped.
+ *
+ * The ASCII codes which should not be percent escaped
+ *
+ * \param c character to classify.
+ * \return true if the character should not be escaped else false.
+ */
+static bool nsurl__is_no_escape(unsigned char c)
+{
+ static const bool no_escape[256] = {
+ false, false, false, false, false, false, false, false, /* 00 */
+ false, false, false, false, false, false, false, false, /* 08 */
+ false, false, false, false, false, false, false, false, /* 10 */
+ false, false, false, false, false, false, false, false, /* 18 */
+ false, true, false, true, true, false, true, true, /* 20 */
+ true, true, true, true, true, true, true, true, /* 28 */
+ true, true, true, true, true, true, true, true, /* 30 */
+ true, true, true, true, false, true, false, true, /* 38 */
+ true, true, true, true, true, true, true, true, /* 40 */
+ true, true, true, true, true, true, true, true, /* 48 */
+ true, true, true, true, true, true, true, true, /* 50 */
+ true, true, true, true, false, true, false, true, /* 58 */
+ false, true, true, true, true, true, true, true, /* 60 */
+ true, true, true, true, true, true, true, true, /* 68 */
+ true, true, true, true, true, true, true, true, /* 70 */
+ true, true, true, false, true, false, true, false, /* 78 */
+ false, false, false, false, false, false, false, false, /* 80 */
+ false, false, false, false, false, false, false, false, /* 88 */
+ false, false, false, false, false, false, false, false, /* 90 */
+ false, false, false, false, false, false, false, false, /* 98 */
+ false, false, false, false, false, false, false, false, /* A0 */
+ false, false, false, false, false, false, false, false, /* A8 */
+ false, false, false, false, false, false, false, false, /* B0 */
+ false, false, false, false, false, false, false, false, /* B8 */
+ false, false, false, false, false, false, false, false, /* C0 */
+ false, false, false, false, false, false, false, false, /* C8 */
+ false, false, false, false, false, false, false, false, /* D0 */
+ false, false, false, false, false, false, false, false, /* D8 */
+ false, false, false, false, false, false, false, false, /* E0 */
+ false, false, false, false, false, false, false, false, /* E8 */
+ false, false, false, false, false, false, false, false, /* F0 */
+ false, false, false, false, false, false, false, false, /* F8 */
+ };
+ return no_escape[c];
+}
+
+
+/**
+ * Obtains a set of markers delimiting sections in a URL string
+ *
+ * \param url_s URL string
+ * \param markers Updated to mark sections in the URL string
+ * \param joining True iff URL string is a relative URL for joining
+ */
+static void nsurl__get_string_markers(const char * const url_s,
+ struct url_markers *markers, bool joining)
+{
+ const char *pos = url_s; /** current position in url_s */
+ bool is_http = false;
+ bool trailing_whitespace = false;
+
+ /* Initialise marker set */
+ struct url_markers marker = { 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, NSURL_SCHEME_OTHER };
+
+ /* Skip any leading whitespace in url_s */
+ while (ascii_is_space(*pos))
+ pos++;
+
+ /* Record start point */
+ marker.start = pos - url_s;
+
+ marker.scheme_end = marker.authority = marker.colon_first = marker.at =
+ marker.colon_last = marker.path = marker.start;
+
+ if (*pos == '\0') {
+ /* Nothing but whitespace, early exit */
+ marker.query = marker.fragment = marker.end = marker.path;
+ *markers = marker;
+ return;
+ }
+
+ /* Get scheme */
+ if (ascii_is_alpha(*pos)) {
+ pos++;
+
+ while (*pos != ':' && *pos != '\0') {
+ if (!ascii_is_alphanumerical(*pos) && (*pos != '+') &&
+ (*pos != '-') && (*pos != '.')) {
+ /* This character is not valid in the
+ * scheme */
+ break;
+ }
+ pos++;
+ }
+
+ if (*pos == ':') {
+ /* This delimits the end of the scheme */
+ size_t off;
+
+ marker.scheme_end = pos - url_s;
+
+ off = marker.scheme_end - marker.start;
+
+ /* Detect http(s) and mailto for scheme specifc
+ * normalisation */
+ if (off == SLEN("http") &&
+ (((*(pos - off + 0) == 'h') ||
+ (*(pos - off + 0) == 'H')) &&
+ ((*(pos - off + 1) == 't') ||
+ (*(pos - off + 1) == 'T')) &&
+ ((*(pos - off + 2) == 't') ||
+ (*(pos - off + 2) == 'T')) &&
+ ((*(pos - off + 3) == 'p') ||
+ (*(pos - off + 3) == 'P')))) {
+ marker.scheme_type = NSURL_SCHEME_HTTP;
+ is_http = true;
+ } else if (off == SLEN("https") &&
+ (((*(pos - off + 0) == 'h') ||
+ (*(pos - off + 0) == 'H')) &&
+ ((*(pos - off + 1) == 't') ||
+ (*(pos - off + 1) == 'T')) &&
+ ((*(pos - off + 2) == 't') ||
+ (*(pos - off + 2) == 'T')) &&
+ ((*(pos - off + 3) == 'p') ||
+ (*(pos - off + 3) == 'P')) &&
+ ((*(pos - off + 4) == 's') ||
+ (*(pos - off + 4) == 'S')))) {
+ marker.scheme_type = NSURL_SCHEME_HTTPS;
+ is_http = true;
+ } else if (off == SLEN("ftp") &&
+ (((*(pos - off + 0) == 'f') ||
+ (*(pos - off + 0) == 'F')) &&
+ ((*(pos - off + 1) == 't') ||
+ (*(pos - off + 1) == 'T')) &&
+ ((*(pos - off + 2) == 'p') ||
+ (*(pos - off + 2) == 'P')))) {
+ marker.scheme_type = NSURL_SCHEME_FTP;
+ } else if (off == SLEN("mailto") &&
+ (((*(pos - off + 0) == 'm') ||
+ (*(pos - off + 0) == 'M')) &&
+ ((*(pos - off + 1) == 'a') ||
+ (*(pos - off + 1) == 'A')) &&
+ ((*(pos - off + 2) == 'i') ||
+ (*(pos - off + 2) == 'I')) &&
+ ((*(pos - off + 3) == 'l') ||
+ (*(pos - off + 3) == 'L')) &&
+ ((*(pos - off + 4) == 't') ||
+ (*(pos - off + 4) == 'T')) &&
+ ((*(pos - off + 5) == 'o') ||
+ (*(pos - off + 5) == 'O')))) {
+ marker.scheme_type = NSURL_SCHEME_MAILTO;
+ }
+
+ /* Skip over colon */
+ pos++;
+
+ /* Mark place as start of authority */
+ marker.authority = marker.colon_first = marker.at =
+ marker.colon_last = marker.path =
+ pos - url_s;
+
+ } else {
+ /* Not found a scheme */
+ if (joining == false) {
+ /* Assuming no scheme == http */
+ marker.scheme_type = NSURL_SCHEME_HTTP;
+ is_http = true;
+ }
+ }
+ }
+
+ /* Get authority
+ *
+ * Two slashes always indicates the start of an authority.
+ *
+ * We are more relaxed in the case of http:
+ * a. when joining, one or more slashes indicates start of authority
+ * b. when not joining, we assume authority if no scheme was present
+ * and in the case of mailto: when we assume there is an authority.
+ */
+ if ((*pos == '/' && *(pos + 1) == '/') ||
+ (is_http && ((joining && *pos == '/') ||
+ (joining == false &&
+ marker.scheme_end != marker.start))) ||
+ marker.scheme_type == NSURL_SCHEME_MAILTO) {
+
+ /* Skip over leading slashes */
+ if (*pos == '/') {
+ if (is_http == false) {
+ if (*pos == '/') pos++;
+ if (*pos == '/') pos++;
+ } else {
+ while (*pos == '/')
+ pos++;
+ }
+
+ marker.authority = marker.colon_first = marker.at =
+ marker.colon_last = marker.path =
+ pos - url_s;
+ }
+
+ /* Need to get (or complete) the authority */
+ while (*pos != '\0') {
+ if (*pos == '/' || *pos == '?' || *pos == '#') {
+ /* End of the authority */
+ break;
+
+ } else if (marker.scheme_type != NSURL_SCHEME_MAILTO &&
+ *pos == ':' && marker.colon_first ==
+ marker.authority) {
+ /* could be username:password or host:port
+ * separator */
+ marker.colon_first = pos - url_s;
+
+ } else if (marker.scheme_type != NSURL_SCHEME_MAILTO &&
+ *pos == ':' && marker.colon_first !=
+ marker.authority) {
+ /* could be host:port separator */
+ marker.colon_last = pos - url_s;
+
+ } else if (*pos == '@' && marker.at ==
+ marker.authority) {
+ /* Credentials @ host separator */
+ marker.at = pos - url_s;
+ }
+
+ pos++;
+ }
+
+ marker.path = pos - url_s;
+
+ } else if ((*pos == '\0' || *pos == '/') &&
+ joining == false && is_http == true) {
+ marker.path = pos - url_s;
+ }
+
+ /* Get path
+ *
+ * Needs to start with '/' if there's no authority
+ */
+ if (*pos == '/' || ((marker.path == marker.authority) &&
+ (*pos != '?') && (*pos != '#') && (*pos != '\0'))) {
+ while (*(++pos) != '\0') {
+ if (*pos == '?' || *pos == '#') {
+ /* End of the path */
+ break;
+ }
+ }
+ }
+
+ marker.query = pos - url_s;
+
+ /* Get query */
+ if (*pos == '?') {
+ while (*(++pos) != '\0') {
+ if (*pos == '#') {
+ /* End of the query */
+ break;
+ }
+ }
+ }
+
+ marker.fragment = pos - url_s;
+
+ /* Get fragment */
+ if (*pos == '#') {
+ while (*(++pos) != '\0')
+ ;
+ }
+
+ /* We got to the end of url_s.
+ * Need to skip back over trailing whitespace to find end of URL */
+ pos--;
+ if (pos >= url_s && ascii_is_space(*pos)) {
+ trailing_whitespace = true;
+ while (pos >= url_s && ascii_is_space(*pos))
+ pos--;
+ }
+
+ marker.end = pos + 1 - url_s;
+
+ if (trailing_whitespace == true) {
+ /* Ensure last url section doesn't pass end */
+ if (marker.fragment > marker.end)
+ marker.fragment = marker.end;
+ if (marker.query > marker.end)
+ marker.query = marker.end;
+ if (marker.path > marker.end)
+ marker.path = marker.end;
+ if (marker.colon_last > marker.end)
+ marker.colon_last = marker.end;
+ if (marker.at > marker.end)
+ marker.at = marker.end;
+ if (marker.colon_last > marker.end)
+ marker.colon_last = marker.end;
+ if (marker.fragment > marker.end)
+ marker.fragment = marker.end;
+ }
+
+#ifdef NSURL_DEBUG
+ LOG("marker.start: %i", marker.start);
+ LOG("marker.scheme_end: %i", marker.scheme_end);
+ LOG("marker.authority: %i", marker.authority);
+
+ LOG("marker.colon_first: %i", marker.colon_first);
+ LOG("marker.at: %i", marker.at);
+ LOG("marker.colon_last: %i", marker.colon_last);
+
+ LOG("marker.path: %i", marker.path);
+ LOG("marker.query: %i", marker.query);
+ LOG("marker.fragment: %i", marker.fragment);
+
+ LOG("marker.end: %i", marker.end);
+#endif
+
+ /* Got all the URL components pegged out now */
+ *markers = marker;
+}
+
+
+/**
+ * Remove dot segments from a path, as per rfc 3986, 5.2.4
+ *
+ * \param path path to remove dot segments from ('\0' terminated)
+ * \param output path with dot segments removed
+ * \return size of output
+ */
+static size_t nsurl__remove_dot_segments(char *path, char *output)
+{
+ char *path_pos = path;
+ char *output_pos = output;
+
+ while (*path_pos != '\0') {
+#ifdef NSURL_DEBUG
+ LOG(" in:%s", path_pos);
+ LOG("out:%.*s", output_pos - output, output);
+#endif
+ if (*path_pos == '.') {
+ if (*(path_pos + 1) == '.' &&
+ *(path_pos + 2) == '/') {
+ /* Found prefix of "../" */
+ path_pos += SLEN("../");
+ continue;
+
+ } else if (*(path_pos + 1) == '/') {
+ /* Found prefix of "./" */
+ path_pos += SLEN("./");
+ continue;
+ }
+ } else if (*path_pos == '/' && *(path_pos + 1) == '.') {
+ if (*(path_pos + 2) == '/') {
+ /* Found prefix of "/./" */
+ path_pos += SLEN("/.");
+ continue;
+
+ } else if (*(path_pos + 2) == '\0') {
+ /* Found "/." at end of path */
+ *(output_pos++) = '/';
+
+ /* End of input path */
+ break;
+
+ } else if (*(path_pos + 2) == '.') {
+ if (*(path_pos + 3) == '/') {
+ /* Found prefix of "/../" */
+ path_pos += SLEN("/..");
+
+ if (output_pos > output)
+ output_pos--;
+ while (output_pos > output &&
+ *output_pos != '/')
+ output_pos--;
+
+ continue;
+
+ } else if (*(path_pos + 3) == '\0') {
+ /* Found "/.." at end of path */
+
+ while (output_pos > output &&
+ *(output_pos -1 ) !='/')
+ output_pos--;
+
+ /* End of input path */
+ break;
+ }
+ }
+ } else if (*path_pos == '.') {
+ if (*(path_pos + 1) == '\0') {
+ /* Found "." at end of path */
+
+ /* End of input path */
+ break;
+
+ } else if (*(path_pos + 1) == '.' &&
+ *(path_pos + 2) == '\0') {
+ /* Found ".." at end of path */
+
+ /* End of input path */
+ break;
+ }
+ }
+ /* Copy first character into output path */
+ *output_pos++ = *path_pos++;
+
+ /* Copy up to but not including next '/' */
+ while ((*path_pos != '/') && (*path_pos != '\0'))
+ *output_pos++ = *path_pos++;
+ }
+
+ return output_pos - output;
+}
+
+
+/**
+ * Get the length of the longest section
+ *
+ * \param m markers delimiting url sections in a string
+ * \return the length of the longest section
+ */
+static size_t nsurl__get_longest_section(struct url_markers *m)
+{
+ size_t length = m->scheme_end - m->start; /* scheme */
+
+ if (length < m->at - m->authority) /* credentials */
+ length = m->at - m->authority;
+
+ if (length < m->path - m->at) /* host */
+ length = m->path - m->at;
+
+ if (length < m->query - m->path) /* path */
+ length = m->query - m->path;
+
+ if (length < m->fragment - m->query) /* query */
+ length = m->fragment - m->query;
+
+ if (length < m->end - m->fragment) /* fragment */
+ length = m->end - m->fragment;
+
+ return length;
+}
+
+
+/**
+ * Converts two hexadecimal digits to a single number
+ *
+ * \param c1 most significant hex digit
+ * \param c2 least significant hex digit
+ * \return the total value of the two digit hex number, or -ve if input not hex
+ *
+ * For unescaping url encoded characters.
+ */
+static inline int nsurl__get_ascii_offset(char c1, char c2)
+{
+ int offset;
+
+ /* Use 1st char as most significant hex digit */
+ if (ascii_is_digit(c1))
+ offset = 16 * (c1 - '0');
+ else if (c1 >= 'a' && c1 <= 'f')
+ offset = 16 * (c1 - 'a' + 10);
+ else if (c1 >= 'A' && c1 <= 'F')
+ offset = 16 * (c1 - 'A' + 10);
+ else
+ /* Not valid hex */
+ return -1;
+
+ /* Use 2nd char as least significant hex digit and sum */
+ if (ascii_is_digit(c2))
+ offset += c2 - '0';
+ else if (c2 >= 'a' && c2 <= 'f')
+ offset += c2 - 'a' + 10;
+ else if (c2 >= 'A' && c2 <= 'F')
+ offset += c2 - 'A' + 10;
+ else
+ /* Not valid hex */
+ return -1;
+
+ return offset;
+}
+
+
+/**
+ * Create the components of a NetSurf URL object for a section of a URL string
+ *
+ * \param url_s URL string
+ * \param section Sets which section of URL string is to be normalised
+ * \param pegs Set of markers delimiting the URL string's sections
+ * \param pos_norm A buffer large enough for the normalised string (*3 + 1)
+ * \param url A NetSurf URL object, to which components may be added
+ * \return NSERROR_OK on success, appropriate error otherwise
+ *
+ * The section of url_s is normalised appropriately.
+ */
+static nserror nsurl__create_from_section(const char * const url_s,
+ const enum url_sections section,
+ const struct url_markers *pegs,
+ char *pos_norm,
+ struct nsurl_components *url)
+{
+ nserror ret;
+ int ascii_offset;
+ int start = 0;
+ int end = 0;
+ const char *pos;
+ const char *pos_url_s;
+ char *norm_start = pos_norm;
+ char *host;
+ size_t copy_len;
+ size_t length;
+ size_t host_len;
+ enum {
+ NSURL_F_NO_PORT = (1 << 0)
+ } flags = 0;
+
+ switch (section) {
+ case URL_SCHEME:
+ start = pegs->start;
+ end = pegs->scheme_end;
+ break;
+
+ case URL_CREDENTIALS:
+ start = pegs->authority;
+ end = pegs->at;
+ break;
+
+ case URL_HOST:
+ start = (pegs->at == pegs->authority &&
+ *(url_s + pegs->at) != '@') ?
+ pegs->at :
+ pegs->at + 1;
+ end = pegs->path;
+ break;
+
+ case URL_PATH:
+ start = pegs->path;
+ end = pegs->query;
+ break;
+
+ case URL_QUERY:
+ start = pegs->query;
+ end = pegs->fragment;
+ break;
+
+ case URL_FRAGMENT:
+ start = (*(url_s + pegs->fragment) != '#') ?
+ pegs->fragment :
+ pegs->fragment + 1;
+ end = pegs->end;
+ break;
+ }
+
+ if (end < start)
+ end = start;
+
+ length = end - start;
+
+ /* Stage 1: Normalise the required section */
+
+ pos = pos_url_s = url_s + start;
+ copy_len = 0;
+ for (; pos < url_s + end; pos++) {
+ if (*pos == '%' && (pos + 2 < url_s + end)) {
+ /* Might be an escaped character needing unescaped */
+
+ /* Find which character which was escaped */
+ ascii_offset = nsurl__get_ascii_offset(*(pos + 1),
+ *(pos + 2));
+
+ if (ascii_offset < 0) {
+ /* % with invalid hex digits. */
+ copy_len++;
+ continue;
+ }
+
+ if ((section != URL_SCHEME && section != URL_HOST) &&
+ (nsurl__is_unreserved(ascii_offset) == false)) {
+ /* This character should be escaped after all,
+ * just let it get copied */
+ copy_len += 3;
+ pos += 2;
+ continue;
+ }
+
+ if (copy_len > 0) {
+ /* Copy up to here */
+ memcpy(pos_norm, pos_url_s, copy_len);
+ pos_norm += copy_len;
+ copy_len = 0;
+ }
+
+ /* Put the unescaped character in the normalised URL */
+ *(pos_norm++) = (char)ascii_offset;
+ pos += 2;
+ pos_url_s = pos + 1;
+
+ length -= 2;
+
+ } else if ((section != URL_SCHEME && section != URL_HOST) &&
+ (nsurl__is_no_escape(*pos) == false)) {
+
+ /* This needs to be escaped */
+ if (copy_len > 0) {
+ /* Copy up to here */
+ memcpy(pos_norm, pos_url_s, copy_len);
+ pos_norm += copy_len;
+ copy_len = 0;
+ }
+
+ /* escape */
+ *(pos_norm++) = '%';
+ *(pos_norm++) = digit2uppercase_hex(
+ ((unsigned char)*pos) >> 4);
+ *(pos_norm++) = digit2uppercase_hex(
+ ((unsigned char)*pos) & 0xf);
+ pos_url_s = pos + 1;
+
+ length += 2;
+
+ } else if ((section == URL_SCHEME || section == URL_HOST) &&
+ ascii_is_alpha_upper(*pos)) {
+ /* Lower case this letter */
+
+ if (copy_len > 0) {
+ /* Copy up to here */
+ memcpy(pos_norm, pos_url_s, copy_len);
+ pos_norm += copy_len;
+ copy_len = 0;
+ }
+ /* Copy lower cased letter into normalised URL */
+ *(pos_norm++) = ascii_to_lower(*pos);
+ pos_url_s = pos + 1;
+
+ } else {
+ /* This character is safe in normalised URL */
+ copy_len++;
+ }
+ }
+
+ if (copy_len > 0) {
+ /* Copy up to here */
+ memcpy(pos_norm, pos_url_s, copy_len);
+ pos_norm += copy_len;
+ }
+
+ /* Mark end of section */
+ (*pos_norm) = '\0';
+
+ /* Stage 2: Create the URL components for the required section */
+ switch (section) {
+ case URL_SCHEME:
+ if (length == 0) {
+ /* No scheme, assuming http */
+ url->scheme = lwc_string_ref(corestring_lwc_http);
+ } else {
+ /* Add scheme to URL */
+ if (lwc_intern_string(norm_start, length,
+ &url->scheme) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ }
+
+ break;
+
+ case URL_CREDENTIALS:
+ url->username = NULL;
+ url->password = NULL;
+
+ if (length != 0 && *norm_start != ':') {
+ char *sec_start = norm_start;
+ if (pegs->colon_first != pegs->authority &&
+ pegs->at > pegs->colon_first + 1) {
+ /* there's a password */
+ sec_start += pegs->colon_first -
+ pegs->authority + 1;
+ if (lwc_intern_string(sec_start,
+ pegs->at - pegs->colon_first -1,
+ &url->password) !=
+ lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+
+ /* update start pos and length for username */
+ sec_start = norm_start;
+ length -= pegs->at - pegs->colon_first;
+ } else if (pegs->colon_first != pegs->authority &&
+ pegs->at == pegs->colon_first + 1) {
+ /* strip username colon */
+ length--;
+ }
+
+ /* Username */
+ if (lwc_intern_string(sec_start, length,
+ &url->username) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ }
+
+ break;
+
+ case URL_HOST:
+ url->host = NULL;
+ url->port = NULL;
+
+ if (length != 0) {
+ size_t colon = 0;
+ char *sec_start = norm_start;
+ if (pegs->at < pegs->colon_first &&
+ pegs->colon_last == pegs->authority) {
+ /* There's one colon and it's after @ marker */
+ colon = pegs->colon_first;
+ } else if (pegs->colon_last != pegs->authority) {
+ /* There's more than one colon */
+ colon = pegs->colon_last;
+ } else {
+ /* There's no colon that could be a port
+ * separator */
+ flags |= NSURL_F_NO_PORT;
+ }
+
+ if (!(flags & NSURL_F_NO_PORT)) {
+ /* Determine whether colon is a port separator
+ */
+ sec_start += colon - pegs->at;
+ while (++sec_start < norm_start + length) {
+ if (!ascii_is_digit(*sec_start)) {
+ /* Character after port isn't a
+ * digit; not a port separator
+ */
+ flags |= NSURL_F_NO_PORT;
+ break;
+ }
+ }
+ }
+
+ if (!(flags & NSURL_F_NO_PORT)) {
+ /* There's a port */
+ size_t skip = (pegs->at == pegs->authority) ?
+ 1 : 0;
+ sec_start = norm_start + colon - pegs->at +
+ skip;
+ if (url->scheme != NULL &&
+ url->scheme_type ==
+ NSURL_SCHEME_HTTP &&
+ length -
+ (colon - pegs->at + skip) == 2 &&
+ *sec_start == '8' &&
+ *(sec_start + 1) == '0') {
+ /* Scheme is http, and port is default
+ * (80) */
+ flags |= NSURL_F_NO_PORT;
+ }
+
+ if (length <= (colon - pegs->at + skip)) {
+ /* No space for a port after the colon
+ */
+ flags |= NSURL_F_NO_PORT;
+ }
+
+ /* Add non-redundant ports to NetSurf URL */
+ sec_start = norm_start + colon - pegs->at +
+ skip;
+ if (!(flags & NSURL_F_NO_PORT) &&
+ lwc_intern_string(sec_start,
+ length -
+ (colon - pegs->at + skip),
+ &url->port) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+
+ /* update length for host */
+ skip = (pegs->at == pegs->authority) ? 0 : 1;
+ length = colon - pegs->at - skip;
+ }
+
+ /* host */
+ /* Encode host according to IDNA2008 */
+ ret = idna_encode(norm_start, length, &host, &host_len);
+ if (ret == NSERROR_OK) {
+ /* valid idna encoding */
+ if (lwc_intern_string(host, host_len,
+ &url->host) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ free(host);
+ } else {
+ /* fall back to straight interning */
+ if (lwc_intern_string(norm_start, length,
+ &url->host) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ }
+ }
+
+ break;
+
+ case URL_PATH:
+ if (length != 0) {
+ if (lwc_intern_string(norm_start, length,
+ &url->path) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ } else if (url->host != NULL &&
+ url->scheme_type != NSURL_SCHEME_MAILTO) {
+ /* Set empty path to "/", if there's a host */
+ if (lwc_intern_string("/", SLEN("/"),
+ &url->path) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ } else {
+ url->path = NULL;
+ }
+
+ break;
+
+ case URL_QUERY:
+ if (length != 0) {
+ if (lwc_intern_string(norm_start, length,
+ &url->query) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ } else {
+ url->query = NULL;
+ }
+
+ break;
+
+ case URL_FRAGMENT:
+ if (length != 0) {
+ if (lwc_intern_string(norm_start, length,
+ &url->fragment) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ } else {
+ url->fragment = NULL;
+ }
+
+ break;
+ }
+
+ return NSERROR_OK;
+}
+
+
+/* Exported function, documented in utils/nsurl/private.h */
+void nsurl__get_string_data(const struct nsurl_components *url,
+ nsurl_component parts, size_t *url_l,
+ struct nsurl_component_lengths *lengths,
+ enum nsurl_string_flags *pflags)
+{
+ enum nsurl_string_flags flags = *pflags;
+ *url_l = 0;
+
+ /* Intersection of required parts and available parts gives
+ * the output parts */
+ if (url->scheme && parts & NSURL_SCHEME) {
+ flags |= NSURL_F_SCHEME;
+
+ lengths->scheme = lwc_string_length(url->scheme);
+ *url_l += lengths->scheme;
+ }
+
+ if (url->username && parts & NSURL_USERNAME) {
+ flags |= NSURL_F_USERNAME;
+
+ lengths->username = lwc_string_length(url->username);
+ *url_l += lengths->username;
+ }
+
+ if (url->password && parts & NSURL_PASSWORD) {
+ flags |= NSURL_F_PASSWORD;
+
+ lengths->password = lwc_string_length(url->password);
+ *url_l += SLEN(":") + lengths->password;
+ }
+
+ if (url->host && parts & NSURL_HOST) {
+ flags |= NSURL_F_HOST;
+
+ lengths->host = lwc_string_length(url->host);
+ *url_l += lengths->host;
+ }
+
+ if (url->port && parts & NSURL_PORT) {
+ flags |= NSURL_F_PORT;
+
+ lengths->port = lwc_string_length(url->port);
+ *url_l += SLEN(":") + lengths->port;
+ }
+
+ if (url->path && parts & NSURL_PATH) {
+ flags |= NSURL_F_PATH;
+
+ lengths->path = lwc_string_length(url->path);
+ *url_l += lengths->path;
+ }
+
+ if (url->query && parts & NSURL_QUERY) {
+ flags |= NSURL_F_QUERY;
+
+ lengths->query = lwc_string_length(url->query);
+ *url_l += lengths->query;
+ }
+
+ if (url->fragment && parts & NSURL_FRAGMENT) {
+ flags |= NSURL_F_FRAGMENT;
+
+ lengths->fragment = lwc_string_length(url->fragment);
+ *url_l += lengths->fragment;
+ }
+
+ /* Turn on any spanned punctuation */
+ if ((flags & NSURL_F_SCHEME) && (parts > NSURL_SCHEME)) {
+ flags |= NSURL_F_SCHEME_PUNCTUATION;
+
+ *url_l += SLEN(":");
+ }
+
+ if ((flags & NSURL_F_SCHEME) && (flags > NSURL_F_SCHEME) &&
+ url->path && lwc_string_data(url->path)[0] == '/') {
+ flags |= NSURL_F_AUTHORITY_PUNCTUATION;
+
+ *url_l += SLEN("//");
+ }
+
+ if ((flags & (NSURL_F_USERNAME | NSURL_F_PASSWORD)) &&
+ flags & NSURL_F_HOST) {
+ flags |= NSURL_F_CREDENTIALS_PUNCTUATION;
+
+ *url_l += SLEN("@");
+ }
+
+ if ((flags & ~NSURL_F_FRAGMENT) && (flags & NSURL_F_FRAGMENT)) {
+ flags |= NSURL_F_FRAGMENT_PUNCTUATION;
+
+ *url_l += SLEN("#");
+ }
+
+ *pflags = flags;
+}
+
+
+/* Exported function, documented in utils/nsurl/private.h */
+void nsurl__get_string(const struct nsurl_components *url, char *url_s,
+ struct nsurl_component_lengths *l,
+ enum nsurl_string_flags flags)
+{
+ char *pos;
+
+ /* Copy the required parts into the url string */
+ pos = url_s;
+
+ if (flags & NSURL_F_SCHEME) {
+ memcpy(pos, lwc_string_data(url->scheme), l->scheme);
+ pos += l->scheme;
+ }
+
+ if (flags & NSURL_F_SCHEME_PUNCTUATION) {
+ *(pos++) = ':';
+ }
+
+ if (flags & NSURL_F_AUTHORITY_PUNCTUATION) {
+ *(pos++) = '/';
+ *(pos++) = '/';
+ }
+
+ if (flags & NSURL_F_USERNAME) {
+ memcpy(pos, lwc_string_data(url->username), l->username);
+ pos += l->username;
+ }
+
+ if (flags & NSURL_F_PASSWORD) {
+ *(pos++) = ':';
+ memcpy(pos, lwc_string_data(url->password), l->password);
+ pos += l->password;
+ }
+
+ if (flags & NSURL_F_CREDENTIALS_PUNCTUATION) {
+ *(pos++) = '@';
+ }
+
+ if (flags & NSURL_F_HOST) {
+ memcpy(pos, lwc_string_data(url->host), l->host);
+ pos += l->host;
+ }
+
+ if (flags & NSURL_F_PORT) {
+ *(pos++) = ':';
+ memcpy(pos, lwc_string_data(url->port), l->port);
+ pos += l->port;
+ }
+
+ if (flags & NSURL_F_PATH) {
+ memcpy(pos, lwc_string_data(url->path), l->path);
+ pos += l->path;
+ }
+
+ if (flags & NSURL_F_QUERY) {
+ memcpy(pos, lwc_string_data(url->query), l->query);
+ pos += l->query;
+ }
+
+ if (flags & NSURL_F_FRAGMENT) {
+ if (flags & NSURL_F_FRAGMENT_PUNCTUATION)
+ *(pos++) = '#';
+ memcpy(pos, lwc_string_data(url->fragment), l->fragment);
+ pos += l->fragment;
+ }
+
+ *pos = '\0';
+}
+
+
+/**
+ * Calculate hash value
+ *
+ * \param url NetSurf URL object to set hash value for
+ */
+void nsurl__calc_hash(nsurl *url)
+{
+ uint32_t hash = 0;
+
+ if (url->components.scheme)
+ hash ^= lwc_string_hash_value(url->components.scheme);
+
+ if (url->components.username)
+ hash ^= lwc_string_hash_value(url->components.username);
+
+ if (url->components.password)
+ hash ^= lwc_string_hash_value(url->components.password);
+
+ if (url->components.host)
+ hash ^= lwc_string_hash_value(url->components.host);
+
+ if (url->components.port)
+ hash ^= lwc_string_hash_value(url->components.port);
+
+ if (url->components.path)
+ hash ^= lwc_string_hash_value(url->components.path);
+
+ if (url->components.query)
+ hash ^= lwc_string_hash_value(url->components.query);
+
+ url->hash = hash;
+}
+
+
+/**
+ * Destroy components
+ *
+ * \param c url components
+ */
+static void nsurl_destroy_components(struct nsurl_components *c)
+{
+ if (c->scheme)
+ lwc_string_unref(c->scheme);
+
+ if (c->username)
+ lwc_string_unref(c->username);
+
+ if (c->password)
+ lwc_string_unref(c->password);
+
+ if (c->host)
+ lwc_string_unref(c->host);
+
+ if (c->port)
+ lwc_string_unref(c->port);
+
+ if (c->path)
+ lwc_string_unref(c->path);
+
+ if (c->query)
+ lwc_string_unref(c->query);
+
+ if (c->fragment)
+ lwc_string_unref(c->fragment);
+}
+
+
+#ifdef NSURL_DEBUG
+/**
+ * Dump a NetSurf URL's internal components
+ *
+ * \param url The NetSurf URL to dump components of
+ */
+static void nsurl__dump(const nsurl *url)
+{
+ if (url->components.scheme)
+ LOG(" Scheme: %s", lwc_string_data(url->components.scheme));
+
+ if (url->components.username)
+ LOG("Username: %s", lwc_string_data(url->components.username));
+
+ if (url->components.password)
+ LOG("Password: %s", lwc_string_data(url->components.password));
+
+ if (url->components.host)
+ LOG(" Host: %s", lwc_string_data(url->components.host));
+
+ if (url->components.port)
+ LOG(" Port: %s", lwc_string_data(url->components.port));
+
+ if (url->components.path)
+ LOG(" Path: %s", lwc_string_data(url->components.path));
+
+ if (url->components.query)
+ LOG(" Query: %s", lwc_string_data(url->components.query));
+
+ if (url->components.fragment)
+ LOG("Fragment: %s", lwc_string_data(url->components.fragment));
+}
+#endif
+
+/******************************************************************************
+ * NetSurf URL Public API *
+ ******************************************************************************/
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_create(const char * const url_s, nsurl **url)
+{
+ struct url_markers m;
+ struct nsurl_components c;
+ size_t length;
+ char *buff;
+ struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ enum nsurl_string_flags str_flags = 0;
+ nserror e = NSERROR_OK;
+ bool match;
+
+ assert(url_s != NULL);
+
+ /* Peg out the URL sections */
+ nsurl__get_string_markers(url_s, &m, false);
+
+ /* Get the length of the longest section */
+ length = nsurl__get_longest_section(&m);
+
+ /* Allocate enough memory to url escape the longest section */
+ buff = malloc(length * 3 + 1);
+ if (buff == NULL)
+ return NSERROR_NOMEM;
+
+ /* Set scheme type */
+ c.scheme_type = m.scheme_type;
+
+ /* Build NetSurf URL object from sections */
+ e |= nsurl__create_from_section(url_s, URL_SCHEME, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_CREDENTIALS, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_HOST, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_PATH, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_QUERY, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_FRAGMENT, &m, buff, &c);
+
+ /* Finished with buffer */
+ free(buff);
+
+ if (e != NSERROR_OK) {
+ nsurl_destroy_components(&c);
+ return NSERROR_NOMEM;
+ }
+
+ /* Validate URL */
+ if ((lwc_string_isequal(c.scheme, corestring_lwc_http,
+ &match) == lwc_error_ok && match == true) ||
+ (lwc_string_isequal(c.scheme, corestring_lwc_https,
+ &match) == lwc_error_ok && match == true)) {
+ /* http, https must have host */
+ if (c.host == NULL) {
+ nsurl_destroy_components(&c);
+ return NSERROR_BAD_URL;
+ }
+ }
+
+ /* Get the string length and find which parts of url are present */
+ nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
+ &str_len, &str_flags);
+
+ /* Create NetSurf URL object */
+ *url = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
+ if (*url == NULL) {
+ nsurl_destroy_components(&c);
+ return NSERROR_NOMEM;
+ }
+
+ (*url)->components = c;
+ (*url)->length = length;
+
+ /* Fill out the url string */
+ nsurl__get_string(&c, (*url)->string, &str_len, str_flags);
+
+ /* Get the nsurl's hash */
+ nsurl__calc_hash(*url);
+
+ /* Give the URL a reference */
+ (*url)->count = 1;
+
+ return NSERROR_OK;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_join(const nsurl *base, const char *rel, nsurl **joined)
+{
+ struct url_markers m;
+ struct nsurl_components c;
+ size_t length;
+ char *buff;
+ char *buff_pos;
+ char *buff_start;
+ struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ enum nsurl_string_flags str_flags = 0;
+ nserror error = 0;
+ enum {
+ NSURL_F_REL = 0,
+ NSURL_F_BASE_SCHEME = (1 << 0),
+ NSURL_F_BASE_AUTHORITY = (1 << 1),
+ NSURL_F_BASE_PATH = (1 << 2),
+ NSURL_F_MERGED_PATH = (1 << 3),
+ NSURL_F_BASE_QUERY = (1 << 4)
+ } joined_parts;
+
+ assert(base != NULL);
+ assert(rel != NULL);
+
+#ifdef NSURL_DEBUG
+ LOG("base: \"%s\", rel: \"%s\"", nsurl_access(base), rel);
+#endif
+
+ /* Peg out the URL sections */
+ nsurl__get_string_markers(rel, &m, true);
+
+ /* Get the length of the longest section */
+ length = nsurl__get_longest_section(&m);
+
+ /* Initially assume that the joined URL can be formed entierly from
+ * the relative URL.
+ */
+ joined_parts = NSURL_F_REL;
+
+ /* Update joined_compnents to indicate any required parts from the
+ * base URL.
+ */
+ if (m.scheme_end - m.start <= 0) {
+ /* The relative url has no scheme.
+ * Use base URL's scheme. */
+ joined_parts |= NSURL_F_BASE_SCHEME;
+
+ if (m.path - m.authority <= 0) {
+ /* The relative URL has no authority.
+ * Use base URL's authority. */
+ joined_parts |= NSURL_F_BASE_AUTHORITY;
+
+ if (m.query - m.path <= 0) {
+ /* The relative URL has no path.
+ * Use base URL's path. */
+ joined_parts |= NSURL_F_BASE_PATH;
+
+ if (m.fragment - m.query <= 0) {
+ /* The relative URL has no query.
+ * Use base URL's query. */
+ joined_parts |= NSURL_F_BASE_QUERY;
+ }
+
+ } else if (*(rel + m.path) != '/') {
+ /* Relative URL has relative path */
+ joined_parts |= NSURL_F_MERGED_PATH;
+ }
+ }
+ }
+
+ /* Allocate enough memory to url escape the longest section, plus
+ * space for path merging (if required).
+ */
+ if (joined_parts & NSURL_F_MERGED_PATH) {
+ /* Need to merge paths */
+ length += (base->components.path != NULL) ?
+ lwc_string_length(base->components.path) : 0;
+ }
+ length *= 4;
+ /* Plus space for removing dots from path */
+ length += (m.query - m.path) + ((base->components.path != NULL) ?
+ lwc_string_length(base->components.path) : 0);
+
+ buff = malloc(length + 5);
+ if (buff == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ buff_pos = buff;
+
+ /* Form joined URL from base or rel components, as appropriate */
+
+ if (joined_parts & NSURL_F_BASE_SCHEME) {
+ c.scheme_type = base->components.scheme_type;
+
+ c.scheme = nsurl__component_copy(base->components.scheme);
+ } else {
+ c.scheme_type = m.scheme_type;
+
+ error = nsurl__create_from_section(rel, URL_SCHEME, &m, buff, &c);
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+ }
+
+ if (joined_parts & NSURL_F_BASE_AUTHORITY) {
+ c.username = nsurl__component_copy(base->components.username);
+ c.password = nsurl__component_copy(base->components.password);
+ c.host = nsurl__component_copy(base->components.host);
+ c.port = nsurl__component_copy(base->components.port);
+ } else {
+ error = nsurl__create_from_section(rel, URL_CREDENTIALS, &m,
+ buff, &c);
+ if (error == NSERROR_OK) {
+ error = nsurl__create_from_section(rel, URL_HOST, &m,
+ buff, &c);
+ }
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+ }
+
+ if (joined_parts & NSURL_F_BASE_PATH) {
+ c.path = nsurl__component_copy(base->components.path);
+
+ } else if (joined_parts & NSURL_F_MERGED_PATH) {
+ struct url_markers m_path;
+ size_t new_length;
+
+ if (base->components.host != NULL &&
+ base->components.path == NULL) {
+ /* Append relative path to "/". */
+ *(buff_pos++) = '/';
+ memcpy(buff_pos, rel + m.path, m.query - m.path);
+ buff_pos += m.query - m.path;
+
+ } else {
+ /* Append relative path to all but last segment of
+ * base path. */
+ size_t path_end = lwc_string_length(
+ base->components.path);
+ const char *path = lwc_string_data(
+ base->components.path);
+
+ while (*(path + path_end) != '/' &&
+ path_end != 0) {
+ path_end--;
+ }
+ if (*(path + path_end) == '/')
+ path_end++;
+
+ /* Copy the base part */
+ memcpy(buff_pos, path, path_end);
+ buff_pos += path_end;
+
+ /* Copy the relative part */
+ memcpy(buff_pos, rel + m.path, m.query - m.path);
+ buff_pos += m.query - m.path;
+ }
+
+ /* add termination to string */
+ *buff_pos++ = '\0';
+
+ new_length = nsurl__remove_dot_segments(buff, buff_pos);
+
+ m_path.path = 0;
+ m_path.query = new_length;
+
+ buff_start = buff_pos + new_length;
+ error = nsurl__create_from_section(buff_pos, URL_PATH, &m_path,
+ buff_start, &c);
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+
+ } else {
+ struct url_markers m_path;
+ size_t new_length;
+
+ memcpy(buff_pos, rel + m.path, m.query - m.path);
+ buff_pos += m.query - m.path;
+ *(buff_pos++) = '\0';
+
+ new_length = nsurl__remove_dot_segments(buff, buff_pos);
+
+ m_path.path = 0;
+ m_path.query = new_length;
+
+ buff_start = buff_pos + new_length;
+
+ error = nsurl__create_from_section(buff_pos, URL_PATH, &m_path,
+ buff_start, &c);
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+ }
+
+ if (joined_parts & NSURL_F_BASE_QUERY) {
+ c.query = nsurl__component_copy(base->components.query);
+ } else {
+ error = nsurl__create_from_section(rel, URL_QUERY, &m,
+ buff, &c);
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+ }
+
+ error = nsurl__create_from_section(rel, URL_FRAGMENT, &m, buff, &c);
+
+ /* Free temporary buffer */
+ free(buff);
+
+ if (error != NSERROR_OK) {
+ return error;
+ }
+
+ /* Get the string length and find which parts of url are present */
+ nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
+ &str_len, &str_flags);
+
+ /* Create NetSurf URL object */
+ *joined = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
+ if (*joined == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ (*joined)->components = c;
+ (*joined)->length = length;
+
+ /* Fill out the url string */
+ nsurl__get_string(&c, (*joined)->string, &str_len, str_flags);
+
+ /* Get the nsurl's hash */
+ nsurl__calc_hash(*joined);
+
+ /* Give the URL a reference */
+ (*joined)->count = 1;
+
+ return NSERROR_OK;
+}
+
diff --git a/utils/nsurl/private.h b/utils/nsurl/private.h
index b8132c5..f8ba51f 100644
--- a/utils/nsurl/private.h
+++ b/utils/nsurl/private.h
@@ -21,6 +21,7 @@
#include <libwapcaplet/libwapcaplet.h>
+#include "utils/nsurl.h"
#include "utils/utils.h"
/** A type for URL schemes */
@@ -72,4 +73,71 @@ struct nsurl {
char string[FLEX_ARRAY_LEN_DECL]; /* Full URL as a string */
};
+
+/** Marker set, indicating positions of sections within a URL string */
+struct nsurl_component_lengths {
+ size_t scheme;
+ size_t username;
+ size_t password;
+ size_t host;
+ size_t port;
+ size_t path;
+ size_t query;
+ size_t fragment;
+};
+
+
+/** Flags indicating which parts of a URL string are required for a nsurl */
+enum nsurl_string_flags {
+ NSURL_F_SCHEME = (1 << 0),
+ NSURL_F_SCHEME_PUNCTUATION = (1 << 1),
+ NSURL_F_AUTHORITY_PUNCTUATION = (1 << 2),
+ NSURL_F_USERNAME = (1 << 3),
+ NSURL_F_PASSWORD = (1 << 4),
+ NSURL_F_CREDENTIALS_PUNCTUATION = (1 << 5),
+ NSURL_F_HOST = (1 << 6),
+ NSURL_F_PORT = (1 << 7),
+ NSURL_F_AUTHORITY = (NSURL_F_USERNAME |
+ NSURL_F_PASSWORD |
+ NSURL_F_HOST |
+ NSURL_F_PORT),
+ NSURL_F_PATH = (1 << 8),
+ NSURL_F_QUERY = (1 << 9),
+ NSURL_F_FRAGMENT_PUNCTUATION = (1 << 10),
+ NSURL_F_FRAGMENT = (1 << 11)
+};
+
+/**
+ * Get nsurl string info; total length, component lengths, & components present
+ *
+ * \param url NetSurf URL components
+ * \param url_s Updated to contain the string
+ * \param l Individual component lengths
+ * \param flags String flags
+ */
+void nsurl__get_string(const struct nsurl_components *url, char *url_s,
+ struct nsurl_component_lengths *l,
+ enum nsurl_string_flags flags);
+
+/**
+ * Get nsurl string info; total length, component lengths, & components present
+ *
+ * \param url NetSurf URL components
+ * \param parts Which parts of the URL are required in the string
+ * \param url_l Updated to total string length
+ * \param lengths Updated with individual component lengths
+ * \param pflags Updated to contain relevant string flags
+ */
+void nsurl__get_string_data(const struct nsurl_components *url,
+ nsurl_component parts, size_t *url_l,
+ struct nsurl_component_lengths *lengths,
+ enum nsurl_string_flags *pflags);
+
+/**
+ * Calculate hash value
+ *
+ * \param url NetSurf URL object to set hash value for
+ */
+void nsurl__calc_hash(nsurl *url);
+
#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=da6e045c669ab1241b4...
commit da6e045c669ab1241b49b396484eb2666e16afba
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
nsurl: Split internal structure out into private header.
diff --git a/utils/nsurl/nsurl.c b/utils/nsurl/nsurl.c
index c5c614c..bc77c58 100644
--- a/utils/nsurl/nsurl.c
+++ b/utils/nsurl/nsurl.c
@@ -42,62 +42,13 @@
#include "utils/errors.h"
#include "utils/idna.h"
#include "utils/log.h"
+#include "utils/nsurl/private.h"
#include "utils/nsurl.h"
#include "utils/utils.h"
/* Define to enable NSURL debugging */
#undef NSURL_DEBUG
-/**
- * nsurl scheme type
- */
-enum scheme_type {
- NSURL_SCHEME_OTHER,
- NSURL_SCHEME_HTTP,
- NSURL_SCHEME_HTTPS,
- NSURL_SCHEME_FTP,
- NSURL_SCHEME_MAILTO
-};
-
-/**
- * nsurl components
- *
- * [scheme]://[username]:[password]@[host]:[port][path][?query]#[fragment]
- *
- * Note:
- * "path" string includes preceding '/', if needed for the scheme
- * "query" string always includes preceding '?'
- *
- * The other spanned punctuation is to be inserted when building URLs from
- * components.
- */
-struct nsurl_components {
- lwc_string *scheme;
- lwc_string *username;
- lwc_string *password;
- lwc_string *host;
- lwc_string *port;
- lwc_string *path;
- lwc_string *query;
- lwc_string *fragment;
-
- enum scheme_type scheme_type;
-};
-
-
-/**
- * NetSurf URL object
- */
-struct nsurl {
- struct nsurl_components components;
-
- int count; /* Number of references to NetSurf URL object */
- uint32_t hash; /* Hash value for nsurl identification */
-
- size_t length; /* Length of string */
- char string[FLEX_ARRAY_LEN_DECL]; /* Full URL as a string */
-};
-
/** Marker set, indicating positions of sections within a URL string */
struct url_markers {
@@ -115,7 +66,7 @@ struct url_markers {
size_t end; /** end of URL */
- enum scheme_type scheme_type;
+ enum nsurl_scheme_type scheme_type;
};
diff --git a/utils/nsurl/private.h b/utils/nsurl/private.h
new file mode 100644
index 0000000..b8132c5
--- /dev/null
+++ b/utils/nsurl/private.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2011-2017 Michael Drake <tlsa(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NETSURF_UTILS_NSURL_PRIVATE_H_
+#define NETSURF_UTILS_NSURL_PRIVATE_H_
+
+#include <libwapcaplet/libwapcaplet.h>
+
+#include "utils/utils.h"
+
+/** A type for URL schemes */
+enum nsurl_scheme_type {
+ NSURL_SCHEME_OTHER,
+ NSURL_SCHEME_HTTP,
+ NSURL_SCHEME_HTTPS,
+ NSURL_SCHEME_FTP,
+ NSURL_SCHEME_MAILTO
+};
+
+
+/**
+ * nsurl components
+ *
+ * [scheme]://[username]:[password]@[host]:[port][path][?query]#[fragment]
+ *
+ * Note:
+ * "path" string includes preceding '/', if needed for the scheme
+ * "query" string always includes preceding '?'
+ *
+ * The other spanned punctuation is to be inserted when building URLs from
+ * components.
+ */
+struct nsurl_components {
+ lwc_string *scheme;
+ lwc_string *username;
+ lwc_string *password;
+ lwc_string *host;
+ lwc_string *port;
+ lwc_string *path;
+ lwc_string *query;
+ lwc_string *fragment;
+
+ enum nsurl_scheme_type scheme_type;
+};
+
+
+/**
+ * NetSurf URL object
+ */
+struct nsurl {
+ struct nsurl_components components;
+
+ int count; /* Number of references to NetSurf URL object */
+ uint32_t hash; /* Hash value for nsurl identification */
+
+ size_t length; /* Length of string */
+ char string[FLEX_ARRAY_LEN_DECL]; /* Full URL as a string */
+};
+
+#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=58d16d68188e445cf59...
commit 58d16d68188e445cf59c7f4d455f1e1ddaf78aef
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
nusrl: Move into utils/nsurl directory.
diff --git a/Makefile b/Makefile
index 5f2697f..97a8128 100644
--- a/Makefile
+++ b/Makefile
@@ -621,12 +621,22 @@ include utils/Makefile
# http utility sources
include utils/http/Makefile
+# nsurl utility sources
+include utils/nsurl/Makefile
+
# Desktop sources
include desktop/Makefile
# S_COMMON are sources common to all builds
-S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_RENDER) $(S_UTILS) $(S_HTTP) \
- $(S_DESKTOP) $(S_JAVASCRIPT_BINDING)
+S_COMMON := \
+ $(S_CONTENT) \
+ $(S_FETCHERS) \
+ $(S_RENDER) \
+ $(S_UTILS) \
+ $(S_HTTP) \
+ $(S_NSURL) \
+ $(S_DESKTOP) \
+ $(S_JAVASCRIPT_BINDING)
# ----------------------------------------------------------------------------
diff --git a/utils/Makefile b/utils/Makefile
index 62b7e05..2f59501 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -12,7 +12,6 @@ S_UTILS := \
log.c \
messages.c \
nsoption.c \
- nsurl.c \
punycode.c \
talloc.c \
time.c \
diff --git a/utils/nsurl.c b/utils/nsurl.c
deleted file mode 100644
index c5c614c..0000000
--- a/utils/nsurl.c
+++ /dev/null
@@ -1,2500 +0,0 @@
-/*
- * Copyright 2011 Michael Drake <tlsa(a)netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file
- * NetSurf URL handling implementation.
- *
- * This is the common implementation of all URL handling within the
- * browser. This implementation is based upon RFC3986 although this has
- * been superceeded by https://url.spec.whatwg.org/ which is based on
- * actual contemporary implementations.
- *
- * Care must be taken with character encodings within this module as
- * the specifications work with specific ascii ranges and must not be
- * affected by locale. Hence the c library character type functions
- * are not used.
- */
-
-#include <assert.h>
-#include <libwapcaplet/libwapcaplet.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-
-#include "utils/ascii.h"
-#include "utils/corestrings.h"
-#include "utils/errors.h"
-#include "utils/idna.h"
-#include "utils/log.h"
-#include "utils/nsurl.h"
-#include "utils/utils.h"
-
-/* Define to enable NSURL debugging */
-#undef NSURL_DEBUG
-
-/**
- * nsurl scheme type
- */
-enum scheme_type {
- NSURL_SCHEME_OTHER,
- NSURL_SCHEME_HTTP,
- NSURL_SCHEME_HTTPS,
- NSURL_SCHEME_FTP,
- NSURL_SCHEME_MAILTO
-};
-
-/**
- * nsurl components
- *
- * [scheme]://[username]:[password]@[host]:[port][path][?query]#[fragment]
- *
- * Note:
- * "path" string includes preceding '/', if needed for the scheme
- * "query" string always includes preceding '?'
- *
- * The other spanned punctuation is to be inserted when building URLs from
- * components.
- */
-struct nsurl_components {
- lwc_string *scheme;
- lwc_string *username;
- lwc_string *password;
- lwc_string *host;
- lwc_string *port;
- lwc_string *path;
- lwc_string *query;
- lwc_string *fragment;
-
- enum scheme_type scheme_type;
-};
-
-
-/**
- * NetSurf URL object
- */
-struct nsurl {
- struct nsurl_components components;
-
- int count; /* Number of references to NetSurf URL object */
- uint32_t hash; /* Hash value for nsurl identification */
-
- size_t length; /* Length of string */
- char string[FLEX_ARRAY_LEN_DECL]; /* Full URL as a string */
-};
-
-
-/** Marker set, indicating positions of sections within a URL string */
-struct url_markers {
- size_t start; /** start of URL */
- size_t scheme_end;
- size_t authority;
-
- size_t colon_first;
- size_t at;
- size_t colon_last;
-
- size_t path;
- size_t query;
- size_t fragment;
-
- size_t end; /** end of URL */
-
- enum scheme_type scheme_type;
-};
-
-
-/** Marker set, indicating positions of sections within a URL string */
-struct nsurl_component_lengths {
- size_t scheme;
- size_t username;
- size_t password;
- size_t host;
- size_t port;
- size_t path;
- size_t query;
- size_t fragment;
-};
-
-
-/** Flags indicating which parts of a URL string are required for a nsurl */
-enum nsurl_string_flags {
- NSURL_F_SCHEME = (1 << 0),
- NSURL_F_SCHEME_PUNCTUATION = (1 << 1),
- NSURL_F_AUTHORITY_PUNCTUATION = (1 << 2),
- NSURL_F_USERNAME = (1 << 3),
- NSURL_F_PASSWORD = (1 << 4),
- NSURL_F_CREDENTIALS_PUNCTUATION = (1 << 5),
- NSURL_F_HOST = (1 << 6),
- NSURL_F_PORT = (1 << 7),
- NSURL_F_AUTHORITY = (NSURL_F_USERNAME |
- NSURL_F_PASSWORD |
- NSURL_F_HOST |
- NSURL_F_PORT),
- NSURL_F_PATH = (1 << 8),
- NSURL_F_QUERY = (1 << 9),
- NSURL_F_FRAGMENT_PUNCTUATION = (1 << 10),
- NSURL_F_FRAGMENT = (1 << 11)
-};
-
-
-/** Sections of a URL */
-enum url_sections {
- URL_SCHEME,
- URL_CREDENTIALS,
- URL_HOST,
- URL_PATH,
- URL_QUERY,
- URL_FRAGMENT
-};
-
-
-#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
-
-#define nsurl__component_compare(c1, c2, match) \
- if (c1 && c2 && lwc_error_ok == \
- lwc_string_isequal(c1, c2, match)) { \
- /* do nothing */ \
- } else if (c1 || c2) { \
- *match = false; \
- }
-
-/**
- * Return a hex digit for the given numerical value.
- *
- * \param digit the value to get the hex digit for.
- * \return character in range 0-9A-F
- */
-inline static char digit2uppercase_hex(unsigned char digit) {
- assert(digit < 16);
- return "0123456789ABCDEF"[digit];
-}
-
-/**
- * determine if a character is unreserved
- *
- * \param c character to classify.
- * \return true if the character is unreserved else false.
- */
-static bool nsurl__is_unreserved(unsigned char c)
-{
- /* From RFC3986 section 2.3 (unreserved characters)
- *
- * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
- *
- */
- static const bool unreserved[256] = {
- false, false, false, false, false, false, false, false, /* 00 */
- false, false, false, false, false, false, false, false, /* 08 */
- false, false, false, false, false, false, false, false, /* 10 */
- false, false, false, false, false, false, false, false, /* 18 */
- false, false, false, false, false, false, false, false, /* 20 */
- false, false, false, false, false, true, true, false, /* 28 */
- true, true, true, true, true, true, true, true, /* 30 */
- true, true, false, false, false, false, false, false, /* 38 */
- false, true, true, true, true, true, true, true, /* 40 */
- true, true, true, true, true, true, true, true, /* 48 */
- true, true, true, true, true, true, true, true, /* 50 */
- true, true, true, false, false, false, false, true, /* 58 */
- false, true, true, true, true, true, true, true, /* 60 */
- true, true, true, true, true, true, true, true, /* 68 */
- true, true, true, true, true, true, true, true, /* 70 */
- true, true, true, false, false, false, true, false, /* 78 */
- false, false, false, false, false, false, false, false, /* 80 */
- false, false, false, false, false, false, false, false, /* 88 */
- false, false, false, false, false, false, false, false, /* 90 */
- false, false, false, false, false, false, false, false, /* 98 */
- false, false, false, false, false, false, false, false, /* A0 */
- false, false, false, false, false, false, false, false, /* A8 */
- false, false, false, false, false, false, false, false, /* B0 */
- false, false, false, false, false, false, false, false, /* B8 */
- false, false, false, false, false, false, false, false, /* C0 */
- false, false, false, false, false, false, false, false, /* C8 */
- false, false, false, false, false, false, false, false, /* D0 */
- false, false, false, false, false, false, false, false, /* D8 */
- false, false, false, false, false, false, false, false, /* E0 */
- false, false, false, false, false, false, false, false, /* E8 */
- false, false, false, false, false, false, false, false, /* F0 */
- false, false, false, false, false, false, false, false /* F8 */
- };
- return unreserved[c];
-}
-
-/**
- * determine if a character should be percent escaped.
- *
- * The ASCII codes which should not be percent escaped
- *
- * \param c character to classify.
- * \return true if the character should not be escaped else false.
- */
-static bool nsurl__is_no_escape(unsigned char c)
-{
- static const bool no_escape[256] = {
- false, false, false, false, false, false, false, false, /* 00 */
- false, false, false, false, false, false, false, false, /* 08 */
- false, false, false, false, false, false, false, false, /* 10 */
- false, false, false, false, false, false, false, false, /* 18 */
- false, true, false, true, true, false, true, true, /* 20 */
- true, true, true, true, true, true, true, true, /* 28 */
- true, true, true, true, true, true, true, true, /* 30 */
- true, true, true, true, false, true, false, true, /* 38 */
- true, true, true, true, true, true, true, true, /* 40 */
- true, true, true, true, true, true, true, true, /* 48 */
- true, true, true, true, true, true, true, true, /* 50 */
- true, true, true, true, false, true, false, true, /* 58 */
- false, true, true, true, true, true, true, true, /* 60 */
- true, true, true, true, true, true, true, true, /* 68 */
- true, true, true, true, true, true, true, true, /* 70 */
- true, true, true, false, true, false, true, false, /* 78 */
- false, false, false, false, false, false, false, false, /* 80 */
- false, false, false, false, false, false, false, false, /* 88 */
- false, false, false, false, false, false, false, false, /* 90 */
- false, false, false, false, false, false, false, false, /* 98 */
- false, false, false, false, false, false, false, false, /* A0 */
- false, false, false, false, false, false, false, false, /* A8 */
- false, false, false, false, false, false, false, false, /* B0 */
- false, false, false, false, false, false, false, false, /* B8 */
- false, false, false, false, false, false, false, false, /* C0 */
- false, false, false, false, false, false, false, false, /* C8 */
- false, false, false, false, false, false, false, false, /* D0 */
- false, false, false, false, false, false, false, false, /* D8 */
- false, false, false, false, false, false, false, false, /* E0 */
- false, false, false, false, false, false, false, false, /* E8 */
- false, false, false, false, false, false, false, false, /* F0 */
- false, false, false, false, false, false, false, false, /* F8 */
- };
- return no_escape[c];
-}
-
-
-/**
- * Obtains a set of markers delimiting sections in a URL string
- *
- * \param url_s URL string
- * \param markers Updated to mark sections in the URL string
- * \param joining True iff URL string is a relative URL for joining
- */
-static void nsurl__get_string_markers(const char * const url_s,
- struct url_markers *markers, bool joining)
-{
- const char *pos = url_s; /** current position in url_s */
- bool is_http = false;
- bool trailing_whitespace = false;
-
- /* Initialise marker set */
- struct url_markers marker = { 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, NSURL_SCHEME_OTHER };
-
- /* Skip any leading whitespace in url_s */
- while (ascii_is_space(*pos))
- pos++;
-
- /* Record start point */
- marker.start = pos - url_s;
-
- marker.scheme_end = marker.authority = marker.colon_first = marker.at =
- marker.colon_last = marker.path = marker.start;
-
- if (*pos == '\0') {
- /* Nothing but whitespace, early exit */
- marker.query = marker.fragment = marker.end = marker.path;
- *markers = marker;
- return;
- }
-
- /* Get scheme */
- if (ascii_is_alpha(*pos)) {
- pos++;
-
- while (*pos != ':' && *pos != '\0') {
- if (!ascii_is_alphanumerical(*pos) && (*pos != '+') &&
- (*pos != '-') && (*pos != '.')) {
- /* This character is not valid in the
- * scheme */
- break;
- }
- pos++;
- }
-
- if (*pos == ':') {
- /* This delimits the end of the scheme */
- size_t off;
-
- marker.scheme_end = pos - url_s;
-
- off = marker.scheme_end - marker.start;
-
- /* Detect http(s) and mailto for scheme specifc
- * normalisation */
- if (off == SLEN("http") &&
- (((*(pos - off + 0) == 'h') ||
- (*(pos - off + 0) == 'H')) &&
- ((*(pos - off + 1) == 't') ||
- (*(pos - off + 1) == 'T')) &&
- ((*(pos - off + 2) == 't') ||
- (*(pos - off + 2) == 'T')) &&
- ((*(pos - off + 3) == 'p') ||
- (*(pos - off + 3) == 'P')))) {
- marker.scheme_type = NSURL_SCHEME_HTTP;
- is_http = true;
- } else if (off == SLEN("https") &&
- (((*(pos - off + 0) == 'h') ||
- (*(pos - off + 0) == 'H')) &&
- ((*(pos - off + 1) == 't') ||
- (*(pos - off + 1) == 'T')) &&
- ((*(pos - off + 2) == 't') ||
- (*(pos - off + 2) == 'T')) &&
- ((*(pos - off + 3) == 'p') ||
- (*(pos - off + 3) == 'P')) &&
- ((*(pos - off + 4) == 's') ||
- (*(pos - off + 4) == 'S')))) {
- marker.scheme_type = NSURL_SCHEME_HTTPS;
- is_http = true;
- } else if (off == SLEN("ftp") &&
- (((*(pos - off + 0) == 'f') ||
- (*(pos - off + 0) == 'F')) &&
- ((*(pos - off + 1) == 't') ||
- (*(pos - off + 1) == 'T')) &&
- ((*(pos - off + 2) == 'p') ||
- (*(pos - off + 2) == 'P')))) {
- marker.scheme_type = NSURL_SCHEME_FTP;
- } else if (off == SLEN("mailto") &&
- (((*(pos - off + 0) == 'm') ||
- (*(pos - off + 0) == 'M')) &&
- ((*(pos - off + 1) == 'a') ||
- (*(pos - off + 1) == 'A')) &&
- ((*(pos - off + 2) == 'i') ||
- (*(pos - off + 2) == 'I')) &&
- ((*(pos - off + 3) == 'l') ||
- (*(pos - off + 3) == 'L')) &&
- ((*(pos - off + 4) == 't') ||
- (*(pos - off + 4) == 'T')) &&
- ((*(pos - off + 5) == 'o') ||
- (*(pos - off + 5) == 'O')))) {
- marker.scheme_type = NSURL_SCHEME_MAILTO;
- }
-
- /* Skip over colon */
- pos++;
-
- /* Mark place as start of authority */
- marker.authority = marker.colon_first = marker.at =
- marker.colon_last = marker.path =
- pos - url_s;
-
- } else {
- /* Not found a scheme */
- if (joining == false) {
- /* Assuming no scheme == http */
- marker.scheme_type = NSURL_SCHEME_HTTP;
- is_http = true;
- }
- }
- }
-
- /* Get authority
- *
- * Two slashes always indicates the start of an authority.
- *
- * We are more relaxed in the case of http:
- * a. when joining, one or more slashes indicates start of authority
- * b. when not joining, we assume authority if no scheme was present
- * and in the case of mailto: when we assume there is an authority.
- */
- if ((*pos == '/' && *(pos + 1) == '/') ||
- (is_http && ((joining && *pos == '/') ||
- (joining == false &&
- marker.scheme_end != marker.start))) ||
- marker.scheme_type == NSURL_SCHEME_MAILTO) {
-
- /* Skip over leading slashes */
- if (*pos == '/') {
- if (is_http == false) {
- if (*pos == '/') pos++;
- if (*pos == '/') pos++;
- } else {
- while (*pos == '/')
- pos++;
- }
-
- marker.authority = marker.colon_first = marker.at =
- marker.colon_last = marker.path =
- pos - url_s;
- }
-
- /* Need to get (or complete) the authority */
- while (*pos != '\0') {
- if (*pos == '/' || *pos == '?' || *pos == '#') {
- /* End of the authority */
- break;
-
- } else if (marker.scheme_type != NSURL_SCHEME_MAILTO &&
- *pos == ':' && marker.colon_first ==
- marker.authority) {
- /* could be username:password or host:port
- * separator */
- marker.colon_first = pos - url_s;
-
- } else if (marker.scheme_type != NSURL_SCHEME_MAILTO &&
- *pos == ':' && marker.colon_first !=
- marker.authority) {
- /* could be host:port separator */
- marker.colon_last = pos - url_s;
-
- } else if (*pos == '@' && marker.at ==
- marker.authority) {
- /* Credentials @ host separator */
- marker.at = pos - url_s;
- }
-
- pos++;
- }
-
- marker.path = pos - url_s;
-
- } else if ((*pos == '\0' || *pos == '/') &&
- joining == false && is_http == true) {
- marker.path = pos - url_s;
- }
-
- /* Get path
- *
- * Needs to start with '/' if there's no authority
- */
- if (*pos == '/' || ((marker.path == marker.authority) &&
- (*pos != '?') && (*pos != '#') && (*pos != '\0'))) {
- while (*(++pos) != '\0') {
- if (*pos == '?' || *pos == '#') {
- /* End of the path */
- break;
- }
- }
- }
-
- marker.query = pos - url_s;
-
- /* Get query */
- if (*pos == '?') {
- while (*(++pos) != '\0') {
- if (*pos == '#') {
- /* End of the query */
- break;
- }
- }
- }
-
- marker.fragment = pos - url_s;
-
- /* Get fragment */
- if (*pos == '#') {
- while (*(++pos) != '\0')
- ;
- }
-
- /* We got to the end of url_s.
- * Need to skip back over trailing whitespace to find end of URL */
- pos--;
- if (pos >= url_s && ascii_is_space(*pos)) {
- trailing_whitespace = true;
- while (pos >= url_s && ascii_is_space(*pos))
- pos--;
- }
-
- marker.end = pos + 1 - url_s;
-
- if (trailing_whitespace == true) {
- /* Ensure last url section doesn't pass end */
- if (marker.fragment > marker.end)
- marker.fragment = marker.end;
- if (marker.query > marker.end)
- marker.query = marker.end;
- if (marker.path > marker.end)
- marker.path = marker.end;
- if (marker.colon_last > marker.end)
- marker.colon_last = marker.end;
- if (marker.at > marker.end)
- marker.at = marker.end;
- if (marker.colon_last > marker.end)
- marker.colon_last = marker.end;
- if (marker.fragment > marker.end)
- marker.fragment = marker.end;
- }
-
-#ifdef NSURL_DEBUG
- LOG("marker.start: %i", marker.start);
- LOG("marker.scheme_end: %i", marker.scheme_end);
- LOG("marker.authority: %i", marker.authority);
-
- LOG("marker.colon_first: %i", marker.colon_first);
- LOG("marker.at: %i", marker.at);
- LOG("marker.colon_last: %i", marker.colon_last);
-
- LOG("marker.path: %i", marker.path);
- LOG("marker.query: %i", marker.query);
- LOG("marker.fragment: %i", marker.fragment);
-
- LOG("marker.end: %i", marker.end);
-#endif
-
- /* Got all the URL components pegged out now */
- *markers = marker;
-}
-
-
-/**
- * Remove dot segments from a path, as per rfc 3986, 5.2.4
- *
- * \param path path to remove dot segments from ('\0' terminated)
- * \param output path with dot segments removed
- * \return size of output
- */
-static size_t nsurl__remove_dot_segments(char *path, char *output)
-{
- char *path_pos = path;
- char *output_pos = output;
-
- while (*path_pos != '\0') {
-#ifdef NSURL_DEBUG
- LOG(" in:%s", path_pos);
- LOG("out:%.*s", output_pos - output, output);
-#endif
- if (*path_pos == '.') {
- if (*(path_pos + 1) == '.' &&
- *(path_pos + 2) == '/') {
- /* Found prefix of "../" */
- path_pos += SLEN("../");
- continue;
-
- } else if (*(path_pos + 1) == '/') {
- /* Found prefix of "./" */
- path_pos += SLEN("./");
- continue;
- }
- } else if (*path_pos == '/' && *(path_pos + 1) == '.') {
- if (*(path_pos + 2) == '/') {
- /* Found prefix of "/./" */
- path_pos += SLEN("/.");
- continue;
-
- } else if (*(path_pos + 2) == '\0') {
- /* Found "/." at end of path */
- *(output_pos++) = '/';
-
- /* End of input path */
- break;
-
- } else if (*(path_pos + 2) == '.') {
- if (*(path_pos + 3) == '/') {
- /* Found prefix of "/../" */
- path_pos += SLEN("/..");
-
- if (output_pos > output)
- output_pos--;
- while (output_pos > output &&
- *output_pos != '/')
- output_pos--;
-
- continue;
-
- } else if (*(path_pos + 3) == '\0') {
- /* Found "/.." at end of path */
-
- while (output_pos > output &&
- *(output_pos -1 ) !='/')
- output_pos--;
-
- /* End of input path */
- break;
- }
- }
- } else if (*path_pos == '.') {
- if (*(path_pos + 1) == '\0') {
- /* Found "." at end of path */
-
- /* End of input path */
- break;
-
- } else if (*(path_pos + 1) == '.' &&
- *(path_pos + 2) == '\0') {
- /* Found ".." at end of path */
-
- /* End of input path */
- break;
- }
- }
- /* Copy first character into output path */
- *output_pos++ = *path_pos++;
-
- /* Copy up to but not including next '/' */
- while ((*path_pos != '/') && (*path_pos != '\0'))
- *output_pos++ = *path_pos++;
- }
-
- return output_pos - output;
-}
-
-
-/**
- * Get the length of the longest section
- *
- * \param m markers delimiting url sections in a string
- * \return the length of the longest section
- */
-static size_t nsurl__get_longest_section(struct url_markers *m)
-{
- size_t length = m->scheme_end - m->start; /* scheme */
-
- if (length < m->at - m->authority) /* credentials */
- length = m->at - m->authority;
-
- if (length < m->path - m->at) /* host */
- length = m->path - m->at;
-
- if (length < m->query - m->path) /* path */
- length = m->query - m->path;
-
- if (length < m->fragment - m->query) /* query */
- length = m->fragment - m->query;
-
- if (length < m->end - m->fragment) /* fragment */
- length = m->end - m->fragment;
-
- return length;
-}
-
-
-/**
- * Converts two hexadecimal digits to a single number
- *
- * \param c1 most significant hex digit
- * \param c2 least significant hex digit
- * \return the total value of the two digit hex number, or -ve if input not hex
- *
- * For unescaping url encoded characters.
- */
-static inline int nsurl__get_ascii_offset(char c1, char c2)
-{
- int offset;
-
- /* Use 1st char as most significant hex digit */
- if (ascii_is_digit(c1))
- offset = 16 * (c1 - '0');
- else if (c1 >= 'a' && c1 <= 'f')
- offset = 16 * (c1 - 'a' + 10);
- else if (c1 >= 'A' && c1 <= 'F')
- offset = 16 * (c1 - 'A' + 10);
- else
- /* Not valid hex */
- return -1;
-
- /* Use 2nd char as least significant hex digit and sum */
- if (ascii_is_digit(c2))
- offset += c2 - '0';
- else if (c2 >= 'a' && c2 <= 'f')
- offset += c2 - 'a' + 10;
- else if (c2 >= 'A' && c2 <= 'F')
- offset += c2 - 'A' + 10;
- else
- /* Not valid hex */
- return -1;
-
- return offset;
-}
-
-
-/**
- * Create the components of a NetSurf URL object for a section of a URL string
- *
- * \param url_s URL string
- * \param section Sets which section of URL string is to be normalised
- * \param pegs Set of markers delimiting the URL string's sections
- * \param pos_norm A buffer large enough for the normalised string (*3 + 1)
- * \param url A NetSurf URL object, to which components may be added
- * \return NSERROR_OK on success, appropriate error otherwise
- *
- * The section of url_s is normalised appropriately.
- */
-static nserror nsurl__create_from_section(const char * const url_s,
- const enum url_sections section,
- const struct url_markers *pegs,
- char *pos_norm,
- struct nsurl_components *url)
-{
- nserror ret;
- int ascii_offset;
- int start = 0;
- int end = 0;
- const char *pos;
- const char *pos_url_s;
- char *norm_start = pos_norm;
- char *host;
- size_t copy_len;
- size_t length;
- size_t host_len;
- enum {
- NSURL_F_NO_PORT = (1 << 0)
- } flags = 0;
-
- switch (section) {
- case URL_SCHEME:
- start = pegs->start;
- end = pegs->scheme_end;
- break;
-
- case URL_CREDENTIALS:
- start = pegs->authority;
- end = pegs->at;
- break;
-
- case URL_HOST:
- start = (pegs->at == pegs->authority &&
- *(url_s + pegs->at) != '@') ?
- pegs->at :
- pegs->at + 1;
- end = pegs->path;
- break;
-
- case URL_PATH:
- start = pegs->path;
- end = pegs->query;
- break;
-
- case URL_QUERY:
- start = pegs->query;
- end = pegs->fragment;
- break;
-
- case URL_FRAGMENT:
- start = (*(url_s + pegs->fragment) != '#') ?
- pegs->fragment :
- pegs->fragment + 1;
- end = pegs->end;
- break;
- }
-
- if (end < start)
- end = start;
-
- length = end - start;
-
- /* Stage 1: Normalise the required section */
-
- pos = pos_url_s = url_s + start;
- copy_len = 0;
- for (; pos < url_s + end; pos++) {
- if (*pos == '%' && (pos + 2 < url_s + end)) {
- /* Might be an escaped character needing unescaped */
-
- /* Find which character which was escaped */
- ascii_offset = nsurl__get_ascii_offset(*(pos + 1),
- *(pos + 2));
-
- if (ascii_offset < 0) {
- /* % with invalid hex digits. */
- copy_len++;
- continue;
- }
-
- if ((section != URL_SCHEME && section != URL_HOST) &&
- (nsurl__is_unreserved(ascii_offset) == false)) {
- /* This character should be escaped after all,
- * just let it get copied */
- copy_len += 3;
- pos += 2;
- continue;
- }
-
- if (copy_len > 0) {
- /* Copy up to here */
- memcpy(pos_norm, pos_url_s, copy_len);
- pos_norm += copy_len;
- copy_len = 0;
- }
-
- /* Put the unescaped character in the normalised URL */
- *(pos_norm++) = (char)ascii_offset;
- pos += 2;
- pos_url_s = pos + 1;
-
- length -= 2;
-
- } else if ((section != URL_SCHEME && section != URL_HOST) &&
- (nsurl__is_no_escape(*pos) == false)) {
-
- /* This needs to be escaped */
- if (copy_len > 0) {
- /* Copy up to here */
- memcpy(pos_norm, pos_url_s, copy_len);
- pos_norm += copy_len;
- copy_len = 0;
- }
-
- /* escape */
- *(pos_norm++) = '%';
- *(pos_norm++) = digit2uppercase_hex(
- ((unsigned char)*pos) >> 4);
- *(pos_norm++) = digit2uppercase_hex(
- ((unsigned char)*pos) & 0xf);
- pos_url_s = pos + 1;
-
- length += 2;
-
- } else if ((section == URL_SCHEME || section == URL_HOST) &&
- ascii_is_alpha_upper(*pos)) {
- /* Lower case this letter */
-
- if (copy_len > 0) {
- /* Copy up to here */
- memcpy(pos_norm, pos_url_s, copy_len);
- pos_norm += copy_len;
- copy_len = 0;
- }
- /* Copy lower cased letter into normalised URL */
- *(pos_norm++) = ascii_to_lower(*pos);
- pos_url_s = pos + 1;
-
- } else {
- /* This character is safe in normalised URL */
- copy_len++;
- }
- }
-
- if (copy_len > 0) {
- /* Copy up to here */
- memcpy(pos_norm, pos_url_s, copy_len);
- pos_norm += copy_len;
- }
-
- /* Mark end of section */
- (*pos_norm) = '\0';
-
- /* Stage 2: Create the URL components for the required section */
- switch (section) {
- case URL_SCHEME:
- if (length == 0) {
- /* No scheme, assuming http */
- url->scheme = lwc_string_ref(corestring_lwc_http);
- } else {
- /* Add scheme to URL */
- if (lwc_intern_string(norm_start, length,
- &url->scheme) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- }
-
- break;
-
- case URL_CREDENTIALS:
- url->username = NULL;
- url->password = NULL;
-
- if (length != 0 && *norm_start != ':') {
- char *sec_start = norm_start;
- if (pegs->colon_first != pegs->authority &&
- pegs->at > pegs->colon_first + 1) {
- /* there's a password */
- sec_start += pegs->colon_first -
- pegs->authority + 1;
- if (lwc_intern_string(sec_start,
- pegs->at - pegs->colon_first -1,
- &url->password) !=
- lwc_error_ok) {
- return NSERROR_NOMEM;
- }
-
- /* update start pos and length for username */
- sec_start = norm_start;
- length -= pegs->at - pegs->colon_first;
- } else if (pegs->colon_first != pegs->authority &&
- pegs->at == pegs->colon_first + 1) {
- /* strip username colon */
- length--;
- }
-
- /* Username */
- if (lwc_intern_string(sec_start, length,
- &url->username) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- }
-
- break;
-
- case URL_HOST:
- url->host = NULL;
- url->port = NULL;
-
- if (length != 0) {
- size_t colon = 0;
- char *sec_start = norm_start;
- if (pegs->at < pegs->colon_first &&
- pegs->colon_last == pegs->authority) {
- /* There's one colon and it's after @ marker */
- colon = pegs->colon_first;
- } else if (pegs->colon_last != pegs->authority) {
- /* There's more than one colon */
- colon = pegs->colon_last;
- } else {
- /* There's no colon that could be a port
- * separator */
- flags |= NSURL_F_NO_PORT;
- }
-
- if (!(flags & NSURL_F_NO_PORT)) {
- /* Determine whether colon is a port separator
- */
- sec_start += colon - pegs->at;
- while (++sec_start < norm_start + length) {
- if (!ascii_is_digit(*sec_start)) {
- /* Character after port isn't a
- * digit; not a port separator
- */
- flags |= NSURL_F_NO_PORT;
- break;
- }
- }
- }
-
- if (!(flags & NSURL_F_NO_PORT)) {
- /* There's a port */
- size_t skip = (pegs->at == pegs->authority) ?
- 1 : 0;
- sec_start = norm_start + colon - pegs->at +
- skip;
- if (url->scheme != NULL &&
- url->scheme_type ==
- NSURL_SCHEME_HTTP &&
- length -
- (colon - pegs->at + skip) == 2 &&
- *sec_start == '8' &&
- *(sec_start + 1) == '0') {
- /* Scheme is http, and port is default
- * (80) */
- flags |= NSURL_F_NO_PORT;
- }
-
- if (length <= (colon - pegs->at + skip)) {
- /* No space for a port after the colon
- */
- flags |= NSURL_F_NO_PORT;
- }
-
- /* Add non-redundant ports to NetSurf URL */
- sec_start = norm_start + colon - pegs->at +
- skip;
- if (!(flags & NSURL_F_NO_PORT) &&
- lwc_intern_string(sec_start,
- length -
- (colon - pegs->at + skip),
- &url->port) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
-
- /* update length for host */
- skip = (pegs->at == pegs->authority) ? 0 : 1;
- length = colon - pegs->at - skip;
- }
-
- /* host */
- /* Encode host according to IDNA2008 */
- ret = idna_encode(norm_start, length, &host, &host_len);
- if (ret == NSERROR_OK) {
- /* valid idna encoding */
- if (lwc_intern_string(host, host_len,
- &url->host) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- free(host);
- } else {
- /* fall back to straight interning */
- if (lwc_intern_string(norm_start, length,
- &url->host) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- }
- }
-
- break;
-
- case URL_PATH:
- if (length != 0) {
- if (lwc_intern_string(norm_start, length,
- &url->path) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- } else if (url->host != NULL &&
- url->scheme_type != NSURL_SCHEME_MAILTO) {
- /* Set empty path to "/", if there's a host */
- if (lwc_intern_string("/", SLEN("/"),
- &url->path) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- } else {
- url->path = NULL;
- }
-
- break;
-
- case URL_QUERY:
- if (length != 0) {
- if (lwc_intern_string(norm_start, length,
- &url->query) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- } else {
- url->query = NULL;
- }
-
- break;
-
- case URL_FRAGMENT:
- if (length != 0) {
- if (lwc_intern_string(norm_start, length,
- &url->fragment) != lwc_error_ok) {
- return NSERROR_NOMEM;
- }
- } else {
- url->fragment = NULL;
- }
-
- break;
- }
-
- return NSERROR_OK;
-}
-
-
-/**
- * Get nsurl string info; total length, component lengths, & components present
- *
- * \param url NetSurf URL components
- * \param parts Which parts of the URL are required in the string
- * \param url_l Updated to total string length
- * \param lengths Updated with individual component lengths
- * \param pflags Updated to contain relevant string flags
- */
-static void nsurl__get_string_data(const struct nsurl_components *url,
- nsurl_component parts, size_t *url_l,
- struct nsurl_component_lengths *lengths,
- enum nsurl_string_flags *pflags)
-{
- enum nsurl_string_flags flags = *pflags;
- *url_l = 0;
-
- /* Intersection of required parts and available parts gives
- * the output parts */
- if (url->scheme && parts & NSURL_SCHEME) {
- flags |= NSURL_F_SCHEME;
-
- lengths->scheme = lwc_string_length(url->scheme);
- *url_l += lengths->scheme;
- }
-
- if (url->username && parts & NSURL_USERNAME) {
- flags |= NSURL_F_USERNAME;
-
- lengths->username = lwc_string_length(url->username);
- *url_l += lengths->username;
- }
-
- if (url->password && parts & NSURL_PASSWORD) {
- flags |= NSURL_F_PASSWORD;
-
- lengths->password = lwc_string_length(url->password);
- *url_l += SLEN(":") + lengths->password;
- }
-
- if (url->host && parts & NSURL_HOST) {
- flags |= NSURL_F_HOST;
-
- lengths->host = lwc_string_length(url->host);
- *url_l += lengths->host;
- }
-
- if (url->port && parts & NSURL_PORT) {
- flags |= NSURL_F_PORT;
-
- lengths->port = lwc_string_length(url->port);
- *url_l += SLEN(":") + lengths->port;
- }
-
- if (url->path && parts & NSURL_PATH) {
- flags |= NSURL_F_PATH;
-
- lengths->path = lwc_string_length(url->path);
- *url_l += lengths->path;
- }
-
- if (url->query && parts & NSURL_QUERY) {
- flags |= NSURL_F_QUERY;
-
- lengths->query = lwc_string_length(url->query);
- *url_l += lengths->query;
- }
-
- if (url->fragment && parts & NSURL_FRAGMENT) {
- flags |= NSURL_F_FRAGMENT;
-
- lengths->fragment = lwc_string_length(url->fragment);
- *url_l += lengths->fragment;
- }
-
- /* Turn on any spanned punctuation */
- if ((flags & NSURL_F_SCHEME) && (parts > NSURL_SCHEME)) {
- flags |= NSURL_F_SCHEME_PUNCTUATION;
-
- *url_l += SLEN(":");
- }
-
- if ((flags & NSURL_F_SCHEME) && (flags > NSURL_F_SCHEME) &&
- url->path && lwc_string_data(url->path)[0] == '/') {
- flags |= NSURL_F_AUTHORITY_PUNCTUATION;
-
- *url_l += SLEN("//");
- }
-
- if ((flags & (NSURL_F_USERNAME | NSURL_F_PASSWORD)) &&
- flags & NSURL_F_HOST) {
- flags |= NSURL_F_CREDENTIALS_PUNCTUATION;
-
- *url_l += SLEN("@");
- }
-
- if ((flags & ~NSURL_F_FRAGMENT) && (flags & NSURL_F_FRAGMENT)) {
- flags |= NSURL_F_FRAGMENT_PUNCTUATION;
-
- *url_l += SLEN("#");
- }
-
- *pflags = flags;
-}
-
-
-/**
- * Get nsurl string info; total length, component lengths, & components present
- *
- * \param url NetSurf URL components
- * \param url_s Updated to contain the string
- * \param l Individual component lengths
- * \param flags String flags
- */
-static void nsurl_get_string(const struct nsurl_components *url, char *url_s,
- struct nsurl_component_lengths *l,
- enum nsurl_string_flags flags)
-{
- char *pos;
-
- /* Copy the required parts into the url string */
- pos = url_s;
-
- if (flags & NSURL_F_SCHEME) {
- memcpy(pos, lwc_string_data(url->scheme), l->scheme);
- pos += l->scheme;
- }
-
- if (flags & NSURL_F_SCHEME_PUNCTUATION) {
- *(pos++) = ':';
- }
-
- if (flags & NSURL_F_AUTHORITY_PUNCTUATION) {
- *(pos++) = '/';
- *(pos++) = '/';
- }
-
- if (flags & NSURL_F_USERNAME) {
- memcpy(pos, lwc_string_data(url->username), l->username);
- pos += l->username;
- }
-
- if (flags & NSURL_F_PASSWORD) {
- *(pos++) = ':';
- memcpy(pos, lwc_string_data(url->password), l->password);
- pos += l->password;
- }
-
- if (flags & NSURL_F_CREDENTIALS_PUNCTUATION) {
- *(pos++) = '@';
- }
-
- if (flags & NSURL_F_HOST) {
- memcpy(pos, lwc_string_data(url->host), l->host);
- pos += l->host;
- }
-
- if (flags & NSURL_F_PORT) {
- *(pos++) = ':';
- memcpy(pos, lwc_string_data(url->port), l->port);
- pos += l->port;
- }
-
- if (flags & NSURL_F_PATH) {
- memcpy(pos, lwc_string_data(url->path), l->path);
- pos += l->path;
- }
-
- if (flags & NSURL_F_QUERY) {
- memcpy(pos, lwc_string_data(url->query), l->query);
- pos += l->query;
- }
-
- if (flags & NSURL_F_FRAGMENT) {
- if (flags & NSURL_F_FRAGMENT_PUNCTUATION)
- *(pos++) = '#';
- memcpy(pos, lwc_string_data(url->fragment), l->fragment);
- pos += l->fragment;
- }
-
- *pos = '\0';
-}
-
-
-/**
- * Calculate hash value
- *
- * \param url NetSurf URL object to set hash value for
- */
-static void nsurl_calc_hash(nsurl *url)
-{
- uint32_t hash = 0;
-
- if (url->components.scheme)
- hash ^= lwc_string_hash_value(url->components.scheme);
-
- if (url->components.username)
- hash ^= lwc_string_hash_value(url->components.username);
-
- if (url->components.password)
- hash ^= lwc_string_hash_value(url->components.password);
-
- if (url->components.host)
- hash ^= lwc_string_hash_value(url->components.host);
-
- if (url->components.port)
- hash ^= lwc_string_hash_value(url->components.port);
-
- if (url->components.path)
- hash ^= lwc_string_hash_value(url->components.path);
-
- if (url->components.query)
- hash ^= lwc_string_hash_value(url->components.query);
-
- url->hash = hash;
-}
-
-
-/**
- * Destroy components
- *
- * \param c url components
- */
-static void nsurl_destroy_components(struct nsurl_components *c)
-{
- if (c->scheme)
- lwc_string_unref(c->scheme);
-
- if (c->username)
- lwc_string_unref(c->username);
-
- if (c->password)
- lwc_string_unref(c->password);
-
- if (c->host)
- lwc_string_unref(c->host);
-
- if (c->port)
- lwc_string_unref(c->port);
-
- if (c->path)
- lwc_string_unref(c->path);
-
- if (c->query)
- lwc_string_unref(c->query);
-
- if (c->fragment)
- lwc_string_unref(c->fragment);
-}
-
-
-#ifdef NSURL_DEBUG
-/**
- * Dump a NetSurf URL's internal components
- *
- * \param url The NetSurf URL to dump components of
- */
-static void nsurl__dump(const nsurl *url)
-{
- if (url->components.scheme)
- LOG(" Scheme: %s", lwc_string_data(url->components.scheme));
-
- if (url->components.username)
- LOG("Username: %s", lwc_string_data(url->components.username));
-
- if (url->components.password)
- LOG("Password: %s", lwc_string_data(url->components.password));
-
- if (url->components.host)
- LOG(" Host: %s", lwc_string_data(url->components.host));
-
- if (url->components.port)
- LOG(" Port: %s", lwc_string_data(url->components.port));
-
- if (url->components.path)
- LOG(" Path: %s", lwc_string_data(url->components.path));
-
- if (url->components.query)
- LOG(" Query: %s", lwc_string_data(url->components.query));
-
- if (url->components.fragment)
- LOG("Fragment: %s", lwc_string_data(url->components.fragment));
-}
-#endif
-
-/******************************************************************************
- * NetSurf URL Public API *
- ******************************************************************************/
-
-/* exported interface, documented in nsurl.h */
-nserror nsurl_create(const char * const url_s, nsurl **url)
-{
- struct url_markers m;
- struct nsurl_components c;
- size_t length;
- char *buff;
- struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
- enum nsurl_string_flags str_flags = 0;
- nserror e = NSERROR_OK;
- bool match;
-
- assert(url_s != NULL);
-
- /* Peg out the URL sections */
- nsurl__get_string_markers(url_s, &m, false);
-
- /* Get the length of the longest section */
- length = nsurl__get_longest_section(&m);
-
- /* Allocate enough memory to url escape the longest section */
- buff = malloc(length * 3 + 1);
- if (buff == NULL)
- return NSERROR_NOMEM;
-
- /* Set scheme type */
- c.scheme_type = m.scheme_type;
-
- /* Build NetSurf URL object from sections */
- e |= nsurl__create_from_section(url_s, URL_SCHEME, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_CREDENTIALS, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_HOST, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_PATH, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_QUERY, &m, buff, &c);
- e |= nsurl__create_from_section(url_s, URL_FRAGMENT, &m, buff, &c);
-
- /* Finished with buffer */
- free(buff);
-
- if (e != NSERROR_OK) {
- nsurl_destroy_components(&c);
- return NSERROR_NOMEM;
- }
-
- /* Validate URL */
- if ((lwc_string_isequal(c.scheme, corestring_lwc_http,
- &match) == lwc_error_ok && match == true) ||
- (lwc_string_isequal(c.scheme, corestring_lwc_https,
- &match) == lwc_error_ok && match == true)) {
- /* http, https must have host */
- if (c.host == NULL) {
- nsurl_destroy_components(&c);
- return NSERROR_BAD_URL;
- }
- }
-
- /* Get the string length and find which parts of url are present */
- nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
- &str_len, &str_flags);
-
- /* Create NetSurf URL object */
- *url = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
- if (*url == NULL) {
- nsurl_destroy_components(&c);
- return NSERROR_NOMEM;
- }
-
- (*url)->components = c;
- (*url)->length = length;
-
- /* Fill out the url string */
- nsurl_get_string(&c, (*url)->string, &str_len, str_flags);
-
- /* Get the nsurl's hash */
- nsurl_calc_hash(*url);
-
- /* Give the URL a reference */
- (*url)->count = 1;
-
- return NSERROR_OK;
-}
-
-
-/* exported interface, documented in nsurl.h */
-nsurl *nsurl_ref(nsurl *url)
-{
- assert(url != NULL);
-
- url->count++;
-
- return url;
-}
-
-
-/* exported interface, documented in nsurl.h */
-void nsurl_unref(nsurl *url)
-{
- assert(url != NULL);
- assert(url->count > 0);
-
- if (--url->count > 0)
- return;
-
-#ifdef NSURL_DEBUG
- nsurl__dump(url);
-#endif
-
- /* Release lwc strings */
- nsurl_destroy_components(&url->components);
-
- /* Free the NetSurf URL */
- free(url);
-}
-
-
-/* exported interface, documented in nsurl.h */
-bool nsurl_compare(const nsurl *url1, const nsurl *url2, nsurl_component parts)
-{
- bool match = true;
-
- assert(url1 != NULL);
- assert(url2 != NULL);
-
- /* Compare URL components */
-
- /* Path, host and query first, since they're most likely to differ */
-
- if (parts & NSURL_PATH) {
- nsurl__component_compare(url1->components.path,
- url2->components.path, &match);
-
- if (match == false)
- return false;
- }
-
- if (parts & NSURL_HOST) {
- nsurl__component_compare(url1->components.host,
- url2->components.host, &match);
-
- if (match == false)
- return false;
- }
-
- if (parts & NSURL_QUERY) {
- nsurl__component_compare(url1->components.query,
- url2->components.query, &match);
-
- if (match == false)
- return false;
- }
-
- if (parts & NSURL_SCHEME) {
- nsurl__component_compare(url1->components.scheme,
- url2->components.scheme, &match);
-
- if (match == false)
- return false;
- }
-
- if (parts & NSURL_USERNAME) {
- nsurl__component_compare(url1->components.username,
- url2->components.username, &match);
-
- if (match == false)
- return false;
- }
-
- if (parts & NSURL_PASSWORD) {
- nsurl__component_compare(url1->components.password,
- url2->components.password, &match);
-
- if (match == false)
- return false;
- }
-
- if (parts & NSURL_PORT) {
- nsurl__component_compare(url1->components.port,
- url2->components.port, &match);
-
- if (match == false)
- return false;
- }
-
- if (parts & NSURL_FRAGMENT) {
- nsurl__component_compare(url1->components.fragment,
- url2->components.fragment, &match);
-
- if (match == false)
- return false;
- }
-
- return true;
-}
-
-
-/* exported interface, documented in nsurl.h */
-nserror nsurl_get(const nsurl *url, nsurl_component parts,
- char **url_s, size_t *url_l)
-{
- struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
- enum nsurl_string_flags str_flags = 0;
-
- assert(url != NULL);
-
- /* Get the string length and find which parts of url need copied */
- nsurl__get_string_data(&(url->components), parts, url_l,
- &str_len, &str_flags);
-
- if (*url_l == 0) {
- return NSERROR_BAD_URL;
- }
-
- /* Allocate memory for url string */
- *url_s = malloc(*url_l + 1); /* adding 1 for '\0' */
- if (*url_s == NULL) {
- return NSERROR_NOMEM;
- }
-
- /* Copy the required parts into the url string */
- nsurl_get_string(&(url->components), *url_s, &str_len, str_flags);
-
- return NSERROR_OK;
-}
-
-
-/* exported interface, documented in nsurl.h */
-lwc_string *nsurl_get_component(const nsurl *url, nsurl_component part)
-{
- assert(url != NULL);
-
- switch (part) {
- case NSURL_SCHEME:
- return (url->components.scheme != NULL) ?
- lwc_string_ref(url->components.scheme) : NULL;
-
- case NSURL_USERNAME:
- return (url->components.username != NULL) ?
- lwc_string_ref(url->components.username) : NULL;
-
- case NSURL_PASSWORD:
- return (url->components.password != NULL) ?
- lwc_string_ref(url->components.password) : NULL;
-
- case NSURL_HOST:
- return (url->components.host != NULL) ?
- lwc_string_ref(url->components.host) : NULL;
-
- case NSURL_PORT:
- return (url->components.port != NULL) ?
- lwc_string_ref(url->components.port) : NULL;
-
- case NSURL_PATH:
- return (url->components.path != NULL) ?
- lwc_string_ref(url->components.path) : NULL;
-
- case NSURL_QUERY:
- return (url->components.query != NULL) ?
- lwc_string_ref(url->components.query) : NULL;
-
- case NSURL_FRAGMENT:
- return (url->components.fragment != NULL) ?
- lwc_string_ref(url->components.fragment) : NULL;
-
- default:
- LOG("Unsupported value passed to part param.");
- assert(0);
- }
-
- return NULL;
-}
-
-
-/* exported interface, documented in nsurl.h */
-bool nsurl_has_component(const nsurl *url, nsurl_component part)
-{
- assert(url != NULL);
-
- switch (part) {
- case NSURL_SCHEME:
- if (url->components.scheme != NULL)
- return true;
- else
- return false;
-
- case NSURL_CREDENTIALS:
- /* Only username required for credentials section */
- /* Fall through */
- case NSURL_USERNAME:
- if (url->components.username != NULL)
- return true;
- else
- return false;
-
- case NSURL_PASSWORD:
- if (url->components.password != NULL)
- return true;
- else
- return false;
-
- case NSURL_HOST:
- if (url->components.host != NULL)
- return true;
- else
- return false;
-
- case NSURL_PORT:
- if (url->components.port != NULL)
- return true;
- else
- return false;
-
- case NSURL_PATH:
- if (url->components.path != NULL)
- return true;
- else
- return false;
-
- case NSURL_QUERY:
- if (url->components.query != NULL)
- return true;
- else
- return false;
-
- case NSURL_FRAGMENT:
- if (url->components.fragment != NULL)
- return true;
- else
- return false;
-
- default:
- LOG("Unsupported value passed to part param.");
- assert(0);
- }
-
- return false;
-}
-
-
-/* exported interface, documented in nsurl.h */
-const char *nsurl_access(const nsurl *url)
-{
- assert(url != NULL);
-
- return url->string;
-}
-
-
-/* exported interface, documented in nsurl.h */
-nserror nsurl_get_utf8(const nsurl *url, char **url_s, size_t *url_l)
-{
- nserror err;
- lwc_string *host;
- char *idna_host = NULL;
- size_t idna_host_len;
- char *scheme = NULL;
- size_t scheme_len;
- char *path = NULL;
- size_t path_len;
-
- assert(url != NULL);
-
- if (url->components.host == NULL) {
- return nsurl_get(url, NSURL_WITH_FRAGMENT, url_s, url_l);
- }
-
- host = url->components.host;
- err = idna_decode(lwc_string_data(host), lwc_string_length(host),
- &idna_host, &idna_host_len);
- if (err != NSERROR_OK) {
- goto cleanup;
- }
-
- err = nsurl_get(url,
- NSURL_SCHEME | NSURL_CREDENTIALS,
- &scheme, &scheme_len);
- if (err != NSERROR_OK) {
- goto cleanup;
- }
-
- err = nsurl_get(url,
- NSURL_PORT | NSURL_PATH | NSURL_QUERY | NSURL_FRAGMENT,
- &path, &path_len);
- if (err != NSERROR_OK) {
- goto cleanup;
- }
-
- *url_l = scheme_len + idna_host_len + path_len + 1; /* +1 for \0 */
- *url_s = malloc(*url_l);
-
- if (*url_s == NULL) {
- err = NSERROR_NOMEM;
- goto cleanup;
- }
-
- snprintf(*url_s, *url_l, "%s%s%s", scheme, idna_host, path);
-
- err = NSERROR_OK;
-
-cleanup:
- free(idna_host);
- free(scheme);
- free(path);
-
- return err;
-}
-
-
-/* exported interface, documented in nsurl.h */
-const char *nsurl_access_leaf(const nsurl *url)
-{
- size_t path_len;
- const char *path;
- const char *leaf;
-
- assert(url != NULL);
-
- if (url->components.path == NULL)
- return "";
-
- path = lwc_string_data(url->components.path);
- path_len = lwc_string_length(url->components.path);
-
- if (path_len == 0)
- return "";
-
- if (path_len == 1 && *path == '/')
- return "/";
-
- leaf = path + path_len;
-
- do {
- leaf--;
- } while ((leaf != path) && (*leaf != '/'));
-
- if (*leaf == '/')
- leaf++;
-
- return leaf;
-}
-
-
-/* exported interface, documented in nsurl.h */
-size_t nsurl_length(const nsurl *url)
-{
- assert(url != NULL);
-
- return url->length;
-}
-
-
-/* exported interface, documented in nsurl.h */
-uint32_t nsurl_hash(const nsurl *url)
-{
- assert(url != NULL);
-
- return url->hash;
-}
-
-
-/* exported interface, documented in nsurl.h */
-nserror nsurl_join(const nsurl *base, const char *rel, nsurl **joined)
-{
- struct url_markers m;
- struct nsurl_components c;
- size_t length;
- char *buff;
- char *buff_pos;
- char *buff_start;
- struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
- enum nsurl_string_flags str_flags = 0;
- nserror error = 0;
- enum {
- NSURL_F_REL = 0,
- NSURL_F_BASE_SCHEME = (1 << 0),
- NSURL_F_BASE_AUTHORITY = (1 << 1),
- NSURL_F_BASE_PATH = (1 << 2),
- NSURL_F_MERGED_PATH = (1 << 3),
- NSURL_F_BASE_QUERY = (1 << 4)
- } joined_parts;
-
- assert(base != NULL);
- assert(rel != NULL);
-
-#ifdef NSURL_DEBUG
- LOG("base: \"%s\", rel: \"%s\"", nsurl_access(base), rel);
-#endif
-
- /* Peg out the URL sections */
- nsurl__get_string_markers(rel, &m, true);
-
- /* Get the length of the longest section */
- length = nsurl__get_longest_section(&m);
-
- /* Initially assume that the joined URL can be formed entierly from
- * the relative URL.
- */
- joined_parts = NSURL_F_REL;
-
- /* Update joined_compnents to indicate any required parts from the
- * base URL.
- */
- if (m.scheme_end - m.start <= 0) {
- /* The relative url has no scheme.
- * Use base URL's scheme. */
- joined_parts |= NSURL_F_BASE_SCHEME;
-
- if (m.path - m.authority <= 0) {
- /* The relative URL has no authority.
- * Use base URL's authority. */
- joined_parts |= NSURL_F_BASE_AUTHORITY;
-
- if (m.query - m.path <= 0) {
- /* The relative URL has no path.
- * Use base URL's path. */
- joined_parts |= NSURL_F_BASE_PATH;
-
- if (m.fragment - m.query <= 0) {
- /* The relative URL has no query.
- * Use base URL's query. */
- joined_parts |= NSURL_F_BASE_QUERY;
- }
-
- } else if (*(rel + m.path) != '/') {
- /* Relative URL has relative path */
- joined_parts |= NSURL_F_MERGED_PATH;
- }
- }
- }
-
- /* Allocate enough memory to url escape the longest section, plus
- * space for path merging (if required).
- */
- if (joined_parts & NSURL_F_MERGED_PATH) {
- /* Need to merge paths */
- length += (base->components.path != NULL) ?
- lwc_string_length(base->components.path) : 0;
- }
- length *= 4;
- /* Plus space for removing dots from path */
- length += (m.query - m.path) + ((base->components.path != NULL) ?
- lwc_string_length(base->components.path) : 0);
-
- buff = malloc(length + 5);
- if (buff == NULL) {
- return NSERROR_NOMEM;
- }
-
- buff_pos = buff;
-
- /* Form joined URL from base or rel components, as appropriate */
-
- if (joined_parts & NSURL_F_BASE_SCHEME) {
- c.scheme_type = base->components.scheme_type;
-
- c.scheme = nsurl__component_copy(base->components.scheme);
- } else {
- c.scheme_type = m.scheme_type;
-
- error = nsurl__create_from_section(rel, URL_SCHEME, &m, buff, &c);
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
- }
-
- if (joined_parts & NSURL_F_BASE_AUTHORITY) {
- c.username = nsurl__component_copy(base->components.username);
- c.password = nsurl__component_copy(base->components.password);
- c.host = nsurl__component_copy(base->components.host);
- c.port = nsurl__component_copy(base->components.port);
- } else {
- error = nsurl__create_from_section(rel, URL_CREDENTIALS, &m,
- buff, &c);
- if (error == NSERROR_OK) {
- error = nsurl__create_from_section(rel, URL_HOST, &m,
- buff, &c);
- }
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
- }
-
- if (joined_parts & NSURL_F_BASE_PATH) {
- c.path = nsurl__component_copy(base->components.path);
-
- } else if (joined_parts & NSURL_F_MERGED_PATH) {
- struct url_markers m_path;
- size_t new_length;
-
- if (base->components.host != NULL &&
- base->components.path == NULL) {
- /* Append relative path to "/". */
- *(buff_pos++) = '/';
- memcpy(buff_pos, rel + m.path, m.query - m.path);
- buff_pos += m.query - m.path;
-
- } else {
- /* Append relative path to all but last segment of
- * base path. */
- size_t path_end = lwc_string_length(
- base->components.path);
- const char *path = lwc_string_data(
- base->components.path);
-
- while (*(path + path_end) != '/' &&
- path_end != 0) {
- path_end--;
- }
- if (*(path + path_end) == '/')
- path_end++;
-
- /* Copy the base part */
- memcpy(buff_pos, path, path_end);
- buff_pos += path_end;
-
- /* Copy the relative part */
- memcpy(buff_pos, rel + m.path, m.query - m.path);
- buff_pos += m.query - m.path;
- }
-
- /* add termination to string */
- *buff_pos++ = '\0';
-
- new_length = nsurl__remove_dot_segments(buff, buff_pos);
-
- m_path.path = 0;
- m_path.query = new_length;
-
- buff_start = buff_pos + new_length;
- error = nsurl__create_from_section(buff_pos, URL_PATH, &m_path,
- buff_start, &c);
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
-
- } else {
- struct url_markers m_path;
- size_t new_length;
-
- memcpy(buff_pos, rel + m.path, m.query - m.path);
- buff_pos += m.query - m.path;
- *(buff_pos++) = '\0';
-
- new_length = nsurl__remove_dot_segments(buff, buff_pos);
-
- m_path.path = 0;
- m_path.query = new_length;
-
- buff_start = buff_pos + new_length;
-
- error = nsurl__create_from_section(buff_pos, URL_PATH, &m_path,
- buff_start, &c);
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
- }
-
- if (joined_parts & NSURL_F_BASE_QUERY) {
- c.query = nsurl__component_copy(base->components.query);
- } else {
- error = nsurl__create_from_section(rel, URL_QUERY, &m,
- buff, &c);
- if (error != NSERROR_OK) {
- free(buff);
- return error;
- }
- }
-
- error = nsurl__create_from_section(rel, URL_FRAGMENT, &m, buff, &c);
-
- /* Free temporary buffer */
- free(buff);
-
- if (error != NSERROR_OK) {
- return error;
- }
-
- /* Get the string length and find which parts of url are present */
- nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
- &str_len, &str_flags);
-
- /* Create NetSurf URL object */
- *joined = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
- if (*joined == NULL) {
- return NSERROR_NOMEM;
- }
-
- (*joined)->components = c;
- (*joined)->length = length;
-
- /* Fill out the url string */
- nsurl_get_string(&c, (*joined)->string, &str_len, str_flags);
-
- /* Get the nsurl's hash */
- nsurl_calc_hash(*joined);
-
- /* Give the URL a reference */
- (*joined)->count = 1;
-
- return NSERROR_OK;
-}
-
-
-/* exported interface, documented in nsurl.h */
-nserror nsurl_defragment(const nsurl *url, nsurl **no_frag)
-{
- size_t length;
- char *pos;
-
- assert(url != NULL);
-
- /* check for source url having no fragment already */
- if (url->components.fragment == NULL) {
- *no_frag = (nsurl *)url;
-
- (*no_frag)->count++;
-
- return NSERROR_OK;
- }
-
- /* Find the change in length from url to new_url */
- length = url->length;
- if (url->components.fragment != NULL) {
- length -= 1 + lwc_string_length(url->components.fragment);
- }
-
- /* Create NetSurf URL object */
- *no_frag = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
- if (*no_frag == NULL) {
- return NSERROR_NOMEM;
- }
-
- /* Copy components */
- (*no_frag)->components.scheme =
- nsurl__component_copy(url->components.scheme);
- (*no_frag)->components.username =
- nsurl__component_copy(url->components.username);
- (*no_frag)->components.password =
- nsurl__component_copy(url->components.password);
- (*no_frag)->components.host =
- nsurl__component_copy(url->components.host);
- (*no_frag)->components.port =
- nsurl__component_copy(url->components.port);
- (*no_frag)->components.path =
- nsurl__component_copy(url->components.path);
- (*no_frag)->components.query =
- nsurl__component_copy(url->components.query);
- (*no_frag)->components.fragment = NULL;
-
- (*no_frag)->components.scheme_type = url->components.scheme_type;
-
- (*no_frag)->length = length;
-
- /* Fill out the url string */
- pos = (*no_frag)->string;
- memcpy(pos, url->string, length);
- pos += length;
- *pos = '\0';
-
- /* Get the nsurl's hash */
- nsurl_calc_hash(*no_frag);
-
- /* Give the URL a reference */
- (*no_frag)->count = 1;
-
- return NSERROR_OK;
-}
-
-
-/* exported interface, documented in nsurl.h */
-nserror nsurl_refragment(const nsurl *url, lwc_string *frag, nsurl **new_url)
-{
- int frag_len;
- int base_len;
- char *pos;
- size_t len;
-
- assert(url != NULL);
- assert(frag != NULL);
-
- /* Find the change in length from url to new_url */
- base_len = url->length;
- if (url->components.fragment != NULL) {
- base_len -= 1 + lwc_string_length(url->components.fragment);
- }
- frag_len = lwc_string_length(frag);
-
- /* Set new_url's length */
- len = base_len + 1 /* # */ + frag_len;
-
- /* Create NetSurf URL object */
- *new_url = malloc(sizeof(nsurl) + len + 1); /* Add 1 for \0 */
- if (*new_url == NULL) {
- return NSERROR_NOMEM;
- }
-
- (*new_url)->length = len;
-
- /* Set string */
- pos = (*new_url)->string;
- memcpy(pos, url->string, base_len);
- pos += base_len;
- *pos = '#';
- memcpy(++pos, lwc_string_data(frag), frag_len);
- pos += frag_len;
- *pos = '\0';
-
- /* Copy components */
- (*new_url)->components.scheme =
- nsurl__component_copy(url->components.scheme);
- (*new_url)->components.username =
- nsurl__component_copy(url->components.username);
- (*new_url)->components.password =
- nsurl__component_copy(url->components.password);
- (*new_url)->components.host =
- nsurl__component_copy(url->components.host);
- (*new_url)->components.port =
- nsurl__component_copy(url->components.port);
- (*new_url)->components.path =
- nsurl__component_copy(url->components.path);
- (*new_url)->components.query =
- nsurl__component_copy(url->components.query);
- (*new_url)->components.fragment =
- lwc_string_ref(frag);
-
- (*new_url)->components.scheme_type = url->components.scheme_type;
-
- /* Get the nsurl's hash */
- nsurl_calc_hash(*new_url);
-
- /* Give the URL a reference */
- (*new_url)->count = 1;
-
- return NSERROR_OK;
-}
-
-
-/* exported interface, documented in nsurl.h */
-nserror nsurl_replace_query(const nsurl *url, const char *query,
- nsurl **new_url)
-{
- int query_len; /* Length of new query string, including '?' */
- int frag_len = 0; /* Length of fragment, including '#' */
- int base_len; /* Length of URL up to start of query */
- char *pos;
- size_t len;
- lwc_string *lwc_query;
-
- assert(url != NULL);
- assert(query != NULL);
- assert(query[0] == '?');
-
- /* Get the length of the new query */
- query_len = strlen(query);
-
- /* Find the change in length from url to new_url */
- base_len = url->length;
- if (url->components.query != NULL) {
- base_len -= lwc_string_length(url->components.query);
- }
- if (url->components.fragment != NULL) {
- frag_len = 1 + lwc_string_length(url->components.fragment);
- base_len -= frag_len;
- }
-
- /* Set new_url's length */
- len = base_len + query_len + frag_len;
-
- /* Create NetSurf URL object */
- *new_url = malloc(sizeof(nsurl) + len + 1); /* Add 1 for \0 */
- if (*new_url == NULL) {
- return NSERROR_NOMEM;
- }
-
- if (lwc_intern_string(query, query_len, &lwc_query) != lwc_error_ok) {
- free(*new_url);
- return NSERROR_NOMEM;
- }
-
- (*new_url)->length = len;
-
- /* Set string */
- pos = (*new_url)->string;
- memcpy(pos, url->string, base_len);
- pos += base_len;
- memcpy(pos, query, query_len);
- pos += query_len;
- if (url->components.fragment != NULL) {
- const char *frag = lwc_string_data(url->components.fragment);
- *pos = '#';
- memcpy(++pos, frag, frag_len - 1);
- pos += frag_len - 1;
- }
- *pos = '\0';
-
- /* Copy components */
- (*new_url)->components.scheme =
- nsurl__component_copy(url->components.scheme);
- (*new_url)->components.username =
- nsurl__component_copy(url->components.username);
- (*new_url)->components.password =
- nsurl__component_copy(url->components.password);
- (*new_url)->components.host =
- nsurl__component_copy(url->components.host);
- (*new_url)->components.port =
- nsurl__component_copy(url->components.port);
- (*new_url)->components.path =
- nsurl__component_copy(url->components.path);
- (*new_url)->components.query = lwc_query;
- (*new_url)->components.fragment =
- nsurl__component_copy(url->components.fragment);
-
- (*new_url)->components.scheme_type = url->components.scheme_type;
-
- /* Get the nsurl's hash */
- nsurl_calc_hash(*new_url);
-
- /* Give the URL a reference */
- (*new_url)->count = 1;
-
- return NSERROR_OK;
-}
-
-
-/* exported interface documented in utils/nsurl.h */
-nserror nsurl_nice(const nsurl *url, char **result, bool remove_extensions)
-{
- const char *data;
- size_t len;
- size_t pos;
- bool match;
- char *name;
-
- assert(url != NULL);
-
- *result = 0;
-
- /* extract the last component of the path, if possible */
- if ((url->components.path != NULL) &&
- (lwc_string_length(url->components.path) != 0) &&
- (lwc_string_isequal(url->components.path,
- corestring_lwc_slash_, &match) == lwc_error_ok) &&
- (match == false)) {
- bool first = true;
- bool keep_looking;
-
- /* Get hold of the string data we're examining */
- data = lwc_string_data(url->components.path);
- len = lwc_string_length(url->components.path);
- pos = len;
-
- do {
- keep_looking = false;
- pos--;
-
- /* Find last '/' with stuff after it */
- while (pos != 0) {
- if (data[pos] == '/' && pos < len - 1) {
- break;
- }
- pos--;
- }
-
- if (pos == 0) {
- break;
- }
-
- if (first) {
- if (strncasecmp("/default.", data + pos,
- SLEN("/default.")) == 0) {
- keep_looking = true;
-
- } else if (strncasecmp("/index.",
- data + pos,
- 6) == 0) {
- keep_looking = true;
-
- }
- first = false;
- }
-
- } while (keep_looking);
-
- if (data[pos] == '/')
- pos++;
-
- if (strncasecmp("default.", data + pos, 8) != 0 &&
- strncasecmp("index.", data + pos, 6) != 0) {
- size_t end = pos;
- while (data[end] != '\0' && data[end] != '/') {
- end++;
- }
- if (end - pos != 0) {
- name = malloc(end - pos + 1);
- if (name == NULL) {
- return NSERROR_NOMEM;
- }
- memcpy(name, data + pos, end - pos);
- name[end - pos] = '\0';
- if (remove_extensions) {
- /* strip any extenstion */
- char *dot = strchr(name, '.');
- if (dot && dot != name) {
- *dot = '\0';
- }
- }
- *result = name;
- return NSERROR_OK;
- }
- }
- }
-
- if (url->components.host != NULL) {
- name = strdup(lwc_string_data(url->components.host));
-
- for (pos = 0; name[pos] != '\0'; pos++) {
- if (name[pos] == '.') {
- name[pos] = '_';
- }
- }
-
- *result = name;
- return NSERROR_OK;
- }
-
- return NSERROR_NOT_FOUND;
-}
-
-
-/* exported interface, documented in nsurl.h */
-nserror nsurl_parent(const nsurl *url, nsurl **new_url)
-{
- lwc_string *lwc_path;
- size_t old_path_len, new_path_len;
- size_t len;
- const char* path = NULL;
- char *pos;
-
- assert(url != NULL);
-
- old_path_len = (url->components.path == NULL) ? 0 :
- lwc_string_length(url->components.path);
-
- /* Find new path length */
- if (old_path_len == 0) {
- new_path_len = old_path_len;
- } else {
- path = lwc_string_data(url->components.path);
-
- new_path_len = old_path_len;
- if (old_path_len > 1) {
- /* Skip over any trailing / */
- if (path[new_path_len - 1] == '/')
- new_path_len--;
-
- /* Work back to next / */
- while (new_path_len > 0 &&
- path[new_path_len - 1] != '/')
- new_path_len--;
- }
- }
-
- /* Find the length of new_url */
- len = url->length;
- if (url->components.query != NULL) {
- len -= lwc_string_length(url->components.query);
- }
- if (url->components.fragment != NULL) {
- len -= 1; /* # */
- len -= lwc_string_length(url->components.fragment);
- }
- len -= old_path_len - new_path_len;
-
- /* Create NetSurf URL object */
- *new_url = malloc(sizeof(nsurl) + len + 1); /* Add 1 for \0 */
- if (*new_url == NULL) {
- return NSERROR_NOMEM;
- }
-
- /* Make new path */
- if (old_path_len == 0) {
- lwc_path = NULL;
- } else if (old_path_len == new_path_len) {
- lwc_path = lwc_string_ref(url->components.path);
- } else {
- if (lwc_intern_string(path, old_path_len - new_path_len,
- &lwc_path) != lwc_error_ok) {
- free(*new_url);
- return NSERROR_NOMEM;
- }
- }
-
- (*new_url)->length = len;
-
- /* Set string */
- pos = (*new_url)->string;
- memcpy(pos, url->string, len);
- pos += len;
- *pos = '\0';
-
- /* Copy components */
- (*new_url)->components.scheme =
- nsurl__component_copy(url->components.scheme);
- (*new_url)->components.username =
- nsurl__component_copy(url->components.username);
- (*new_url)->components.password =
- nsurl__component_copy(url->components.password);
- (*new_url)->components.host =
- nsurl__component_copy(url->components.host);
- (*new_url)->components.port =
- nsurl__component_copy(url->components.port);
- (*new_url)->components.path = lwc_path;
- (*new_url)->components.query = NULL;
- (*new_url)->components.fragment = NULL;
-
- (*new_url)->components.scheme_type = url->components.scheme_type;
-
- /* Get the nsurl's hash */
- nsurl_calc_hash(*new_url);
-
- /* Give the URL a reference */
- (*new_url)->count = 1;
-
- return NSERROR_OK;
-}
-
diff --git a/utils/nsurl/Makefile b/utils/nsurl/Makefile
new file mode 100644
index 0000000..08656f3
--- /dev/null
+++ b/utils/nsurl/Makefile
@@ -0,0 +1,6 @@
+# nsurl utils sources
+
+S_NSURL := \
+ nsurl.c
+
+S_NSURL := $(addprefix utils/nsurl/,$(S_NSURL))
\ No newline at end of file
diff --git a/utils/nsurl/nsurl.c b/utils/nsurl/nsurl.c
new file mode 100644
index 0000000..c5c614c
--- /dev/null
+++ b/utils/nsurl/nsurl.c
@@ -0,0 +1,2500 @@
+/*
+ * Copyright 2011 Michael Drake <tlsa(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * NetSurf URL handling implementation.
+ *
+ * This is the common implementation of all URL handling within the
+ * browser. This implementation is based upon RFC3986 although this has
+ * been superceeded by https://url.spec.whatwg.org/ which is based on
+ * actual contemporary implementations.
+ *
+ * Care must be taken with character encodings within this module as
+ * the specifications work with specific ascii ranges and must not be
+ * affected by locale. Hence the c library character type functions
+ * are not used.
+ */
+
+#include <assert.h>
+#include <libwapcaplet/libwapcaplet.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#include "utils/ascii.h"
+#include "utils/corestrings.h"
+#include "utils/errors.h"
+#include "utils/idna.h"
+#include "utils/log.h"
+#include "utils/nsurl.h"
+#include "utils/utils.h"
+
+/* Define to enable NSURL debugging */
+#undef NSURL_DEBUG
+
+/**
+ * nsurl scheme type
+ */
+enum scheme_type {
+ NSURL_SCHEME_OTHER,
+ NSURL_SCHEME_HTTP,
+ NSURL_SCHEME_HTTPS,
+ NSURL_SCHEME_FTP,
+ NSURL_SCHEME_MAILTO
+};
+
+/**
+ * nsurl components
+ *
+ * [scheme]://[username]:[password]@[host]:[port][path][?query]#[fragment]
+ *
+ * Note:
+ * "path" string includes preceding '/', if needed for the scheme
+ * "query" string always includes preceding '?'
+ *
+ * The other spanned punctuation is to be inserted when building URLs from
+ * components.
+ */
+struct nsurl_components {
+ lwc_string *scheme;
+ lwc_string *username;
+ lwc_string *password;
+ lwc_string *host;
+ lwc_string *port;
+ lwc_string *path;
+ lwc_string *query;
+ lwc_string *fragment;
+
+ enum scheme_type scheme_type;
+};
+
+
+/**
+ * NetSurf URL object
+ */
+struct nsurl {
+ struct nsurl_components components;
+
+ int count; /* Number of references to NetSurf URL object */
+ uint32_t hash; /* Hash value for nsurl identification */
+
+ size_t length; /* Length of string */
+ char string[FLEX_ARRAY_LEN_DECL]; /* Full URL as a string */
+};
+
+
+/** Marker set, indicating positions of sections within a URL string */
+struct url_markers {
+ size_t start; /** start of URL */
+ size_t scheme_end;
+ size_t authority;
+
+ size_t colon_first;
+ size_t at;
+ size_t colon_last;
+
+ size_t path;
+ size_t query;
+ size_t fragment;
+
+ size_t end; /** end of URL */
+
+ enum scheme_type scheme_type;
+};
+
+
+/** Marker set, indicating positions of sections within a URL string */
+struct nsurl_component_lengths {
+ size_t scheme;
+ size_t username;
+ size_t password;
+ size_t host;
+ size_t port;
+ size_t path;
+ size_t query;
+ size_t fragment;
+};
+
+
+/** Flags indicating which parts of a URL string are required for a nsurl */
+enum nsurl_string_flags {
+ NSURL_F_SCHEME = (1 << 0),
+ NSURL_F_SCHEME_PUNCTUATION = (1 << 1),
+ NSURL_F_AUTHORITY_PUNCTUATION = (1 << 2),
+ NSURL_F_USERNAME = (1 << 3),
+ NSURL_F_PASSWORD = (1 << 4),
+ NSURL_F_CREDENTIALS_PUNCTUATION = (1 << 5),
+ NSURL_F_HOST = (1 << 6),
+ NSURL_F_PORT = (1 << 7),
+ NSURL_F_AUTHORITY = (NSURL_F_USERNAME |
+ NSURL_F_PASSWORD |
+ NSURL_F_HOST |
+ NSURL_F_PORT),
+ NSURL_F_PATH = (1 << 8),
+ NSURL_F_QUERY = (1 << 9),
+ NSURL_F_FRAGMENT_PUNCTUATION = (1 << 10),
+ NSURL_F_FRAGMENT = (1 << 11)
+};
+
+
+/** Sections of a URL */
+enum url_sections {
+ URL_SCHEME,
+ URL_CREDENTIALS,
+ URL_HOST,
+ URL_PATH,
+ URL_QUERY,
+ URL_FRAGMENT
+};
+
+
+#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
+
+#define nsurl__component_compare(c1, c2, match) \
+ if (c1 && c2 && lwc_error_ok == \
+ lwc_string_isequal(c1, c2, match)) { \
+ /* do nothing */ \
+ } else if (c1 || c2) { \
+ *match = false; \
+ }
+
+/**
+ * Return a hex digit for the given numerical value.
+ *
+ * \param digit the value to get the hex digit for.
+ * \return character in range 0-9A-F
+ */
+inline static char digit2uppercase_hex(unsigned char digit) {
+ assert(digit < 16);
+ return "0123456789ABCDEF"[digit];
+}
+
+/**
+ * determine if a character is unreserved
+ *
+ * \param c character to classify.
+ * \return true if the character is unreserved else false.
+ */
+static bool nsurl__is_unreserved(unsigned char c)
+{
+ /* From RFC3986 section 2.3 (unreserved characters)
+ *
+ * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
+ *
+ */
+ static const bool unreserved[256] = {
+ false, false, false, false, false, false, false, false, /* 00 */
+ false, false, false, false, false, false, false, false, /* 08 */
+ false, false, false, false, false, false, false, false, /* 10 */
+ false, false, false, false, false, false, false, false, /* 18 */
+ false, false, false, false, false, false, false, false, /* 20 */
+ false, false, false, false, false, true, true, false, /* 28 */
+ true, true, true, true, true, true, true, true, /* 30 */
+ true, true, false, false, false, false, false, false, /* 38 */
+ false, true, true, true, true, true, true, true, /* 40 */
+ true, true, true, true, true, true, true, true, /* 48 */
+ true, true, true, true, true, true, true, true, /* 50 */
+ true, true, true, false, false, false, false, true, /* 58 */
+ false, true, true, true, true, true, true, true, /* 60 */
+ true, true, true, true, true, true, true, true, /* 68 */
+ true, true, true, true, true, true, true, true, /* 70 */
+ true, true, true, false, false, false, true, false, /* 78 */
+ false, false, false, false, false, false, false, false, /* 80 */
+ false, false, false, false, false, false, false, false, /* 88 */
+ false, false, false, false, false, false, false, false, /* 90 */
+ false, false, false, false, false, false, false, false, /* 98 */
+ false, false, false, false, false, false, false, false, /* A0 */
+ false, false, false, false, false, false, false, false, /* A8 */
+ false, false, false, false, false, false, false, false, /* B0 */
+ false, false, false, false, false, false, false, false, /* B8 */
+ false, false, false, false, false, false, false, false, /* C0 */
+ false, false, false, false, false, false, false, false, /* C8 */
+ false, false, false, false, false, false, false, false, /* D0 */
+ false, false, false, false, false, false, false, false, /* D8 */
+ false, false, false, false, false, false, false, false, /* E0 */
+ false, false, false, false, false, false, false, false, /* E8 */
+ false, false, false, false, false, false, false, false, /* F0 */
+ false, false, false, false, false, false, false, false /* F8 */
+ };
+ return unreserved[c];
+}
+
+/**
+ * determine if a character should be percent escaped.
+ *
+ * The ASCII codes which should not be percent escaped
+ *
+ * \param c character to classify.
+ * \return true if the character should not be escaped else false.
+ */
+static bool nsurl__is_no_escape(unsigned char c)
+{
+ static const bool no_escape[256] = {
+ false, false, false, false, false, false, false, false, /* 00 */
+ false, false, false, false, false, false, false, false, /* 08 */
+ false, false, false, false, false, false, false, false, /* 10 */
+ false, false, false, false, false, false, false, false, /* 18 */
+ false, true, false, true, true, false, true, true, /* 20 */
+ true, true, true, true, true, true, true, true, /* 28 */
+ true, true, true, true, true, true, true, true, /* 30 */
+ true, true, true, true, false, true, false, true, /* 38 */
+ true, true, true, true, true, true, true, true, /* 40 */
+ true, true, true, true, true, true, true, true, /* 48 */
+ true, true, true, true, true, true, true, true, /* 50 */
+ true, true, true, true, false, true, false, true, /* 58 */
+ false, true, true, true, true, true, true, true, /* 60 */
+ true, true, true, true, true, true, true, true, /* 68 */
+ true, true, true, true, true, true, true, true, /* 70 */
+ true, true, true, false, true, false, true, false, /* 78 */
+ false, false, false, false, false, false, false, false, /* 80 */
+ false, false, false, false, false, false, false, false, /* 88 */
+ false, false, false, false, false, false, false, false, /* 90 */
+ false, false, false, false, false, false, false, false, /* 98 */
+ false, false, false, false, false, false, false, false, /* A0 */
+ false, false, false, false, false, false, false, false, /* A8 */
+ false, false, false, false, false, false, false, false, /* B0 */
+ false, false, false, false, false, false, false, false, /* B8 */
+ false, false, false, false, false, false, false, false, /* C0 */
+ false, false, false, false, false, false, false, false, /* C8 */
+ false, false, false, false, false, false, false, false, /* D0 */
+ false, false, false, false, false, false, false, false, /* D8 */
+ false, false, false, false, false, false, false, false, /* E0 */
+ false, false, false, false, false, false, false, false, /* E8 */
+ false, false, false, false, false, false, false, false, /* F0 */
+ false, false, false, false, false, false, false, false, /* F8 */
+ };
+ return no_escape[c];
+}
+
+
+/**
+ * Obtains a set of markers delimiting sections in a URL string
+ *
+ * \param url_s URL string
+ * \param markers Updated to mark sections in the URL string
+ * \param joining True iff URL string is a relative URL for joining
+ */
+static void nsurl__get_string_markers(const char * const url_s,
+ struct url_markers *markers, bool joining)
+{
+ const char *pos = url_s; /** current position in url_s */
+ bool is_http = false;
+ bool trailing_whitespace = false;
+
+ /* Initialise marker set */
+ struct url_markers marker = { 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, NSURL_SCHEME_OTHER };
+
+ /* Skip any leading whitespace in url_s */
+ while (ascii_is_space(*pos))
+ pos++;
+
+ /* Record start point */
+ marker.start = pos - url_s;
+
+ marker.scheme_end = marker.authority = marker.colon_first = marker.at =
+ marker.colon_last = marker.path = marker.start;
+
+ if (*pos == '\0') {
+ /* Nothing but whitespace, early exit */
+ marker.query = marker.fragment = marker.end = marker.path;
+ *markers = marker;
+ return;
+ }
+
+ /* Get scheme */
+ if (ascii_is_alpha(*pos)) {
+ pos++;
+
+ while (*pos != ':' && *pos != '\0') {
+ if (!ascii_is_alphanumerical(*pos) && (*pos != '+') &&
+ (*pos != '-') && (*pos != '.')) {
+ /* This character is not valid in the
+ * scheme */
+ break;
+ }
+ pos++;
+ }
+
+ if (*pos == ':') {
+ /* This delimits the end of the scheme */
+ size_t off;
+
+ marker.scheme_end = pos - url_s;
+
+ off = marker.scheme_end - marker.start;
+
+ /* Detect http(s) and mailto for scheme specifc
+ * normalisation */
+ if (off == SLEN("http") &&
+ (((*(pos - off + 0) == 'h') ||
+ (*(pos - off + 0) == 'H')) &&
+ ((*(pos - off + 1) == 't') ||
+ (*(pos - off + 1) == 'T')) &&
+ ((*(pos - off + 2) == 't') ||
+ (*(pos - off + 2) == 'T')) &&
+ ((*(pos - off + 3) == 'p') ||
+ (*(pos - off + 3) == 'P')))) {
+ marker.scheme_type = NSURL_SCHEME_HTTP;
+ is_http = true;
+ } else if (off == SLEN("https") &&
+ (((*(pos - off + 0) == 'h') ||
+ (*(pos - off + 0) == 'H')) &&
+ ((*(pos - off + 1) == 't') ||
+ (*(pos - off + 1) == 'T')) &&
+ ((*(pos - off + 2) == 't') ||
+ (*(pos - off + 2) == 'T')) &&
+ ((*(pos - off + 3) == 'p') ||
+ (*(pos - off + 3) == 'P')) &&
+ ((*(pos - off + 4) == 's') ||
+ (*(pos - off + 4) == 'S')))) {
+ marker.scheme_type = NSURL_SCHEME_HTTPS;
+ is_http = true;
+ } else if (off == SLEN("ftp") &&
+ (((*(pos - off + 0) == 'f') ||
+ (*(pos - off + 0) == 'F')) &&
+ ((*(pos - off + 1) == 't') ||
+ (*(pos - off + 1) == 'T')) &&
+ ((*(pos - off + 2) == 'p') ||
+ (*(pos - off + 2) == 'P')))) {
+ marker.scheme_type = NSURL_SCHEME_FTP;
+ } else if (off == SLEN("mailto") &&
+ (((*(pos - off + 0) == 'm') ||
+ (*(pos - off + 0) == 'M')) &&
+ ((*(pos - off + 1) == 'a') ||
+ (*(pos - off + 1) == 'A')) &&
+ ((*(pos - off + 2) == 'i') ||
+ (*(pos - off + 2) == 'I')) &&
+ ((*(pos - off + 3) == 'l') ||
+ (*(pos - off + 3) == 'L')) &&
+ ((*(pos - off + 4) == 't') ||
+ (*(pos - off + 4) == 'T')) &&
+ ((*(pos - off + 5) == 'o') ||
+ (*(pos - off + 5) == 'O')))) {
+ marker.scheme_type = NSURL_SCHEME_MAILTO;
+ }
+
+ /* Skip over colon */
+ pos++;
+
+ /* Mark place as start of authority */
+ marker.authority = marker.colon_first = marker.at =
+ marker.colon_last = marker.path =
+ pos - url_s;
+
+ } else {
+ /* Not found a scheme */
+ if (joining == false) {
+ /* Assuming no scheme == http */
+ marker.scheme_type = NSURL_SCHEME_HTTP;
+ is_http = true;
+ }
+ }
+ }
+
+ /* Get authority
+ *
+ * Two slashes always indicates the start of an authority.
+ *
+ * We are more relaxed in the case of http:
+ * a. when joining, one or more slashes indicates start of authority
+ * b. when not joining, we assume authority if no scheme was present
+ * and in the case of mailto: when we assume there is an authority.
+ */
+ if ((*pos == '/' && *(pos + 1) == '/') ||
+ (is_http && ((joining && *pos == '/') ||
+ (joining == false &&
+ marker.scheme_end != marker.start))) ||
+ marker.scheme_type == NSURL_SCHEME_MAILTO) {
+
+ /* Skip over leading slashes */
+ if (*pos == '/') {
+ if (is_http == false) {
+ if (*pos == '/') pos++;
+ if (*pos == '/') pos++;
+ } else {
+ while (*pos == '/')
+ pos++;
+ }
+
+ marker.authority = marker.colon_first = marker.at =
+ marker.colon_last = marker.path =
+ pos - url_s;
+ }
+
+ /* Need to get (or complete) the authority */
+ while (*pos != '\0') {
+ if (*pos == '/' || *pos == '?' || *pos == '#') {
+ /* End of the authority */
+ break;
+
+ } else if (marker.scheme_type != NSURL_SCHEME_MAILTO &&
+ *pos == ':' && marker.colon_first ==
+ marker.authority) {
+ /* could be username:password or host:port
+ * separator */
+ marker.colon_first = pos - url_s;
+
+ } else if (marker.scheme_type != NSURL_SCHEME_MAILTO &&
+ *pos == ':' && marker.colon_first !=
+ marker.authority) {
+ /* could be host:port separator */
+ marker.colon_last = pos - url_s;
+
+ } else if (*pos == '@' && marker.at ==
+ marker.authority) {
+ /* Credentials @ host separator */
+ marker.at = pos - url_s;
+ }
+
+ pos++;
+ }
+
+ marker.path = pos - url_s;
+
+ } else if ((*pos == '\0' || *pos == '/') &&
+ joining == false && is_http == true) {
+ marker.path = pos - url_s;
+ }
+
+ /* Get path
+ *
+ * Needs to start with '/' if there's no authority
+ */
+ if (*pos == '/' || ((marker.path == marker.authority) &&
+ (*pos != '?') && (*pos != '#') && (*pos != '\0'))) {
+ while (*(++pos) != '\0') {
+ if (*pos == '?' || *pos == '#') {
+ /* End of the path */
+ break;
+ }
+ }
+ }
+
+ marker.query = pos - url_s;
+
+ /* Get query */
+ if (*pos == '?') {
+ while (*(++pos) != '\0') {
+ if (*pos == '#') {
+ /* End of the query */
+ break;
+ }
+ }
+ }
+
+ marker.fragment = pos - url_s;
+
+ /* Get fragment */
+ if (*pos == '#') {
+ while (*(++pos) != '\0')
+ ;
+ }
+
+ /* We got to the end of url_s.
+ * Need to skip back over trailing whitespace to find end of URL */
+ pos--;
+ if (pos >= url_s && ascii_is_space(*pos)) {
+ trailing_whitespace = true;
+ while (pos >= url_s && ascii_is_space(*pos))
+ pos--;
+ }
+
+ marker.end = pos + 1 - url_s;
+
+ if (trailing_whitespace == true) {
+ /* Ensure last url section doesn't pass end */
+ if (marker.fragment > marker.end)
+ marker.fragment = marker.end;
+ if (marker.query > marker.end)
+ marker.query = marker.end;
+ if (marker.path > marker.end)
+ marker.path = marker.end;
+ if (marker.colon_last > marker.end)
+ marker.colon_last = marker.end;
+ if (marker.at > marker.end)
+ marker.at = marker.end;
+ if (marker.colon_last > marker.end)
+ marker.colon_last = marker.end;
+ if (marker.fragment > marker.end)
+ marker.fragment = marker.end;
+ }
+
+#ifdef NSURL_DEBUG
+ LOG("marker.start: %i", marker.start);
+ LOG("marker.scheme_end: %i", marker.scheme_end);
+ LOG("marker.authority: %i", marker.authority);
+
+ LOG("marker.colon_first: %i", marker.colon_first);
+ LOG("marker.at: %i", marker.at);
+ LOG("marker.colon_last: %i", marker.colon_last);
+
+ LOG("marker.path: %i", marker.path);
+ LOG("marker.query: %i", marker.query);
+ LOG("marker.fragment: %i", marker.fragment);
+
+ LOG("marker.end: %i", marker.end);
+#endif
+
+ /* Got all the URL components pegged out now */
+ *markers = marker;
+}
+
+
+/**
+ * Remove dot segments from a path, as per rfc 3986, 5.2.4
+ *
+ * \param path path to remove dot segments from ('\0' terminated)
+ * \param output path with dot segments removed
+ * \return size of output
+ */
+static size_t nsurl__remove_dot_segments(char *path, char *output)
+{
+ char *path_pos = path;
+ char *output_pos = output;
+
+ while (*path_pos != '\0') {
+#ifdef NSURL_DEBUG
+ LOG(" in:%s", path_pos);
+ LOG("out:%.*s", output_pos - output, output);
+#endif
+ if (*path_pos == '.') {
+ if (*(path_pos + 1) == '.' &&
+ *(path_pos + 2) == '/') {
+ /* Found prefix of "../" */
+ path_pos += SLEN("../");
+ continue;
+
+ } else if (*(path_pos + 1) == '/') {
+ /* Found prefix of "./" */
+ path_pos += SLEN("./");
+ continue;
+ }
+ } else if (*path_pos == '/' && *(path_pos + 1) == '.') {
+ if (*(path_pos + 2) == '/') {
+ /* Found prefix of "/./" */
+ path_pos += SLEN("/.");
+ continue;
+
+ } else if (*(path_pos + 2) == '\0') {
+ /* Found "/." at end of path */
+ *(output_pos++) = '/';
+
+ /* End of input path */
+ break;
+
+ } else if (*(path_pos + 2) == '.') {
+ if (*(path_pos + 3) == '/') {
+ /* Found prefix of "/../" */
+ path_pos += SLEN("/..");
+
+ if (output_pos > output)
+ output_pos--;
+ while (output_pos > output &&
+ *output_pos != '/')
+ output_pos--;
+
+ continue;
+
+ } else if (*(path_pos + 3) == '\0') {
+ /* Found "/.." at end of path */
+
+ while (output_pos > output &&
+ *(output_pos -1 ) !='/')
+ output_pos--;
+
+ /* End of input path */
+ break;
+ }
+ }
+ } else if (*path_pos == '.') {
+ if (*(path_pos + 1) == '\0') {
+ /* Found "." at end of path */
+
+ /* End of input path */
+ break;
+
+ } else if (*(path_pos + 1) == '.' &&
+ *(path_pos + 2) == '\0') {
+ /* Found ".." at end of path */
+
+ /* End of input path */
+ break;
+ }
+ }
+ /* Copy first character into output path */
+ *output_pos++ = *path_pos++;
+
+ /* Copy up to but not including next '/' */
+ while ((*path_pos != '/') && (*path_pos != '\0'))
+ *output_pos++ = *path_pos++;
+ }
+
+ return output_pos - output;
+}
+
+
+/**
+ * Get the length of the longest section
+ *
+ * \param m markers delimiting url sections in a string
+ * \return the length of the longest section
+ */
+static size_t nsurl__get_longest_section(struct url_markers *m)
+{
+ size_t length = m->scheme_end - m->start; /* scheme */
+
+ if (length < m->at - m->authority) /* credentials */
+ length = m->at - m->authority;
+
+ if (length < m->path - m->at) /* host */
+ length = m->path - m->at;
+
+ if (length < m->query - m->path) /* path */
+ length = m->query - m->path;
+
+ if (length < m->fragment - m->query) /* query */
+ length = m->fragment - m->query;
+
+ if (length < m->end - m->fragment) /* fragment */
+ length = m->end - m->fragment;
+
+ return length;
+}
+
+
+/**
+ * Converts two hexadecimal digits to a single number
+ *
+ * \param c1 most significant hex digit
+ * \param c2 least significant hex digit
+ * \return the total value of the two digit hex number, or -ve if input not hex
+ *
+ * For unescaping url encoded characters.
+ */
+static inline int nsurl__get_ascii_offset(char c1, char c2)
+{
+ int offset;
+
+ /* Use 1st char as most significant hex digit */
+ if (ascii_is_digit(c1))
+ offset = 16 * (c1 - '0');
+ else if (c1 >= 'a' && c1 <= 'f')
+ offset = 16 * (c1 - 'a' + 10);
+ else if (c1 >= 'A' && c1 <= 'F')
+ offset = 16 * (c1 - 'A' + 10);
+ else
+ /* Not valid hex */
+ return -1;
+
+ /* Use 2nd char as least significant hex digit and sum */
+ if (ascii_is_digit(c2))
+ offset += c2 - '0';
+ else if (c2 >= 'a' && c2 <= 'f')
+ offset += c2 - 'a' + 10;
+ else if (c2 >= 'A' && c2 <= 'F')
+ offset += c2 - 'A' + 10;
+ else
+ /* Not valid hex */
+ return -1;
+
+ return offset;
+}
+
+
+/**
+ * Create the components of a NetSurf URL object for a section of a URL string
+ *
+ * \param url_s URL string
+ * \param section Sets which section of URL string is to be normalised
+ * \param pegs Set of markers delimiting the URL string's sections
+ * \param pos_norm A buffer large enough for the normalised string (*3 + 1)
+ * \param url A NetSurf URL object, to which components may be added
+ * \return NSERROR_OK on success, appropriate error otherwise
+ *
+ * The section of url_s is normalised appropriately.
+ */
+static nserror nsurl__create_from_section(const char * const url_s,
+ const enum url_sections section,
+ const struct url_markers *pegs,
+ char *pos_norm,
+ struct nsurl_components *url)
+{
+ nserror ret;
+ int ascii_offset;
+ int start = 0;
+ int end = 0;
+ const char *pos;
+ const char *pos_url_s;
+ char *norm_start = pos_norm;
+ char *host;
+ size_t copy_len;
+ size_t length;
+ size_t host_len;
+ enum {
+ NSURL_F_NO_PORT = (1 << 0)
+ } flags = 0;
+
+ switch (section) {
+ case URL_SCHEME:
+ start = pegs->start;
+ end = pegs->scheme_end;
+ break;
+
+ case URL_CREDENTIALS:
+ start = pegs->authority;
+ end = pegs->at;
+ break;
+
+ case URL_HOST:
+ start = (pegs->at == pegs->authority &&
+ *(url_s + pegs->at) != '@') ?
+ pegs->at :
+ pegs->at + 1;
+ end = pegs->path;
+ break;
+
+ case URL_PATH:
+ start = pegs->path;
+ end = pegs->query;
+ break;
+
+ case URL_QUERY:
+ start = pegs->query;
+ end = pegs->fragment;
+ break;
+
+ case URL_FRAGMENT:
+ start = (*(url_s + pegs->fragment) != '#') ?
+ pegs->fragment :
+ pegs->fragment + 1;
+ end = pegs->end;
+ break;
+ }
+
+ if (end < start)
+ end = start;
+
+ length = end - start;
+
+ /* Stage 1: Normalise the required section */
+
+ pos = pos_url_s = url_s + start;
+ copy_len = 0;
+ for (; pos < url_s + end; pos++) {
+ if (*pos == '%' && (pos + 2 < url_s + end)) {
+ /* Might be an escaped character needing unescaped */
+
+ /* Find which character which was escaped */
+ ascii_offset = nsurl__get_ascii_offset(*(pos + 1),
+ *(pos + 2));
+
+ if (ascii_offset < 0) {
+ /* % with invalid hex digits. */
+ copy_len++;
+ continue;
+ }
+
+ if ((section != URL_SCHEME && section != URL_HOST) &&
+ (nsurl__is_unreserved(ascii_offset) == false)) {
+ /* This character should be escaped after all,
+ * just let it get copied */
+ copy_len += 3;
+ pos += 2;
+ continue;
+ }
+
+ if (copy_len > 0) {
+ /* Copy up to here */
+ memcpy(pos_norm, pos_url_s, copy_len);
+ pos_norm += copy_len;
+ copy_len = 0;
+ }
+
+ /* Put the unescaped character in the normalised URL */
+ *(pos_norm++) = (char)ascii_offset;
+ pos += 2;
+ pos_url_s = pos + 1;
+
+ length -= 2;
+
+ } else if ((section != URL_SCHEME && section != URL_HOST) &&
+ (nsurl__is_no_escape(*pos) == false)) {
+
+ /* This needs to be escaped */
+ if (copy_len > 0) {
+ /* Copy up to here */
+ memcpy(pos_norm, pos_url_s, copy_len);
+ pos_norm += copy_len;
+ copy_len = 0;
+ }
+
+ /* escape */
+ *(pos_norm++) = '%';
+ *(pos_norm++) = digit2uppercase_hex(
+ ((unsigned char)*pos) >> 4);
+ *(pos_norm++) = digit2uppercase_hex(
+ ((unsigned char)*pos) & 0xf);
+ pos_url_s = pos + 1;
+
+ length += 2;
+
+ } else if ((section == URL_SCHEME || section == URL_HOST) &&
+ ascii_is_alpha_upper(*pos)) {
+ /* Lower case this letter */
+
+ if (copy_len > 0) {
+ /* Copy up to here */
+ memcpy(pos_norm, pos_url_s, copy_len);
+ pos_norm += copy_len;
+ copy_len = 0;
+ }
+ /* Copy lower cased letter into normalised URL */
+ *(pos_norm++) = ascii_to_lower(*pos);
+ pos_url_s = pos + 1;
+
+ } else {
+ /* This character is safe in normalised URL */
+ copy_len++;
+ }
+ }
+
+ if (copy_len > 0) {
+ /* Copy up to here */
+ memcpy(pos_norm, pos_url_s, copy_len);
+ pos_norm += copy_len;
+ }
+
+ /* Mark end of section */
+ (*pos_norm) = '\0';
+
+ /* Stage 2: Create the URL components for the required section */
+ switch (section) {
+ case URL_SCHEME:
+ if (length == 0) {
+ /* No scheme, assuming http */
+ url->scheme = lwc_string_ref(corestring_lwc_http);
+ } else {
+ /* Add scheme to URL */
+ if (lwc_intern_string(norm_start, length,
+ &url->scheme) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ }
+
+ break;
+
+ case URL_CREDENTIALS:
+ url->username = NULL;
+ url->password = NULL;
+
+ if (length != 0 && *norm_start != ':') {
+ char *sec_start = norm_start;
+ if (pegs->colon_first != pegs->authority &&
+ pegs->at > pegs->colon_first + 1) {
+ /* there's a password */
+ sec_start += pegs->colon_first -
+ pegs->authority + 1;
+ if (lwc_intern_string(sec_start,
+ pegs->at - pegs->colon_first -1,
+ &url->password) !=
+ lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+
+ /* update start pos and length for username */
+ sec_start = norm_start;
+ length -= pegs->at - pegs->colon_first;
+ } else if (pegs->colon_first != pegs->authority &&
+ pegs->at == pegs->colon_first + 1) {
+ /* strip username colon */
+ length--;
+ }
+
+ /* Username */
+ if (lwc_intern_string(sec_start, length,
+ &url->username) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ }
+
+ break;
+
+ case URL_HOST:
+ url->host = NULL;
+ url->port = NULL;
+
+ if (length != 0) {
+ size_t colon = 0;
+ char *sec_start = norm_start;
+ if (pegs->at < pegs->colon_first &&
+ pegs->colon_last == pegs->authority) {
+ /* There's one colon and it's after @ marker */
+ colon = pegs->colon_first;
+ } else if (pegs->colon_last != pegs->authority) {
+ /* There's more than one colon */
+ colon = pegs->colon_last;
+ } else {
+ /* There's no colon that could be a port
+ * separator */
+ flags |= NSURL_F_NO_PORT;
+ }
+
+ if (!(flags & NSURL_F_NO_PORT)) {
+ /* Determine whether colon is a port separator
+ */
+ sec_start += colon - pegs->at;
+ while (++sec_start < norm_start + length) {
+ if (!ascii_is_digit(*sec_start)) {
+ /* Character after port isn't a
+ * digit; not a port separator
+ */
+ flags |= NSURL_F_NO_PORT;
+ break;
+ }
+ }
+ }
+
+ if (!(flags & NSURL_F_NO_PORT)) {
+ /* There's a port */
+ size_t skip = (pegs->at == pegs->authority) ?
+ 1 : 0;
+ sec_start = norm_start + colon - pegs->at +
+ skip;
+ if (url->scheme != NULL &&
+ url->scheme_type ==
+ NSURL_SCHEME_HTTP &&
+ length -
+ (colon - pegs->at + skip) == 2 &&
+ *sec_start == '8' &&
+ *(sec_start + 1) == '0') {
+ /* Scheme is http, and port is default
+ * (80) */
+ flags |= NSURL_F_NO_PORT;
+ }
+
+ if (length <= (colon - pegs->at + skip)) {
+ /* No space for a port after the colon
+ */
+ flags |= NSURL_F_NO_PORT;
+ }
+
+ /* Add non-redundant ports to NetSurf URL */
+ sec_start = norm_start + colon - pegs->at +
+ skip;
+ if (!(flags & NSURL_F_NO_PORT) &&
+ lwc_intern_string(sec_start,
+ length -
+ (colon - pegs->at + skip),
+ &url->port) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+
+ /* update length for host */
+ skip = (pegs->at == pegs->authority) ? 0 : 1;
+ length = colon - pegs->at - skip;
+ }
+
+ /* host */
+ /* Encode host according to IDNA2008 */
+ ret = idna_encode(norm_start, length, &host, &host_len);
+ if (ret == NSERROR_OK) {
+ /* valid idna encoding */
+ if (lwc_intern_string(host, host_len,
+ &url->host) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ free(host);
+ } else {
+ /* fall back to straight interning */
+ if (lwc_intern_string(norm_start, length,
+ &url->host) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ }
+ }
+
+ break;
+
+ case URL_PATH:
+ if (length != 0) {
+ if (lwc_intern_string(norm_start, length,
+ &url->path) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ } else if (url->host != NULL &&
+ url->scheme_type != NSURL_SCHEME_MAILTO) {
+ /* Set empty path to "/", if there's a host */
+ if (lwc_intern_string("/", SLEN("/"),
+ &url->path) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ } else {
+ url->path = NULL;
+ }
+
+ break;
+
+ case URL_QUERY:
+ if (length != 0) {
+ if (lwc_intern_string(norm_start, length,
+ &url->query) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ } else {
+ url->query = NULL;
+ }
+
+ break;
+
+ case URL_FRAGMENT:
+ if (length != 0) {
+ if (lwc_intern_string(norm_start, length,
+ &url->fragment) != lwc_error_ok) {
+ return NSERROR_NOMEM;
+ }
+ } else {
+ url->fragment = NULL;
+ }
+
+ break;
+ }
+
+ return NSERROR_OK;
+}
+
+
+/**
+ * Get nsurl string info; total length, component lengths, & components present
+ *
+ * \param url NetSurf URL components
+ * \param parts Which parts of the URL are required in the string
+ * \param url_l Updated to total string length
+ * \param lengths Updated with individual component lengths
+ * \param pflags Updated to contain relevant string flags
+ */
+static void nsurl__get_string_data(const struct nsurl_components *url,
+ nsurl_component parts, size_t *url_l,
+ struct nsurl_component_lengths *lengths,
+ enum nsurl_string_flags *pflags)
+{
+ enum nsurl_string_flags flags = *pflags;
+ *url_l = 0;
+
+ /* Intersection of required parts and available parts gives
+ * the output parts */
+ if (url->scheme && parts & NSURL_SCHEME) {
+ flags |= NSURL_F_SCHEME;
+
+ lengths->scheme = lwc_string_length(url->scheme);
+ *url_l += lengths->scheme;
+ }
+
+ if (url->username && parts & NSURL_USERNAME) {
+ flags |= NSURL_F_USERNAME;
+
+ lengths->username = lwc_string_length(url->username);
+ *url_l += lengths->username;
+ }
+
+ if (url->password && parts & NSURL_PASSWORD) {
+ flags |= NSURL_F_PASSWORD;
+
+ lengths->password = lwc_string_length(url->password);
+ *url_l += SLEN(":") + lengths->password;
+ }
+
+ if (url->host && parts & NSURL_HOST) {
+ flags |= NSURL_F_HOST;
+
+ lengths->host = lwc_string_length(url->host);
+ *url_l += lengths->host;
+ }
+
+ if (url->port && parts & NSURL_PORT) {
+ flags |= NSURL_F_PORT;
+
+ lengths->port = lwc_string_length(url->port);
+ *url_l += SLEN(":") + lengths->port;
+ }
+
+ if (url->path && parts & NSURL_PATH) {
+ flags |= NSURL_F_PATH;
+
+ lengths->path = lwc_string_length(url->path);
+ *url_l += lengths->path;
+ }
+
+ if (url->query && parts & NSURL_QUERY) {
+ flags |= NSURL_F_QUERY;
+
+ lengths->query = lwc_string_length(url->query);
+ *url_l += lengths->query;
+ }
+
+ if (url->fragment && parts & NSURL_FRAGMENT) {
+ flags |= NSURL_F_FRAGMENT;
+
+ lengths->fragment = lwc_string_length(url->fragment);
+ *url_l += lengths->fragment;
+ }
+
+ /* Turn on any spanned punctuation */
+ if ((flags & NSURL_F_SCHEME) && (parts > NSURL_SCHEME)) {
+ flags |= NSURL_F_SCHEME_PUNCTUATION;
+
+ *url_l += SLEN(":");
+ }
+
+ if ((flags & NSURL_F_SCHEME) && (flags > NSURL_F_SCHEME) &&
+ url->path && lwc_string_data(url->path)[0] == '/') {
+ flags |= NSURL_F_AUTHORITY_PUNCTUATION;
+
+ *url_l += SLEN("//");
+ }
+
+ if ((flags & (NSURL_F_USERNAME | NSURL_F_PASSWORD)) &&
+ flags & NSURL_F_HOST) {
+ flags |= NSURL_F_CREDENTIALS_PUNCTUATION;
+
+ *url_l += SLEN("@");
+ }
+
+ if ((flags & ~NSURL_F_FRAGMENT) && (flags & NSURL_F_FRAGMENT)) {
+ flags |= NSURL_F_FRAGMENT_PUNCTUATION;
+
+ *url_l += SLEN("#");
+ }
+
+ *pflags = flags;
+}
+
+
+/**
+ * Get nsurl string info; total length, component lengths, & components present
+ *
+ * \param url NetSurf URL components
+ * \param url_s Updated to contain the string
+ * \param l Individual component lengths
+ * \param flags String flags
+ */
+static void nsurl_get_string(const struct nsurl_components *url, char *url_s,
+ struct nsurl_component_lengths *l,
+ enum nsurl_string_flags flags)
+{
+ char *pos;
+
+ /* Copy the required parts into the url string */
+ pos = url_s;
+
+ if (flags & NSURL_F_SCHEME) {
+ memcpy(pos, lwc_string_data(url->scheme), l->scheme);
+ pos += l->scheme;
+ }
+
+ if (flags & NSURL_F_SCHEME_PUNCTUATION) {
+ *(pos++) = ':';
+ }
+
+ if (flags & NSURL_F_AUTHORITY_PUNCTUATION) {
+ *(pos++) = '/';
+ *(pos++) = '/';
+ }
+
+ if (flags & NSURL_F_USERNAME) {
+ memcpy(pos, lwc_string_data(url->username), l->username);
+ pos += l->username;
+ }
+
+ if (flags & NSURL_F_PASSWORD) {
+ *(pos++) = ':';
+ memcpy(pos, lwc_string_data(url->password), l->password);
+ pos += l->password;
+ }
+
+ if (flags & NSURL_F_CREDENTIALS_PUNCTUATION) {
+ *(pos++) = '@';
+ }
+
+ if (flags & NSURL_F_HOST) {
+ memcpy(pos, lwc_string_data(url->host), l->host);
+ pos += l->host;
+ }
+
+ if (flags & NSURL_F_PORT) {
+ *(pos++) = ':';
+ memcpy(pos, lwc_string_data(url->port), l->port);
+ pos += l->port;
+ }
+
+ if (flags & NSURL_F_PATH) {
+ memcpy(pos, lwc_string_data(url->path), l->path);
+ pos += l->path;
+ }
+
+ if (flags & NSURL_F_QUERY) {
+ memcpy(pos, lwc_string_data(url->query), l->query);
+ pos += l->query;
+ }
+
+ if (flags & NSURL_F_FRAGMENT) {
+ if (flags & NSURL_F_FRAGMENT_PUNCTUATION)
+ *(pos++) = '#';
+ memcpy(pos, lwc_string_data(url->fragment), l->fragment);
+ pos += l->fragment;
+ }
+
+ *pos = '\0';
+}
+
+
+/**
+ * Calculate hash value
+ *
+ * \param url NetSurf URL object to set hash value for
+ */
+static void nsurl_calc_hash(nsurl *url)
+{
+ uint32_t hash = 0;
+
+ if (url->components.scheme)
+ hash ^= lwc_string_hash_value(url->components.scheme);
+
+ if (url->components.username)
+ hash ^= lwc_string_hash_value(url->components.username);
+
+ if (url->components.password)
+ hash ^= lwc_string_hash_value(url->components.password);
+
+ if (url->components.host)
+ hash ^= lwc_string_hash_value(url->components.host);
+
+ if (url->components.port)
+ hash ^= lwc_string_hash_value(url->components.port);
+
+ if (url->components.path)
+ hash ^= lwc_string_hash_value(url->components.path);
+
+ if (url->components.query)
+ hash ^= lwc_string_hash_value(url->components.query);
+
+ url->hash = hash;
+}
+
+
+/**
+ * Destroy components
+ *
+ * \param c url components
+ */
+static void nsurl_destroy_components(struct nsurl_components *c)
+{
+ if (c->scheme)
+ lwc_string_unref(c->scheme);
+
+ if (c->username)
+ lwc_string_unref(c->username);
+
+ if (c->password)
+ lwc_string_unref(c->password);
+
+ if (c->host)
+ lwc_string_unref(c->host);
+
+ if (c->port)
+ lwc_string_unref(c->port);
+
+ if (c->path)
+ lwc_string_unref(c->path);
+
+ if (c->query)
+ lwc_string_unref(c->query);
+
+ if (c->fragment)
+ lwc_string_unref(c->fragment);
+}
+
+
+#ifdef NSURL_DEBUG
+/**
+ * Dump a NetSurf URL's internal components
+ *
+ * \param url The NetSurf URL to dump components of
+ */
+static void nsurl__dump(const nsurl *url)
+{
+ if (url->components.scheme)
+ LOG(" Scheme: %s", lwc_string_data(url->components.scheme));
+
+ if (url->components.username)
+ LOG("Username: %s", lwc_string_data(url->components.username));
+
+ if (url->components.password)
+ LOG("Password: %s", lwc_string_data(url->components.password));
+
+ if (url->components.host)
+ LOG(" Host: %s", lwc_string_data(url->components.host));
+
+ if (url->components.port)
+ LOG(" Port: %s", lwc_string_data(url->components.port));
+
+ if (url->components.path)
+ LOG(" Path: %s", lwc_string_data(url->components.path));
+
+ if (url->components.query)
+ LOG(" Query: %s", lwc_string_data(url->components.query));
+
+ if (url->components.fragment)
+ LOG("Fragment: %s", lwc_string_data(url->components.fragment));
+}
+#endif
+
+/******************************************************************************
+ * NetSurf URL Public API *
+ ******************************************************************************/
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_create(const char * const url_s, nsurl **url)
+{
+ struct url_markers m;
+ struct nsurl_components c;
+ size_t length;
+ char *buff;
+ struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ enum nsurl_string_flags str_flags = 0;
+ nserror e = NSERROR_OK;
+ bool match;
+
+ assert(url_s != NULL);
+
+ /* Peg out the URL sections */
+ nsurl__get_string_markers(url_s, &m, false);
+
+ /* Get the length of the longest section */
+ length = nsurl__get_longest_section(&m);
+
+ /* Allocate enough memory to url escape the longest section */
+ buff = malloc(length * 3 + 1);
+ if (buff == NULL)
+ return NSERROR_NOMEM;
+
+ /* Set scheme type */
+ c.scheme_type = m.scheme_type;
+
+ /* Build NetSurf URL object from sections */
+ e |= nsurl__create_from_section(url_s, URL_SCHEME, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_CREDENTIALS, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_HOST, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_PATH, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_QUERY, &m, buff, &c);
+ e |= nsurl__create_from_section(url_s, URL_FRAGMENT, &m, buff, &c);
+
+ /* Finished with buffer */
+ free(buff);
+
+ if (e != NSERROR_OK) {
+ nsurl_destroy_components(&c);
+ return NSERROR_NOMEM;
+ }
+
+ /* Validate URL */
+ if ((lwc_string_isequal(c.scheme, corestring_lwc_http,
+ &match) == lwc_error_ok && match == true) ||
+ (lwc_string_isequal(c.scheme, corestring_lwc_https,
+ &match) == lwc_error_ok && match == true)) {
+ /* http, https must have host */
+ if (c.host == NULL) {
+ nsurl_destroy_components(&c);
+ return NSERROR_BAD_URL;
+ }
+ }
+
+ /* Get the string length and find which parts of url are present */
+ nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
+ &str_len, &str_flags);
+
+ /* Create NetSurf URL object */
+ *url = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
+ if (*url == NULL) {
+ nsurl_destroy_components(&c);
+ return NSERROR_NOMEM;
+ }
+
+ (*url)->components = c;
+ (*url)->length = length;
+
+ /* Fill out the url string */
+ nsurl_get_string(&c, (*url)->string, &str_len, str_flags);
+
+ /* Get the nsurl's hash */
+ nsurl_calc_hash(*url);
+
+ /* Give the URL a reference */
+ (*url)->count = 1;
+
+ return NSERROR_OK;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nsurl *nsurl_ref(nsurl *url)
+{
+ assert(url != NULL);
+
+ url->count++;
+
+ return url;
+}
+
+
+/* exported interface, documented in nsurl.h */
+void nsurl_unref(nsurl *url)
+{
+ assert(url != NULL);
+ assert(url->count > 0);
+
+ if (--url->count > 0)
+ return;
+
+#ifdef NSURL_DEBUG
+ nsurl__dump(url);
+#endif
+
+ /* Release lwc strings */
+ nsurl_destroy_components(&url->components);
+
+ /* Free the NetSurf URL */
+ free(url);
+}
+
+
+/* exported interface, documented in nsurl.h */
+bool nsurl_compare(const nsurl *url1, const nsurl *url2, nsurl_component parts)
+{
+ bool match = true;
+
+ assert(url1 != NULL);
+ assert(url2 != NULL);
+
+ /* Compare URL components */
+
+ /* Path, host and query first, since they're most likely to differ */
+
+ if (parts & NSURL_PATH) {
+ nsurl__component_compare(url1->components.path,
+ url2->components.path, &match);
+
+ if (match == false)
+ return false;
+ }
+
+ if (parts & NSURL_HOST) {
+ nsurl__component_compare(url1->components.host,
+ url2->components.host, &match);
+
+ if (match == false)
+ return false;
+ }
+
+ if (parts & NSURL_QUERY) {
+ nsurl__component_compare(url1->components.query,
+ url2->components.query, &match);
+
+ if (match == false)
+ return false;
+ }
+
+ if (parts & NSURL_SCHEME) {
+ nsurl__component_compare(url1->components.scheme,
+ url2->components.scheme, &match);
+
+ if (match == false)
+ return false;
+ }
+
+ if (parts & NSURL_USERNAME) {
+ nsurl__component_compare(url1->components.username,
+ url2->components.username, &match);
+
+ if (match == false)
+ return false;
+ }
+
+ if (parts & NSURL_PASSWORD) {
+ nsurl__component_compare(url1->components.password,
+ url2->components.password, &match);
+
+ if (match == false)
+ return false;
+ }
+
+ if (parts & NSURL_PORT) {
+ nsurl__component_compare(url1->components.port,
+ url2->components.port, &match);
+
+ if (match == false)
+ return false;
+ }
+
+ if (parts & NSURL_FRAGMENT) {
+ nsurl__component_compare(url1->components.fragment,
+ url2->components.fragment, &match);
+
+ if (match == false)
+ return false;
+ }
+
+ return true;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_get(const nsurl *url, nsurl_component parts,
+ char **url_s, size_t *url_l)
+{
+ struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ enum nsurl_string_flags str_flags = 0;
+
+ assert(url != NULL);
+
+ /* Get the string length and find which parts of url need copied */
+ nsurl__get_string_data(&(url->components), parts, url_l,
+ &str_len, &str_flags);
+
+ if (*url_l == 0) {
+ return NSERROR_BAD_URL;
+ }
+
+ /* Allocate memory for url string */
+ *url_s = malloc(*url_l + 1); /* adding 1 for '\0' */
+ if (*url_s == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ /* Copy the required parts into the url string */
+ nsurl_get_string(&(url->components), *url_s, &str_len, str_flags);
+
+ return NSERROR_OK;
+}
+
+
+/* exported interface, documented in nsurl.h */
+lwc_string *nsurl_get_component(const nsurl *url, nsurl_component part)
+{
+ assert(url != NULL);
+
+ switch (part) {
+ case NSURL_SCHEME:
+ return (url->components.scheme != NULL) ?
+ lwc_string_ref(url->components.scheme) : NULL;
+
+ case NSURL_USERNAME:
+ return (url->components.username != NULL) ?
+ lwc_string_ref(url->components.username) : NULL;
+
+ case NSURL_PASSWORD:
+ return (url->components.password != NULL) ?
+ lwc_string_ref(url->components.password) : NULL;
+
+ case NSURL_HOST:
+ return (url->components.host != NULL) ?
+ lwc_string_ref(url->components.host) : NULL;
+
+ case NSURL_PORT:
+ return (url->components.port != NULL) ?
+ lwc_string_ref(url->components.port) : NULL;
+
+ case NSURL_PATH:
+ return (url->components.path != NULL) ?
+ lwc_string_ref(url->components.path) : NULL;
+
+ case NSURL_QUERY:
+ return (url->components.query != NULL) ?
+ lwc_string_ref(url->components.query) : NULL;
+
+ case NSURL_FRAGMENT:
+ return (url->components.fragment != NULL) ?
+ lwc_string_ref(url->components.fragment) : NULL;
+
+ default:
+ LOG("Unsupported value passed to part param.");
+ assert(0);
+ }
+
+ return NULL;
+}
+
+
+/* exported interface, documented in nsurl.h */
+bool nsurl_has_component(const nsurl *url, nsurl_component part)
+{
+ assert(url != NULL);
+
+ switch (part) {
+ case NSURL_SCHEME:
+ if (url->components.scheme != NULL)
+ return true;
+ else
+ return false;
+
+ case NSURL_CREDENTIALS:
+ /* Only username required for credentials section */
+ /* Fall through */
+ case NSURL_USERNAME:
+ if (url->components.username != NULL)
+ return true;
+ else
+ return false;
+
+ case NSURL_PASSWORD:
+ if (url->components.password != NULL)
+ return true;
+ else
+ return false;
+
+ case NSURL_HOST:
+ if (url->components.host != NULL)
+ return true;
+ else
+ return false;
+
+ case NSURL_PORT:
+ if (url->components.port != NULL)
+ return true;
+ else
+ return false;
+
+ case NSURL_PATH:
+ if (url->components.path != NULL)
+ return true;
+ else
+ return false;
+
+ case NSURL_QUERY:
+ if (url->components.query != NULL)
+ return true;
+ else
+ return false;
+
+ case NSURL_FRAGMENT:
+ if (url->components.fragment != NULL)
+ return true;
+ else
+ return false;
+
+ default:
+ LOG("Unsupported value passed to part param.");
+ assert(0);
+ }
+
+ return false;
+}
+
+
+/* exported interface, documented in nsurl.h */
+const char *nsurl_access(const nsurl *url)
+{
+ assert(url != NULL);
+
+ return url->string;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_get_utf8(const nsurl *url, char **url_s, size_t *url_l)
+{
+ nserror err;
+ lwc_string *host;
+ char *idna_host = NULL;
+ size_t idna_host_len;
+ char *scheme = NULL;
+ size_t scheme_len;
+ char *path = NULL;
+ size_t path_len;
+
+ assert(url != NULL);
+
+ if (url->components.host == NULL) {
+ return nsurl_get(url, NSURL_WITH_FRAGMENT, url_s, url_l);
+ }
+
+ host = url->components.host;
+ err = idna_decode(lwc_string_data(host), lwc_string_length(host),
+ &idna_host, &idna_host_len);
+ if (err != NSERROR_OK) {
+ goto cleanup;
+ }
+
+ err = nsurl_get(url,
+ NSURL_SCHEME | NSURL_CREDENTIALS,
+ &scheme, &scheme_len);
+ if (err != NSERROR_OK) {
+ goto cleanup;
+ }
+
+ err = nsurl_get(url,
+ NSURL_PORT | NSURL_PATH | NSURL_QUERY | NSURL_FRAGMENT,
+ &path, &path_len);
+ if (err != NSERROR_OK) {
+ goto cleanup;
+ }
+
+ *url_l = scheme_len + idna_host_len + path_len + 1; /* +1 for \0 */
+ *url_s = malloc(*url_l);
+
+ if (*url_s == NULL) {
+ err = NSERROR_NOMEM;
+ goto cleanup;
+ }
+
+ snprintf(*url_s, *url_l, "%s%s%s", scheme, idna_host, path);
+
+ err = NSERROR_OK;
+
+cleanup:
+ free(idna_host);
+ free(scheme);
+ free(path);
+
+ return err;
+}
+
+
+/* exported interface, documented in nsurl.h */
+const char *nsurl_access_leaf(const nsurl *url)
+{
+ size_t path_len;
+ const char *path;
+ const char *leaf;
+
+ assert(url != NULL);
+
+ if (url->components.path == NULL)
+ return "";
+
+ path = lwc_string_data(url->components.path);
+ path_len = lwc_string_length(url->components.path);
+
+ if (path_len == 0)
+ return "";
+
+ if (path_len == 1 && *path == '/')
+ return "/";
+
+ leaf = path + path_len;
+
+ do {
+ leaf--;
+ } while ((leaf != path) && (*leaf != '/'));
+
+ if (*leaf == '/')
+ leaf++;
+
+ return leaf;
+}
+
+
+/* exported interface, documented in nsurl.h */
+size_t nsurl_length(const nsurl *url)
+{
+ assert(url != NULL);
+
+ return url->length;
+}
+
+
+/* exported interface, documented in nsurl.h */
+uint32_t nsurl_hash(const nsurl *url)
+{
+ assert(url != NULL);
+
+ return url->hash;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_join(const nsurl *base, const char *rel, nsurl **joined)
+{
+ struct url_markers m;
+ struct nsurl_components c;
+ size_t length;
+ char *buff;
+ char *buff_pos;
+ char *buff_start;
+ struct nsurl_component_lengths str_len = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ enum nsurl_string_flags str_flags = 0;
+ nserror error = 0;
+ enum {
+ NSURL_F_REL = 0,
+ NSURL_F_BASE_SCHEME = (1 << 0),
+ NSURL_F_BASE_AUTHORITY = (1 << 1),
+ NSURL_F_BASE_PATH = (1 << 2),
+ NSURL_F_MERGED_PATH = (1 << 3),
+ NSURL_F_BASE_QUERY = (1 << 4)
+ } joined_parts;
+
+ assert(base != NULL);
+ assert(rel != NULL);
+
+#ifdef NSURL_DEBUG
+ LOG("base: \"%s\", rel: \"%s\"", nsurl_access(base), rel);
+#endif
+
+ /* Peg out the URL sections */
+ nsurl__get_string_markers(rel, &m, true);
+
+ /* Get the length of the longest section */
+ length = nsurl__get_longest_section(&m);
+
+ /* Initially assume that the joined URL can be formed entierly from
+ * the relative URL.
+ */
+ joined_parts = NSURL_F_REL;
+
+ /* Update joined_compnents to indicate any required parts from the
+ * base URL.
+ */
+ if (m.scheme_end - m.start <= 0) {
+ /* The relative url has no scheme.
+ * Use base URL's scheme. */
+ joined_parts |= NSURL_F_BASE_SCHEME;
+
+ if (m.path - m.authority <= 0) {
+ /* The relative URL has no authority.
+ * Use base URL's authority. */
+ joined_parts |= NSURL_F_BASE_AUTHORITY;
+
+ if (m.query - m.path <= 0) {
+ /* The relative URL has no path.
+ * Use base URL's path. */
+ joined_parts |= NSURL_F_BASE_PATH;
+
+ if (m.fragment - m.query <= 0) {
+ /* The relative URL has no query.
+ * Use base URL's query. */
+ joined_parts |= NSURL_F_BASE_QUERY;
+ }
+
+ } else if (*(rel + m.path) != '/') {
+ /* Relative URL has relative path */
+ joined_parts |= NSURL_F_MERGED_PATH;
+ }
+ }
+ }
+
+ /* Allocate enough memory to url escape the longest section, plus
+ * space for path merging (if required).
+ */
+ if (joined_parts & NSURL_F_MERGED_PATH) {
+ /* Need to merge paths */
+ length += (base->components.path != NULL) ?
+ lwc_string_length(base->components.path) : 0;
+ }
+ length *= 4;
+ /* Plus space for removing dots from path */
+ length += (m.query - m.path) + ((base->components.path != NULL) ?
+ lwc_string_length(base->components.path) : 0);
+
+ buff = malloc(length + 5);
+ if (buff == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ buff_pos = buff;
+
+ /* Form joined URL from base or rel components, as appropriate */
+
+ if (joined_parts & NSURL_F_BASE_SCHEME) {
+ c.scheme_type = base->components.scheme_type;
+
+ c.scheme = nsurl__component_copy(base->components.scheme);
+ } else {
+ c.scheme_type = m.scheme_type;
+
+ error = nsurl__create_from_section(rel, URL_SCHEME, &m, buff, &c);
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+ }
+
+ if (joined_parts & NSURL_F_BASE_AUTHORITY) {
+ c.username = nsurl__component_copy(base->components.username);
+ c.password = nsurl__component_copy(base->components.password);
+ c.host = nsurl__component_copy(base->components.host);
+ c.port = nsurl__component_copy(base->components.port);
+ } else {
+ error = nsurl__create_from_section(rel, URL_CREDENTIALS, &m,
+ buff, &c);
+ if (error == NSERROR_OK) {
+ error = nsurl__create_from_section(rel, URL_HOST, &m,
+ buff, &c);
+ }
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+ }
+
+ if (joined_parts & NSURL_F_BASE_PATH) {
+ c.path = nsurl__component_copy(base->components.path);
+
+ } else if (joined_parts & NSURL_F_MERGED_PATH) {
+ struct url_markers m_path;
+ size_t new_length;
+
+ if (base->components.host != NULL &&
+ base->components.path == NULL) {
+ /* Append relative path to "/". */
+ *(buff_pos++) = '/';
+ memcpy(buff_pos, rel + m.path, m.query - m.path);
+ buff_pos += m.query - m.path;
+
+ } else {
+ /* Append relative path to all but last segment of
+ * base path. */
+ size_t path_end = lwc_string_length(
+ base->components.path);
+ const char *path = lwc_string_data(
+ base->components.path);
+
+ while (*(path + path_end) != '/' &&
+ path_end != 0) {
+ path_end--;
+ }
+ if (*(path + path_end) == '/')
+ path_end++;
+
+ /* Copy the base part */
+ memcpy(buff_pos, path, path_end);
+ buff_pos += path_end;
+
+ /* Copy the relative part */
+ memcpy(buff_pos, rel + m.path, m.query - m.path);
+ buff_pos += m.query - m.path;
+ }
+
+ /* add termination to string */
+ *buff_pos++ = '\0';
+
+ new_length = nsurl__remove_dot_segments(buff, buff_pos);
+
+ m_path.path = 0;
+ m_path.query = new_length;
+
+ buff_start = buff_pos + new_length;
+ error = nsurl__create_from_section(buff_pos, URL_PATH, &m_path,
+ buff_start, &c);
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+
+ } else {
+ struct url_markers m_path;
+ size_t new_length;
+
+ memcpy(buff_pos, rel + m.path, m.query - m.path);
+ buff_pos += m.query - m.path;
+ *(buff_pos++) = '\0';
+
+ new_length = nsurl__remove_dot_segments(buff, buff_pos);
+
+ m_path.path = 0;
+ m_path.query = new_length;
+
+ buff_start = buff_pos + new_length;
+
+ error = nsurl__create_from_section(buff_pos, URL_PATH, &m_path,
+ buff_start, &c);
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+ }
+
+ if (joined_parts & NSURL_F_BASE_QUERY) {
+ c.query = nsurl__component_copy(base->components.query);
+ } else {
+ error = nsurl__create_from_section(rel, URL_QUERY, &m,
+ buff, &c);
+ if (error != NSERROR_OK) {
+ free(buff);
+ return error;
+ }
+ }
+
+ error = nsurl__create_from_section(rel, URL_FRAGMENT, &m, buff, &c);
+
+ /* Free temporary buffer */
+ free(buff);
+
+ if (error != NSERROR_OK) {
+ return error;
+ }
+
+ /* Get the string length and find which parts of url are present */
+ nsurl__get_string_data(&c, NSURL_WITH_FRAGMENT, &length,
+ &str_len, &str_flags);
+
+ /* Create NetSurf URL object */
+ *joined = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
+ if (*joined == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ (*joined)->components = c;
+ (*joined)->length = length;
+
+ /* Fill out the url string */
+ nsurl_get_string(&c, (*joined)->string, &str_len, str_flags);
+
+ /* Get the nsurl's hash */
+ nsurl_calc_hash(*joined);
+
+ /* Give the URL a reference */
+ (*joined)->count = 1;
+
+ return NSERROR_OK;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_defragment(const nsurl *url, nsurl **no_frag)
+{
+ size_t length;
+ char *pos;
+
+ assert(url != NULL);
+
+ /* check for source url having no fragment already */
+ if (url->components.fragment == NULL) {
+ *no_frag = (nsurl *)url;
+
+ (*no_frag)->count++;
+
+ return NSERROR_OK;
+ }
+
+ /* Find the change in length from url to new_url */
+ length = url->length;
+ if (url->components.fragment != NULL) {
+ length -= 1 + lwc_string_length(url->components.fragment);
+ }
+
+ /* Create NetSurf URL object */
+ *no_frag = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
+ if (*no_frag == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ /* Copy components */
+ (*no_frag)->components.scheme =
+ nsurl__component_copy(url->components.scheme);
+ (*no_frag)->components.username =
+ nsurl__component_copy(url->components.username);
+ (*no_frag)->components.password =
+ nsurl__component_copy(url->components.password);
+ (*no_frag)->components.host =
+ nsurl__component_copy(url->components.host);
+ (*no_frag)->components.port =
+ nsurl__component_copy(url->components.port);
+ (*no_frag)->components.path =
+ nsurl__component_copy(url->components.path);
+ (*no_frag)->components.query =
+ nsurl__component_copy(url->components.query);
+ (*no_frag)->components.fragment = NULL;
+
+ (*no_frag)->components.scheme_type = url->components.scheme_type;
+
+ (*no_frag)->length = length;
+
+ /* Fill out the url string */
+ pos = (*no_frag)->string;
+ memcpy(pos, url->string, length);
+ pos += length;
+ *pos = '\0';
+
+ /* Get the nsurl's hash */
+ nsurl_calc_hash(*no_frag);
+
+ /* Give the URL a reference */
+ (*no_frag)->count = 1;
+
+ return NSERROR_OK;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_refragment(const nsurl *url, lwc_string *frag, nsurl **new_url)
+{
+ int frag_len;
+ int base_len;
+ char *pos;
+ size_t len;
+
+ assert(url != NULL);
+ assert(frag != NULL);
+
+ /* Find the change in length from url to new_url */
+ base_len = url->length;
+ if (url->components.fragment != NULL) {
+ base_len -= 1 + lwc_string_length(url->components.fragment);
+ }
+ frag_len = lwc_string_length(frag);
+
+ /* Set new_url's length */
+ len = base_len + 1 /* # */ + frag_len;
+
+ /* Create NetSurf URL object */
+ *new_url = malloc(sizeof(nsurl) + len + 1); /* Add 1 for \0 */
+ if (*new_url == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ (*new_url)->length = len;
+
+ /* Set string */
+ pos = (*new_url)->string;
+ memcpy(pos, url->string, base_len);
+ pos += base_len;
+ *pos = '#';
+ memcpy(++pos, lwc_string_data(frag), frag_len);
+ pos += frag_len;
+ *pos = '\0';
+
+ /* Copy components */
+ (*new_url)->components.scheme =
+ nsurl__component_copy(url->components.scheme);
+ (*new_url)->components.username =
+ nsurl__component_copy(url->components.username);
+ (*new_url)->components.password =
+ nsurl__component_copy(url->components.password);
+ (*new_url)->components.host =
+ nsurl__component_copy(url->components.host);
+ (*new_url)->components.port =
+ nsurl__component_copy(url->components.port);
+ (*new_url)->components.path =
+ nsurl__component_copy(url->components.path);
+ (*new_url)->components.query =
+ nsurl__component_copy(url->components.query);
+ (*new_url)->components.fragment =
+ lwc_string_ref(frag);
+
+ (*new_url)->components.scheme_type = url->components.scheme_type;
+
+ /* Get the nsurl's hash */
+ nsurl_calc_hash(*new_url);
+
+ /* Give the URL a reference */
+ (*new_url)->count = 1;
+
+ return NSERROR_OK;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_replace_query(const nsurl *url, const char *query,
+ nsurl **new_url)
+{
+ int query_len; /* Length of new query string, including '?' */
+ int frag_len = 0; /* Length of fragment, including '#' */
+ int base_len; /* Length of URL up to start of query */
+ char *pos;
+ size_t len;
+ lwc_string *lwc_query;
+
+ assert(url != NULL);
+ assert(query != NULL);
+ assert(query[0] == '?');
+
+ /* Get the length of the new query */
+ query_len = strlen(query);
+
+ /* Find the change in length from url to new_url */
+ base_len = url->length;
+ if (url->components.query != NULL) {
+ base_len -= lwc_string_length(url->components.query);
+ }
+ if (url->components.fragment != NULL) {
+ frag_len = 1 + lwc_string_length(url->components.fragment);
+ base_len -= frag_len;
+ }
+
+ /* Set new_url's length */
+ len = base_len + query_len + frag_len;
+
+ /* Create NetSurf URL object */
+ *new_url = malloc(sizeof(nsurl) + len + 1); /* Add 1 for \0 */
+ if (*new_url == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ if (lwc_intern_string(query, query_len, &lwc_query) != lwc_error_ok) {
+ free(*new_url);
+ return NSERROR_NOMEM;
+ }
+
+ (*new_url)->length = len;
+
+ /* Set string */
+ pos = (*new_url)->string;
+ memcpy(pos, url->string, base_len);
+ pos += base_len;
+ memcpy(pos, query, query_len);
+ pos += query_len;
+ if (url->components.fragment != NULL) {
+ const char *frag = lwc_string_data(url->components.fragment);
+ *pos = '#';
+ memcpy(++pos, frag, frag_len - 1);
+ pos += frag_len - 1;
+ }
+ *pos = '\0';
+
+ /* Copy components */
+ (*new_url)->components.scheme =
+ nsurl__component_copy(url->components.scheme);
+ (*new_url)->components.username =
+ nsurl__component_copy(url->components.username);
+ (*new_url)->components.password =
+ nsurl__component_copy(url->components.password);
+ (*new_url)->components.host =
+ nsurl__component_copy(url->components.host);
+ (*new_url)->components.port =
+ nsurl__component_copy(url->components.port);
+ (*new_url)->components.path =
+ nsurl__component_copy(url->components.path);
+ (*new_url)->components.query = lwc_query;
+ (*new_url)->components.fragment =
+ nsurl__component_copy(url->components.fragment);
+
+ (*new_url)->components.scheme_type = url->components.scheme_type;
+
+ /* Get the nsurl's hash */
+ nsurl_calc_hash(*new_url);
+
+ /* Give the URL a reference */
+ (*new_url)->count = 1;
+
+ return NSERROR_OK;
+}
+
+
+/* exported interface documented in utils/nsurl.h */
+nserror nsurl_nice(const nsurl *url, char **result, bool remove_extensions)
+{
+ const char *data;
+ size_t len;
+ size_t pos;
+ bool match;
+ char *name;
+
+ assert(url != NULL);
+
+ *result = 0;
+
+ /* extract the last component of the path, if possible */
+ if ((url->components.path != NULL) &&
+ (lwc_string_length(url->components.path) != 0) &&
+ (lwc_string_isequal(url->components.path,
+ corestring_lwc_slash_, &match) == lwc_error_ok) &&
+ (match == false)) {
+ bool first = true;
+ bool keep_looking;
+
+ /* Get hold of the string data we're examining */
+ data = lwc_string_data(url->components.path);
+ len = lwc_string_length(url->components.path);
+ pos = len;
+
+ do {
+ keep_looking = false;
+ pos--;
+
+ /* Find last '/' with stuff after it */
+ while (pos != 0) {
+ if (data[pos] == '/' && pos < len - 1) {
+ break;
+ }
+ pos--;
+ }
+
+ if (pos == 0) {
+ break;
+ }
+
+ if (first) {
+ if (strncasecmp("/default.", data + pos,
+ SLEN("/default.")) == 0) {
+ keep_looking = true;
+
+ } else if (strncasecmp("/index.",
+ data + pos,
+ 6) == 0) {
+ keep_looking = true;
+
+ }
+ first = false;
+ }
+
+ } while (keep_looking);
+
+ if (data[pos] == '/')
+ pos++;
+
+ if (strncasecmp("default.", data + pos, 8) != 0 &&
+ strncasecmp("index.", data + pos, 6) != 0) {
+ size_t end = pos;
+ while (data[end] != '\0' && data[end] != '/') {
+ end++;
+ }
+ if (end - pos != 0) {
+ name = malloc(end - pos + 1);
+ if (name == NULL) {
+ return NSERROR_NOMEM;
+ }
+ memcpy(name, data + pos, end - pos);
+ name[end - pos] = '\0';
+ if (remove_extensions) {
+ /* strip any extenstion */
+ char *dot = strchr(name, '.');
+ if (dot && dot != name) {
+ *dot = '\0';
+ }
+ }
+ *result = name;
+ return NSERROR_OK;
+ }
+ }
+ }
+
+ if (url->components.host != NULL) {
+ name = strdup(lwc_string_data(url->components.host));
+
+ for (pos = 0; name[pos] != '\0'; pos++) {
+ if (name[pos] == '.') {
+ name[pos] = '_';
+ }
+ }
+
+ *result = name;
+ return NSERROR_OK;
+ }
+
+ return NSERROR_NOT_FOUND;
+}
+
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_parent(const nsurl *url, nsurl **new_url)
+{
+ lwc_string *lwc_path;
+ size_t old_path_len, new_path_len;
+ size_t len;
+ const char* path = NULL;
+ char *pos;
+
+ assert(url != NULL);
+
+ old_path_len = (url->components.path == NULL) ? 0 :
+ lwc_string_length(url->components.path);
+
+ /* Find new path length */
+ if (old_path_len == 0) {
+ new_path_len = old_path_len;
+ } else {
+ path = lwc_string_data(url->components.path);
+
+ new_path_len = old_path_len;
+ if (old_path_len > 1) {
+ /* Skip over any trailing / */
+ if (path[new_path_len - 1] == '/')
+ new_path_len--;
+
+ /* Work back to next / */
+ while (new_path_len > 0 &&
+ path[new_path_len - 1] != '/')
+ new_path_len--;
+ }
+ }
+
+ /* Find the length of new_url */
+ len = url->length;
+ if (url->components.query != NULL) {
+ len -= lwc_string_length(url->components.query);
+ }
+ if (url->components.fragment != NULL) {
+ len -= 1; /* # */
+ len -= lwc_string_length(url->components.fragment);
+ }
+ len -= old_path_len - new_path_len;
+
+ /* Create NetSurf URL object */
+ *new_url = malloc(sizeof(nsurl) + len + 1); /* Add 1 for \0 */
+ if (*new_url == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ /* Make new path */
+ if (old_path_len == 0) {
+ lwc_path = NULL;
+ } else if (old_path_len == new_path_len) {
+ lwc_path = lwc_string_ref(url->components.path);
+ } else {
+ if (lwc_intern_string(path, old_path_len - new_path_len,
+ &lwc_path) != lwc_error_ok) {
+ free(*new_url);
+ return NSERROR_NOMEM;
+ }
+ }
+
+ (*new_url)->length = len;
+
+ /* Set string */
+ pos = (*new_url)->string;
+ memcpy(pos, url->string, len);
+ pos += len;
+ *pos = '\0';
+
+ /* Copy components */
+ (*new_url)->components.scheme =
+ nsurl__component_copy(url->components.scheme);
+ (*new_url)->components.username =
+ nsurl__component_copy(url->components.username);
+ (*new_url)->components.password =
+ nsurl__component_copy(url->components.password);
+ (*new_url)->components.host =
+ nsurl__component_copy(url->components.host);
+ (*new_url)->components.port =
+ nsurl__component_copy(url->components.port);
+ (*new_url)->components.path = lwc_path;
+ (*new_url)->components.query = NULL;
+ (*new_url)->components.fragment = NULL;
+
+ (*new_url)->components.scheme_type = url->components.scheme_type;
+
+ /* Get the nsurl's hash */
+ nsurl_calc_hash(*new_url);
+
+ /* Give the URL a reference */
+ (*new_url)->count = 1;
+
+ return NSERROR_OK;
+}
+
-----------------------------------------------------------------------
--
NetSurf Browser
6 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.6-216-gb23f55c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b23f55c81bca21de78411...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b23f55c81bca21de7841111...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b23f55c81bca21de7841111ac...
The branch, master has been updated
via b23f55c81bca21de7841111ace809df0f6408d65 (commit)
via e96bf013394c0dd06cb25e666e8c68d22c12a318 (commit)
from 6075feb4875ed2035de460fcdc7858f314ad0bef (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b23f55c81bca21de784...
commit b23f55c81bca21de7841111ace809df0f6408d65
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix warnings and errors in atari frontend
diff --git a/frontends/atari/download.c b/frontends/atari/download.c
index 3e7a685..d756e66 100644
--- a/frontends/atari/download.c
+++ b/frontends/atari/download.c
@@ -28,9 +28,9 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/string.h"
+#include "netsurf/inttypes.h"
#include "netsurf/browser_window.h"
#include "netsurf/download.h"
#include "desktop/save_complete.h"
diff --git a/frontends/atari/gemtk/guiwin.c b/frontends/atari/gemtk/guiwin.c
index ea0f8f9..84c7af8 100644
--- a/frontends/atari/gemtk/guiwin.c
+++ b/frontends/atari/gemtk/guiwin.c
@@ -127,7 +127,7 @@ error:
*/
static short preproc_wm(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8])
{
- GRECT g, g_ro, g2;
+ GRECT g, g2;
short retval = 1;
int val = 1;
struct gemtk_wm_scroll_info_s *slid;
@@ -169,7 +169,6 @@ static short preproc_wm(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8])
slid = gemtk_wm_get_scroll_info(gw);
gemtk_wm_get_grect(gw, GEMTK_WM_AREA_CONTENT, &g);
- g_ro = g;
switch(msg[4]) {
@@ -471,67 +470,66 @@ static short preproc_mu_keybd(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8])
{
short retval = 0;
- if ((gw->toolbar != NULL) && (gw->toolbar_edit_obj > -1)) {
+ if ((gw->toolbar != NULL) && (gw->toolbar_edit_obj > -1)) {
- short next_edit_obj = gw->toolbar_edit_obj;
- short next_char = -1;
- short edit_idx;
- short r;
+ short next_edit_obj = gw->toolbar_edit_obj;
+ short next_char = -1;
+ short edit_idx;
- DEBUG_PRINT(("%s, gw: %p, toolbar_edit_obj: %d\n", __FUNCTION__, gw,
- gw->toolbar_edit_obj));
+ DEBUG_PRINT(("%s, gw: %p, toolbar_edit_obj: %d\n",
+ __FUNCTION__, gw,
+ gw->toolbar_edit_obj));
- r = form_wkeybd(gw->toolbar, gw->toolbar_edit_obj, next_edit_obj,
- ev_out->emo_kreturn,
- &next_edit_obj, &next_char, gw->handle);
+ form_wkeybd(gw->toolbar, gw->toolbar_edit_obj, next_edit_obj,
+ ev_out->emo_kreturn,
+ &next_edit_obj, &next_char, gw->handle);
- if (next_edit_obj != gw->toolbar_edit_obj) {
+ if (next_edit_obj != gw->toolbar_edit_obj) {
gemtk_wm_set_toolbar_edit_obj(gw, next_edit_obj,
- ev_out->emo_kreturn);
- } else {
- if (next_char > 13) {
- r = objc_wedit(gw->toolbar, gw->toolbar_edit_obj,
- ev_out->emo_kreturn, &edit_idx,
- EDCHAR, gw->handle);
- }
- }
- //retval = 1;
- /*gemtk_wm_send_msg(gw, GEMTK_WM_WM_FORM_KEY, gw->toolbar_edit_obj,
- ev_out->emo_kreturn, 0, 0);*/
- }
+ ev_out->emo_kreturn);
+ } else {
+ if (next_char > 13) {
+ objc_wedit(gw->toolbar, gw->toolbar_edit_obj,
+ ev_out->emo_kreturn, &edit_idx,
+ EDCHAR, gw->handle);
+ }
+ }
+ //retval = 1;
+ /*gemtk_wm_send_msg(gw, GEMTK_WM_WM_FORM_KEY, gw->toolbar_edit_obj,
+ ev_out->emo_kreturn, 0, 0);*/
+ }
- if((gw->form != NULL) && (gw->form_edit_obj > -1) ) {
+ if ((gw->form != NULL) && (gw->form_edit_obj > -1)) {
- short next_edit_obj = gw->form_edit_obj;
- short next_char = -1;
- short edit_idx;
- short r;
+ short next_edit_obj = gw->form_edit_obj;
+ short next_char = -1;
+ short edit_idx;
- r = form_wkeybd(gw->form, gw->form_edit_obj, next_edit_obj,
- ev_out->emo_kreturn,
- &next_edit_obj, &next_char, gw->handle);
+ form_wkeybd(gw->form, gw->form_edit_obj, next_edit_obj,
+ ev_out->emo_kreturn,
+ &next_edit_obj, &next_char, gw->handle);
- if (next_edit_obj != gw->form_edit_obj) {
+ if (next_edit_obj != gw->form_edit_obj) {
if(gw->form_edit_obj != -1) {
objc_wedit(gw->form, gw->form_edit_obj,
- ev_out->emo_kreturn, &edit_idx,
- EDEND, gw->handle);
+ ev_out->emo_kreturn, &edit_idx,
+ EDEND, gw->handle);
}
- gw->form_edit_obj = next_edit_obj;
+ gw->form_edit_obj = next_edit_obj;
- objc_wedit(gw->form, gw->form_edit_obj,
- ev_out->emo_kreturn, &edit_idx,
- EDINIT, gw->handle);
- } else {
- if(next_char > 13)
- r = objc_wedit(gw->form, gw->form_edit_obj,
- ev_out->emo_kreturn, &edit_idx,
- EDCHAR, gw->handle);
- }
- }
- return(retval);
+ objc_wedit(gw->form, gw->form_edit_obj,
+ ev_out->emo_kreturn, &edit_idx,
+ EDINIT, gw->handle);
+ } else {
+ if(next_char > 13)
+ objc_wedit(gw->form, gw->form_edit_obj,
+ ev_out->emo_kreturn, &edit_idx,
+ EDCHAR, gw->handle);
+ }
+ }
+ return(retval);
}
/**
diff --git a/frontends/atari/gemtk/objc.c b/frontends/atari/gemtk/objc.c
index 855413e..3746892 100644
--- a/frontends/atari/gemtk/objc.c
+++ b/frontends/atari/gemtk/objc.c
@@ -49,6 +49,7 @@ char *gemtk_obj_get_text(OBJECT * tree, short idx)
return (p);
}
+/*
static void set_text(OBJECT *obj, short idx, char * text, int len)
{
char spare[255];
@@ -63,6 +64,7 @@ static void set_text(OBJECT *obj, short idx, char * text, int len)
set_string(obj, idx, spare);
}
+*/
char gemtk_obj_set_str_safe(OBJECT * tree, short idx, const char *txt)
{
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 1cf51d3..d4a6915 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -386,13 +386,13 @@ static void atari_window_reformat(struct gui_window *gw)
static void gui_window_redraw_window(struct gui_window *gw)
{
- CMP_BROWSER b;
- GRECT rect;
- if (gw == NULL)
- return;
- b = gw->browser;
- window_get_grect(gw->root, BROWSER_AREA_CONTENT, &rect);
- window_schedule_redraw_grect(gw->root, &rect);
+ //CMP_BROWSER b;
+ GRECT rect;
+ if (gw == NULL)
+ return;
+ //b = gw->browser;
+ window_get_grect(gw->root, BROWSER_AREA_CONTENT, &rect);
+ window_schedule_redraw_grect(gw->root, &rect);
}
static void gui_window_update_box(struct gui_window *gw, const struct rect *rect)
diff --git a/frontends/atari/hotlist.c b/frontends/atari/hotlist.c
index ee9385d..da59916 100644
--- a/frontends/atari/hotlist.c
+++ b/frontends/atari/hotlist.c
@@ -25,9 +25,9 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
+#include "netsurf/inttypes.h"
#include "netsurf/keypress.h"
#include "content/content.h"
#include "desktop/hotlist.h"
@@ -91,12 +91,12 @@ static void atari_hotlist_draw(struct core_window *cw, int x,
static void atari_hotlist_keypress(struct core_window *cw, uint32_t ucs4)
{
- GUIWIN *gemtk_win;
- GRECT area;
+ //GUIWIN *gemtk_win;
+ //GRECT area;
LOG("ucs4: %"PRIu32 , ucs4);
hotlist_keypress(ucs4);
- gemtk_win = atari_treeview_get_gemtk_window(cw);
- atari_treeview_get_grect(cw, TREEVIEW_AREA_CONTENT, &area);
+ //gemtk_win = atari_treeview_get_gemtk_window(cw);
+ //atari_treeview_get_grect(cw, TREEVIEW_AREA_CONTENT, &area);
//gemtk_wm_exec_redraw(gemtk_win, &area);
}
diff --git a/frontends/atari/plot/font_freetype.c b/frontends/atari/plot/font_freetype.c
index 8b535e3..17d3c3b 100644
--- a/frontends/atari/plot/font_freetype.c
+++ b/frontends/atari/plot/font_freetype.c
@@ -262,13 +262,14 @@ static FT_Glyph ft_getglyph(const plot_font_style_t *fstyle, uint32_t ucs4)
FT_UInt glyph_index;
FTC_ScalerRec srec;
FT_Glyph glyph;
- FT_Error error;
+ //FT_Error error;
ftc_faceid_t *ft_face;
ft_fill_scalar(fstyle, &srec);
ft_face = (ftc_faceid_t *)srec.face_id;
glyph_index = FTC_CMapCache_Lookup(ft_cmap_cache, srec.face_id, ft_face->cidx, ucs4);
- error = FTC_ImageCache_LookupScaler(ft_image_cache,
+ //error =
+ FTC_ImageCache_LookupScaler(ft_image_cache,
&srec,
FT_LOAD_RENDER |
FT_LOAD_FORCE_AUTOHINT |
diff --git a/frontends/atari/plot/font_internal.c b/frontends/atari/plot/font_internal.c
index 6a811e3..3575bc3 100644
--- a/frontends/atari/plot/font_internal.c
+++ b/frontends/atari/plot/font_internal.c
@@ -161,7 +161,7 @@ static int pixel_pos( FONT_PLOTTER self, const plot_font_style_t * fstyle,const
static void draw_glyph1(FONT_PLOTTER self, GRECT *inloc, uint8_t *chrp, int pitch, uint32_t colour )
{
size_t bmpstride;
- GRECT clip;
+ //GRECT clip;
uint32_t * fontdata;
int xloop,yloop;
int stride = pitch / 8;
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index dd41e17..aa8e080 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -680,12 +680,12 @@ void window_close_search(ROOTWIN *rootwin)
struct browser_window *bw;
struct gui_window *gw;
GRECT area;
- OBJECT *obj;
+ //OBJECT *obj;
gw = rootwin->active_gui_window;
bw = gw->browser->bw;
- obj = gemtk_obj_get_tree(TOOLBAR);
+ //obj = gemtk_obj_get_tree(TOOLBAR);
if (gw->search != NULL) {
nsatari_search_session_destroy(gw->search);
diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c
index e186a81..ed1fb2e 100644
--- a/frontends/atari/settings.c
+++ b/frontends/atari/settings.c
@@ -593,7 +593,7 @@ static void form_event(int index, int external)
else
tmp_option_memory_cache_size += 1;
- if( tmp_option_memory_cache_size < 0 )
+ if( tmp_option_memory_cache_size == 0)
tmp_option_memory_cache_size = 1;
if( tmp_option_memory_cache_size > 999 )
tmp_option_memory_cache_size = 999;
@@ -610,7 +610,7 @@ static void form_event(int index, int external)
else
tmp_option_disc_cache_size += 1;
- if( tmp_option_disc_cache_size < 0 )
+ if( tmp_option_disc_cache_size == 0 )
tmp_option_disc_cache_size = 1;
if( tmp_option_disc_cache_size > 9999 )
tmp_option_disc_cache_size = 9999;
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 78da2b0..93aef6e 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -366,11 +366,11 @@ static void __CDECL on_keybd_event(struct core_window *cw, EVMULT_OUT *ev_out,
}
-static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
- short msg[8])
+static void __CDECL on_redraw_event(struct core_window *cw,
+ EVMULT_OUT *ev_out,
+ short msg[8])
{
GRECT work, clip;
- struct gemtk_wm_scroll_info_s *slid;
struct atari_treeview_window *tv = (struct atari_treeview_window *)cw;
if (tv == NULL)
@@ -381,7 +381,7 @@ static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
atari_treeview_get_grect(cw, TREEVIEW_AREA_CONTENT, &work);
//dbg_grect("treeview work: ", &work);
- slid = gemtk_wm_get_scroll_info(tv->window);
+ gemtk_wm_get_scroll_info(tv->window);
clip = work;
@@ -390,10 +390,10 @@ static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
return;
}
- if (atari_treeview_is_iconified(cw) == true) {
- atari_treeview_redraw_icon(cw, &clip);
- return;
- }
+ if (atari_treeview_is_iconified(cw) == true) {
+ atari_treeview_redraw_icon(cw, &clip);
+ return;
+ }
/* make redraw coords relative to content viewport */
clip.g_x -= work.g_x;
@@ -425,8 +425,9 @@ static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
}
}
-static void __CDECL on_mbutton_event(struct core_window *cw, EVMULT_OUT *ev_out,
- short msg[8])
+static void __CDECL on_mbutton_event(struct core_window *cw,
+ EVMULT_OUT *ev_out,
+ short msg[8])
{
struct atari_treeview_window *tv = (struct atari_treeview_window *)cw;
struct gemtk_wm_scroll_info_s *slid;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e96bf013394c0dd06cb...
commit e96bf013394c0dd06cb25e666e8c68d22c12a318
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
make backing store use inttypes format specifiers
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 8670c31..bcb97d2 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -620,7 +620,7 @@ static nserror store_evict(struct store_state *state)
return NSERROR_OK;
}
- LOG("Evicting entries to reduce %"PRIu64" by %zd",
+ LOG("Evicting entries to reduce %"PRIu64" by %"PRIsizet,
state->total_alloc, state->hysteresis);
/* allocate storage for the list */
@@ -658,7 +658,7 @@ static nserror store_evict(struct store_state *state)
free(elist);
- LOG("removed %zd in %d entries", removed, ent);
+ LOG("removed %"PRIsizet" in %d entries", removed, ent);
return ret;
}
@@ -1204,7 +1204,7 @@ read_entries(struct store_state *state)
entries_size = (1 << state->entry_bits) * sizeof(struct store_entry);
- LOG("Allocating %zd bytes for max of %d entries of %ld length elements %ld length",
+ LOG("Allocating %"PRIsizet" bytes for max of %d entries of %ld length elements %ld length",
entries_size, 1 << state->entry_bits,
sizeof(struct store_entry),
sizeof(struct store_entry_element));
@@ -1560,13 +1560,13 @@ initialise(const struct llcache_store_parameters *parameters)
LOG("FS backing store init successful");
- LOG("path:%s limit:%zd hyst:%zd addr:%d entries:%d",
+ LOG("path:%s limit:%"PRIsizet" hyst:%"PRIsizet" addr:%d entries:%d",
newstate->path,
newstate->limit,
newstate->hysteresis,
newstate->ident_bits,
newstate->entry_bits);
- LOG("Using %"PRIu64"/%zd", newstate->total_alloc, newstate->limit);
+ LOG("Using %"PRIu64"/%"PRIsizet, newstate->total_alloc, newstate->limit);
return NSERROR_OK;
}
@@ -1605,7 +1605,7 @@ finalise(void)
/* avoid division by zero */
if (op_count > 0) {
- LOG("Cache total/hit/miss/fail (counts) %d/%zd/%zd/%d (100%%/%zd%%/%zd%%/%d%%)",
+ LOG("Cache total/hit/miss/fail (counts) %d/%"PRIsizet"/%"PRIsizet"/%d (100%%/%"PRIsizet"%%/%"PRIsizet"%%/%d%%)",
op_count,
storestate->hit_count,
storestate->miss_count,
@@ -1661,7 +1661,7 @@ static nserror store_write_block(struct store_state *state,
bse->elem[elem_idx].size,
offst);
if (wr != (ssize_t)bse->elem[elem_idx].size) {
- LOG("Write failed %zd of %d bytes from %p at 0x%jx block %d errno %d",
+ LOG("Write failed %"PRIssizet" of %d bytes from %p at 0x%jx block %d errno %d",
wr,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
@@ -1671,7 +1671,7 @@ static nserror store_write_block(struct store_state *state,
return NSERROR_SAVE_FAILED;
}
- LOG("Wrote %zd bytes from %p at 0x%jx block %d",
+ LOG("Wrote %"PRIssizet" bytes from %p at 0x%jx block %d",
wr,
bse->elem[elem_idx].data,
(uintmax_t)offst,
@@ -1708,7 +1708,7 @@ static nserror store_write_file(struct store_state *state,
close(fd);
if (wr != (ssize_t)bse->elem[elem_idx].size) {
- LOG("Write failed %zd of %d bytes from %p errno %d",
+ LOG("Write failed %"PRIssizet" of %d bytes from %p errno %d",
wr,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
@@ -1718,7 +1718,7 @@ static nserror store_write_file(struct store_state *state,
return NSERROR_SAVE_FAILED;
}
- LOG("Wrote %zd bytes from %p", wr, bse->elem[elem_idx].data);
+ LOG("Wrote %"PRIssizet" bytes from %p", wr, bse->elem[elem_idx].data);
return NSERROR_OK;
}
@@ -1829,7 +1829,7 @@ static nserror store_read_block(struct store_state *state,
bse->elem[elem_idx].size,
offst);
if (rd != (ssize_t)bse->elem[elem_idx].size) {
- LOG("Failed reading %zd of %d bytes into %p from 0x%jx block %d errno %d",
+ LOG("Failed reading %"PRIssizet" of %d bytes into %p from 0x%jx block %d errno %d",
rd,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
@@ -1839,7 +1839,7 @@ static nserror store_read_block(struct store_state *state,
return NSERROR_SAVE_FAILED;
}
- LOG("Read %zd bytes into %p from 0x%jx block %d",
+ LOG("Read %"PRIssizet" bytes into %p from 0x%jx block %d",
rd,
bse->elem[elem_idx].data,
(uintmax_t)offst,
@@ -1878,7 +1878,8 @@ static nserror store_read_file(struct store_state *state,
bse->elem[elem_idx].data + tot,
bse->elem[elem_idx].size - tot);
if (rd <= 0) {
- LOG("read error returned %zd errno %d", rd, errno);
+ LOG("read error returned %"PRIssizet" errno %d",
+ rd, errno);
ret = NSERROR_NOT_FOUND;
break;
}
@@ -1887,7 +1888,7 @@ static nserror store_read_file(struct store_state *state,
close(fd);
- LOG("Read %zd bytes into %p", tot, bse->elem[elem_idx].data);
+ LOG("Read %"PRIsizet" bytes into %p", tot, bse->elem[elem_idx].data);
return ret;
}
-----------------------------------------------------------------------
Summary of changes:
content/fs_backing_store.c | 29 ++++++-----
frontends/atari/download.c | 2 +-
frontends/atari/gemtk/guiwin.c | 94 +++++++++++++++++-----------------
frontends/atari/gemtk/objc.c | 2 +
frontends/atari/gui.c | 14 ++---
frontends/atari/hotlist.c | 10 ++--
frontends/atari/plot/font_freetype.c | 5 +-
frontends/atari/plot/font_internal.c | 2 +-
frontends/atari/rootwin.c | 4 +-
frontends/atari/settings.c | 4 +-
frontends/atari/treeview.c | 21 ++++----
11 files changed, 95 insertions(+), 92 deletions(-)
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 8670c31..bcb97d2 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -620,7 +620,7 @@ static nserror store_evict(struct store_state *state)
return NSERROR_OK;
}
- LOG("Evicting entries to reduce %"PRIu64" by %zd",
+ LOG("Evicting entries to reduce %"PRIu64" by %"PRIsizet,
state->total_alloc, state->hysteresis);
/* allocate storage for the list */
@@ -658,7 +658,7 @@ static nserror store_evict(struct store_state *state)
free(elist);
- LOG("removed %zd in %d entries", removed, ent);
+ LOG("removed %"PRIsizet" in %d entries", removed, ent);
return ret;
}
@@ -1204,7 +1204,7 @@ read_entries(struct store_state *state)
entries_size = (1 << state->entry_bits) * sizeof(struct store_entry);
- LOG("Allocating %zd bytes for max of %d entries of %ld length elements %ld length",
+ LOG("Allocating %"PRIsizet" bytes for max of %d entries of %ld length elements %ld length",
entries_size, 1 << state->entry_bits,
sizeof(struct store_entry),
sizeof(struct store_entry_element));
@@ -1560,13 +1560,13 @@ initialise(const struct llcache_store_parameters *parameters)
LOG("FS backing store init successful");
- LOG("path:%s limit:%zd hyst:%zd addr:%d entries:%d",
+ LOG("path:%s limit:%"PRIsizet" hyst:%"PRIsizet" addr:%d entries:%d",
newstate->path,
newstate->limit,
newstate->hysteresis,
newstate->ident_bits,
newstate->entry_bits);
- LOG("Using %"PRIu64"/%zd", newstate->total_alloc, newstate->limit);
+ LOG("Using %"PRIu64"/%"PRIsizet, newstate->total_alloc, newstate->limit);
return NSERROR_OK;
}
@@ -1605,7 +1605,7 @@ finalise(void)
/* avoid division by zero */
if (op_count > 0) {
- LOG("Cache total/hit/miss/fail (counts) %d/%zd/%zd/%d (100%%/%zd%%/%zd%%/%d%%)",
+ LOG("Cache total/hit/miss/fail (counts) %d/%"PRIsizet"/%"PRIsizet"/%d (100%%/%"PRIsizet"%%/%"PRIsizet"%%/%d%%)",
op_count,
storestate->hit_count,
storestate->miss_count,
@@ -1661,7 +1661,7 @@ static nserror store_write_block(struct store_state *state,
bse->elem[elem_idx].size,
offst);
if (wr != (ssize_t)bse->elem[elem_idx].size) {
- LOG("Write failed %zd of %d bytes from %p at 0x%jx block %d errno %d",
+ LOG("Write failed %"PRIssizet" of %d bytes from %p at 0x%jx block %d errno %d",
wr,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
@@ -1671,7 +1671,7 @@ static nserror store_write_block(struct store_state *state,
return NSERROR_SAVE_FAILED;
}
- LOG("Wrote %zd bytes from %p at 0x%jx block %d",
+ LOG("Wrote %"PRIssizet" bytes from %p at 0x%jx block %d",
wr,
bse->elem[elem_idx].data,
(uintmax_t)offst,
@@ -1708,7 +1708,7 @@ static nserror store_write_file(struct store_state *state,
close(fd);
if (wr != (ssize_t)bse->elem[elem_idx].size) {
- LOG("Write failed %zd of %d bytes from %p errno %d",
+ LOG("Write failed %"PRIssizet" of %d bytes from %p errno %d",
wr,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
@@ -1718,7 +1718,7 @@ static nserror store_write_file(struct store_state *state,
return NSERROR_SAVE_FAILED;
}
- LOG("Wrote %zd bytes from %p", wr, bse->elem[elem_idx].data);
+ LOG("Wrote %"PRIssizet" bytes from %p", wr, bse->elem[elem_idx].data);
return NSERROR_OK;
}
@@ -1829,7 +1829,7 @@ static nserror store_read_block(struct store_state *state,
bse->elem[elem_idx].size,
offst);
if (rd != (ssize_t)bse->elem[elem_idx].size) {
- LOG("Failed reading %zd of %d bytes into %p from 0x%jx block %d errno %d",
+ LOG("Failed reading %"PRIssizet" of %d bytes into %p from 0x%jx block %d errno %d",
rd,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
@@ -1839,7 +1839,7 @@ static nserror store_read_block(struct store_state *state,
return NSERROR_SAVE_FAILED;
}
- LOG("Read %zd bytes into %p from 0x%jx block %d",
+ LOG("Read %"PRIssizet" bytes into %p from 0x%jx block %d",
rd,
bse->elem[elem_idx].data,
(uintmax_t)offst,
@@ -1878,7 +1878,8 @@ static nserror store_read_file(struct store_state *state,
bse->elem[elem_idx].data + tot,
bse->elem[elem_idx].size - tot);
if (rd <= 0) {
- LOG("read error returned %zd errno %d", rd, errno);
+ LOG("read error returned %"PRIssizet" errno %d",
+ rd, errno);
ret = NSERROR_NOT_FOUND;
break;
}
@@ -1887,7 +1888,7 @@ static nserror store_read_file(struct store_state *state,
close(fd);
- LOG("Read %zd bytes into %p", tot, bse->elem[elem_idx].data);
+ LOG("Read %"PRIsizet" bytes into %p", tot, bse->elem[elem_idx].data);
return ret;
}
diff --git a/frontends/atari/download.c b/frontends/atari/download.c
index 3e7a685..d756e66 100644
--- a/frontends/atari/download.c
+++ b/frontends/atari/download.c
@@ -28,9 +28,9 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/string.h"
+#include "netsurf/inttypes.h"
#include "netsurf/browser_window.h"
#include "netsurf/download.h"
#include "desktop/save_complete.h"
diff --git a/frontends/atari/gemtk/guiwin.c b/frontends/atari/gemtk/guiwin.c
index ea0f8f9..84c7af8 100644
--- a/frontends/atari/gemtk/guiwin.c
+++ b/frontends/atari/gemtk/guiwin.c
@@ -127,7 +127,7 @@ error:
*/
static short preproc_wm(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8])
{
- GRECT g, g_ro, g2;
+ GRECT g, g2;
short retval = 1;
int val = 1;
struct gemtk_wm_scroll_info_s *slid;
@@ -169,7 +169,6 @@ static short preproc_wm(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8])
slid = gemtk_wm_get_scroll_info(gw);
gemtk_wm_get_grect(gw, GEMTK_WM_AREA_CONTENT, &g);
- g_ro = g;
switch(msg[4]) {
@@ -471,67 +470,66 @@ static short preproc_mu_keybd(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8])
{
short retval = 0;
- if ((gw->toolbar != NULL) && (gw->toolbar_edit_obj > -1)) {
+ if ((gw->toolbar != NULL) && (gw->toolbar_edit_obj > -1)) {
- short next_edit_obj = gw->toolbar_edit_obj;
- short next_char = -1;
- short edit_idx;
- short r;
+ short next_edit_obj = gw->toolbar_edit_obj;
+ short next_char = -1;
+ short edit_idx;
- DEBUG_PRINT(("%s, gw: %p, toolbar_edit_obj: %d\n", __FUNCTION__, gw,
- gw->toolbar_edit_obj));
+ DEBUG_PRINT(("%s, gw: %p, toolbar_edit_obj: %d\n",
+ __FUNCTION__, gw,
+ gw->toolbar_edit_obj));
- r = form_wkeybd(gw->toolbar, gw->toolbar_edit_obj, next_edit_obj,
- ev_out->emo_kreturn,
- &next_edit_obj, &next_char, gw->handle);
+ form_wkeybd(gw->toolbar, gw->toolbar_edit_obj, next_edit_obj,
+ ev_out->emo_kreturn,
+ &next_edit_obj, &next_char, gw->handle);
- if (next_edit_obj != gw->toolbar_edit_obj) {
+ if (next_edit_obj != gw->toolbar_edit_obj) {
gemtk_wm_set_toolbar_edit_obj(gw, next_edit_obj,
- ev_out->emo_kreturn);
- } else {
- if (next_char > 13) {
- r = objc_wedit(gw->toolbar, gw->toolbar_edit_obj,
- ev_out->emo_kreturn, &edit_idx,
- EDCHAR, gw->handle);
- }
- }
- //retval = 1;
- /*gemtk_wm_send_msg(gw, GEMTK_WM_WM_FORM_KEY, gw->toolbar_edit_obj,
- ev_out->emo_kreturn, 0, 0);*/
- }
+ ev_out->emo_kreturn);
+ } else {
+ if (next_char > 13) {
+ objc_wedit(gw->toolbar, gw->toolbar_edit_obj,
+ ev_out->emo_kreturn, &edit_idx,
+ EDCHAR, gw->handle);
+ }
+ }
+ //retval = 1;
+ /*gemtk_wm_send_msg(gw, GEMTK_WM_WM_FORM_KEY, gw->toolbar_edit_obj,
+ ev_out->emo_kreturn, 0, 0);*/
+ }
- if((gw->form != NULL) && (gw->form_edit_obj > -1) ) {
+ if ((gw->form != NULL) && (gw->form_edit_obj > -1)) {
- short next_edit_obj = gw->form_edit_obj;
- short next_char = -1;
- short edit_idx;
- short r;
+ short next_edit_obj = gw->form_edit_obj;
+ short next_char = -1;
+ short edit_idx;
- r = form_wkeybd(gw->form, gw->form_edit_obj, next_edit_obj,
- ev_out->emo_kreturn,
- &next_edit_obj, &next_char, gw->handle);
+ form_wkeybd(gw->form, gw->form_edit_obj, next_edit_obj,
+ ev_out->emo_kreturn,
+ &next_edit_obj, &next_char, gw->handle);
- if (next_edit_obj != gw->form_edit_obj) {
+ if (next_edit_obj != gw->form_edit_obj) {
if(gw->form_edit_obj != -1) {
objc_wedit(gw->form, gw->form_edit_obj,
- ev_out->emo_kreturn, &edit_idx,
- EDEND, gw->handle);
+ ev_out->emo_kreturn, &edit_idx,
+ EDEND, gw->handle);
}
- gw->form_edit_obj = next_edit_obj;
+ gw->form_edit_obj = next_edit_obj;
- objc_wedit(gw->form, gw->form_edit_obj,
- ev_out->emo_kreturn, &edit_idx,
- EDINIT, gw->handle);
- } else {
- if(next_char > 13)
- r = objc_wedit(gw->form, gw->form_edit_obj,
- ev_out->emo_kreturn, &edit_idx,
- EDCHAR, gw->handle);
- }
- }
- return(retval);
+ objc_wedit(gw->form, gw->form_edit_obj,
+ ev_out->emo_kreturn, &edit_idx,
+ EDINIT, gw->handle);
+ } else {
+ if(next_char > 13)
+ objc_wedit(gw->form, gw->form_edit_obj,
+ ev_out->emo_kreturn, &edit_idx,
+ EDCHAR, gw->handle);
+ }
+ }
+ return(retval);
}
/**
diff --git a/frontends/atari/gemtk/objc.c b/frontends/atari/gemtk/objc.c
index 855413e..3746892 100644
--- a/frontends/atari/gemtk/objc.c
+++ b/frontends/atari/gemtk/objc.c
@@ -49,6 +49,7 @@ char *gemtk_obj_get_text(OBJECT * tree, short idx)
return (p);
}
+/*
static void set_text(OBJECT *obj, short idx, char * text, int len)
{
char spare[255];
@@ -63,6 +64,7 @@ static void set_text(OBJECT *obj, short idx, char * text, int len)
set_string(obj, idx, spare);
}
+*/
char gemtk_obj_set_str_safe(OBJECT * tree, short idx, const char *txt)
{
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 1cf51d3..d4a6915 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -386,13 +386,13 @@ static void atari_window_reformat(struct gui_window *gw)
static void gui_window_redraw_window(struct gui_window *gw)
{
- CMP_BROWSER b;
- GRECT rect;
- if (gw == NULL)
- return;
- b = gw->browser;
- window_get_grect(gw->root, BROWSER_AREA_CONTENT, &rect);
- window_schedule_redraw_grect(gw->root, &rect);
+ //CMP_BROWSER b;
+ GRECT rect;
+ if (gw == NULL)
+ return;
+ //b = gw->browser;
+ window_get_grect(gw->root, BROWSER_AREA_CONTENT, &rect);
+ window_schedule_redraw_grect(gw->root, &rect);
}
static void gui_window_update_box(struct gui_window *gw, const struct rect *rect)
diff --git a/frontends/atari/hotlist.c b/frontends/atari/hotlist.c
index ee9385d..da59916 100644
--- a/frontends/atari/hotlist.c
+++ b/frontends/atari/hotlist.c
@@ -25,9 +25,9 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
+#include "netsurf/inttypes.h"
#include "netsurf/keypress.h"
#include "content/content.h"
#include "desktop/hotlist.h"
@@ -91,12 +91,12 @@ static void atari_hotlist_draw(struct core_window *cw, int x,
static void atari_hotlist_keypress(struct core_window *cw, uint32_t ucs4)
{
- GUIWIN *gemtk_win;
- GRECT area;
+ //GUIWIN *gemtk_win;
+ //GRECT area;
LOG("ucs4: %"PRIu32 , ucs4);
hotlist_keypress(ucs4);
- gemtk_win = atari_treeview_get_gemtk_window(cw);
- atari_treeview_get_grect(cw, TREEVIEW_AREA_CONTENT, &area);
+ //gemtk_win = atari_treeview_get_gemtk_window(cw);
+ //atari_treeview_get_grect(cw, TREEVIEW_AREA_CONTENT, &area);
//gemtk_wm_exec_redraw(gemtk_win, &area);
}
diff --git a/frontends/atari/plot/font_freetype.c b/frontends/atari/plot/font_freetype.c
index 8b535e3..17d3c3b 100644
--- a/frontends/atari/plot/font_freetype.c
+++ b/frontends/atari/plot/font_freetype.c
@@ -262,13 +262,14 @@ static FT_Glyph ft_getglyph(const plot_font_style_t *fstyle, uint32_t ucs4)
FT_UInt glyph_index;
FTC_ScalerRec srec;
FT_Glyph glyph;
- FT_Error error;
+ //FT_Error error;
ftc_faceid_t *ft_face;
ft_fill_scalar(fstyle, &srec);
ft_face = (ftc_faceid_t *)srec.face_id;
glyph_index = FTC_CMapCache_Lookup(ft_cmap_cache, srec.face_id, ft_face->cidx, ucs4);
- error = FTC_ImageCache_LookupScaler(ft_image_cache,
+ //error =
+ FTC_ImageCache_LookupScaler(ft_image_cache,
&srec,
FT_LOAD_RENDER |
FT_LOAD_FORCE_AUTOHINT |
diff --git a/frontends/atari/plot/font_internal.c b/frontends/atari/plot/font_internal.c
index 6a811e3..3575bc3 100644
--- a/frontends/atari/plot/font_internal.c
+++ b/frontends/atari/plot/font_internal.c
@@ -161,7 +161,7 @@ static int pixel_pos( FONT_PLOTTER self, const plot_font_style_t * fstyle,const
static void draw_glyph1(FONT_PLOTTER self, GRECT *inloc, uint8_t *chrp, int pitch, uint32_t colour )
{
size_t bmpstride;
- GRECT clip;
+ //GRECT clip;
uint32_t * fontdata;
int xloop,yloop;
int stride = pitch / 8;
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index dd41e17..aa8e080 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -680,12 +680,12 @@ void window_close_search(ROOTWIN *rootwin)
struct browser_window *bw;
struct gui_window *gw;
GRECT area;
- OBJECT *obj;
+ //OBJECT *obj;
gw = rootwin->active_gui_window;
bw = gw->browser->bw;
- obj = gemtk_obj_get_tree(TOOLBAR);
+ //obj = gemtk_obj_get_tree(TOOLBAR);
if (gw->search != NULL) {
nsatari_search_session_destroy(gw->search);
diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c
index e186a81..ed1fb2e 100644
--- a/frontends/atari/settings.c
+++ b/frontends/atari/settings.c
@@ -593,7 +593,7 @@ static void form_event(int index, int external)
else
tmp_option_memory_cache_size += 1;
- if( tmp_option_memory_cache_size < 0 )
+ if( tmp_option_memory_cache_size == 0)
tmp_option_memory_cache_size = 1;
if( tmp_option_memory_cache_size > 999 )
tmp_option_memory_cache_size = 999;
@@ -610,7 +610,7 @@ static void form_event(int index, int external)
else
tmp_option_disc_cache_size += 1;
- if( tmp_option_disc_cache_size < 0 )
+ if( tmp_option_disc_cache_size == 0 )
tmp_option_disc_cache_size = 1;
if( tmp_option_disc_cache_size > 9999 )
tmp_option_disc_cache_size = 9999;
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 78da2b0..93aef6e 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -366,11 +366,11 @@ static void __CDECL on_keybd_event(struct core_window *cw, EVMULT_OUT *ev_out,
}
-static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
- short msg[8])
+static void __CDECL on_redraw_event(struct core_window *cw,
+ EVMULT_OUT *ev_out,
+ short msg[8])
{
GRECT work, clip;
- struct gemtk_wm_scroll_info_s *slid;
struct atari_treeview_window *tv = (struct atari_treeview_window *)cw;
if (tv == NULL)
@@ -381,7 +381,7 @@ static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
atari_treeview_get_grect(cw, TREEVIEW_AREA_CONTENT, &work);
//dbg_grect("treeview work: ", &work);
- slid = gemtk_wm_get_scroll_info(tv->window);
+ gemtk_wm_get_scroll_info(tv->window);
clip = work;
@@ -390,10 +390,10 @@ static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
return;
}
- if (atari_treeview_is_iconified(cw) == true) {
- atari_treeview_redraw_icon(cw, &clip);
- return;
- }
+ if (atari_treeview_is_iconified(cw) == true) {
+ atari_treeview_redraw_icon(cw, &clip);
+ return;
+ }
/* make redraw coords relative to content viewport */
clip.g_x -= work.g_x;
@@ -425,8 +425,9 @@ static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
}
}
-static void __CDECL on_mbutton_event(struct core_window *cw, EVMULT_OUT *ev_out,
- short msg[8])
+static void __CDECL on_mbutton_event(struct core_window *cw,
+ EVMULT_OUT *ev_out,
+ short msg[8])
{
struct atari_treeview_window *tv = (struct atari_treeview_window *)cw;
struct gemtk_wm_scroll_info_s *slid;
--
NetSurf Browser
6 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.6-214-g6075feb
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/6075feb4875ed2035de46...
...commit http://git.netsurf-browser.org/netsurf.git/commit/6075feb4875ed2035de460f...
...tree http://git.netsurf-browser.org/netsurf.git/tree/6075feb4875ed2035de460fcd...
The branch, master has been updated
via 6075feb4875ed2035de460fcdc7858f314ad0bef (commit)
from 11f11e0a7f8f7dd03d5b1fc22a8e54af305fbe6f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6075feb4875ed2035de...
commit 6075feb4875ed2035de460fcdc7858f314ad0bef
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
create netsurf inttypes header to have portable integer formatting macros
diff --git a/content/content.c b/content/content.c
index 51c40d7..2eb035c 100644
--- a/content/content.c
+++ b/content/content.c
@@ -21,10 +21,11 @@
* Content handling implementation.
*/
-#include <inttypes.h>
+#include <stdint.h>
#include <stdlib.h>
#include <nsutils/time.h>
+#include "netsurf/inttypes.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "netsurf/browser_window.h"
diff --git a/content/fetchers/data.c b/content/fetchers/data.c
index 139d09a..cb99e6f 100644
--- a/content/fetchers/data.c
+++ b/content/fetchers/data.c
@@ -27,6 +27,7 @@
#include <libwapcaplet/libwapcaplet.h>
#include <nsutils/base64.h>
+#include "netsurf/inttypes.h"
#include "utils/url.h"
#include "utils/nsurl.h"
#include "utils/corestrings.h"
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index 6ffa638..4fa1a21 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -44,6 +44,7 @@
#endif
#include <libwapcaplet/libwapcaplet.h>
+#include "netsurf/inttypes.h"
#include "utils/nsurl.h"
#include "utils/dirent.h"
#include "utils/corestrings.h"
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 21ad8c7..b8b4b19 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -29,6 +29,7 @@
#include <stdarg.h>
#include <libwapcaplet/libwapcaplet.h>
+#include "netsurf/inttypes.h"
#include "utils/nsurl.h"
#include "utils/corestrings.h"
#include "utils/log.h"
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 635f917..8670c31 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -43,11 +43,11 @@
#include <stdlib.h>
#include <nsutils/unistd.h>
+#include "netsurf/inttypes.h"
#include "utils/filepath.h"
#include "utils/file.h"
#include "utils/nsurl.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/gui_internal.h"
#include "netsurf/misc.h"
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 9c7ce22..02107f7 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -22,12 +22,12 @@
*/
#include <assert.h>
-#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <stdlib.h>
+#include "netsurf/inttypes.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "netsurf/misc.h"
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 93185c1..0baf411 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <png.h>
+#include "netsurf/inttypes.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/content/handlers/javascript/duktape/dukky.c b/content/handlers/javascript/duktape/dukky.c
index 7dd3bd7..1282ad9 100644
--- a/content/handlers/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
@@ -23,16 +23,15 @@
* Duktapeish implementation of javascript engine functions.
*/
-#include <inttypes.h>
-
+#include <stdint.h>
#include <nsutils/time.h>
-#include "content/content.h"
-
+#include "netsurf/inttypes.h"
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/corestrings.h"
+#include "content/content.h"
#include "javascript/js.h"
#include "javascript/content.h"
diff --git a/content/llcache.c b/content/llcache.c
index 4bd6eb3..eb30053 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -35,12 +35,10 @@
#include <stdint.h>
#include <string.h>
#include <strings.h>
-#include <inttypes.h>
-
#include <nsutils/time.h>
+#include "netsurf/inttypes.h"
#include "utils/config.h"
-
#include "utils/corestrings.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 4a14737..0f597aa 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -25,12 +25,12 @@
#include <stdlib.h>
#include <libwapcaplet/libwapcaplet.h>
+#include "netsurf/inttypes.h"
#include "utils/config.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/log.h"
#include "utils/utf8.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "content/content_factory.h"
#include "content/fetchers.h"
diff --git a/frontends/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c
index 91973f4..a4c5855 100644
--- a/frontends/amiga/iff_dr2d.c
+++ b/frontends/amiga/iff_dr2d.c
@@ -20,12 +20,12 @@
#include <stdio.h>
#include <stdlib.h>
-#include <inttypes.h>
#include <svgtiny.h>
#include <proto/exec.h>
#include <string.h>
#include <proto/dos.h>
+#include "netsurf/inttypes.h"
#ifndef AMIGA_DR2D_STANDALONE
#include "utils/nsurl.h"
#include "netsurf/content.h"
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index d0de378..cbb7195 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -16,12 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <sys/types.h>
#include <string.h>
#include <assert.h>
#include <stdlib.h>
+#include "netsurf/inttypes.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "netsurf/bitmap.h"
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index a49aec7..9045009 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -17,8 +17,8 @@
*/
#include <assert.h>
-#include <inttypes.h>
+#include "netsurf/inttypes.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "netsurf/mouse.h"
diff --git a/frontends/atari/deskmenu.c b/frontends/atari/deskmenu.c
index 77df4e5..addba27 100644
--- a/frontends/atari/deskmenu.c
+++ b/frontends/atari/deskmenu.c
@@ -23,6 +23,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
+#include "utils/utils.h"
#include "netsurf/browser_window.h"
#include "netsurf/keypress.h"
#include "desktop/save_complete.h"
diff --git a/frontends/atari/font.c b/frontends/atari/font.c
index 5402e78..7971655 100644
--- a/frontends/atari/font.c
+++ b/frontends/atari/font.c
@@ -16,11 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
+#include "netsurf/inttypes.h"
#include "utils/utf8.h"
#include "utils/log.h"
#include "utils/nsoption.h"
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 731c032..78da2b0 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -16,13 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <sys/types.h>
#include <string.h>
#include "assert.h"
#include "cflib.h"
+#include "netsurf/inttypes.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index ccc60ea..e7c07f5 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <assert.h>
#include <ft2build.h>
#include FT_CACHE_H
+#include "netsurf/inttypes.h"
#include "utils/filepath.h"
#include "utils/utf8.h"
#include "utils/log.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index abfda93..326e573 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -23,7 +23,6 @@
*/
#include <stdlib.h>
-#include <inttypes.h>
#include <string.h>
#include <limits.h>
#include <assert.h>
@@ -32,6 +31,7 @@
#include <gdk/gdkkeysyms.h>
#include <gdk-pixbuf/gdk-pixdata.h>
+#include "netsurf/inttypes.h"
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/nsoption.h"
diff --git a/frontends/riscos/url_complete.h b/frontends/riscos/url_complete.h
index 6a4660e..9243612 100644
--- a/frontends/riscos/url_complete.h
+++ b/frontends/riscos/url_complete.h
@@ -23,9 +23,8 @@
#ifndef _NETSURF_RISCOS_URLCOMPLETE_H_
#define _NETSURF_RISCOS_URLCOMPLETE_H_
-#include <inttypes.h>
#include <stdbool.h>
-#include "oslib/wimp.h"
+#include <oslib/wimp.h>
struct gui_window;
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 45d5b14..b1ea58a 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -29,10 +29,10 @@
#include <assert.h>
#include <ctype.h>
-#include <inttypes.h>
#include <math.h>
#include <stdio.h>
#include <stdbool.h>
+#include <stdint.h>
#include <time.h>
#include <string.h>
#include <oslib/colourtrans.h>
@@ -43,6 +43,7 @@
#include <oslib/wimpspriteop.h>
#include <nsutils/time.h>
+#include "netsurf/inttypes.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/talloc.h"
diff --git a/frontends/windows/font.c b/frontends/windows/font.c
index 791b8cd..f50ba6e 100644
--- a/frontends/windows/font.c
+++ b/frontends/windows/font.c
@@ -23,10 +23,10 @@
*/
#include "utils/config.h"
-#include <inttypes.h>
#include <assert.h>
#include <windows.h>
+#include "netsurf/inttypes.h"
#include "utils/log.h"
#include "utils/nsoption.h"
#include "utils/utf8.h"
diff --git a/include/netsurf/inttypes.h b/include/netsurf/inttypes.h
new file mode 100644
index 0000000..874d83f
--- /dev/null
+++ b/include/netsurf/inttypes.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2017 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * Netsurf additional integer type formatting macros.
+ */
+
+#ifndef NETSURF_INTTYPES_H
+#define NETSURF_INTTYPES_H
+
+#include <inttypes.h>
+
+#ifndef PRIxPTR
+#define PRIxPTR "x"
+#endif
+
+#ifndef PRId64
+#define PRId64 "lld"
+#endif
+
+/* Windows does not have sizet formating codes */
+#if defined(_WIN32)
+
+/** windows printf formatting for size_t type */
+#define PRIsizet "Iu"
+
+/** windows printf formatting for ssize_t type */
+#define PRIssizet "Id"
+
+#else
+
+/** c99 standard printf formatting for size_t type */
+#define PRIsizet "zu"
+
+/** c99 standard printf formatting for ssize_t type */
+#define PRIssizet "zd"
+
+#endif
+
+
+
+#endif
+
diff --git a/render/html_css_fetcher.c b/render/html_css_fetcher.c
index b9d79a7..9eda6ae 100644
--- a/render/html_css_fetcher.c
+++ b/render/html_css_fetcher.c
@@ -21,18 +21,19 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-
#include <dom/dom.h>
#include <libwapcaplet/libwapcaplet.h>
+#include "netsurf/inttypes.h"
#include "utils/config.h"
-#include "content/fetch.h"
-#include "content/fetchers.h"
-#include "render/html_internal.h"
#include "utils/log.h"
#include "utils/ring.h"
#include "utils/nsurl.h"
#include "utils/utils.h"
+#include "content/fetch.h"
+#include "content/fetchers.h"
+
+#include "render/html_internal.h"
typedef struct html_css_fetcher_item {
uint32_t key;
diff --git a/utils/http/primitives.c b/utils/http/primitives.c
index f4c4e05..1e24d2a 100644
--- a/utils/http/primitives.c
+++ b/utils/http/primitives.c
@@ -16,11 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
+#include "netsurf/inttypes.h"
#include "utils/http/primitives.h"
/**
diff --git a/utils/idna.c b/utils/idna.c
index d75f957..34cc40f 100644
--- a/utils/idna.c
+++ b/utils/idna.c
@@ -28,6 +28,8 @@
#include <string.h>
#include <libutf8proc/utf8proc.h>
+#include "netsurf/inttypes.h"
+
#include "utils/errors.h"
#include "utils/idna.h"
#include "utils/idna_props.h"
diff --git a/utils/utils.h b/utils/utils.h
index 6f2ee45..3995071 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -23,10 +23,9 @@
* \todo Many of these functions and macros should have their own headers.
*/
-#ifndef _NETSURF_UTILS_UTILS_H_
-#define _NETSURF_UTILS_UTILS_H_
+#ifndef NETSURF_UTILS_UTILS_H
+#define NETSURF_UTILS_UTILS_H
-#include <inttypes.h>
#include <stdbool.h>
#ifndef NOF_ELEMENTS
@@ -52,29 +51,11 @@
#endif
#endif
-#ifndef PRIxPTR
-#define PRIxPTR "x"
-#endif
-
-#ifndef PRId64
-#define PRId64 "lld"
-#endif
-
-/* Windows does not have sizet formating codes or POSIX mkdir so work
- * around that
- */
+/* Windows does not have POSIX mkdir so work around that */
#if defined(_WIN32)
-/** windows printf formatting for size_t type */
-#define PRIsizet "Iu"
-/** windows printf formatting for ssize_t type */
-#define PRIssizet "Id"
/** windows mkdir function */
#define nsmkdir(dir, mode) mkdir((dir))
#else
-/** c99 standard printf formatting for size_t type */
-#define PRIsizet "zu"
-/** c99 standard printf formatting for ssize_t type */
-#define PRIssizet "zd"
/** POSIX mkdir function */
#define nsmkdir(dir, mode) mkdir((dir), (mode))
#endif
-----------------------------------------------------------------------
Summary of changes:
content/content.c | 3 +-
content/fetchers/data.c | 1 +
content/fetchers/file.c | 1 +
content/fetchers/resource.c | 1 +
content/fs_backing_store.c | 2 +-
content/handlers/image/image_cache.c | 2 +-
content/handlers/image/png.c | 1 +
content/handlers/javascript/duktape/dukky.c | 7 ++--
content/llcache.c | 4 +--
desktop/netsurf.c | 2 +-
frontends/amiga/iff_dr2d.c | 2 +-
frontends/atari/bitmap.c | 2 +-
frontends/atari/cookies.c | 2 +-
frontends/atari/deskmenu.c | 1 +
frontends/atari/font.c | 2 +-
frontends/atari/treeview.c | 2 +-
frontends/framebuffer/font_freetype.c | 2 +-
frontends/gtk/window.c | 2 +-
frontends/riscos/url_complete.h | 3 +-
frontends/riscos/window.c | 3 +-
frontends/windows/font.c | 2 +-
include/netsurf/{types.h => inttypes.h} | 50 +++++++++++++++++----------
render/html_css_fetcher.c | 9 ++---
utils/http/primitives.c | 2 +-
utils/idna.c | 2 ++
utils/utils.h | 25 ++------------
26 files changed, 68 insertions(+), 67 deletions(-)
copy include/netsurf/{types.h => inttypes.h} (55%)
diff --git a/content/content.c b/content/content.c
index 51c40d7..2eb035c 100644
--- a/content/content.c
+++ b/content/content.c
@@ -21,10 +21,11 @@
* Content handling implementation.
*/
-#include <inttypes.h>
+#include <stdint.h>
#include <stdlib.h>
#include <nsutils/time.h>
+#include "netsurf/inttypes.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "netsurf/browser_window.h"
diff --git a/content/fetchers/data.c b/content/fetchers/data.c
index 139d09a..cb99e6f 100644
--- a/content/fetchers/data.c
+++ b/content/fetchers/data.c
@@ -27,6 +27,7 @@
#include <libwapcaplet/libwapcaplet.h>
#include <nsutils/base64.h>
+#include "netsurf/inttypes.h"
#include "utils/url.h"
#include "utils/nsurl.h"
#include "utils/corestrings.h"
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index 6ffa638..4fa1a21 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -44,6 +44,7 @@
#endif
#include <libwapcaplet/libwapcaplet.h>
+#include "netsurf/inttypes.h"
#include "utils/nsurl.h"
#include "utils/dirent.h"
#include "utils/corestrings.h"
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 21ad8c7..b8b4b19 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -29,6 +29,7 @@
#include <stdarg.h>
#include <libwapcaplet/libwapcaplet.h>
+#include "netsurf/inttypes.h"
#include "utils/nsurl.h"
#include "utils/corestrings.h"
#include "utils/log.h"
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 635f917..8670c31 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -43,11 +43,11 @@
#include <stdlib.h>
#include <nsutils/unistd.h>
+#include "netsurf/inttypes.h"
#include "utils/filepath.h"
#include "utils/file.h"
#include "utils/nsurl.h"
#include "utils/log.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/gui_internal.h"
#include "netsurf/misc.h"
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 9c7ce22..02107f7 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -22,12 +22,12 @@
*/
#include <assert.h>
-#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <stdlib.h>
+#include "netsurf/inttypes.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "netsurf/misc.h"
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 93185c1..0baf411 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <png.h>
+#include "netsurf/inttypes.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/content/handlers/javascript/duktape/dukky.c b/content/handlers/javascript/duktape/dukky.c
index 7dd3bd7..1282ad9 100644
--- a/content/handlers/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
@@ -23,16 +23,15 @@
* Duktapeish implementation of javascript engine functions.
*/
-#include <inttypes.h>
-
+#include <stdint.h>
#include <nsutils/time.h>
-#include "content/content.h"
-
+#include "netsurf/inttypes.h"
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/corestrings.h"
+#include "content/content.h"
#include "javascript/js.h"
#include "javascript/content.h"
diff --git a/content/llcache.c b/content/llcache.c
index 4bd6eb3..eb30053 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -35,12 +35,10 @@
#include <stdint.h>
#include <string.h>
#include <strings.h>
-#include <inttypes.h>
-
#include <nsutils/time.h>
+#include "netsurf/inttypes.h"
#include "utils/config.h"
-
#include "utils/corestrings.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 4a14737..0f597aa 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -25,12 +25,12 @@
#include <stdlib.h>
#include <libwapcaplet/libwapcaplet.h>
+#include "netsurf/inttypes.h"
#include "utils/config.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/log.h"
#include "utils/utf8.h"
-#include "utils/utils.h"
#include "utils/messages.h"
#include "content/content_factory.h"
#include "content/fetchers.h"
diff --git a/frontends/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c
index 91973f4..a4c5855 100644
--- a/frontends/amiga/iff_dr2d.c
+++ b/frontends/amiga/iff_dr2d.c
@@ -20,12 +20,12 @@
#include <stdio.h>
#include <stdlib.h>
-#include <inttypes.h>
#include <svgtiny.h>
#include <proto/exec.h>
#include <string.h>
#include <proto/dos.h>
+#include "netsurf/inttypes.h"
#ifndef AMIGA_DR2D_STANDALONE
#include "utils/nsurl.h"
#include "netsurf/content.h"
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index d0de378..cbb7195 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -16,12 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <sys/types.h>
#include <string.h>
#include <assert.h>
#include <stdlib.h>
+#include "netsurf/inttypes.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "netsurf/bitmap.h"
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index a49aec7..9045009 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -17,8 +17,8 @@
*/
#include <assert.h>
-#include <inttypes.h>
+#include "netsurf/inttypes.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "netsurf/mouse.h"
diff --git a/frontends/atari/deskmenu.c b/frontends/atari/deskmenu.c
index 77df4e5..addba27 100644
--- a/frontends/atari/deskmenu.c
+++ b/frontends/atari/deskmenu.c
@@ -23,6 +23,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
+#include "utils/utils.h"
#include "netsurf/browser_window.h"
#include "netsurf/keypress.h"
#include "desktop/save_complete.h"
diff --git a/frontends/atari/font.c b/frontends/atari/font.c
index 5402e78..7971655 100644
--- a/frontends/atari/font.c
+++ b/frontends/atari/font.c
@@ -16,11 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
+#include "netsurf/inttypes.h"
#include "utils/utf8.h"
#include "utils/log.h"
#include "utils/nsoption.h"
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 731c032..78da2b0 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -16,13 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <sys/types.h>
#include <string.h>
#include "assert.h"
#include "cflib.h"
+#include "netsurf/inttypes.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index ccc60ea..e7c07f5 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <assert.h>
#include <ft2build.h>
#include FT_CACHE_H
+#include "netsurf/inttypes.h"
#include "utils/filepath.h"
#include "utils/utf8.h"
#include "utils/log.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index abfda93..326e573 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -23,7 +23,6 @@
*/
#include <stdlib.h>
-#include <inttypes.h>
#include <string.h>
#include <limits.h>
#include <assert.h>
@@ -32,6 +31,7 @@
#include <gdk/gdkkeysyms.h>
#include <gdk-pixbuf/gdk-pixdata.h>
+#include "netsurf/inttypes.h"
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/nsoption.h"
diff --git a/frontends/riscos/url_complete.h b/frontends/riscos/url_complete.h
index 6a4660e..9243612 100644
--- a/frontends/riscos/url_complete.h
+++ b/frontends/riscos/url_complete.h
@@ -23,9 +23,8 @@
#ifndef _NETSURF_RISCOS_URLCOMPLETE_H_
#define _NETSURF_RISCOS_URLCOMPLETE_H_
-#include <inttypes.h>
#include <stdbool.h>
-#include "oslib/wimp.h"
+#include <oslib/wimp.h>
struct gui_window;
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 45d5b14..b1ea58a 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -29,10 +29,10 @@
#include <assert.h>
#include <ctype.h>
-#include <inttypes.h>
#include <math.h>
#include <stdio.h>
#include <stdbool.h>
+#include <stdint.h>
#include <time.h>
#include <string.h>
#include <oslib/colourtrans.h>
@@ -43,6 +43,7 @@
#include <oslib/wimpspriteop.h>
#include <nsutils/time.h>
+#include "netsurf/inttypes.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/talloc.h"
diff --git a/frontends/windows/font.c b/frontends/windows/font.c
index 791b8cd..f50ba6e 100644
--- a/frontends/windows/font.c
+++ b/frontends/windows/font.c
@@ -23,10 +23,10 @@
*/
#include "utils/config.h"
-#include <inttypes.h>
#include <assert.h>
#include <windows.h>
+#include "netsurf/inttypes.h"
#include "utils/log.h"
#include "utils/nsoption.h"
#include "utils/utf8.h"
diff --git a/include/netsurf/types.h b/include/netsurf/inttypes.h
similarity index 55%
copy from include/netsurf/types.h
copy to include/netsurf/inttypes.h
index 5c9501b..874d83f 100644
--- a/include/netsurf/types.h
+++ b/include/netsurf/inttypes.h
@@ -18,28 +18,42 @@
/**
* \file
- *
- * NetSurf types.
- *
- * These are convenience types used throughout the browser.
+ * Netsurf additional integer type formatting macros.
*/
-#ifndef NETSURF_TYPES_H
-#define NETSURF_TYPES_H
+#ifndef NETSURF_INTTYPES_H
+#define NETSURF_INTTYPES_H
-#include <stdint.h>
+#include <inttypes.h>
-/**
- * Colour type: XBGR
- */
-typedef uint32_t colour;
+#ifndef PRIxPTR
+#define PRIxPTR "x"
+#endif
-/**
- * Rectangle coordinates
- */
-typedef struct rect {
- int x0, y0; /**< Top left */
- int x1, y1; /**< Bottom right */
-} rect;
+#ifndef PRId64
+#define PRId64 "lld"
+#endif
+
+/* Windows does not have sizet formating codes */
+#if defined(_WIN32)
+
+/** windows printf formatting for size_t type */
+#define PRIsizet "Iu"
+
+/** windows printf formatting for ssize_t type */
+#define PRIssizet "Id"
+
+#else
+
+/** c99 standard printf formatting for size_t type */
+#define PRIsizet "zu"
+
+/** c99 standard printf formatting for ssize_t type */
+#define PRIssizet "zd"
#endif
+
+
+
+#endif
+
diff --git a/render/html_css_fetcher.c b/render/html_css_fetcher.c
index b9d79a7..9eda6ae 100644
--- a/render/html_css_fetcher.c
+++ b/render/html_css_fetcher.c
@@ -21,18 +21,19 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-
#include <dom/dom.h>
#include <libwapcaplet/libwapcaplet.h>
+#include "netsurf/inttypes.h"
#include "utils/config.h"
-#include "content/fetch.h"
-#include "content/fetchers.h"
-#include "render/html_internal.h"
#include "utils/log.h"
#include "utils/ring.h"
#include "utils/nsurl.h"
#include "utils/utils.h"
+#include "content/fetch.h"
+#include "content/fetchers.h"
+
+#include "render/html_internal.h"
typedef struct html_css_fetcher_item {
uint32_t key;
diff --git a/utils/http/primitives.c b/utils/http/primitives.c
index f4c4e05..1e24d2a 100644
--- a/utils/http/primitives.c
+++ b/utils/http/primitives.c
@@ -16,11 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
+#include "netsurf/inttypes.h"
#include "utils/http/primitives.h"
/**
diff --git a/utils/idna.c b/utils/idna.c
index d75f957..34cc40f 100644
--- a/utils/idna.c
+++ b/utils/idna.c
@@ -28,6 +28,8 @@
#include <string.h>
#include <libutf8proc/utf8proc.h>
+#include "netsurf/inttypes.h"
+
#include "utils/errors.h"
#include "utils/idna.h"
#include "utils/idna_props.h"
diff --git a/utils/utils.h b/utils/utils.h
index 6f2ee45..3995071 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -23,10 +23,9 @@
* \todo Many of these functions and macros should have their own headers.
*/
-#ifndef _NETSURF_UTILS_UTILS_H_
-#define _NETSURF_UTILS_UTILS_H_
+#ifndef NETSURF_UTILS_UTILS_H
+#define NETSURF_UTILS_UTILS_H
-#include <inttypes.h>
#include <stdbool.h>
#ifndef NOF_ELEMENTS
@@ -52,29 +51,11 @@
#endif
#endif
-#ifndef PRIxPTR
-#define PRIxPTR "x"
-#endif
-
-#ifndef PRId64
-#define PRId64 "lld"
-#endif
-
-/* Windows does not have sizet formating codes or POSIX mkdir so work
- * around that
- */
+/* Windows does not have POSIX mkdir so work around that */
#if defined(_WIN32)
-/** windows printf formatting for size_t type */
-#define PRIsizet "Iu"
-/** windows printf formatting for ssize_t type */
-#define PRIssizet "Id"
/** windows mkdir function */
#define nsmkdir(dir, mode) mkdir((dir))
#else
-/** c99 standard printf formatting for size_t type */
-#define PRIsizet "zu"
-/** c99 standard printf formatting for ssize_t type */
-#define PRIssizet "zd"
/** POSIX mkdir function */
#define nsmkdir(dir, mode) mkdir((dir), (mode))
#endif
--
NetSurf Browser
6 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.6-213-g11f11e0
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/11f11e0a7f8f7dd03d5b1...
...commit http://git.netsurf-browser.org/netsurf.git/commit/11f11e0a7f8f7dd03d5b1fc...
...tree http://git.netsurf-browser.org/netsurf.git/tree/11f11e0a7f8f7dd03d5b1fc22...
The branch, master has been updated
via 11f11e0a7f8f7dd03d5b1fc22a8e54af305fbe6f (commit)
from 10248264ff43a917dd18796daa61ee5a5f1229d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=11f11e0a7f8f7dd03d5...
commit 11f11e0a7f8f7dd03d5b1fc22a8e54af305fbe6f
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
add missing utils header for NOF_ELEMENTS macro
diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c
index 5759a89..e186a81 100644
--- a/frontends/atari/settings.c
+++ b/frontends/atari/settings.c
@@ -32,6 +32,7 @@
#include "utils/dirent.h"
#include "utils/nsoption.h"
#include "utils/log.h"
+#include "utils/utils.h"
#include "netsurf/plot_style.h"
#include "atari/gui.h"
-----------------------------------------------------------------------
Summary of changes:
frontends/atari/settings.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c
index 5759a89..e186a81 100644
--- a/frontends/atari/settings.c
+++ b/frontends/atari/settings.c
@@ -32,6 +32,7 @@
#include "utils/dirent.h"
#include "utils/nsoption.h"
#include "utils/log.h"
+#include "utils/utils.h"
#include "netsurf/plot_style.h"
#include "atari/gui.h"
--
NetSurf Browser
6 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.6-212-g1024826
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/10248264ff43a917dd187...
...commit http://git.netsurf-browser.org/netsurf.git/commit/10248264ff43a917dd18796...
...tree http://git.netsurf-browser.org/netsurf.git/tree/10248264ff43a917dd18796da...
The branch, master has been updated
via 10248264ff43a917dd18796daa61ee5a5f1229d5 (commit)
via d1246c20612c6f6ad23b0e47497949bf2c0ec0a6 (commit)
from 70d700b26c13e04b601c4ac3db09514db473d01c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=10248264ff43a917dd1...
commit 10248264ff43a917dd18796daa61ee5a5f1229d5
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fixup cocoa form select menu includes to get rect type definition
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index 3ffd4cb..b7d168e 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -19,7 +19,7 @@
#import "cocoa/FormSelectMenu.h"
#import "cocoa/coordinates.h"
-#import "utils/utils.h"
+#import "netsurf/types.h"
#import "netsurf/browser_window.h"
#import "netsurf/form.h"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d1246c20612c6f6ad23...
commit d1246c20612c6f6ad23b0e47497949bf2c0ec0a6
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
add missing include of inttypes to atari cookies viewer
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index b7f7309..a49aec7 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -17,6 +17,7 @@
*/
#include <assert.h>
+#include <inttypes.h>
#include "utils/log.h"
#include "utils/messages.h"
-----------------------------------------------------------------------
Summary of changes:
frontends/atari/cookies.c | 1 +
frontends/cocoa/FormSelectMenu.m | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index b7f7309..a49aec7 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -17,6 +17,7 @@
*/
#include <assert.h>
+#include <inttypes.h>
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index 3ffd4cb..b7d168e 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -19,7 +19,7 @@
#import "cocoa/FormSelectMenu.h"
#import "cocoa/coordinates.h"
-#import "utils/utils.h"
+#import "netsurf/types.h"
#import "netsurf/browser_window.h"
#import "netsurf/form.h"
--
NetSurf Browser
6 years, 10 months
- 1
- 0