summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Shaw <jshaw@netsurf-browser.org>2007-11-27 14:57:33 (GMT)
committer James Shaw <jshaw@netsurf-browser.org>2007-11-27 14:57:33 (GMT)
commit6021127d58793ef06cda894fe311ab4997f22555 (patch)
treeb6633c5cc8de5e098cfc7ed7f5c691676eb3e66c
parent77ea66727da396aca31721713accb6927327c8f2 (diff)
downloadlibrosprite-6021127d58793ef06cda894fe311ab4997f22555.tar.gz
librosprite-6021127d58793ef06cda894fe311ab4997f22555.tar.bz2
Misc tweaks for code style, more warnings in Makefile, more structure
for mask reading svn path=/import/jshaw/libsprite/; revision=9995
-rw-r--r--trunk/Makefile9
-rw-r--r--trunk/example.c7
-rw-r--r--trunk/libsprite.c49
-rw-r--r--trunk/libsprite.h9
4 files changed, 56 insertions, 18 deletions
diff --git a/trunk/Makefile b/trunk/Makefile
index 24560be..7c88189 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -3,10 +3,13 @@ CC = gcc
LD = gcc
ARFLAGS = -cru
CFLAGS = -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
- -Wwrite-strings \
- -Wnested-externs -Werror -pedantic -std=c99
+ -Wwrite-strings -Wstrict-prototypes \
+ -Wnested-externs -Werror -pedantic -std=c99 \
+ -Wno-format-zero-length -Wformat-security -Wstrict-aliasing=2 \
+ -Wmissing-format-attribute \
+ -Wformat=2 -Werror-implicit-function-declaration
LDFLAGS = -L./
-#-Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes
+#-Wmissing-declarations -Wmissing-prototypes
example: libsprite.a example.o
${LD} -g -o $@ example.o ${LDFLAGS} -lsprite -lSDL
diff --git a/trunk/example.c b/trunk/example.c
index bdd12b4..8424c11 100644
--- a/trunk/example.c
+++ b/trunk/example.c
@@ -10,9 +10,9 @@ void sdl_draw_pixel(SDL_Surface* surface, uint32_t x, uint32_t y, uint32_t color
uint32_t* pixel = ((uint32_t*) (surface->pixels)) + (y * surface->pitch/4) + x;
/* pretty sure SDL can do this, but can't figure out how */
uint32_t alpha = 0xff;/*color & 0x000000ff;*/
- uint32_t r = ((color & 0xff000000) >> 24) * (alpha / 256.0);
- uint32_t g = ((color & 0x00ff0000) >> 16) * (alpha / 256.0);
- uint32_t b = ((color & 0x0000ff00) >> 8) * (alpha / 256.0);
+ uint32_t r = ((color & 0xff000000) >> 24) * (alpha / 255.0);
+ uint32_t g = ((color & 0x00ff0000) >> 16) * (alpha / 255.0);
+ uint32_t b = ((color & 0x0000ff00) >> 8) * (alpha / 255.0);
uint32_t mapped_color = SDL_MapRGBA(surface->format, r, g, b, alpha);
*pixel = mapped_color;
@@ -73,6 +73,7 @@ int main(int argc, char *argv[])
if (sprite->has_palette) printf("paletteSize %u\n", sprite->palettesize);
printf("hasMask %s\n", sprite->has_mask ? "YES" : "NO");
+ if (sprite->has_mask) printf("mask_width %u\n", sprite->mode->mask_width);
if (sprite->has_mask) printf("maskbpp %u\n", sprite->mode->maskbpp);
sdl_blank(screen);
diff --git a/trunk/libsprite.c b/trunk/libsprite.c
index 2120f94..4a7e1ac 100644
--- a/trunk/libsprite.c
+++ b/trunk/libsprite.c
@@ -18,17 +18,22 @@ struct sprite_header {
uint32_t first_used_bit; /* old format only (spriteType = 0) */
uint32_t last_used_bit;
uint32_t image_size; /* bytes */
- uint32_t mask_size;
+ uint32_t mask_size; /* bytes */
};
struct sprite_mask_state {
uint32_t x;
uint32_t y;
+ uint32_t max_x;
+ uint32_t max_y;
+ uint32_t offset_into_word;
+ uint32_t current_byte_index;
+ uint32_t current_word;
};
static struct sprite_mode oldmodes[256];
-static uint8_t sprite_16bpp_translate[] = {
+static const uint8_t sprite_16bpp_translate[] = {
0x00, 0x08, 0x10, 0x18, 0x20, 0x29, 0x31, 0x39,
0x41, 0x4a, 0x52, 0x5a, 0x62, 0x6a, 0x73, 0x7b,
0x83, 0x8b, 0x94, 0x9c, 0xa4, 0xac, 0xb4, 0xbd,
@@ -39,18 +44,18 @@ static uint8_t sprite_16bpp_translate[] = {
* which in turn requires sprite_load_palette(FILE* f)
* defined in this file
*/
-static uint32_t sprite_1bpp_palette[] = { 0xffffff00, 0x0 };
+static const uint32_t sprite_1bpp_palette[] = { 0xffffff00, 0x0 };
-static uint32_t sprite_2bpp_palette[] = { 0xffffff00, 0xbbbbbb00, 0x77777700, 0x0 };
+static const uint32_t sprite_2bpp_palette[] = { 0xffffff00, 0xbbbbbb00, 0x77777700, 0x0 };
-static uint32_t sprite_4bpp_palette[] = {
+static const uint32_t sprite_4bpp_palette[] = {
0xffffff00, 0xdddddd00, 0xbbbbbb00, 0x99999900,
0x77777700, 0x55555500, 0x33333300, 0x0,
0x449900, 0xeeee0000, 0xcc0000, 0xdd000000,
0xeeeebb00, 0x55880000, 0xffbb0000, 0xbbff00
};
-static uint32_t sprite_8bpp_palette[] = {
+static const uint32_t sprite_8bpp_palette[] = {
0x0, 0x11111100, 0x22222200, 0x33333300,
0x44000000, 0x55111100, 0x66222200, 0x77333300,
0x4400, 0x11115500, 0x22226600, 0x33337700,
@@ -117,10 +122,11 @@ static uint32_t sprite_8bpp_palette[] = {
0xcccccc00, 0xdddddd00, 0xeeeeee00, 0xffffff00
};
-void sprite_init()
+void sprite_init(void)
{
for (uint32_t i = 0; i < 256; i++) {
oldmodes[i].colorbpp = 0;
+ oldmodes[i].maskbpp = 1;
oldmodes[i].xdpi = 0;
oldmodes[i].ydpi = 0;
}
@@ -173,7 +179,7 @@ void sprite_init()
/* old modes have the same mask bpp as their colour bpp -- PRM1-781 */
for (uint32_t i = 0; i < 256; i++) {
- oldmodes[i].maskbpp = oldmodes[i].colorbpp;
+ oldmodes[i].mask_width = oldmodes[i].colorbpp;
}
}
@@ -212,6 +218,7 @@ struct sprite_mode* sprite_get_mode(uint32_t spriteMode)
* unless bit 31 is set (http://select.riscos.com/prm/graphics/sprites/alphachannel.html)
*/
mode->maskbpp = (hasEightBitAlpha ? 8 : 1);
+ mode->mask_width = mode->maskbpp;
mode->xdpi = (spriteMode & 0x07ffc000) >> 14; /* preserve bits 14-26 only */
mode->ydpi = (spriteMode & 0x00003ffe) >> 1; /* preserve bits 1-13 only */
@@ -277,6 +284,7 @@ uint32_t sprite_palette_lookup(struct sprite* sprite, uint32_t pixel)
return translated_pixel;
}
+/* TODO: could make static inline? */
uint32_t sprite_cmyk_to_rgb(uint32_t cmyk)
{
const uint8_t c = cmyk & 0xff;
@@ -297,12 +305,15 @@ uint32_t sprite_cmyk_to_rgb(uint32_t cmyk)
return r << 24 | g << 16 | b << 8;
}
+/* TODO: could make static inline? */
uint32_t sprite_upscale_color(uint32_t pixel, struct sprite_mode* mode)
{
switch (mode->colorbpp) {
case 32:
if (mode->color_model == SPRITE_RGB) {
/* swap from 0xAABBGGRR to 0xRRGGBBAA */
+ /*uint8_t alpha = pixel & (0xff << 24);
+ TODO: think about mask/alpha */
return BSWAP(pixel);
} else {
return sprite_cmyk_to_rgb(pixel);
@@ -337,13 +348,30 @@ uint32_t sprite_upscale_color(uint32_t pixel, struct sprite_mode* mode)
}
}
+struct sprite_mask_state* sprite_init_mask_state(struct sprite* sprite, struct sprite_header* header, uint8_t* mask)
+{
+ struct sprite_mask_state* mask_state = malloc(sizeof(struct sprite_mask_state));
+
+ mask_state->x = header->first_used_bit;
+ mask_state->y = 0;
+ mask_state->max_x = header->width_words * 32 - (31 - header->last_used_bit) - 1;
+ mask_state->max_y = sprite->height - 1;
+ mask_state->offset_into_word = mask_state->x % 32;
+ mask_state->current_byte_index = 0;
+ mask_state->current_word = BTUINT((mask + mask_state->current_byte_index));
+
+ return mask_state;
+}
+
/* Get the next mask byte.
* Mask of 0xff denotes 100% opaque, 0x00 denotes 100% transparent
*/
-uint8_t sprite_get_mask(struct sprite* sprite, struct sprite_header* header, struct sprite_mask_state* mask_state)
+uint8_t sprite_next_mask_pixel(struct sprite* sprite, struct sprite_header* header, struct sprite_mask_state* mask_state)
{
/* a 1bpp mask (for new mode sprites), each row is word aligned (therefore potential righthand wastage */
sprite = sprite; header = header; mask_state = mask_state;
+
+
return 0xff;
}
@@ -384,8 +412,7 @@ void sprite_load_high_color(uint8_t* image_in, uint8_t* mask, struct sprite* spr
void sprite_load_low_color(uint8_t* image_in, uint8_t* mask, struct sprite* sprite, struct sprite_header* header)
{
- mask = mask; /* TODO: mask */
-
+ mask = mask;
sprite->image = malloc(sprite->width * sprite->height * 4); /* all image data is 32bpp going out */
const uint32_t bpp = sprite->mode->colorbpp;
diff --git a/trunk/libsprite.h b/trunk/libsprite.h
index 8d89631..04724d7 100644
--- a/trunk/libsprite.h
+++ b/trunk/libsprite.h
@@ -16,7 +16,14 @@ struct sprite_area {
struct sprite_mode {
uint32_t colorbpp;
+ /* maskbpp denotes the amount of alpha bpp used
+ * while mask_width is the bits used to store the mask.
+ * Old modes have the same mask_width as their colorbpp, but the value
+ * is always all-zeroes or all-ones.
+ * New modes can have 1bpp or 8bpp masks
+ */
uint32_t maskbpp;
+ uint32_t mask_width; /* in pixels */
uint32_t xdpi;
uint32_t ydpi;
uint32_t color_model;
@@ -39,7 +46,7 @@ struct sprite {
uint32_t* image;
};
-void sprite_init();
+void sprite_init(void);
struct sprite_area* sprite_load_file(FILE* f);
struct sprite_palette* sprite_load_palette(FILE* f);