X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimage.c;h=48d5d6b9b116f7c12ae490d0e0fc77b37f587a94;hb=d46d9596c225dbbcaef4b76e0828036e3addfbe3;hp=828313d53d8ec5099480582b5e8782b9ff9b19db;hpb=501776384dca3e264f25475f1526b1564f2c035a;p=libucw.git

diff --git a/images/image.c b/images/image.c
index 828313d5..48d5d6b9 100644
--- a/images/image.c
+++ b/images/image.c
@@ -12,47 +12,15 @@
 #include "lib/lib.h"
 #include "lib/mempool.h"
 #include "images/images.h"
-#include <string.h>
-
-#define MAX_IMAGE_BYTES (1 << 30)
-
-void
-image_thread_init(struct image_thread *it)
-{
-  DBG("image_thread_init()");
-  bzero(it, sizeof(*it));
-  it->pool = mp_new(1024);
-}
-
-void
-image_thread_cleanup(struct image_thread *it)
-{
-  DBG("image_thread_cleanup()");
-  mp_delete(it->pool);
-}
+#include "images/error.h"
+#include "images/color.h"
 
-void
-image_thread_err_format(struct image_thread *it, uns code, char *msg, ...)
-{
-  va_list args;
-  va_start(args, msg);
-  it->err_code = code;
-  it->err_msg = mp_vprintf(it->pool, msg, args);
-  va_end(args);
-}
+#include <string.h>
 
-struct image *
-image_new(struct image_thread *it, uns cols, uns rows, uns flags, struct mempool *pool)
+static inline uns
+flags_to_pixel_size(uns flags)
 {
-  DBG("image_new(cols=%u rows=%u flags=0x%x pool=%p)", cols, rows, flags, pool);
-  flags &= IMAGE_PIXEL_FORMAT | IMAGE_SSE_ALIGNED;
-  if (unlikely(!image_dimensions_valid(cols, rows)))
-    {
-      image_thread_err_format(it, IMAGE_ERR_INVALID_DIMENSIONS, "Invalid image dimensions (%ux%u)", cols, rows);
-      return NULL;
-    }
-  struct image *img;
-  uns pixel_size, row_size, align;
+  uns pixel_size;
   switch (flags & IMAGE_COLOR_SPACE)
     {
       case COLOR_SPACE_GRAYSCALE:
@@ -66,6 +34,22 @@ image_new(struct image_thread *it, uns cols, uns rows, uns flags, struct mempool
     }
   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)
+{
+  DBG("image_new(cols=%u rows=%u flags=0x%x pool=%p)", cols, rows, flags, pool);
+  flags &= IMAGE_NEW_FLAGS;
+  if (unlikely(!image_dimensions_valid(cols, rows)))
+    {
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Invalid image dimensions (%ux%u)", cols, rows);
+      return NULL;
+    }
+  struct image *img;
+  uns pixel_size, row_size, align;
+  pixel_size = flags_to_pixel_size(flags);
   switch (pixel_size)
     {
       case 1:
@@ -90,9 +74,9 @@ image_new(struct image_thread *it, uns cols, uns rows, uns flags, struct mempool
   row_size = ALIGN(row_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));
-  if (unlikely(bytes_64 > MAX_IMAGE_BYTES))
+  if (unlikely(bytes_64 > image_max_bytes))
     {
-      image_thread_err(it, IMAGE_ERR_INVALID_DIMENSIONS, "Image does not fit in memory");
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Image does not fit in memory");
       return NULL;
     }
   if (pool)
@@ -110,20 +94,20 @@ image_new(struct image_thread *it, uns cols, uns rows, uns flags, struct mempool
   img->cols = cols;
   img->rows = rows;
   img->row_size = row_size;
-  img->image_size = bytes_64;
+  img->image_size = image_size_64;
   DBG("img=%p flags=0x%x pixel_size=%u row_size=%u image_size=%u pixels=%p",
     img, img->flags, img->pixel_size, img->row_size, img->image_size, img->pixels);
   return img;
 }
 
 struct image *
-image_clone(struct image_thread *it, struct image *src, uns flags, struct mempool *pool)
+image_clone(struct image_context *ctx, struct image *src, uns flags, struct mempool *pool)
 {
   DBG("image_clone(src=%p flags=0x%x pool=%p)", src, src->flags, pool);
   struct image *img;
-  flags &= ~IMAGE_CHANNELS_FORMAT;
+  flags &= IMAGE_NEW_FLAGS & ~IMAGE_CHANNELS_FORMAT;
   flags |= src->flags & IMAGE_CHANNELS_FORMAT;
-  if (!(img = image_new(it, src->cols, src->rows, flags, pool)))
+  if (!(img = image_new(ctx, src->cols, src->rows, flags, pool)))
     return NULL;
   if (img->image_size)
     {
@@ -137,7 +121,7 @@ image_clone(struct image_thread *it, struct image *src, uns flags, struct mempoo
 #         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"
 	}
-      else if (src->row_size != img->row_size)
+      else if (src->row_size != img->row_size || ((img->flags | src->flags) & IMAGE_GAPS_PROTECTED))
         {
           byte *s = src->pixels;
           byte *d = img->pixels;
@@ -164,47 +148,58 @@ image_destroy(struct image *img)
 }
 
 void
-image_clear(struct image_thread *it UNUSED, struct image *img)
+image_clear(struct image_context *ctx UNUSED, struct image *img)
 {
   DBG("image_clear(img=%p)", img);
   if (img->image_size)
-    bzero(img->pixels, img->image_size);
+    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)
+	  bzero(p, bytes);
+      }
+    else
+      bzero(img->pixels, img->image_size);
 }
 
-int
-image_init_matrix(struct image_thread *it, struct image *img, byte *pixels, uns cols, uns rows, uns row_size, uns flags)
+struct image *
+image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, uns cols, uns rows, uns row_size, uns flags)
 {
-  DBG("image_init_matrix(img=%p cols=%u rows=%u row_size=%u flags=0x%x)", img, cols, rows, row_size, uns 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)))
     {
-      image_thread_err_format(it, IMAGE_ERR_INVALID_DIMENSIONS, "Invalid image dimensions (%ux%u)", cols, rows);
-      return 0;
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Invalid image dimensions (%ux%u)", cols, rows);
+      return NULL;
     }
   img->pixels = pixels;
   img->cols = cols;
   img->rows = rows;
+  img->pixel_size = flags_to_pixel_size(flags);
   img->row_size = row_size;
   img->image_size = rows * row_size;
-  img->flags = flags & (IMAGE_PIXEL_FORMAT | IMAGE_SSE_ALIGNED);
-  return 1;
+  img->flags = flags & (IMAGE_NEW_FLAGS | IMAGE_GAPS_PROTECTED);
+  return img;
 }
 
-int
-image_init_subimage(struct image_thread *it UNUSED, struct image *img, struct image *src, uns left, uns top, uns cols, uns rows)
+struct image *
+image_init_subimage(struct image_context *ctx UNUSED, struct image *img, struct image *src, uns left, uns top, uns cols, uns rows)
 {
-  DBG("image_init_subimage(img=%p src=%p left=%u top=%u cols=%u rows=%u)");
+  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->row_size = src->row_size;
   img->image_size = src->row_size * rows;
-  img->flags = src->flags & ~IMAGE_NEED_DESTROY; 
-  return 1;
+  img->flags = src->flags & IMAGE_NEW_FLAGS;
+  img->flags |= IMAGE_GAPS_PROTECTED;
+  return img;
 }
 
 byte *
-color_space_to_name(enum color_space cs)
+color_space_to_name(uns cs)
 {
   return image_channels_format_to_name(cs);
 }