fix(jpeg): be a little more flexible with corrupt IPTC blocks (#5140)

Recent PR #5081 added more detection of corruptions in (among other
places) the IPTC blocks in a JPEG file.

But we maybe got a little too aggressive, since there appear to be some
jpg files out there that have strange (maybe technically incorrect?)
IPTC blocks but are otherwise fine.

Anyway, I noticed that for ICC profiles in JPEG files, we use the OIIO
attribute "imageinput:strict" to decide whether a localized corruption
in the ICC profile ONLY causes the ICC profile to be skipped (reading
the pixels just fine), or a stricter mode where anything suspicious is
grounds to stop reading the file entirely and declare it corrupt.

So in this patch, I'm using the same control for the analogous purpose
when reading the IPTC blocks. By default, just skip the IPTC block if we
don't know how to decode it. But if in strict mode, make a full error
that will cause us to stop reading the file.

With this change, I needed to update the jpeg-corrupt test to force
strict node, and update some some ref outputs.

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

src/jpeg.imageio/jpeginput.cpp

@@ -284,8 +284,9 @@ JpgInput::open(const std::string& name, ImageSpec& newspec)
             decode_xmp(xml, m_spec);
         } else if (m->marker == (JPEG_APP0 + 13) && m->data_length >= 13
                    && !strncmp((const char*)m->data, "Photoshop 3.0", 13)) {
-            if (!jpeg_decode_iptc(
-                    string_view((const char*)m->data, m->data_length))) {
+            bool ok = jpeg_decode_iptc(
+                string_view((const char*)m->data, m->data_length));
+            if (!ok && OIIO::get_int_attribute("imageinput:strict")) {
                 errorfmt("Corrupted IPTC data");
                 return false;
             }

testsuite/jpeg-corrupt/ref/out-alt.txt

@@ -44,5 +44,7 @@ src/corrupt-icc-4552.jpg : 1500 x 1000, 3 channel, uint8 jpeg
     ICCProfile:rendering_intent: "Unknown"
     jpeg:subsampling: "4:2:0"
     oiio:ColorSpace: "srgb_rec709_scene"
-iinfo ERROR: "src/corrupt-iptc-8011.jpg" : JPEG error: Corrupt JPEG data: 256 extraneous bytes before marker 0xdb ("src/corrupt-iptc-8011.jpg")
+oiiotool ERROR: read : JPEG error: Corrupt JPEG data: 256 extraneous bytes before marker 0xdb ("src/corrupt-iptc-8011.jpg")
 Corrupted IPTC data
+Full command line was:
+> oiiotool -oiioattrib imageinput:strict 1 -info -v src/corrupt-iptc-8011.jpg

testsuite/jpeg-corrupt/ref/out-alt2.txt

@@ -43,5 +43,7 @@ src/corrupt-icc-4552.jpg : 1500 x 1000, 3 channel, uint8 jpeg
     ICCProfile:rendering_intent: "Unknown"
     jpeg:subsampling: "4:2:0"
     oiio:ColorSpace: "srgb_rec709_scene"
-iinfo ERROR: "src/corrupt-iptc-8011.jpg" : JPEG error: Corrupt JPEG data: 256 extraneous bytes before marker 0xdb ("src/corrupt-iptc-8011.jpg")
+oiiotool ERROR: read : JPEG error: Corrupt JPEG data: 256 extraneous bytes before marker 0xdb ("src/corrupt-iptc-8011.jpg")
 Corrupted IPTC data
+Full command line was:
+> oiiotool -oiioattrib imageinput:strict 1 -info -v src/corrupt-iptc-8011.jpg

testsuite/jpeg-corrupt/ref/out-alt3.txt

@@ -44,5 +44,7 @@ src/corrupt-icc-4552.jpg : 1500 x 1000, 3 channel, uint8 jpeg
     ICCProfile:rendering_intent: "Unknown"
     jpeg:subsampling: "4:2:0"
     oiio:ColorSpace: "srgb_rec709_scene"
-iinfo ERROR: "src/corrupt-iptc-8011.jpg" : JPEG error: Corrupt JPEG data: 256 extraneous bytes before marker 0xdb ("src/corrupt-iptc-8011.jpg")
+oiiotool ERROR: read : JPEG error: Corrupt JPEG data: 256 extraneous bytes before marker 0xdb ("src/corrupt-iptc-8011.jpg")
 Corrupted IPTC data
+Full command line was:
+> oiiotool -oiioattrib imageinput:strict 1 -info -v src/corrupt-iptc-8011.jpg

testsuite/jpeg-corrupt/ref/out-alt4.txt

@@ -44,5 +44,7 @@ src/corrupt-icc-4552.jpg : 1500 x 1000, 3 channel, uint8 jpeg
     ICCProfile:rendering_intent: "Unknown"
     jpeg:subsampling: "4:2:0"
     oiio:ColorSpace: "srgb_rec709_scene"
-iinfo ERROR: "src/corrupt-iptc-8011.jpg" : JPEG error: Corrupt JPEG data: 256 extraneous bytes before marker 0xdb ("src/corrupt-iptc-8011.jpg")
+oiiotool ERROR: read : JPEG error: Corrupt JPEG data: 256 extraneous bytes before marker 0xdb ("src/corrupt-iptc-8011.jpg")
 Corrupted IPTC data
+Full command line was:
+> oiiotool -oiioattrib imageinput:strict 1 -info -v src/corrupt-iptc-8011.jpg

testsuite/jpeg-corrupt/ref/out.txt

@@ -26,4 +26,4 @@
 command += info_command ("src/corrupt-icc-4552.jpg", safematch=True)
 
 # This file had corrupted IPTC data
-command += info_command ("-v src/corrupt-iptc-8011.jpg", info_program="iinfo")
+command += oiiotool("-oiioattrib imageinput:strict 1 -info -v src/corrupt-iptc-8011.jpg")