Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/c95cca4ca6e806f1e2a3a829ce0dda655fdc886d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/c95cca4ca6e806f1e2a3a829ce0dda655fdc886d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/c95cca4ca6e806f1e2a3a829ce0dda655fdc886d
The branch, master has been updated
via c95cca4ca6e806f1e2a3a829ce0dda655fdc886d (commit)
via 59b108498a5c45b3fbab4fed5bfe55881e9ef1ad (commit)
from 91f4f89d4c864c6ce0170d60a13a29aed56fea5d (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=c95cca4ca6e806f1e2a3a829ce0dda655fdc886d
commit c95cca4ca6e806f1e2a3a829ce0dda655fdc886d
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
licence and credits buttons got swapped, fix it
Thanks to bavier for the bug report
diff --git a/frontends/gtk/about.c b/frontends/gtk/about.c
index f003faf..9cf5d27 100644
--- a/frontends/gtk/about.c
+++ b/frontends/gtk/about.c
@@ -80,11 +80,11 @@ nsgtk_about_dialog_response(GtkDialog *dialog,
switch (response_id) {
case ABOUT_RESPONSE_ID_LICENCE:
- about_open("about:credits");
+ about_open("about:licence");
break;
case ABOUT_RESPONSE_ID_CREDITS:
- about_open("about:licence");
+ about_open("about:credits");
break;
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=59b108498a5c45b3fbab4fed5bfe55881e9ef1ad
commit 59b108498a5c45b3fbab4fed5bfe55881e9ef1ad
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix bitmap modification callback calling for bmp image handler
bitmap file decoding is done at first call to redraw but was not
calling the modified callback at the correct time immediately after
decode so frontend image chnages were not being done. This caused
nsgtk to fail to apply its colour space fixups so red was swapped with
blue.
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index e552cdf..5970f8b 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -166,7 +166,6 @@ static bool nsbmp_convert(struct content *c)
/* exit as a success */
bmp->bitmap = bmp->bmp->bitmap;
- guit->bitmap->modified(bmp->bitmap);
content_set_ready(c);
content_set_done(c);
@@ -182,11 +181,18 @@ static bool nsbmp_redraw(struct content *c, struct
content_redraw_data *data,
nsbmp_content *bmp = (nsbmp_content *) c;
bitmap_flags_t flags = BITMAPF_NONE;
- if (bmp->bmp->decoded == false)
- if (bmp_decode(bmp->bmp) != BMP_OK)
+ if (bmp->bmp->decoded == false) {
+ bmp_result res;
+ res = bmp_decode(bmp->bmp);
+ /* allow short or incomplete image data giving a partial image*/
+ if ((res != BMP_OK) &&
+ (res != BMP_INSUFFICIENT_DATA) &&
+ (res != BMP_DATA_ERROR)) {
return false;
+ }
- bmp->bitmap = bmp->bmp->bitmap;
+ guit->bitmap->modified(bmp->bitmap);
+ }
if (data->repeat_x)
flags |= BITMAPF_REPEAT_X;
-----------------------------------------------------------------------
Summary of changes:
content/handlers/image/bmp.c | 14 ++++++++++----
frontends/gtk/about.c | 4 ++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index e552cdf..5970f8b 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -166,7 +166,6 @@ static bool nsbmp_convert(struct content *c)
/* exit as a success */
bmp->bitmap = bmp->bmp->bitmap;
- guit->bitmap->modified(bmp->bitmap);
content_set_ready(c);
content_set_done(c);
@@ -182,11 +181,18 @@ static bool nsbmp_redraw(struct content *c, struct
content_redraw_data *data,
nsbmp_content *bmp = (nsbmp_content *) c;
bitmap_flags_t flags = BITMAPF_NONE;
- if (bmp->bmp->decoded == false)
- if (bmp_decode(bmp->bmp) != BMP_OK)
+ if (bmp->bmp->decoded == false) {
+ bmp_result res;
+ res = bmp_decode(bmp->bmp);
+ /* allow short or incomplete image data giving a partial image*/
+ if ((res != BMP_OK) &&
+ (res != BMP_INSUFFICIENT_DATA) &&
+ (res != BMP_DATA_ERROR)) {
return false;
+ }
- bmp->bitmap = bmp->bmp->bitmap;
+ guit->bitmap->modified(bmp->bitmap);
+ }
if (data->repeat_x)
flags |= BITMAPF_REPEAT_X;
diff --git a/frontends/gtk/about.c b/frontends/gtk/about.c
index f003faf..9cf5d27 100644
--- a/frontends/gtk/about.c
+++ b/frontends/gtk/about.c
@@ -80,11 +80,11 @@ nsgtk_about_dialog_response(GtkDialog *dialog,
switch (response_id) {
case ABOUT_RESPONSE_ID_LICENCE:
- about_open("about:credits");
+ about_open("about:licence");
break;
case ABOUT_RESPONSE_ID_CREDITS:
- about_open("about:licence");
+ about_open("about:credits");
break;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
