Merge branch 'v3.12.4'

[libucw.git] / images / io-main.c

diff --git a/images/io-main.c b/images/io-main.c
index 7b176b70a187e4944bfa8af6966e4a3a3f6b96a3..c2975842c3e7076b2e4e8162250c865a39c4d660 100644 (file)
--- a/images/io-main.c
+++ b/images/io-main.c
@@ -9,11 +9,12 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.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>
 
@@ -51,7 +52,7 @@ libungif_failed:
 #endif
 #ifdef CONFIG_IMAGES_LIBPNG
   libpng_cleanup(io);
-libpng_failed:  
+libpng_failed:
 #endif
 #ifdef CONFIG_IMAGES_LIBJPEG
   libjpeg_cleanup(io);
@@ -341,20 +342,18 @@ image_io_read_data_finish(struct image_io_read_data_internals *rdi, struct image
          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);
@@ -363,10 +362,6 @@ image_io_read_data_finish(struct image_io_read_data_internals *rdi, struct image
          image_destroy(rdi->image);
          rdi->image = img;
        }
-
-      // FIXME: support for various color spaces
-
-      ASSERT(!rdi->need_transformations);
     }
 
   /* Success */