From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Tue, 8 Aug 2006 17:42:54 +0000 (+0200)
Subject: another bugfix
X-Git-Tag: holmes-import~606
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=9302b2d7d901f9f2ffd52e26ba5fb0f0b1008afc;p=libucw.git

another bugfix
---

diff --git a/images/io-main.c b/images/io-main.c
index c080b60c..c0907841 100644
--- a/images/io-main.c
+++ b/images/io-main.c
@@ -283,8 +283,9 @@ image_io_read_data_finish(struct image_io_read_data_internals *rdi, struct image
       if ((io->flags ^ rdi->image->flags) & IMAGE_ALPHA)
         {
 	  DBG("Aplying background");
-	  uns flags = rdi->image->flags & ~IMAGE_ALPHA; 
-	  rdi->need_transformations = (flags & io->flags) & IMAGE_NEW_FLAGS;
+	  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->thread, io->cols, io->rows, flags, rdi->need_transformations ? NULL : io->pool);
 	  if (unlikely(!img))
 	    {