April 2017 - netsurf-commits - listmaster.pepperfish.net

buildsystem: branch ashmew2/kolibri deleted. release/1.5-3-g5f994a6

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/buildsystem.git/shortlog/00000000000000000... ...commit http://git.netsurf-browser.org/buildsystem.git/commit/0000000000000000000... ...tree http://git.netsurf-browser.org/buildsystem.git/tree/000000000000000000000... The branch, ashmew2/kolibri has been deleted was 5f994a6f7580e5d064b4b9e9578ad51a217c6727 ----------------------------------------------------------------------- 5f994a6f7580e5d064b4b9e9578ad51a217c6727 Add support for Cross compiling for KolibriOS from Linux ----------------------------------------------------------------------- -- NetSurf Project build system

6 years, 7 months

1
0
0 / 0

buildsystem: branch ashmew2/kolibri-cross created. release/1.5-3-g520dd97

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/buildsystem.git/shortlog/520dd9740ce60ffd0... ...commit http://git.netsurf-browser.org/buildsystem.git/commit/520dd9740ce60ffd077... ...tree http://git.netsurf-browser.org/buildsystem.git/tree/520dd9740ce60ffd0778d... The branch, ashmew2/kolibri-cross has been created at 520dd9740ce60ffd0778d9565f8779c31b8a2acb (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/buildsystem.git/commit/?id=520dd9740ce60ff... commit 520dd9740ce60ffd0778d9565f8779c31b8a2acb Author: Ashish Gupta <ashmew2(a)gmail.com> Commit: Ashish Gupta <ashmew2(a)gmail.com> Patch Makefile.tools to support cross compiling from Linux to KolibriOS diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 86fac4c..6567840 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -29,7 +29,6 @@ ############################################################################### # Sanity checks ############################################################################### - ifeq ($(COMPONENT_TYPE),) $(error COMPONENT_TYPE not set) endif @@ -55,8 +54,13 @@ NSTESTTOOLS := $(NSSHARED)/testtools # Bootstrap default tooling ############################################################################### -BUILD_CC ?= cc +ifeq ($(HOST),kolibrios) + BUILD_CC := kos32-gcc + CC := kos32-gcc + BUILD := Linux +endif +BUILD_CC ?= cc ############################################################################### # Host/build platform detection ############################################################################### @@ -125,8 +129,10 @@ else CC__ := $(CC) # Improve our guess at the identity of CC # (only if CC was not specified by the user) - ifeq ($(origin CC),default) - CC__ := $(HOST)-gcc + ifneq ($(HOST),kolibrios) + ifeq ($(origin CC),default) + CC__ := $(HOST)-gcc + endif endif # Search the path for the compiler @@ -140,6 +146,11 @@ else CC__ := $(realpath $(toolpath_)) toolpath_ := $(dir $(CC__)) toolprefix_ := $(subst :,/,$(dir $(subst -,/,$(subst /,:,$(CC__))))) + + ifeq ($(HOST),kolibrios) + toolprefix_ := $(subst kos32/,kos32,$(toolprefix_)) + endif + ifeq ($(origin AR),default) AR__ := $(toolprefix_)-ar endif @@ -242,6 +253,24 @@ else PREFIX ?= $(GCCSDK_INSTALL_ENV) endif + + ifeq ($(HOST),kolibrios) + #Cross compiling for KolibriOS from Linux + #expat was added for libdom. + #SDL was added for libnsfb. + #Both of them should probably be moved to respective library Makefiles. + CFLAGS := $(CFLAGS) -c -Wno-error=undef -Wno-error=char-subscripts -Wno-error=pedantic -U__STRICT_ANSI__ -I $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include -I $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/machine -I $(HOME)/kolibrios/contrib/sdk/sources/SDL-1.2.2/include -I$(HOME)/kolibrios/contrib/sdk/sources/expat/lib \ + -std=c99 -g -U_Win32 -U_WIN32 -U__MINGW32__ \ + -U__BSD_VISIBLE -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 \ + -D_POSIX_C_SOURCE=200809L -D_NETBSD_SOURCE + + CXXFLAGS := $(CXXFLAGS) -U__STRICT_ANSI__ -I$(GCCSDK_INSTALL_ENV)/newlib/libc/include + + LDFLAGS := $(LDFLAGS) -T$(GCCSDK_INSTALL_ENV)/newlib/libc/static.lds -nostdlib -static \ + -image-base 0 -L/home/autobuild/tools/win32/mingw32/lib -lgcc \ + /home/autobuild/tools/win32/lib/libz.a /home/autobuild/tools/win32/lib/libdll.a \ + /home/autobuild/tools/win32/lib/libapp.a /home/autobuild/tools/win32/lib/libc.dll.a + endif endif # Default prefix ----------------------------------------------------------------------- -- NetSurf Project build system

6 years, 7 months

1
0
0 / 0

netsurf: branch master updated. release/3.6-370-g2c8a47b

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/2c8a47b7d44116cb29a2b... ...commit http://git.netsurf-browser.org/netsurf.git/commit/2c8a47b7d44116cb29a2ba4... ...tree http://git.netsurf-browser.org/netsurf.git/tree/2c8a47b7d44116cb29a2ba46d... The branch, master has been updated via 2c8a47b7d44116cb29a2ba46db0118ef726615d3 (commit) from 90100bbd45be8e3bc45f258a32a24f433cadbd70 (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=2c8a47b7d44116cb29a... commit 2c8a47b7d44116cb29a2ba46db0118ef726615d3 Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> GTK: Slight optimisation to nsfont_split(). When we aren't modifying the line, pango_layout_get_line_readonly() is a faster alternative to pango_layout_get_line(). diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c index 5276148..fb065b1 100644 --- a/frontends/gtk/layout_pango.c +++ b/frontends/gtk/layout_pango.c @@ -194,7 +194,7 @@ nsfont_split(const plot_font_style_t *fstyle, pango_layout_set_single_paragraph_mode(layout, TRUE); /* Obtain the second line of the layout (if there is one) */ - line = pango_layout_get_line(layout, 1); + line = pango_layout_get_line_readonly(layout, 1); if (line != NULL) { /* Pango split the text. The line's start_index indicates the * start of the character after the line break. */ ----------------------------------------------------------------------- Summary of changes: frontends/gtk/layout_pango.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c index 5276148..fb065b1 100644 --- a/frontends/gtk/layout_pango.c +++ b/frontends/gtk/layout_pango.c @@ -194,7 +194,7 @@ nsfont_split(const plot_font_style_t *fstyle, pango_layout_set_single_paragraph_mode(layout, TRUE); /* Obtain the second line of the layout (if there is one) */ - line = pango_layout_get_line(layout, 1); + line = pango_layout_get_line_readonly(layout, 1); if (line != NULL) { /* Pango split the text. The line's start_index indicates the * start of the character after the line break. */ -- NetSurf Browser

6 years, 7 months

1
0
0 / 0

netsurf: branch master updated. release/3.6-369-g90100bb

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/90100bbd45be8e3bc45f2... ...commit http://git.netsurf-browser.org/netsurf.git/commit/90100bbd45be8e3bc45f258... ...tree http://git.netsurf-browser.org/netsurf.git/tree/90100bbd45be8e3bc45f258a3... The branch, master has been updated via 90100bbd45be8e3bc45f258a32a24f433cadbd70 (commit) from 5d5081eb5788315f8ce7b60af05fe6d071672edd (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=90100bbd45be8e3bc45... commit 90100bbd45be8e3bc45f258a32a24f433cadbd70 Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> GTK: Font rendering: Use same pango layout for painting as for measuring. With this change we are consistent about how the pango layout we use is created. Now it always comes from a pango_layout_new() call on a pango context that comes from gdk_pango_context_get(). Previously the pango layout used for painting came from a call to pango_cairo_create_layout(), which required a global called "current_cr" (a cairo drawing context), which is only valid during redraw (painting). Since it was only valid during painting, this source could not be used for pango layout creation for the measuring code. diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c index bad57d6..5276148 100644 --- a/frontends/gtk/layout_pango.c +++ b/frontends/gtk/layout_pango.c @@ -226,27 +226,24 @@ nserror nsfont_paint(int x, int y, const char *string, size_t length, const plot_font_style_t *fstyle) { PangoFontDescription *desc; - PangoLayout *layout; PangoLayoutLine *line; if (length == 0) return NSERROR_OK; - layout = pango_cairo_create_layout(current_cr); + nsfont_pango_check(); desc = nsfont_style_to_description(fstyle); - pango_layout_set_font_description(layout, desc); + pango_layout_set_font_description(nsfont_pango_layout, desc); pango_font_description_free(desc); - pango_layout_set_text(layout, string, length); + pango_layout_set_text(nsfont_pango_layout, string, length); - line = pango_layout_get_line_readonly(layout, 0); + line = pango_layout_get_line_readonly(nsfont_pango_layout, 0); cairo_move_to(current_cr, x, y); nsgtk_set_colour(fstyle->foreground); pango_cairo_show_layout_line(current_cr, line); - g_object_unref(layout); - return NSERROR_OK; } ----------------------------------------------------------------------- Summary of changes: frontends/gtk/layout_pango.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c index bad57d6..5276148 100644 --- a/frontends/gtk/layout_pango.c +++ b/frontends/gtk/layout_pango.c @@ -226,27 +226,24 @@ nserror nsfont_paint(int x, int y, const char *string, size_t length, const plot_font_style_t *fstyle) { PangoFontDescription *desc; - PangoLayout *layout; PangoLayoutLine *line; if (length == 0) return NSERROR_OK; - layout = pango_cairo_create_layout(current_cr); + nsfont_pango_check(); desc = nsfont_style_to_description(fstyle); - pango_layout_set_font_description(layout, desc); + pango_layout_set_font_description(nsfont_pango_layout, desc); pango_font_description_free(desc); - pango_layout_set_text(layout, string, length); + pango_layout_set_text(nsfont_pango_layout, string, length); - line = pango_layout_get_line_readonly(layout, 0); + line = pango_layout_get_line_readonly(nsfont_pango_layout, 0); cairo_move_to(current_cr, x, y); nsgtk_set_colour(fstyle->foreground); pango_cairo_show_layout_line(current_cr, line); - g_object_unref(layout); - return NSERROR_OK; } -- NetSurf Browser

6 years, 7 months

1
0
0 / 0

libnslayout: branch master updated. 617c559accc02deb3e956b592dc22d7891e28369

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnslayout.git/shortlog/617c559accc02deb3... ...commit http://git.netsurf-browser.org/libnslayout.git/commit/617c559accc02deb3e9... ...tree http://git.netsurf-browser.org/libnslayout.git/tree/617c559accc02deb3e956... The branch, master has been updated via 617c559accc02deb3e956b592dc22d7891e28369 (commit) from f18b7ad86fe25e32cac7d9bca1abe92c46437535 (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/libnslayout.git/commit/?id=617c559accc02de... commit 617c559accc02deb3e956b592dc22d7891e28369 Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Client API: Various changes due to new thinking about responsibilities. diff --git a/include/libnslayout/nslayout.h b/include/libnslayout/nslayout.h index b486cba..62ce584 100644 --- a/include/libnslayout/nslayout.h +++ b/include/libnslayout/nslayout.h @@ -22,8 +22,8 @@ extern "C" #include <libnslayout/error.h> -/** An opaque client-owned replaced element */ -typedef void nslayout_replaced; +/** A client-defined replaced element structure */ +typedef struct nslayout_replaced nslayout_replaced; /** A rectangle */ typedef struct nslayout_rect { @@ -33,15 +33,25 @@ typedef struct nslayout_rect { int h; /**< Height of rect in px */ } nslayout_rect; +/***/ +enum nslayout_dom_node_event_type { + NSLAYOUT_DOM_NODE_INSERTED, + NSLAYOUT_DOM_NODE_MODIFIED, + NSLAYOUT_DOM_NODE_REMOVED, + NSLAYOUT_DOM_NODE__COUNT, +}; + /** Render list */ typedef struct nslayout_render_list { } nslayout_render_list; -/** Render list */ +/** Opaque layout tree object */ typedef struct nslayout_layout nslayout_layout; + /** * A LibNSLayout request + * Client calls to set replaced element intrinsic dimensions. * * Passed to the client via nslayout_callback */ @@ -49,7 +59,6 @@ typedef struct nslayout_request { /** Request type */ enum { NSLAYOUT_GET_RESOURCE, - NSLAYOUT_CREATE_REPLACED, NSLAYOUT_RENDER, NSLAYOUT_SET_EXTENTS, NSLAYOUT_GET_INTRINSIC_SIZE @@ -60,9 +69,6 @@ typedef struct nslayout_request { const char *url; /**< Absolute URL */ } get_resource; struct { - dom_element *element; /**< DOM element */ - } create_replaced; - struct { nslayout_render_list *list; /**< Render list */ } render; struct { @@ -79,9 +85,6 @@ typedef struct nslayout_request { nslayout_replaced **replaced; /** Replacement object */ } get_resource; struct { - nslayout_replaced **replaced; /** Replacement object */ - } create_replaced; - struct { unsigned int *width; /** Replacement object's width */ unsigned int *height; /** Replacement object's height */ } get_intrinsic_size; @@ -90,6 +93,59 @@ typedef struct nslayout_request { /** + * Client calls for DOM tree change events. + * + * \param[in] layout The layout requiring update for DOM change. + * \param[in] node The DOM node which is concerned in the event. + * \param[in] type The type of DOM change event. + * \return NSLAYOUT_OK on success, appropriate error otherwise. + */ +nslayout_error nslayout_dom_node_event( + nslayout_layout *layout, + dom_event_target *node, + enum nslayout_dom_node_event_type type); + +/** + * Client calls to set node as client-replaced. + * + * \param[in] layout The layout to replace an element in. + * \param[in] node The DOM node which is to be replaced. + * \param[in] replaced The client's replacement object to register with node. + * \return NSLAYOUT_OK on success, appropriate error otherwise. + */ +nslayout_error nslayout_node_event_set_replaced( + nslayout_layout *layout, + dom_event_target *node, + nslayout_replaced *replaced); + + +/** + * Client calls to set replaced element intrinsic dimensions. + * + * \param[in] layout The layout to replace an element in. + * \param[in] node The DOM node which is to be replaced. + * \param[in] width Width in pixels. + * \param[in] height Height in pixels. + * \return NSLAYOUT_OK on success, appropriate error otherwise. + */ +nslayout_error nslayout_node_event_set_intrinsic_dimensions( + nslayout_layout *layout, + dom_event_target *node, + unsigned int width, + unsigned int height); + + +/** + * Client calls to tell NSLayout that everything requires reselection. + * + * \param[in]layout The layout to who's selection context has changed. + * \return NSLAYOUT_OK on success, appropriate error otherwise. + */ +nslayout_error nslayout_selection_context_updated( + nslayout_layout *layout); + + +/** * Initialise LibNSLayout * * \return NSLAYOUT_OK on success, appropriate error otherwise. ----------------------------------------------------------------------- Summary of changes: include/libnslayout/nslayout.h | 76 ++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/include/libnslayout/nslayout.h b/include/libnslayout/nslayout.h index b486cba..62ce584 100644 --- a/include/libnslayout/nslayout.h +++ b/include/libnslayout/nslayout.h @@ -22,8 +22,8 @@ extern "C" #include <libnslayout/error.h> -/** An opaque client-owned replaced element */ -typedef void nslayout_replaced; +/** A client-defined replaced element structure */ +typedef struct nslayout_replaced nslayout_replaced; /** A rectangle */ typedef struct nslayout_rect { @@ -33,15 +33,25 @@ typedef struct nslayout_rect { int h; /**< Height of rect in px */ } nslayout_rect; +/***/ +enum nslayout_dom_node_event_type { + NSLAYOUT_DOM_NODE_INSERTED, + NSLAYOUT_DOM_NODE_MODIFIED, + NSLAYOUT_DOM_NODE_REMOVED, + NSLAYOUT_DOM_NODE__COUNT, +}; + /** Render list */ typedef struct nslayout_render_list { } nslayout_render_list; -/** Render list */ +/** Opaque layout tree object */ typedef struct nslayout_layout nslayout_layout; + /** * A LibNSLayout request + * Client calls to set replaced element intrinsic dimensions. * * Passed to the client via nslayout_callback */ @@ -49,7 +59,6 @@ typedef struct nslayout_request { /** Request type */ enum { NSLAYOUT_GET_RESOURCE, - NSLAYOUT_CREATE_REPLACED, NSLAYOUT_RENDER, NSLAYOUT_SET_EXTENTS, NSLAYOUT_GET_INTRINSIC_SIZE @@ -60,9 +69,6 @@ typedef struct nslayout_request { const char *url; /**< Absolute URL */ } get_resource; struct { - dom_element *element; /**< DOM element */ - } create_replaced; - struct { nslayout_render_list *list; /**< Render list */ } render; struct { @@ -79,9 +85,6 @@ typedef struct nslayout_request { nslayout_replaced **replaced; /** Replacement object */ } get_resource; struct { - nslayout_replaced **replaced; /** Replacement object */ - } create_replaced; - struct { unsigned int *width; /** Replacement object's width */ unsigned int *height; /** Replacement object's height */ } get_intrinsic_size; @@ -90,6 +93,59 @@ typedef struct nslayout_request { /** + * Client calls for DOM tree change events. + * + * \param[in] layout The layout requiring update for DOM change. + * \param[in] node The DOM node which is concerned in the event. + * \param[in] type The type of DOM change event. + * \return NSLAYOUT_OK on success, appropriate error otherwise. + */ +nslayout_error nslayout_dom_node_event( + nslayout_layout *layout, + dom_event_target *node, + enum nslayout_dom_node_event_type type); + +/** + * Client calls to set node as client-replaced. + * + * \param[in] layout The layout to replace an element in. + * \param[in] node The DOM node which is to be replaced. + * \param[in] replaced The client's replacement object to register with node. + * \return NSLAYOUT_OK on success, appropriate error otherwise. + */ +nslayout_error nslayout_node_event_set_replaced( + nslayout_layout *layout, + dom_event_target *node, + nslayout_replaced *replaced); + + +/** + * Client calls to set replaced element intrinsic dimensions. + * + * \param[in] layout The layout to replace an element in. + * \param[in] node The DOM node which is to be replaced. + * \param[in] width Width in pixels. + * \param[in] height Height in pixels. + * \return NSLAYOUT_OK on success, appropriate error otherwise. + */ +nslayout_error nslayout_node_event_set_intrinsic_dimensions( + nslayout_layout *layout, + dom_event_target *node, + unsigned int width, + unsigned int height); + + +/** + * Client calls to tell NSLayout that everything requires reselection. + * + * \param[in]layout The layout to who's selection context has changed. + * \return NSLAYOUT_OK on success, appropriate error otherwise. + */ +nslayout_error nslayout_selection_context_updated( + nslayout_layout *layout); + + +/** * Initialise LibNSLayout * * \return NSLAYOUT_OK on success, appropriate error otherwise. -- NetSurf Layout Engine

6 years, 7 months

1
0
0 / 0

netsurf: branch master updated. release/3.6-368-g5d5081e

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/5d5081eb5788315f8ce7b... ...commit http://git.netsurf-browser.org/netsurf.git/commit/5d5081eb5788315f8ce7b60... ...tree http://git.netsurf-browser.org/netsurf.git/tree/5d5081eb5788315f8ce7b60af... The branch, master has been updated via 5d5081eb5788315f8ce7b60af05fe6d071672edd (commit) from abdab90859a7299b2cf7eb6c3f6e68df9d17d1d7 (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=5d5081eb5788315f8ce... commit 5d5081eb5788315f8ce7b60af05fe6d071672edd Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> CSS: Handle presentational hint for HR's "width" attribute. diff --git a/content/handlers/css/hints.c b/content/handlers/css/hints.c index 9fe9ffb..9dfcf40 100644 --- a/content/handlers/css/hints.c +++ b/content/handlers/css/hints.c @@ -1586,6 +1586,7 @@ css_error node_presentational_hint(void *pw, void *node, css_hint_width(pw, node); break; case DOM_HTML_ELEMENT_TYPE_HR: + css_hint_width(pw, node); css_hint_margin_left_right_hr(pw, node); break; case DOM_HTML_ELEMENT_TYPE_TEXTAREA: ----------------------------------------------------------------------- Summary of changes: content/handlers/css/hints.c | 1 + 1 file changed, 1 insertion(+) diff --git a/content/handlers/css/hints.c b/content/handlers/css/hints.c index 9fe9ffb..9dfcf40 100644 --- a/content/handlers/css/hints.c +++ b/content/handlers/css/hints.c @@ -1586,6 +1586,7 @@ css_error node_presentational_hint(void *pw, void *node, css_hint_width(pw, node); break; case DOM_HTML_ELEMENT_TYPE_HR: + css_hint_width(pw, node); css_hint_margin_left_right_hr(pw, node); break; case DOM_HTML_ELEMENT_TYPE_TEXTAREA: -- NetSurf Browser

6 years, 7 months

1
0
0 / 0

libnsgif: branch master updated. release/0.1.4-22-gc9b99d2

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnsgif.git/shortlog/c9b99d28a0be8eb76c6e... ...commit http://git.netsurf-browser.org/libnsgif.git/commit/c9b99d28a0be8eb76c6eb0... ...tree http://git.netsurf-browser.org/libnsgif.git/tree/c9b99d28a0be8eb76c6eb057... The branch, master has been updated via c9b99d28a0be8eb76c6eb0575c7a51b524da832c (commit) from af6ab260260383f86b2dde2c2973ad59f7c42d05 (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=c9b99d28a0be8eb76c... commit c9b99d28a0be8eb76c6eb0575c7a51b524da832c Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> LZW decoder: Slight code clarity and comment improvement. diff --git a/src/lzw.c b/src/lzw.c index 6ad95aa..743f4d3 100644 --- a/src/lzw.c +++ b/src/lzw.c @@ -316,6 +316,7 @@ lzw_result lzw_decode(struct lzw_ctx *ctx, return res; } + /* Handle the new code */ if (code_new == clear_code) { /* Got Clear code */ return lzw__clear_codes(ctx, stack_pos_out); @@ -323,11 +324,11 @@ lzw_result lzw_decode(struct lzw_ctx *ctx, } else if (code_new == ctx->eoi_code) { /* Got End of Information code */ return LZW_EOI_CODE; - } - if (code_new > current_entry) { + } else if (code_new > current_entry) { /* Code is invalid */ return LZW_BAD_CODE; + } else if (code_new < current_entry) { /* Code is in table */ code_out = code_new; @@ -357,6 +358,7 @@ lzw_result lzw_decode(struct lzw_ctx *ctx, } } + /* Store details of this code as "previous code" to the context. */ ctx->previous_code_first = table[code_new].first_value; ctx->previous_code = code_new; ----------------------------------------------------------------------- Summary of changes: src/lzw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lzw.c b/src/lzw.c index 6ad95aa..743f4d3 100644 --- a/src/lzw.c +++ b/src/lzw.c @@ -316,6 +316,7 @@ lzw_result lzw_decode(struct lzw_ctx *ctx, return res; } + /* Handle the new code */ if (code_new == clear_code) { /* Got Clear code */ return lzw__clear_codes(ctx, stack_pos_out); @@ -323,11 +324,11 @@ lzw_result lzw_decode(struct lzw_ctx *ctx, } else if (code_new == ctx->eoi_code) { /* Got End of Information code */ return LZW_EOI_CODE; - } - if (code_new > current_entry) { + } else if (code_new > current_entry) { /* Code is invalid */ return LZW_BAD_CODE; + } else if (code_new < current_entry) { /* Code is in table */ code_out = code_new; @@ -357,6 +358,7 @@ lzw_result lzw_decode(struct lzw_ctx *ctx, } } + /* Store details of this code as "previous code" to the context. */ ctx->previous_code_first = table[code_new].first_value; ctx->previous_code = code_new; -- NetSurf GIF Decoder

6 years, 7 months

1
0
0 / 0

netsurf: branch master updated. release/3.6-367-gabdab90

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/abdab90859a7299b2cf7e... ...commit http://git.netsurf-browser.org/netsurf.git/commit/abdab90859a7299b2cf7eb6... ...tree http://git.netsurf-browser.org/netsurf.git/tree/abdab90859a7299b2cf7eb6c3... The branch, master has been updated via abdab90859a7299b2cf7eb6c3f6e68df9d17d1d7 (commit) from e499f5c08f27b0fa738f784dbb91d8fc28d8ca01 (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=abdab90859a7299b2cf... commit abdab90859a7299b2cf7eb6c3f6e68df9d17d1d7 Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> Presentational hints: Ensure length is initialised for auto margins. Although the length is unused when margin is auto, having uninitialised values present in a computed style means that the style hashing may give the same style different hashes depending on the unintitialised info. The effect of this would have been be to reduce the chance of computed style sharing. It would have had no effect on page rendering. diff --git a/content/handlers/css/hints.c b/content/handlers/css/hints.c index a962123..9fe9ffb 100644 --- a/content/handlers/css/hints.c +++ b/content/handlers/css/hints.c @@ -882,6 +882,7 @@ static void css_hint_margin_left_right_align_center( corestring_dom_align, &attr); if (exc == DOM_NO_ERR && attr != NULL) { + memset(hint, 0, sizeof(*hint) * 2); if (dom_string_caseless_lwc_isequal(attr, corestring_lwc_center) || dom_string_caseless_lwc_isequal(attr, @@ -1022,6 +1023,7 @@ static void css_hint_margin_left_right_hr( corestring_dom_align, &attr); if (exc == DOM_NO_ERR && attr != NULL) { + memset(hint, 0, sizeof(*hint) * 2); if (dom_string_caseless_lwc_isequal(attr, corestring_lwc_left)) { hint->prop = CSS_PROP_MARGIN_LEFT; ----------------------------------------------------------------------- Summary of changes: content/handlers/css/hints.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/handlers/css/hints.c b/content/handlers/css/hints.c index a962123..9fe9ffb 100644 --- a/content/handlers/css/hints.c +++ b/content/handlers/css/hints.c @@ -882,6 +882,7 @@ static void css_hint_margin_left_right_align_center( corestring_dom_align, &attr); if (exc == DOM_NO_ERR && attr != NULL) { + memset(hint, 0, sizeof(*hint) * 2); if (dom_string_caseless_lwc_isequal(attr, corestring_lwc_center) || dom_string_caseless_lwc_isequal(attr, @@ -1022,6 +1023,7 @@ static void css_hint_margin_left_right_hr( corestring_dom_align, &attr); if (exc == DOM_NO_ERR && attr != NULL) { + memset(hint, 0, sizeof(*hint) * 2); if (dom_string_caseless_lwc_isequal(attr, corestring_lwc_left)) { hint->prop = CSS_PROP_MARGIN_LEFT; -- NetSurf Browser

6 years, 7 months

1
0
0 / 0

libnsgif: branch tlsa/lzw deleted. release/0.1.4-19-gf9797e4

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnsgif.git/shortlog/00000000000000000000... ...commit http://git.netsurf-browser.org/libnsgif.git/commit/0000000000000000000000... ...tree http://git.netsurf-browser.org/libnsgif.git/tree/000000000000000000000000... The branch, tlsa/lzw has been deleted was f9797e4ae82090808036b1e1ec4318d0f1bdc456 ----------------------------------------------------------------------- f9797e4ae82090808036b1e1ec4318d0f1bdc456 New LZW decoder: Real-world fix; continue after dictionary is full. ----------------------------------------------------------------------- -- NetSurf GIF Decoder

6 years, 7 months

1
0
0 / 0

libnsgif: branch master updated. release/0.1.4-21-gaf6ab26

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnsgif.git/shortlog/af6ab260260383f86b2d... ...commit http://git.netsurf-browser.org/libnsgif.git/commit/af6ab260260383f86b2dde... ...tree http://git.netsurf-browser.org/libnsgif.git/tree/af6ab260260383f86b2dde2c... The branch, master has been updated via af6ab260260383f86b2dde2c2973ad59f7c42d05 (commit) from 099b873abca6b868f159e16894f3640d40dca5aa (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=af6ab260260383f86b... commit af6ab260260383f86b2dde2c2973ad59f7c42d05 Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> LZW decoder: Squash scan-build error by adding assert. Note, for scan-build to correctly interpret the assert, the library must be built in debug mode: $ scan-build-4.0 make VARIANT=debug diff --git a/src/lzw.c b/src/lzw.c index 6b7156e..6ad95aa 100644 --- a/src/lzw.c +++ b/src/lzw.c @@ -6,6 +6,7 @@ * Copyright 2017 Michael Drake <michael.drake(a)codethink.co.uk> */ +#include <assert.h> #include <stdint.h> #include <stdlib.h> #include <stdbool.h> @@ -160,6 +161,8 @@ static inline lzw_result lzw__next_code( uint8_t current_bit = ctx->sb_bit & 0x7; uint8_t byte_advance = (current_bit + code_size) >> 3; + assert(byte_advance <= 2); + if (ctx->sb_bit + code_size < ctx->sb_bit_count) { /* Fast path: code fully inside this sub-block */ const uint8_t *data = ctx->sb_data + (ctx->sb_bit >> 3); ----------------------------------------------------------------------- Summary of changes: src/lzw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lzw.c b/src/lzw.c index 6b7156e..6ad95aa 100644 --- a/src/lzw.c +++ b/src/lzw.c @@ -6,6 +6,7 @@ * Copyright 2017 Michael Drake <michael.drake(a)codethink.co.uk> */ +#include <assert.h> #include <stdint.h> #include <stdlib.h> #include <stdbool.h> @@ -160,6 +161,8 @@ static inline lzw_result lzw__next_code( uint8_t current_bit = ctx->sb_bit & 0x7; uint8_t byte_advance = (current_bit + code_size) >> 3; + assert(byte_advance <= 2); + if (ctx->sb_bit + code_size < ctx->sb_bit_count) { /* Fast path: code fully inside this sub-block */ const uint8_t *data = ctx->sb_data + (ctx->sb_bit >> 3); -- NetSurf GIF Decoder

6 years, 7 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits April 2017