PNG re-work: test tags from PNG reads and re-work a little

libpng synthesizes gAMA and cHRM chunks on input when sRGB is present,
so ignore them if sRGB is present.

No longer generate a png_text tag when the keyword is recognized.

Added png_time

diff --git a/MANIFEST b/MANIFEST
index 756b81edd08d887c3fde8b98c1d3a7118613a34e..83b363703b9444ad23be9c16da9b418c06e44a5a 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -227,6 +227,7 @@ PNG/t/00load.t
 PNG/t/10png.t                  Test png support
 PNG/testimg/badcrc.png
 PNG/testimg/bilevel.png
 PNG/t/10png.t                  Test png support
 PNG/testimg/badcrc.png
 PNG/testimg/bilevel.png

+PNG/testimg/comment.png

 PNG/testimg/cover.png
 PNG/testimg/cover16.png
 PNG/testimg/cover16i.png
 PNG/testimg/cover.png
 PNG/testimg/cover16.png
 PNG/testimg/cover16i.png

diff --git a/PNG/MANIFEST b/PNG/MANIFEST
index 9bd6644d40cf884a696ea9ff889b4809bfa553c7..08579200c90dd443085d4031206946f88fc71391 100644 (file)
--- a/PNG/MANIFEST
+++ b/PNG/MANIFEST
@@ -12,6 +12,7 @@ t/00load.t
 t/10png.t
 testimg/badcrc.png
 testimg/bilevel.png
 t/10png.t
 testimg/badcrc.png
 testimg/bilevel.png

+testimg/comment.png

 testimg/cover.png
 testimg/cover16.png
 testimg/cover16i.png
 testimg/cover.png
 testimg/cover16.png
 testimg/cover16i.png

diff --git a/PNG/impng.c b/PNG/impng.c
index f9a7a25272a3b4a034bd177cd5b7f1936ea70054..1d63ab3f4c0f9ebe7ee6ebe42419d0d3e96bdfa0 100644 (file)
--- a/PNG/impng.c
+++ b/PNG/impng.c
@@ -724,25 +724,28 @@ get_png_tags(i_img *im, png_structp png_ptr, png_infop info_ptr, int bit_depth)
   /* the various readers can call png_set_expand(), libpng will make
      it's internal record of bit_depth at least 8 in that case */
   i_tags_setn(&im->tags, "png_bits", bit_depth);
   /* the various readers can call png_set_expand(), libpng will make
      it's internal record of bit_depth at least 8 in that case */
   i_tags_setn(&im->tags, "png_bits", bit_depth);

-

   
   

-  {
+  if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sRGB)) {

     int intent;
     if (png_get_sRGB(png_ptr, info_ptr, &intent)) {
       i_tags_setn(&im->tags, "png_srgb_intent", intent);
     }
   }
     int intent;
     if (png_get_sRGB(png_ptr, info_ptr, &intent)) {
       i_tags_setn(&im->tags, "png_srgb_intent", intent);
     }
   }

-  {
+  else {
+    /* Ignore these if there's an sRGB chunk, libpng simulates
+       their existence if there's an sRGB chunk, and the PNG spec says
+       that these are ignored if the sRGB is present, so ignore them.
+    */

     double gamma;
     double gamma;

-    if (png_get_gAMA(png_ptr, info_ptr, &gamma)) {
-      i_tags_set_float2(&im->tags, "png_gamma", 0, gamma, 4);
-    }
-  }
-  {

     double white_x, white_y;
     double red_x, red_y;
     double green_x, green_y;
     double blue_x, blue_y;
     double white_x, white_y;
     double red_x, red_y;
     double green_x, green_y;
     double blue_x, blue_y;

+
+    if (png_get_gAMA(png_ptr, info_ptr, &gamma)) {
+      i_tags_set_float2(&im->tags, "png_gamma", 0, gamma, 4);
+    }
+

     if (png_get_cHRM(png_ptr, info_ptr, &white_x, &white_y,
                     &red_x, &red_y, &green_x, &green_y,
                     &blue_x, &blue_y)) {
     if (png_get_cHRM(png_ptr, info_ptr, &white_x, &white_y,
                     &red_x, &red_y, &green_x, &green_y,
                     &blue_x, &blue_y)) {


@@ -765,26 +768,44 @@ get_png_tags(i_img *im, png_structp png_ptr, png_infop info_ptr, int bit_depth)
       int i;
       for (i = 0; i < num_text; ++i) {
        int j;
       int i;
       for (i = 0; i < num_text; ++i) {
        int j;

-       char tag_name[50];
-       sprintf(tag_name, "png_text%d_key", i);
-       i_tags_set(&im->tags, tag_name, text[i].key, -1);
-       sprintf(tag_name, "png_text%d_text", i);
-       i_tags_set(&im->tags, tag_name, text[i].text, -1);
-       sprintf(tag_name, "png_text%d_type", i);
-       i_tags_set(&im->tags, tag_name, 
-                  (text[i].compression == PNG_TEXT_COMPRESSION_NONE
-                   || text[i].compression == PNG_TEXT_COMPRESSION_zTXt) ?
-                  "text" : "itxt", -1);
+       int found = 0;

 
        for (j = 0; j < text_tags_count; ++j) {
          if (strcmp(text_tags[j].keyword, text[i].key) == 0) {
            i_tags_set(&im->tags, text_tags[j].tagname, text[i].text, -1);
 
        for (j = 0; j < text_tags_count; ++j) {
          if (strcmp(text_tags[j].keyword, text[i].key) == 0) {
            i_tags_set(&im->tags, text_tags[j].tagname, text[i].text, -1);

+           found = 1;

            break;
          }
        }
            break;
          }
        }

+
+       if (!found) {
+         char tag_name[50];
+         sprintf(tag_name, "png_text%d_key", i);
+         i_tags_set(&im->tags, tag_name, text[i].key, -1);
+         sprintf(tag_name, "png_text%d_text", i);
+         i_tags_set(&im->tags, tag_name, text[i].text, -1);
+         sprintf(tag_name, "png_text%d_type", i);
+         i_tags_set(&im->tags, tag_name, 
+                    (text[i].compression == PNG_TEXT_COMPRESSION_NONE
+                     || text[i].compression == PNG_TEXT_COMPRESSION_zTXt) ?
+                    "text" : "itxt", -1);
+       }

       }
     }
   }
       }
     }
   }

+
+  {
+    png_time *mod_time;
+
+    if (png_get_tIME(png_ptr, info_ptr, &mod_time)) {
+      char time_formatted[80];
+
+      sprintf(time_formatted, "%d-%02d-%02dT%02d:%02d:%02d",
+             mod_time->year, mod_time->month, mod_time->day,
+             mod_time->hour, mod_time->minute, mod_time->second);
+      i_tags_set(&im->tags, "png_time", time_formatted, -1);
+    }
+  }

 }
 
 static int
 }
 
 static int

diff --git a/PNG/t/10png.t b/PNG/t/10png.t
index 8ef014100e4ed20a8d66eb77b326cca6131342bf..ff9fb579fc7dff840abaeb129e80cec32c6f0b72 100644 (file)
--- a/PNG/t/10png.t
+++ b/PNG/t/10png.t
@@ -10,7 +10,7 @@ my $debug_writes = 1;
 
 init_log("testout/t102png.log",1);
 
 
 init_log("testout/t102png.log",1);
 

-plan tests => 204;
+plan tests => 210;

 
 # this loads Imager::File::PNG too
 ok($Imager::formats{"png"}, "must have png format");
 
 # this loads Imager::File::PNG too
 ok($Imager::formats{"png"}, "must have png format");


@@ -568,6 +568,21 @@ SKIP:
   is($in->tags(name => "png_bits"), 16, "check png_bits");
 }
 
   is($in->tags(name => "png_bits"), 16, "check png_bits");
 }
 

+SKIP:
+{
+  my $im = Imager->new(file => "testimg/comment.png");
+  ok($im, "read file with comment")
+    or diag("Cannot read comment.png: ".Imager->errstr);
+  $im
+    or skip("Cannot test tags file I can't read", 5);
+  is($im->tags(name => "i_comment"), "Test comment", "check i_comment");
+  is($im->tags(name => "png_interlace"), "0", "no interlace");
+  is($im->tags(name => "png_interlace_name"), "none", "no interlace (text)");
+  is($im->tags(name => "png_srgb_intent"), "0", "srgb perceptual");
+  is($im->tags(name => "png_time"), "2012-04-15T03:36:50",
+     "modification time");
+}
+

 sub limited_write {
   my ($limit) = @_;
 
 sub limited_write {
   my ($limit) = @_;
 

diff --git a/PNG/testimg/comment.png b/PNG/testimg/comment.png
new file mode 100644 (file)
index 0000000..8962fe1
Binary files /dev/null and b/PNG/testimg/comment.png differ