- 24-bit color .ICO/.CUR files can now be read.

diff --git a/Changes b/Changes
index 3c7bfa7e6924ad3f650c5bb7c2c36eb6d064b279..eb594048c0f0f38e1a04fb0691af9db917aee9c3 100644 (file)
--- a/Changes
+++ b/Changes
@@ -3,6 +3,8 @@ Imager release history.  Older releases can be found in Changes.old
 Imager 0.66 - unreleased
 ===========
 
+ - 24-bit color .ICO/.CUR files can now be read.
+
 Bug fixes:
 
  - an optimization skipping 0 src alpha values could cause the

diff --git a/ICO/imicon.c b/ICO/imicon.c
index c132f68a9eb62c4143d174c52f171435b117426e..2246592ccd3702229b31ea6ebe45f49c6d517cae 100644 (file)
--- a/ICO/imicon.c
+++ b/ICO/imicon.c
@@ -46,13 +46,15 @@ read_one_icon(ico_reader_t *file, int index, int masked) {
     i_color *line_buf;
     i_color *outp;
     ico_color_t *inp = image->image_data;
+    int channels = masked || image->bit_count == 32 ? 4 : 3;
 
-    if (!i_int_check_image_file_limits(image->width, image->height, 4, 1)) {
+    if (!i_int_check_image_file_limits(image->width, image->height, channels, 1)) {
       ico_image_release(image);
       return NULL;
     }
 
-    result = i_img_8_new(image->width, image->height, 4);
+    
+    result = i_img_8_new(image->width, image->height, channels);
     if (!result) {
       ico_image_release(image);
       return NULL;

diff --git a/ICO/msicon.c b/ICO/msicon.c
index e8e2d89b8827a64a0983b3f5e2d2fa9ffbfdc2f5..0b878be2dfe1d2f2aaa92997259b6e28b14b93fa 100644 (file)
--- a/ICO/msicon.c
+++ b/ICO/msicon.c
@@ -10,6 +10,8 @@ int read_packed(io_glue *ig, const char *format, ...);
 static int 
 read_palette(ico_reader_t *file, ico_image_t *image, int *error);
 static int 
+read_24bit_data(ico_reader_t *file, ico_image_t *image, int *error);
+static int 
 read_32bit_data(ico_reader_t *file, ico_image_t *image, int *error);
 static int 
 read_8bit_data(ico_reader_t *file, ico_image_t *image, int *error);
@@ -256,7 +258,8 @@ ico_image_read(ico_reader_t *file, int index, int *error) {
     return NULL;
   }
 
-  if (bit_count != 1 && bit_count != 4 && bit_count != 8 && bit_count != 32) {
+  if (bit_count != 1 && bit_count != 4 && bit_count != 8
+      && bit_count != 24 && bit_count != 32) {
     *error = ICOERR_Unknown_Bits;
     return 0;
   }
@@ -291,6 +294,21 @@ ico_image_read(ico_reader_t *file, int index, int *error) {
       return NULL;
     }
   }
+  else if (bit_count == 24) {
+    result->palette_size = 0;
+
+    result->image_data = malloc(result->width * result->height * sizeof(ico_color_t));
+    if (!result->image_data) {
+      free(result);
+      *error = ICOERR_Out_Of_Memory;
+      return NULL;
+    }
+    if (!read_24bit_data(file, result, error)) {
+      free(result->image_data);
+      free(result);
+      return NULL;
+    }
+  }
   else {
     int read_result;
 
@@ -780,6 +798,56 @@ read_32bit_data(ico_reader_t *file, ico_image_t *image, int *error) {
   return 1;
 }
 
+/*
+=item read_24bit_data
+
+Reads 24 bit image data.
+
+=cut
+*/
+
+static
+int
+read_24bit_data(ico_reader_t *file, ico_image_t *image, int *error) {
+  int line_bytes = image->width * 3;
+  unsigned char *buffer;
+  int y;
+  int x;
+  unsigned char *inp;
+  ico_color_t *outp;
+
+  line_bytes = (line_bytes + 3) / 4 * 4;
+
+  buffer = malloc(line_bytes);
+
+  if (!buffer) {
+    *error = ICOERR_Out_Of_Memory;
+    return 0;
+  }
+
+  for (y = image->height - 1; y >= 0; --y) {
+    if (i_io_read(file->ig, buffer, line_bytes) != line_bytes) {
+      free(buffer);
+      *error = ICOERR_Short_File;
+      return 0;
+    }
+    outp = image->image_data;
+    outp += y * image->width;
+    inp = buffer;
+    for (x = 0; x < image->width; ++x) {
+      outp->b = inp[0];
+      outp->g = inp[1];
+      outp->r = inp[2];
+      outp->a = 255;
+      ++outp;
+      inp += 3;
+    }
+  }
+  free(buffer);
+
+  return 1;
+}
+
 /*
 =item read_8bit_data
 

diff --git a/ICO/t/t10icon.t b/ICO/t/t10icon.t
index bd2d4fe5995576048a9b8d5f77fdd0c5cf952c71..707bc4b8c99d04e13d029818b936fb65502f0c9b 100644 (file)
--- a/ICO/t/t10icon.t
+++ b/ICO/t/t10icon.t
@@ -1,6 +1,6 @@
 #!perl -w
 use strict;
-use Test::More tests => 98;
+use Test::More tests => 100;
 use Imager::Test qw(is_image);
 
 BEGIN { use_ok('Imager::File::ICO'); }
@@ -361,3 +361,13 @@ EOS
   is($im2->type, 'direct', 'expect a direct image');
   is_image($im2, $imcopy, 'check against expected');
 }
+
+{
+  # read 24-bit images
+  my $im = Imager->new;
+  ok($im->read(file => 'testimg/rgb1616.ico'), "read 24-bit data image")
+    or print "# ", $im->errstr, "\n";
+  my $vs = Imager->new(xsize => 16, ysize => 16);
+  $vs->box(filled => 1, color => '#333366');
+  is_image($im, $vs, "check we got the right colors");
+}

diff --git a/ICO/testimg/rgb1616.ico b/ICO/testimg/rgb1616.ico
new file mode 100644 (file)
index 0000000..59bfe2a
Binary files /dev/null and b/ICO/testimg/rgb1616.ico differ