X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimage.c;h=8c0779bb9fbf38a3e4a24faebb043eedee1b8e75;hb=HEAD;hp=e6111ab8e995d98819f090bfc45cc854266ff0e6;hpb=62eda8640605c19ecd817e274e75717022349732;p=libucw.git diff --git a/images/image.c b/images/image.c index e6111ab8..8c0779bb 100644 --- a/images/image.c +++ b/images/image.c @@ -9,36 +9,25 @@ #undef LOCAL_DEBUG -#include "lib/lib.h" -#include "lib/mempool.h" -#include "images/images.h" -#include "images/error.h" -#include "images/color.h" +#include +#include +#include +#include +#include #include -static inline uns -flags_to_pixel_size(uns flags) +static inline uint +flags_to_pixel_size(uint flags) { - uns pixel_size; - switch (flags & IMAGE_COLOR_SPACE) - { - case COLOR_SPACE_GRAYSCALE: - pixel_size = 1; - break; - case COLOR_SPACE_RGB: - pixel_size = 3; - break; - default: - ASSERT(0); - } + uint pixel_size = color_space_channels[flags & IMAGE_COLOR_SPACE]; if (flags & IMAGE_ALPHA) pixel_size++; return pixel_size; } struct image * -image_new(struct image_context *ctx, uns cols, uns rows, uns flags, struct mempool *pool) +image_new(struct image_context *ctx, uint cols, uint rows, uint flags, struct mempool *pool) { DBG("image_new(cols=%u rows=%u flags=0x%x pool=%p)", cols, rows, flags, pool); flags &= IMAGE_NEW_FLAGS; @@ -48,9 +37,14 @@ image_new(struct image_context *ctx, uns cols, uns rows, uns flags, struct mempo return NULL; } struct image *img; - uns pixel_size, row_pixels_size, row_size, align; - pixel_size = flags_to_pixel_size(flags); - switch (pixel_size) + uint channels, pixel_size, row_pixels_size, row_size, align; + pixel_size = channels = flags_to_pixel_size(flags); + if (!channels || channels > 4) + { + IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Invalid number of color channels (%u)", channels); + return NULL; + } + switch (channels) { case 1: case 2: @@ -71,9 +65,9 @@ image_new(struct image_context *ctx, uns cols, uns rows, uns flags, struct mempo else align = 1; row_pixels_size = cols * pixel_size; - row_size = ALIGN(row_pixels_size, align); + row_size = ALIGN_TO(row_pixels_size, align); u64 image_size_64 = (u64)row_size * rows; - u64 bytes_64 = image_size_64 + (sizeof(struct image) + IMAGE_SSE_ALIGN_SIZE - 1 + sizeof(uns)); + u64 bytes_64 = image_size_64 + (sizeof(struct image) + IMAGE_SSE_ALIGN_SIZE - 1 + sizeof(uint)); if (unlikely(bytes_64 > image_max_bytes)) { IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Image does not fit in memory"); @@ -90,6 +84,7 @@ image_new(struct image_context *ctx, uns cols, uns rows, uns flags, struct mempo byte *p = (byte *)img + sizeof(struct image); img->pixels = ALIGN_PTR(p, IMAGE_SSE_ALIGN_SIZE); img->flags = flags; + img->channels = channels; img->pixel_size = pixel_size; img->cols = cols; img->rows = rows; @@ -102,7 +97,7 @@ image_new(struct image_context *ctx, uns cols, uns rows, uns flags, struct mempo } struct image * -image_clone(struct image_context *ctx, struct image *src, uns flags, struct mempool *pool) +image_clone(struct image_context *ctx, struct image *src, uint flags, struct mempool *pool) { DBG("image_clone(src=%p flags=0x%x pool=%p)", src, src->flags, pool); struct image *img; @@ -110,23 +105,25 @@ image_clone(struct image_context *ctx, struct image *src, uns flags, struct memp flags |= src->flags & IMAGE_CHANNELS_FORMAT; if (!(img = image_new(ctx, src->cols, src->rows, flags, pool))) return NULL; + ASSERT(src->channels == img->channels); if (img->image_size) { if (src->pixel_size != img->pixel_size) /* conversion between aligned and unaligned RGB */ { + ASSERT(src->channels == 3); # define IMAGE_WALK_PREFIX(x) walk_##x # define IMAGE_WALK_INLINE # define IMAGE_WALK_IMAGE img # define IMAGE_WALK_SEC_IMAGE src # define IMAGE_WALK_DOUBLE # define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; walk_pos[2] = walk_sec_pos[2]; }while(0) -# include "images/image-walk.h" +# include } else if (src->row_size != img->row_size || ((img->flags | src->flags) & IMAGE_GAPS_PROTECTED)) { byte *s = src->pixels; byte *d = img->pixels; - for (uns row = src->rows; row--; ) + for (uint row = src->rows; row--; ) { memcpy(d, s, src->row_pixels_size); d += img->row_size; @@ -155,8 +152,8 @@ image_clear(struct image_context *ctx UNUSED, struct image *img) if (img->flags & IMAGE_GAPS_PROTECTED) { byte *p = img->pixels; - uns bytes = img->cols * img->pixel_size; - for (uns row = img->rows; row--; p += img->row_size) + uint bytes = img->cols * img->pixel_size; + for (uint row = img->rows; row--; p += img->row_size) bzero(p, bytes); } else @@ -164,7 +161,7 @@ image_clear(struct image_context *ctx UNUSED, struct image *img) } struct image * -image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, uns cols, uns rows, uns row_size, uns flags) +image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, uint cols, uint rows, uint row_size, uint flags) { DBG("image_init_matrix(img=%p pixels=%p cols=%u rows=%u row_size=%u flags=0x%x)", img, pixels, cols, rows, row_size, flags); if (unlikely(!image_dimensions_valid(cols, rows))) @@ -175,7 +172,7 @@ image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, un img->pixels = pixels; img->cols = cols; img->rows = rows; - img->pixel_size = flags_to_pixel_size(flags); + img->pixel_size = img->channels = flags_to_pixel_size(flags); img->row_size = row_size; img->row_pixels_size = cols * img->pixel_size; img->image_size = rows * row_size; @@ -184,14 +181,14 @@ image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, un } struct image * -image_init_subimage(struct image_context *ctx UNUSED, struct image *img, struct image *src, uns left, uns top, uns cols, uns rows) +image_init_subimage(struct image_context *ctx UNUSED, struct image *img, struct image *src, uint left, uint top, uint cols, uint rows) { DBG("image_init_subimage(img=%p src=%p left=%u top=%u cols=%u rows=%u)", img, src, left, top, cols, rows); ASSERT(left + cols <= src->cols && top + rows <= src->rows); img->pixels = src->pixels + left * src->pixel_size + top * src->row_size; img->cols = cols; img->rows = rows; - img->pixel_size = src->pixel_size; + img->pixel_size = img->channels = src->pixel_size; img->row_size = src->row_size; img->row_pixels_size = cols * src->pixel_size; img->image_size = src->row_size * rows; @@ -201,45 +198,30 @@ image_init_subimage(struct image_context *ctx UNUSED, struct image *img, struct } byte * -color_space_to_name(uns cs) +image_channels_format_to_name(uint format, byte *buf) { - return image_channels_format_to_name(cs); + byte *cs_name = color_space_id_to_name(format & IMAGE_COLOR_SPACE); + uint l = strlen(cs_name); + memcpy(buf, cs_name, l + 1); + if (format & IMAGE_ALPHA) + strcpy(buf + l, "+Alpha"); + return buf; } -byte * -image_channels_format_to_name(uns format) +uint +image_name_to_channels_format(byte *name) { - switch (format) + uint i; + if (i = color_space_name_to_id(name)) + return i; + uint l = strlen(name); + if (l > 6 && !strcasecmp(name + l - 5, "+alpha")) { - case COLOR_SPACE_GRAYSCALE: - return "Gray"; - case COLOR_SPACE_GRAYSCALE | IMAGE_ALPHA: - return "GrayAlpha"; - case COLOR_SPACE_RGB: - return "RGB"; - case COLOR_SPACE_RGB | IMAGE_ALPHA: - return "RGBAlpha"; - default: - return NULL; + byte buf[l + 1]; + memcpy(buf, name, l - 6); + buf[l - 6] = 0; + if (i = color_space_name_to_id(name)) + return i; } -} - -uns -image_name_to_channels_format(byte *name) -{ - if (!strcasecmp(name, "gray")) - return COLOR_SPACE_GRAYSCALE; - if (!strcasecmp(name, "grayscale")) - return COLOR_SPACE_GRAYSCALE; - if (!strcasecmp(name, "grayalpha")) - return COLOR_SPACE_GRAYSCALE | IMAGE_ALPHA; - if (!strcasecmp(name, "grayscalealpha")) - return COLOR_SPACE_GRAYSCALE | IMAGE_ALPHA; - if (!strcasecmp(name, "rgb")) - return COLOR_SPACE_RGB; - if (!strcasecmp(name, "rgbalpha")) - return COLOR_SPACE_RGB | IMAGE_ALPHA; - if (!strcasecmp(name, "rgba")) - return COLOR_SPACE_RGB | IMAGE_ALPHA; return 0; }