[MINOR] Adopt 2023.12 version of C++ XMP Toolkit (#188)

(Bumps MSRV to 1.70.0.)

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, macos-latest, macos-13-xlarge, ubuntu-latest]
-        rust_version: [stable, 1.67.0]
+        rust_version: [stable, 1.70.0]
 
     steps:
       - name: Checkout repository
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [aarch64-unknown-linux-gnu]
-        rust_version: [stable, 1.67.0]
+        rust_version: [stable, 1.70.0]
 
     steps:
       - name: Checkout repository

Cargo.toml

@@ -10,7 +10,7 @@ authors = ["Eric Scouten <scouten@adobe.com>"]
 keywords = ["xmp", "metadata"]
 categories = ["api-bindings"]
 edition = "2021"
-rust-version = "1.67.0"
+rust-version = "1.70.0"
 exclude = [
     "external/xmp_toolkit/docs",
     "external/xmp_toolkit/samples",

README.md

@@ -20,7 +20,7 @@ We welcome contributions to this project. For information on contributing, provi
 
 ## Requirements
 
-The toolkit requires **Rust version 1.67.0** or newer. When a newer version of Rust becomes required, a new minor (1.x.0) version of this crate will be released.
+The toolkit requires **Rust version 1.70.0** or newer. When a newer version of Rust becomes required, a new minor (1.x.0) version of this crate will be released.
 
 ## Crate features
 

build.rs

@@ -106,6 +106,9 @@ fn main() {
                 .define("XMP_MacBuild", "1")
                 .define("_LARGEFILE64_SOURCE", None)
                 .define("XML_DEV_URANDOM", None)
+                .define("XMP_OSX_SDK", Some("13.1"))
+                .define("XMP_OSX_TARGET", Some("10.15"))
+                .define("APPLE_UNIVERSAL", Some("1"))
                 .flag("-Wno-deprecated-declarations")
                 .flag("-Wno-deprecated-register")
                 .flag("-Wno-int-in-bool-context")
@@ -205,7 +208,7 @@ fn main() {
         .define("XML_STATIC", "1")
         .define("XMP_StaticBuild", "1")
         .define("HAVE_EXPAT_CONFIG_H", "1")
-        .flag_if_supported("-std=c++11")
+        .flag_if_supported("-std=c++17")
         .flag_if_supported("-Wno-deprecated")
         .flag_if_supported("-Wno-deprecated-declarations")
         .flag_if_supported("-Wno-missing-field-initializers")
@@ -435,7 +438,7 @@ fn compile_for_docs() {
     config
         .cpp(true)
         .define("NOOP_FFI", Some("1"))
-        .flag_if_supported("-std=c++11")
+        .flag_if_supported("-std=c++17")
         .flag_if_supported("-Wno-deprecated")
         .flag_if_supported("-Wno-deprecated-declarations")
         .flag_if_supported("-Wno-missing-field-initializers")

external/zlib/crc32.c

@@ -98,13 +98,22 @@
 #  endif
 #endif
 
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
+#  define ARMCRC32
+#endif
+
 /* Local functions. */
 local z_crc_t multmodp OF((z_crc_t a, z_crc_t b));
 local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
 
-/* If available, use the ARM processor CRC32 instruction. */
-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
-#  define ARMCRC32
+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
+    local z_word_t byte_swap OF((z_word_t word));
+#endif
+
+#if defined(W) && !defined(ARMCRC32)
+    local z_crc_t crc_word OF((z_word_t data));
+    local z_word_t crc_word_big OF((z_word_t data));
 #endif
 
 #if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
@@ -630,7 +639,7 @@ unsigned long ZEXPORT crc32_z(
 #endif /* DYNAMIC_CRC_TABLE */
 
     /* Pre-condition the CRC */
-    crc ^= 0xffffffff;
+    crc = (~crc) & 0xffffffff;
 
     /* Compute the CRC up to a word boundary. */
     while (len && ((z_size_t)buf & 7) != 0) {
@@ -645,8 +654,8 @@ unsigned long ZEXPORT crc32_z(
     len &= 7;
 
     /* Do three interleaved CRCs to realize the throughput of one crc32x
-       instruction per cycle. Each CRC is calcuated on Z_BATCH words. The three
-       CRCs are combined into a single CRC after each set of batches. */
+       instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+       three CRCs are combined into a single CRC after each set of batches. */
     while (num >= 3 * Z_BATCH) {
         crc1 = 0;
         crc2 = 0;
@@ -749,7 +758,7 @@ unsigned long ZEXPORT crc32_z(
 #endif /* DYNAMIC_CRC_TABLE */
 
     /* Pre-condition the CRC */
-    crc ^= 0xffffffff;
+    crc = (~crc) & 0xffffffff;
 
 #ifdef W
 
@@ -1077,7 +1086,7 @@ uLong ZEXPORT crc32_combine64(
 #ifdef DYNAMIC_CRC_TABLE
     once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
-    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
+    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
 }
 
 /* ========================================================================= */
@@ -1086,7 +1095,7 @@ uLong ZEXPORT crc32_combine(
     uLong crc2,
     z_off_t len2)
 {
-    return crc32_combine64(crc1, crc2, len2);
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
 }
 
 /* ========================================================================= */
@@ -1103,7 +1112,7 @@ uLong ZEXPORT crc32_combine_gen64(
 uLong ZEXPORT crc32_combine_gen(
     z_off_t len2)
 {
-    return crc32_combine_gen64(len2);
+    return crc32_combine_gen64((z_off64_t)len2);
 }
 
 /* ========================================================================= */
@@ -1112,5 +1121,5 @@ uLong crc32_combine_op(
     uLong crc2,
     uLong op)
 {
-    return multmodp(op, crc1) ^ crc2;
+    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
 }