#undef LOCAL_DEBUG
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "images/images.h"
-#include "images/error.h"
-#include "images/io-main.h"
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/io-main.h>
+#include <images/color.h>
#include <string.h>
#endif
#ifdef CONFIG_IMAGES_LIBPNG
libpng_cleanup(io);
-libpng_failed:
+libpng_failed:
#endif
#ifdef CONFIG_IMAGES_LIBJPEG
libjpeg_cleanup(io);
}
struct image *
-image_io_read_data_prepare(struct image_io_read_data_internals *rdi, struct image_io *io, uns cols, uns rows, uns flags)
+image_io_read_data_prepare(struct image_io_read_data_internals *rdi, struct image_io *io, uint cols, uint rows, uint flags)
{
DBG("image_io_read_data_prepare()");
if (rdi->need_transformations = io->cols != cols || io->rows != rows ||
if (io->cols != rdi->image->cols || io->rows != rdi->image->rows)
{
DBG("Scaling image");
- uns flags = rdi->image->flags;
+ uint flags = rdi->image->flags;
if (!(rdi->need_transformations = ((io->flags ^ rdi->image->flags) & (IMAGE_NEW_FLAGS & ~IMAGE_PIXELS_ALIGNED))))
flags = io->flags;
struct image *img = image_new(io->context, io->cols, io->rows, flags, rdi->need_transformations ? NULL : io->pool);
rdi->image = img;
}
- /* Merge with background */
- if ((io->flags ^ rdi->image->flags) & IMAGE_ALPHA)
+ /* Convert pixel format */
+ if (io->flags != rdi->image->flags)
{
- DBG("Applying background");
- uns flags = rdi->image->flags & ~IMAGE_ALPHA;
- if (!(rdi->need_transformations = (flags ^ io->flags) & (IMAGE_NEW_FLAGS & ~IMAGE_PIXELS_ALIGNED)))
- flags = io->flags;
- struct image *img = image_new(io->context, io->cols, io->rows, flags, rdi->need_transformations ? NULL : io->pool);
+ struct image *img = image_new(io->context, io->cols, io->rows, io->flags, io->pool);
if (unlikely(!img))
{
image_destroy(rdi->image);
return 0;
}
- if (unlikely(!image_apply_background(io->context, img, rdi->image, &io->background_color)))
+ struct image_conv_options opt = image_conv_defaults;
+ opt.background = io->background_color;
+ if (unlikely(!image_conv(io->context, img, rdi->image, &opt)))
{
image_destroy(rdi->image);
image_destroy(img);
image_destroy(rdi->image);
rdi->image = img;
}
-
- // FIXME: support for various color spaces
-
- ASSERT(!rdi->need_transformations);
}
/* Success */