Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/a4cb24ed46e1893799a2426513c419a24143e531
...commit
http://git.netsurf-browser.org/netsurf.git/commit/a4cb24ed46e1893799a2426513c419a24143e531
...tree
http://git.netsurf-browser.org/netsurf.git/tree/a4cb24ed46e1893799a2426513c419a24143e531
The branch, master has been updated
via a4cb24ed46e1893799a2426513c419a24143e531 (commit)
via b6238c6c5c82322b94943ffa446f1c1bf77fcea3 (commit)
via 1dd3c80d9beb45eda990bf46a704809dec2e4ba0 (commit)
from 7c3382834eda19e2aba6e53d855c35e011b5ebfc (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=a4cb24ed46e1893799a2426513c419a24143e531
commit a4cb24ed46e1893799a2426513c419a24143e531
Author: Michael Drake <t...@netsurf-browser.org>
Commit: Michael Drake <t...@netsurf-browser.org>
Image: ICO: Update for new libnsbmp API.
diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c
index 2d839b1..63ca254 100644
--- a/content/handlers/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -71,7 +71,6 @@ static nserror nsico_create_ico_data(nsico_content *c)
.bitmap_create = nsico_bitmap_create,
.bitmap_destroy = guit->bitmap->destroy,
.bitmap_get_buffer = guit->bitmap->get_buffer,
- .bitmap_get_bpp = guit->bitmap->get_bpp
};
c->ico = calloc(sizeof(ico_collection), 1);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b6238c6c5c82322b94943ffa446f1c1bf77fcea3
commit b6238c6c5c82322b94943ffa446f1c1bf77fcea3
Author: Michael Drake <t...@netsurf-browser.org>
Commit: Michael Drake <t...@netsurf-browser.org>
Image: BMP: Update for new libnsbmp API.
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index a723022..6ef4aac 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -74,7 +74,6 @@ static nserror nsbmp_create_bmp_data(nsbmp_content *bmp)
.bitmap_create = nsbmp_bitmap_create,
.bitmap_destroy = guit->bitmap->destroy,
.bitmap_get_buffer = guit->bitmap->get_buffer,
- .bitmap_get_bpp = guit->bitmap->get_bpp
};
bmp->bmp = calloc(sizeof(struct bmp_image), 1);
@@ -151,8 +150,7 @@ static bool nsbmp_convert(struct content *c)
/* Store our content width and description */
c->width = bmp->bmp->width;
c->height = bmp->bmp->height;
- swidth = bmp->bmp->bitmap_callbacks.bitmap_get_bpp(bmp->bmp->bitmap) *
- bmp->bmp->width;
+ swidth = sizeof(uint32_t) * bmp->bmp->width;
c->size += (swidth * bmp->bmp->height) + 16 + 44;
/* set title text */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=1dd3c80d9beb45eda990bf46a704809dec2e4ba0
commit 1dd3c80d9beb45eda990bf46a704809dec2e4ba0
Author: Michael Drake <t...@netsurf-browser.org>
Commit: Michael Drake <t...@netsurf-browser.org>
PNG: Bytes per pixel is always 4.
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 06a38ca..a1db3f6 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -170,7 +170,7 @@ static void info_callback(png_structp png_s, png_infop info)
}
png_c->rowstride = guit->bitmap->get_rowstride(png_c->bitmap);
- png_c->bpp = guit->bitmap->get_bpp(png_c->bitmap);
+ png_c->bpp = sizeof(uint32_t);
nspng_setup_transforms(png_s, info);
-----------------------------------------------------------------------
Summary of changes:
content/handlers/image/bmp.c | 4 +---
content/handlers/image/ico.c | 1 -
content/handlers/image/png.c | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index a723022..6ef4aac 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -74,7 +74,6 @@ static nserror nsbmp_create_bmp_data(nsbmp_content *bmp)
.bitmap_create = nsbmp_bitmap_create,
.bitmap_destroy = guit->bitmap->destroy,
.bitmap_get_buffer = guit->bitmap->get_buffer,
- .bitmap_get_bpp = guit->bitmap->get_bpp
};
bmp->bmp = calloc(sizeof(struct bmp_image), 1);
@@ -151,8 +150,7 @@ static bool nsbmp_convert(struct content *c)
/* Store our content width and description */
c->width = bmp->bmp->width;
c->height = bmp->bmp->height;
- swidth = bmp->bmp->bitmap_callbacks.bitmap_get_bpp(bmp->bmp->bitmap) *
- bmp->bmp->width;
+ swidth = sizeof(uint32_t) * bmp->bmp->width;
c->size += (swidth * bmp->bmp->height) + 16 + 44;
/* set title text */
diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c
index 2d839b1..63ca254 100644
--- a/content/handlers/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -71,7 +71,6 @@ static nserror nsico_create_ico_data(nsico_content *c)
.bitmap_create = nsico_bitmap_create,
.bitmap_destroy = guit->bitmap->destroy,
.bitmap_get_buffer = guit->bitmap->get_buffer,
- .bitmap_get_bpp = guit->bitmap->get_bpp
};
c->ico = calloc(sizeof(ico_collection), 1);
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 06a38ca..a1db3f6 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -170,7 +170,7 @@ static void info_callback(png_structp png_s, png_infop info)
}
png_c->rowstride = guit->bitmap->get_rowstride(png_c->bitmap);
- png_c->bpp = guit->bitmap->get_bpp(png_c->bitmap);
+ png_c->bpp = sizeof(uint32_t);
nspng_setup_transforms(png_s, info);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- netsurf-commits@netsurf-browser.org
To unsubscribe send an email to netsurf-commits-le...@netsurf-browser.org
