Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/53a379ea45a3dd497c5471acc692addfe3f5297e
...commit
http://git.netsurf-browser.org/netsurf.git/commit/53a379ea45a3dd497c5471acc692addfe3f5297e
...tree
http://git.netsurf-browser.org/netsurf.git/tree/53a379ea45a3dd497c5471acc692addfe3f5297e
The branch, master has been updated
via 53a379ea45a3dd497c5471acc692addfe3f5297e (commit)
via eee26ed867167ee70e96904de6d719c5ead7a39d (commit)
from d3b4a286f93d6d341d7b2f60ece83b3e31cf90ff (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/commitdiff/53a379ea45a3dd497c5471acc692addfe3f5297e
commit 53a379ea45a3dd497c5471acc692addfe3f5297e
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Squash warning.
diff --git a/framebuffer/fbtk/event.c b/framebuffer/fbtk/event.c
index 67f9306..3ace28a 100644
--- a/framebuffer/fbtk/event.c
+++ b/framebuffer/fbtk/event.c
@@ -218,8 +218,8 @@ fbtk_event(fbtk_widget_t *root, nsfb_event_t *event, int
timeout)
switch (event->type) {
case NSFB_EVENT_KEY_DOWN:
case NSFB_EVENT_KEY_UP:
- if ((event->value.controlcode >= NSFB_KEY_MOUSE_1) &&
- (event->value.controlcode <= NSFB_KEY_MOUSE_5)) {
+ if ((event->value.keycode >= NSFB_KEY_MOUSE_1) &&
+ (event->value.keycode <= NSFB_KEY_MOUSE_5)) {
fbtk_click(root, event);
} else {
fbtk_input(root, event);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/eee26ed867167ee70e96904de6d719c5ead7a39d
commit eee26ed867167ee70e96904de6d719c5ead7a39d
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Squash set but unused variable warning.
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c
index 581fd9a..c2279a1 100644
--- a/framebuffer/font_freetype.c
+++ b/framebuffer/font_freetype.c
@@ -396,7 +396,8 @@ FT_Glyph fb_getglyph(const plot_font_style_t *fstyle,
uint32_t ucs4)
fb_face = (fb_faceid_t *)srec.face_id;
- glyph_index = FTC_CMapCache_Lookup(ft_cmap_cache, srec.face_id,
fb_face->cidx, ucs4);
+ glyph_index = FTC_CMapCache_Lookup(ft_cmap_cache, srec.face_id,
+ fb_face->cidx, ucs4);
error = FTC_ImageCache_LookupScaler(ft_image_cache,
&srec,
@@ -406,6 +407,8 @@ FT_Glyph fb_getglyph(const plot_font_style_t *fstyle,
uint32_t ucs4)
glyph_index,
&glyph,
NULL);
+ if (error != 0)
+ return NULL;
return glyph;
}
-----------------------------------------------------------------------
Summary of changes:
framebuffer/fbtk/event.c | 4 ++--
framebuffer/font_freetype.c | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/framebuffer/fbtk/event.c b/framebuffer/fbtk/event.c
index 67f9306..3ace28a 100644
--- a/framebuffer/fbtk/event.c
+++ b/framebuffer/fbtk/event.c
@@ -218,8 +218,8 @@ fbtk_event(fbtk_widget_t *root, nsfb_event_t *event, int
timeout)
switch (event->type) {
case NSFB_EVENT_KEY_DOWN:
case NSFB_EVENT_KEY_UP:
- if ((event->value.controlcode >= NSFB_KEY_MOUSE_1) &&
- (event->value.controlcode <= NSFB_KEY_MOUSE_5)) {
+ if ((event->value.keycode >= NSFB_KEY_MOUSE_1) &&
+ (event->value.keycode <= NSFB_KEY_MOUSE_5)) {
fbtk_click(root, event);
} else {
fbtk_input(root, event);
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c
index 581fd9a..c2279a1 100644
--- a/framebuffer/font_freetype.c
+++ b/framebuffer/font_freetype.c
@@ -396,7 +396,8 @@ FT_Glyph fb_getglyph(const plot_font_style_t *fstyle,
uint32_t ucs4)
fb_face = (fb_faceid_t *)srec.face_id;
- glyph_index = FTC_CMapCache_Lookup(ft_cmap_cache, srec.face_id,
fb_face->cidx, ucs4);
+ glyph_index = FTC_CMapCache_Lookup(ft_cmap_cache, srec.face_id,
+ fb_face->cidx, ucs4);
error = FTC_ImageCache_LookupScaler(ft_image_cache,
&srec,
@@ -406,6 +407,8 @@ FT_Glyph fb_getglyph(const plot_font_style_t *fstyle,
uint32_t ucs4)
glyph_index,
&glyph,
NULL);
+ if (error != 0)
+ return NULL;
return glyph;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
