summaryrefslogtreecommitdiff
path: root/content/handlers/image
diff options
context:
space:
mode:
Diffstat (limited to 'content/handlers/image')
-rw-r--r--content/handlers/image/bmp.c4
-rw-r--r--content/handlers/image/gif.c4
-rw-r--r--content/handlers/image/ico.c4
-rw-r--r--content/handlers/image/jpeg.c10
-rw-r--r--content/handlers/image/nssprite.c4
-rw-r--r--content/handlers/image/png.c10
-rw-r--r--content/handlers/image/rsvg.c6
-rw-r--r--content/handlers/image/svg.c17
-rw-r--r--content/handlers/image/webp.c8
9 files changed, 34 insertions, 33 deletions
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index 48a37fb24..75d8880f3 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -122,8 +122,8 @@ static bool nsbmp_convert(struct content *c)
nsbmp_content *bmp = (nsbmp_content *) c;
bmp_result res;
uint32_t swidth;
- const char *data;
- unsigned long size;
+ const uint8_t *data;
+ size_t size;
char *title;
/* set the bmp data */
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c
index 253265caa..ee85a6309 100644
--- a/content/handlers/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -236,8 +236,8 @@ static bool nsgif_convert(struct content *c)
{
nsgif_content *gif = (nsgif_content *) c;
int res;
- const char *data;
- unsigned long size;
+ const uint8_t *data;
+ size_t size;
char *title;
/* Get the animation */
diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c
index 85aab9f64..467533376 100644
--- a/content/handlers/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -120,8 +120,8 @@ static bool nsico_convert(struct content *c)
nsico_content *ico = (nsico_content *) c;
struct bmp_image *bmp;
bmp_result res;
- const char *data;
- unsigned long size;
+ const uint8_t *data;
+ size_t size;
char *title;
/* set the ico data */
diff --git a/content/handlers/image/jpeg.c b/content/handlers/image/jpeg.c
index e2f5f8f26..52cdb2201 100644
--- a/content/handlers/image/jpeg.c
+++ b/content/handlers/image/jpeg.c
@@ -168,8 +168,8 @@ static void nsjpeg_error_exit(j_common_ptr cinfo)
static struct bitmap *
jpeg_cache_convert(struct content *c)
{
- uint8_t *source_data; /* Jpeg source data */
- unsigned long source_size; /* length of Jpeg source data */
+ const uint8_t *source_data; /* Jpeg source data */
+ size_t source_size; /* length of Jpeg source data */
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
jmp_buf setjmp_buffer;
@@ -188,7 +188,7 @@ jpeg_cache_convert(struct content *c)
nsjpeg_term_source };
/* obtain jpeg source data and perfom minimal sanity checks */
- source_data = (uint8_t *)content__get_source_data(c, &source_size);
+ source_data = content__get_source_data(c, &source_size);
if ((source_data == NULL) ||
(source_size < MIN_JPEG_SIZE)) {
@@ -315,8 +315,8 @@ static bool nsjpeg_convert(struct content *c)
nsjpeg_skip_input_data, jpeg_resync_to_restart,
nsjpeg_term_source };
union content_msg_data msg_data;
- const char *data;
- unsigned long size;
+ const uint8_t *data;
+ size_t size;
char *title;
/* check image header is valid and get width/height */
diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c
index 269c24356..916bcbd34 100644
--- a/content/handlers/image/nssprite.c
+++ b/content/handlers/image/nssprite.c
@@ -98,8 +98,8 @@ static bool nssprite_convert(struct content *c)
struct rosprite_mem_context* ctx = NULL;
- const char *data;
- unsigned long size;
+ const uint8_t *data;
+ size_t size;
char *title;
data = content__get_source_data(c, &size);
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 7a4ce3010..841d5de52 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -367,8 +367,8 @@ static bool nspng_process_data(struct content *c, const char *data,
}
struct png_cache_read_data_s {
- const char *data;
- unsigned long size;
+ const uint8_t *data;
+ size_t size;
};
/** PNG library read fucntion to read data from a memory array
@@ -551,8 +551,8 @@ static nserror nspng_clone(const struct content *old_c, struct content **new_c)
{
nspng_content *clone_png_c;
nserror error;
- const char *data;
- unsigned long size;
+ const uint8_t *data;
+ size_t size;
clone_png_c = calloc(1, sizeof(nspng_content));
if (clone_png_c == NULL)
@@ -573,7 +573,7 @@ static nserror nspng_clone(const struct content *old_c, struct content **new_c)
data = content__get_source_data(&clone_png_c->base, &size);
if (size > 0) {
- if (nspng_process_data(&clone_png_c->base, data, size) == false) {
+ if (nspng_process_data(&clone_png_c->base, (const char *)data, size) == false) {
content_destroy(&clone_png_c->base);
return NSERROR_NOMEM;
}
diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c
index 2ba1b49f5..ee7373795 100644
--- a/content/handlers/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -262,8 +262,8 @@ static nserror rsvg_clone(const struct content *old, struct content **newc)
{
rsvg_content *svg;
nserror error;
- const char *data;
- unsigned long size;
+ const uint8_t *data;
+ size_t size;
svg = calloc(1, sizeof(rsvg_content));
if (svg == NULL)
@@ -284,7 +284,7 @@ static nserror rsvg_clone(const struct content *old, struct content **newc)
data = content__get_source_data(&svg->base, &size);
if (size > 0) {
- if (rsvg_process_data(&svg->base, data, size) == false) {
+ if (rsvg_process_data(&svg->base, (const char *)data, size) == false) {
content_destroy(&svg->base);
return NSERROR_NOMEM;
}
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index 99722495f..3f4e00c89 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -126,8 +126,8 @@ static bool svg_convert(struct content *c)
static void svg_reformat(struct content *c, int width, int height)
{
svg_content *svg = (svg_content *) c;
- const char *source_data;
- unsigned long source_size;
+ const uint8_t *source_data;
+ size_t source_size;
assert(svg->diagram);
@@ -135,9 +135,12 @@ static void svg_reformat(struct content *c, int width, int height)
if (width != svg->current_width || height != svg->current_height) {
source_data = content__get_source_data(c, &source_size);
- svgtiny_parse(svg->diagram, source_data, source_size,
- nsurl_access(content_get_url(c)),
- width, height);
+ svgtiny_parse(svg->diagram,
+ (const char *)source_data,
+ source_size,
+ nsurl_access(content_get_url(c)),
+ width,
+ height);
svg->current_width = width;
svg->current_height = height;
@@ -222,7 +225,7 @@ svg_redraw_internal(struct content *c,
return false;
}
}
- }
+ }
#undef BGR
@@ -361,5 +364,3 @@ static const char *svg_types[] = {
CONTENT_FACTORY_REGISTER_TYPES(svg, svg_types, svg_content_handler);
-
-
diff --git a/content/handlers/image/webp.c b/content/handlers/image/webp.c
index 66a86c9f4..cbcb5ce55 100644
--- a/content/handlers/image/webp.c
+++ b/content/handlers/image/webp.c
@@ -88,7 +88,7 @@ static struct bitmap *
webp_cache_convert(struct content *c)
{
const uint8_t *source_data; /* webp source data */
- unsigned long source_size; /* length of webp source data */
+ size_t source_size; /* length of webp source data */
VP8StatusCode webpres;
WebPBitstreamFeatures webpfeatures;
unsigned int bmap_flags;
@@ -97,7 +97,7 @@ webp_cache_convert(struct content *c)
size_t rowstride;
struct bitmap *bitmap = NULL;
- source_data = (uint8_t *)content__get_source_data(c, &source_size);
+ source_data = content__get_source_data(c, &source_size);
webpres = WebPGetFeatures(source_data, source_size, &webpfeatures);
@@ -156,12 +156,12 @@ webp_cache_convert(struct content *c)
static bool webp_convert(struct content *c)
{
int res;
- unsigned long data_size;
const uint8_t* data;
+ size_t data_size;
int width;
int height;
- data = (uint8_t *)content__get_source_data(c, &data_size);
+ data = content__get_source_data(c, &data_size);
res = WebPGetInfo(data, data_size, &width, &height);
if (res == 0) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 08:57:59 +0000