Index: uspace/lib/draw/codec/tga.c =================================================================== --- uspace/lib/draw/codec/tga.c (revision b7fd2a02e4161f4edd38548e7f8456b8021549be) +++ uspace/lib/draw/codec/tga.c (revision 0c793e2e9c4358a2bb2521d35eb36b273cf0283b) @@ -46,9 +46,9 @@ uint8_t cmap_type; uint8_t img_type; - + uint16_t cmap_first_entry; uint16_t cmap_entries; uint8_t cmap_bpp; - + uint16_t startx; uint16_t starty; @@ -79,9 +79,9 @@ cmap_type_t cmap_type; img_type_t img_type; - + uint16_t cmap_first_entry; uint16_t cmap_entries; uint8_t cmap_bpp; - + uint16_t startx; uint16_t starty; @@ -91,11 +91,11 @@ uint8_t img_alpha_bpp; uint8_t img_alpha_dir; - + void *id_data; size_t id_length; - + void *cmap_data; size_t cmap_length; - + void *img_data; size_t img_length; @@ -117,20 +117,20 @@ if (size < sizeof(tga_header_t)) return false; - + tga_header_t *head = (tga_header_t *) data; - + /* Image ID field */ tga->id_data = data + sizeof(tga_header_t); tga->id_length = head->id_length; - + if (size < sizeof(tga_header_t) + tga->id_length) return false; - + /* Color map type */ tga->cmap_type = head->cmap_type; - + /* Image type */ tga->img_type = head->img_type; - + /* Color map specification */ tga->cmap_first_entry = uint16_t_le2host(head->cmap_first_entry); @@ -139,9 +139,9 @@ tga->cmap_data = tga->id_data + tga->id_length; tga->cmap_length = ALIGN_UP(tga->cmap_entries * tga->cmap_bpp, 8) >> 3; - + if (size < sizeof(tga_header_t) + tga->id_length + tga->cmap_length) return false; - + /* Image specification */ tga->startx = uint16_t_le2host(head->startx); @@ -154,9 +154,9 @@ tga->img_data = tga->cmap_data + tga->cmap_length; tga->img_length = ALIGN_UP(tga->width * tga->height * tga->img_bpp, 8) >> 3; - + if (size < sizeof(tga_header_t) + tga->id_length + tga->cmap_length + tga->img_length) return false; - + return true; } @@ -182,9 +182,9 @@ if (!decode_tga_header(data, size, &tga)) return NULL; - + /* * Check for unsupported features. */ - + switch (tga.cmap_type) { case CMAP_NOT_PRESENT: @@ -194,5 +194,5 @@ return NULL; } - + switch (tga.img_type) { case IMG_BGRA: @@ -208,20 +208,20 @@ return NULL; } - + if (tga.img_alpha_bpp != 0) return NULL; - + sysarg_t twidth = tga.startx + tga.width; sysarg_t theight = tga.starty + tga.height; - + surface_t *surface = surface_create(twidth, theight, NULL, flags); if (surface == NULL) return NULL; - + /* * TGA is encoded in a bottom-up manner, the true-color * variant is in BGR 8:8:8 encoding. */ - + switch (tga.img_type) { case IMG_BGRA: @@ -230,5 +230,5 @@ size_t offset = ((y - tga.starty) * tga.width + (x - tga.startx)) * 3; - + pixel_t pixel = bgr_888_2pixel(((uint8_t *) tga.img_data) + offset); @@ -242,5 +242,5 @@ size_t offset = (y - tga.starty) * tga.width + (x - tga.startx); - + pixel_t pixel = gray_8_2pixel(((uint8_t *) tga.img_data) + offset); @@ -252,5 +252,5 @@ break; } - + return surface; } Index: uspace/lib/draw/codec/tga.gz.c =================================================================== --- uspace/lib/draw/codec/tga.gz.c (revision b7fd2a02e4161f4edd38548e7f8456b8021549be) +++ uspace/lib/draw/codec/tga.gz.c (revision 0c793e2e9c4358a2bb2521d35eb36b273cf0283b) @@ -58,11 +58,11 @@ void *data_expanded; size_t size_expanded; - + errno_t ret = gzip_expand(data, size, &data_expanded, &size_expanded); if (ret != EOK) return NULL; - + surface_t *surface = decode_tga(data_expanded, size_expanded, flags); - + free(data_expanded); return surface; Index: uspace/lib/draw/codec/webp.c =================================================================== --- uspace/lib/draw/codec/webp.c (revision b7fd2a02e4161f4edd38548e7f8456b8021549be) +++ uspace/lib/draw/codec/webp.c (revision 0c793e2e9c4358a2bb2521d35eb36b273cf0283b) @@ -84,12 +84,12 @@ bool alpha_used; uint8_t version; - + uint8_t *src; /**< Input buffer */ size_t srclen; /**< Input buffer size */ size_t srccnt; /**< Position in the input buffer */ - + uint32_t bitbuf; /**< Bit buffer */ size_t bitlen; /**< Number of bits in the bit buffer */ - + bool overrun; /**< Overrun condition */ } webp_t; @@ -107,5 +107,5 @@ /* Bit accumulator for at least 36 bits */ uint64_t val = state->bitbuf; - + while (state->bitlen < cnt) { if (state->srccnt == state->srclen) { @@ -113,5 +113,5 @@ return 0; } - + /* Load 8 more bits */ val |= ((uint64_t) state->src[state->srccnt]) << state->bitlen; @@ -119,9 +119,9 @@ state->bitlen += 8; } - + /* Update bits in the buffer */ state->bitbuf = (uint32_t) (val >> cnt); state->bitlen -= cnt; - + return ((uint32_t) (val & ((1 << cnt) - 1))); } @@ -143,33 +143,33 @@ (size - sizeof(riff_header_t) < sizeof(webp_header_t))) return false; - + riff_header_t *riff_header = (riff_header_t *) data; if (riff_header->fourcc != FOURCC_RIFF) return false; - + /* Check payload size */ size_t payload_size = uint32_t_le2host(riff_header->payload_size); if (payload_size + sizeof(riff_header_t) > size) return false; - + data += sizeof(riff_header_t); webp_header_t *webp_header = (webp_header_t *) data; if (webp_header->fourcc != FOURCC_WEBP) return false; - + /* Only lossless encoding supported so far */ if (webp_header->encoding != FOURCC_WEBP_LOSSLESS) return false; - + webp->stream_size = uint32_t_le2host(webp_header->stream_size); if (webp->stream_size + sizeof(riff_header_t) + sizeof(webp_header_t) > size) return false; - + if (webp_header->signature != SIGNATURE_WEBP_LOSSLESS) return false; - + data += sizeof(webp_header_t); - + /* Setup decoding state */ webp->src = (uint8_t *) data; @@ -179,21 +179,21 @@ webp->bitlen = 0; webp->overrun = false; - + /* Decode the rest of the metadata */ webp->width = get_bits(webp, 14) + 1; CHECK_OVERRUN(*webp, false); - + webp->height = get_bits(webp, 14) + 1; CHECK_OVERRUN(*webp, false); - + webp->alpha_used = get_bits(webp, 1); CHECK_OVERRUN(*webp, false); - + webp->version = get_bits(webp, 3); CHECK_OVERRUN(*webp, false); - + if (webp->version != 0) return false; - + return true; } @@ -218,26 +218,26 @@ if (!decode_webp_header(data, size, &webp)) return NULL; - + bool transform_present = false; - + do { transform_present = get_bits(&webp, 1); CHECK_OVERRUN(webp, NULL); - + if (transform_present) { webp_transform_t transform = get_bits(&webp, 2); CHECK_OVERRUN(webp, NULL); - + if (transform == TRANSFORM_PREDICTOR) { // FIXME TODO } else return NULL; - + // FIXME: decode other transforms } } while (transform_present); - + // FIXME: decode image data - + return NULL; }