Merge changes I1437390a,I10a20de5,I1ac777d1 into main

* changes: pngdec.c: add support for 'eXIf' tag pngdec.c: support ImageMagick app1 exif text data pngdec.c: add missing #ifdef for png_get_iCCP
enc_neon: enable vld1q_u8_x4 for clang & msvc
2025-04-05 00:16:50 +02:00 · 2025-03-06 14:00:07 -08:00 · 2025-03-05 16:56:20 -08:00 · 2025-03-05 13:54:09 -08:00 · 2025-03-05 13:54:07 -08:00 · 2025-03-05 13:54:04 -08:00
2 changed files with 19 additions and 1 deletions
--- a/imageio/pngdec.c
+++ b/imageio/pngdec.c
@ -139,6 +139,8 @@ static const struct {
  { "Raw profile type xmp",  ProcessRawProfile, METADATA_OFFSET(xmp) },
  // Exiftool puts exif data in APP1 chunk, too.
  { "Raw profile type APP1", ProcessRawProfile, METADATA_OFFSET(exif) },
+  // ImageMagick uses lowercase app1.
+  { "Raw profile type app1", ProcessRawProfile, METADATA_OFFSET(exif) },
  // XMP Specification Part 3, Section 3 #PNG
  { "XML:com.adobe.xmp",     MetadataCopy,      METADATA_OFFSET(xmp) },
  { NULL, NULL, 0 },
@ -159,6 +161,20 @@ static int ExtractMetadataFromPNG(png_structp png,
    png_textp text = NULL;
    const png_uint_32 num = png_get_text(png, info, &text, NULL);
    png_uint_32 i;
+
+#ifdef PNG_eXIf_SUPPORTED
+    // Look for an 'eXIf' tag. Preference is given to this tag as it's newer
+    // than the TextualData tags.
+    {
+      png_bytep exif;
+      png_uint_32 len;
+
+      if (png_get_eXIf_1(png, info, &len, &exif) == PNG_INFO_eXIf) {
+        if (!MetadataCopy((const char*)exif, len, &metadata->exif)) return 0;
+      }
+    }
+#endif  // PNG_eXIf_SUPPORTED
+
    // Look for EXIF / XMP metadata.
    for (i = 0; i < num; ++i, ++text) {
      int j;
@ -192,6 +208,7 @@ static int ExtractMetadataFromPNG(png_structp png,
        }
      }
    }
+#ifdef PNG_iCCP_SUPPORTED
    // Look for an ICC profile.
    {
      png_charp name;
@ -208,6 +225,7 @@ static int ExtractMetadataFromPNG(png_structp png,
        if (!MetadataCopy((const char*)profile, len, &metadata->iccp)) return 0;
      }
    }
+#endif  // PNG_iCCP_SUPPORTED
  }
  return 1;
 }
--- a/src/dsp/enc_neon.c
+++ b/src/dsp/enc_neon.c
@ -946,7 +946,7 @@ static int Quantize2Blocks_NEON(int16_t in[32], int16_t out[32],
  } while (0)

 static WEBP_INLINE uint8x16x4_t Vld1qU8x4(const uint8_t* ptr) {
-#if LOCAL_GCC_PREREQ(9, 4)
+#if LOCAL_CLANG_PREREQ(3, 4) || LOCAL_GCC_PREREQ(9, 4) || defined(_MSC_VER)
  return vld1q_u8_x4(ptr);
 #else
  uint8x16x4_t res;
Author	SHA1	Message	Date
James Zern	1d86819f49	Merge changes I1437390a,I10a20de5,I1ac777d1 into main * changes: pngdec.c: add support for 'eXIf' tag pngdec.c: support ImageMagick app1 exif text data pngdec.c: add missing #ifdef for png_get_iCCP	2025-03-06 14:00:07 -08:00
James Zern	743a5f092d	enc_neon: enable vld1q_u8_x4 for clang & msvc This restores the use of the function after 980b708e enc_neon: fix build w/aarch64 gcc < 9.4.0 The intrinsic was added to llvm for aarch64 in: 5e4ce1ae9dad Implement the newly added AArch64 ACLE functions for ld1/st1 with 2/3/4 vectors. The functions are like: vst1_s8_x2 ... llvmorg-3.4.0-rc1~101 https://github.com/llvm/llvm-project/commit/5e4ce1ae9dad Visual Studio 2019 and 2022 also support the function (2017 is still disabled for this path due to it relying on arm64_neon.h). Change-Id: I6ff10e22deb3968a48738a4458d2d3d55410b5ec	2025-03-05 16:56:20 -08:00
James Zern	565da14882	pngdec.c: add support for 'eXIf' tag Test file created with exiftool 12.76: ``` exiftool test_app1_exif.png -exif:all \ -exif:DocumentName=test_multi_exif.png -o test_multi_exif.png ``` Bug: webp:398066379 Change-Id: I1437390a70f5708421683eb69c588624bb376baa	2025-03-05 13:54:09 -08:00
James Zern	319860e919	pngdec.c: support ImageMagick app1 exif text data Test file created with ImageMagick 6.9.13-12: ``` convert test_exif.png test_app1_exif.png ``` Bug: webp:398066379 Change-Id: I10a20de5699fabb0906045994d7d1f4b9e951973	2025-03-05 13:54:07 -08:00
James Zern	815fc1e110	pngdec.c: add missing #ifdef for png_get_iCCP png_get_iCCP is an optional part of the API. Protect its usage with PNG_iCCP_SUPPORTED. Change-Id: I1ac777d1c2a200bb3e1303b3d095cc0d67633bd4	2025-03-05 13:54:04 -08:00