diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0c4b17f..2518704f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,13 +68,13 @@ jobs: echo "RELEASE_VERSION=$(cat build/version.txt)" >> $GITHUB_ENV echo ${{ env.RELEASE_VERSION }} - name: Upload reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: reports.zip path: build/reports - name: Upload unit test reference files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: reference_files.zip @@ -83,67 +83,67 @@ jobs: run: | ls -lah build/bin/*/releaseExecutable build/libs/ build/outputs/aar/ build/XCFrameworks/release/ - name: Upload kim.jar - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim.jar path: build/libs/kim-jvm-${{ env.RELEASE_VERSION }}.jar - name: Upload kim.aar - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim.aar path: build/outputs/aar/kim-release.aar - name: Upload kim.xcframework - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim.xcframework path: build/XCFrameworks/release/kim.xcframework - name: Upload kim.exe - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim.exe path: build/bin/win/releaseExecutable/kim.exe - name: Upload kim-macosX64.kexe - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim-macosX64.kexe path: build/bin/macosX64/releaseExecutable/kim.kexe - name: Upload kim-macosArm64.kexe - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim-macosArm64.kexe path: build/bin/macosArm64/releaseExecutable/kim.kexe - name: Upload kim-win-lib.zip - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim-win-lib.zip path: build/bin/win/releaseStatic - name: Upload kim-linuxArm64.kexe - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim-linuxArm64.kexe path: build/bin/linuxArm64/releaseExecutable/kim.kexe - name: Upload kim-linuxX64-lib.zip - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim-linuxX64-lib.zip path: build/bin/linuxX64/releaseStatic - name: Upload kim-linuxX64.kexe - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim-linuxX64.kexe path: build/bin/linuxX64/releaseExecutable/kim.kexe - name: Upload kim-linuxArm64-lib.zip - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: kim-linuxArm64-lib.zip diff --git a/README.md b/README.md index 6d6b059e..1c27bb43 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ of Ashampoo Photo Organizer, which, in turn, is driven by user community feedbac ## Installation ``` -implementation("com.ashampoo:kim:0.22.1") +implementation("com.ashampoo:kim:0.22.2") ``` For the targets `wasmJs` & `js` you also need to specify this: diff --git a/build.gradle.kts b/build.gradle.kts index a084904e..1f990843 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType @@ -27,7 +26,7 @@ repositories { val productName: String = "Ashampoo Kim" val ktorVersion: String = "3.0.3" -val xmpCoreVersion: String = "1.5.0" +val xmpCoreVersion: String = "1.5.1" val dateTimeVersion: String = "0.6.1" val kotlinxIoVersion: String = "0.6.0" @@ -120,7 +119,6 @@ kotlin { androidTarget { - @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions { jvmTarget = JvmTarget.JVM_11 } @@ -374,6 +372,7 @@ android { namespace = "com.ashampoo.kim" + // For API 35 tests fail. Something seems incompatible. compileSdk = 34 sourceSets["main"].res.srcDirs("src/commonMain/resources") diff --git a/src/commonMain/kotlin/com/ashampoo/kim/Kim.kt b/src/commonMain/kotlin/com/ashampoo/kim/Kim.kt index 887232f8..cc81ca63 100644 --- a/src/commonMain/kotlin/com/ashampoo/kim/Kim.kt +++ b/src/commonMain/kotlin/com/ashampoo/kim/Kim.kt @@ -71,9 +71,7 @@ public object Kim { val imageFormat = ImageFormat.detect(headerBytes) ?: return@use null val imageParser = ImageParser.forFormat(imageFormat) - - if (imageParser == null) - return@use ImageMetadata(imageFormat, null, null, null, null, null) + ?: return@use ImageMetadata(imageFormat, null, null, null, null, null) val newReader = PrePendingByteReader(it, headerBytes.toList()) diff --git a/src/commonTest/resources/com/ashampoo/kim/testdata/xmp/acdsee_sample_mod.xmp b/src/commonTest/resources/com/ashampoo/kim/testdata/xmp/acdsee_sample_mod.xmp index 00ccf0b2..54ff7d99 100644 --- a/src/commonTest/resources/com/ashampoo/kim/testdata/xmp/acdsee_sample_mod.xmp +++ b/src/commonTest/resources/com/ashampoo/kim/testdata/xmp/acdsee_sample_mod.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_flagged.jpg b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_flagged.jpg index fdef75e6..ab93b0c6 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_flagged.jpg and b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_flagged.jpg differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_flagged.jpg.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_flagged.jpg.txt index f241da1f..e7824f12 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_flagged.jpg.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_flagged.jpg.txt @@ -135,7 +135,7 @@ Keywords (25) = 'people' ---- XMP ---- - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_location_shown.jpg b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_location_shown.jpg index 7f681ece..faba26f5 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_location_shown.jpg and b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_location_shown.jpg differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_location_shown.jpg.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_location_shown.jpg.txt index 5dce3942..55014d6c 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_location_shown.jpg.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_location_shown.jpg.txt @@ -139,7 +139,7 @@ Keywords (25) = 'people' ---- XMP ---- - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg index 8bced322..8538c827 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg and b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg.txt index e9bb5270..ee2e6c10 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg.txt @@ -135,7 +135,7 @@ Keywords (25) = 'people' ---- XMP ---- - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/rotated_right.jpg b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/rotated_right.jpg index e2c3d24b..4ccf31bc 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/rotated_right.jpg and b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/rotated_right.jpg differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/rotated_right.jpg.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/rotated_right.jpg.txt index 6d47f21a..c12aa969 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/rotated_right.jpg.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/rotated_right.jpg.txt @@ -135,7 +135,7 @@ Keywords (25) = 'people' ---- XMP ---- - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_flagged.jxl b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_flagged.jxl index e42af95b..fdac3c79 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_flagged.jxl and b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_flagged.jxl differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_flagged.jxl.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_flagged.jxl.txt index d8c45f8c..905f2d09 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_flagged.jxl.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_flagged.jxl.txt @@ -61,7 +61,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + - + + + + + + + + + + + //CRASH + + + + + + + + + + 0, 0 + 255, 255 + + + + + 0, 0 + 255, 255 + + + + + 0, 0 + 255, 255 + + + + + 0, 0 + 255, 255 + + + + + 0, 0 + 255, 255 + + + + + 0, 0 + 255, 255 + + + + + 0, 0 + 255, 255 + + + + + 0, 0 + 255, 255 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_gps_coordinates_and_location_shown.no_metadata.jxl b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_gps_coordinates_and_location_shown.no_metadata.jxl index c265054f..a9ee6229 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_gps_coordinates_and_location_shown.no_metadata.jxl and b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_gps_coordinates_and_location_shown.no_metadata.jxl differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_gps_coordinates_and_location_shown.no_metadata.jxl.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_gps_coordinates_and_location_shown.no_metadata.jxl.txt new file mode 100644 index 00000000..6fafe344 --- /dev/null +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_gps_coordinates_and_location_shown.no_metadata.jxl.txt @@ -0,0 +1,55 @@ +File format : JXL +Resolution : null +---- TIFF ---- +Version 42 +Big-endian (Motorola, MM) +---- Directory IFD0 @ 8 ---- +0000000010 0x8769 ExifOffset = 40 +0000000022 0x8825 GPSInfo = 48 + +---- Directory ExifIFD @ 40 ---- + +---- Directory GPS @ 48 ---- +0000000050 0x0000 GPSVersionID = [0x02, 0x03, 0x00, 0x00] +0000000062 0x0001 GPSLatitudeRef = N +0000000074 0x0002 GPSLatitude = [53/1 (53.0), 13/1 (13.0), 24519/2500 (9.8076)] +0000000086 0x0003 GPSLongitudeRef = E +0000000098 0x0004 GPSLongitude = [8/1 (8.0), 14/1 (14.0), 56949/2500 (22.7796)] + +---- XMP ---- + + + + + + + + + + + //CRASH + + + + + + + + + + \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_keywords.jxl b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_keywords.jxl index 745243c3..79fa79ce 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_keywords.jxl and b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_keywords.jxl differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_keywords.jxl.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_keywords.jxl.txt index e943470a..91274ac0 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_keywords.jxl.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_keywords.jxl.txt @@ -61,7 +61,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_location_shown.jxl b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_location_shown.jxl index fca6fe6f..646d42d7 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_location_shown.jxl and b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_location_shown.jxl differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_location_shown.jxl.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_location_shown.jxl.txt index 3cdbade5..86506a20 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_location_shown.jxl.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_location_shown.jxl.txt @@ -61,7 +61,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl index 57350636..a7086a0c 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl and b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl.txt index 863385e2..0eb557b0 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl.txt @@ -61,7 +61,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/rotated_right.jxl b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/rotated_right.jxl index c85bd9e2..d4974cbd 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/rotated_right.jxl and b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/rotated_right.jxl differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/rotated_right.jxl.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/rotated_right.jxl.txt index 02b3ffd1..de7e6977 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/rotated_right.jxl.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/rotated_right.jxl.txt @@ -62,7 +62,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_description.png b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_description.png index 730ceec1..023542d3 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_description.png and b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_description.png differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_description.png.txt b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_description.png.txt index 6143c879..e945f709 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_description.png.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_description.png.txt @@ -130,7 +130,7 @@ Time Created (60) = '15:28:58-15:28' ---- XMP ---- - + - + - + - + - + + + + + + + + + + + //CRASH + + + + + + + + + + \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_gps_coordinates_and_location_shown.png b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_gps_coordinates_and_location_shown.png index 1f2f73f3..864bb00f 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_gps_coordinates_and_location_shown.png and b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_gps_coordinates_and_location_shown.png differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_gps_coordinates_and_location_shown.png.txt b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_gps_coordinates_and_location_shown.png.txt new file mode 100644 index 00000000..e80e2f4f --- /dev/null +++ b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_gps_coordinates_and_location_shown.png.txt @@ -0,0 +1,197 @@ +File format : PNG +Resolution : 500 x 333 +---- TIFF ---- +Version 42 +Little-endian (Intel, II) +---- Directory IFD0 @ 8 ---- +0000000010 0x0100 ImageWidth = 500 +0000000022 0x0101 ImageHeight = 333 +0000000034 0x0102 BitsPerSample = [8, 8, 8] +0000000046 0x010f Make = Canon +0000000058 0x0110 Model = Canon EOS M3 +0000000070 0x0112 Orientation = 1 +0000000082 0x011a XResolution = 180/1 (180.0) +0000000094 0x011b YResolution = 180/1 (180.0) +0000000106 0x0128 ResolutionUnit = 2 +0000000118 0x0131 Software = GIMP 2.10.30 +0000000130 0x0132 ModifyDate = 2023:07:12 15:28:58 +0000000142 0x0213 YCbCrPositioning = 2 +0000000154 0x8769 ExifOffset = 258 +0000000166 0x8825 GPSInfo = 4568 + +---- Directory ExifIFD @ 258 ---- +0000000260 0x829a ExposureTime = 1/4000 (2.5E-4) +0000000272 0x829d FNumber = 56/10 (5.6) +0000000284 0x8822 ExposureProgram = 4 +0000000296 0x8827 ISO = 3200 +0000000308 0x8830 SensitivityType = 2 +0000000320 0x8832 RecommendedExposureIndex = 3200 +0000000332 0x9000 ExifVersion = [0x30, 0x32, 0x33, 0x30] +0000000344 0x9003 DateTimeOriginal = 2017:11:12 21:41:48 +0000000356 0x9004 DateTimeDigitized = 2017:11:12 21:41:48 +0000000368 0x9101 ComponentsConfiguration = [0x01, 0x02, 0x03, 0x00] +0000000380 0x9102 CompressedBitsPerPixel = 3/1 (3.0) +0000000392 0x9201 ShutterSpeedValue = 383/32 (11.96875) +0000000404 0x9202 ApertureValue = 159/32 (4.96875) +0000000416 0x9204 ExposureCompensation = 0/3 (0.0) +0000000428 0x9207 MeteringMode = 5 +0000000440 0x9209 Flash = 16 +0000000452 0x920a FocalLength = 55/1 (55.0) +0000000464 0x927c MakerNote = [3624 bytes] +0000000476 0x9290 SubSecTime = +0000000488 0x9291 SubSecTimeOriginal = 76 +0000000500 0x9292 SubSecTimeDigitized = 76 +0000000512 0xa000 FlashpixVersion = [0x30, 0x31, 0x30, 0x30] +0000000524 0xa001 ColorSpace = 1 +0000000536 0xa002 ExifImageWidth = 2304 +0000000548 0xa003 ExifImageHeight = 1536 +0000000560 0xa20e FocalPlaneXResolution = 2304000/879 (2621.16041) +0000000572 0xa20f FocalPlaneYResolution = 1536000/586 (2621.16041) +0000000584 0xa210 FocalPlaneResolutionUnit = 2 +0000000596 0xa217 SensingMethod = 2 +0000000608 0xa300 FileSource = 3 +0000000620 0xa401 CustomRendered = 0 +0000000632 0xa402 ExposureMode = 0 +0000000644 0xa403 WhiteBalance = 1 +0000000656 0xa404 DigitalZoomRatio = 6000/6000 (1.0) +0000000668 0xa406 SceneCaptureType = 0 +0000000680 0xa431 BodySerialNumber = 073043001183 +0000000692 0xa432 LensSpecification = [18/1 (18.0), 55/1 (55.0), 0/1 (0.0), 0/1 (0.0)] +0000000704 0xa434 LensModel = EF-M18-55mm f/3.5-5.6 IS STM +0000000716 0xa435 LensSerialNumber = 0000455071 + +---- Directory GPS @ 4568 ---- +0000004570 0x0000 GPSVersionID = [0x02, 0x03, 0x00, 0x00] +0000004582 0x0001 GPSLatitudeRef = N +0000004594 0x0002 GPSLatitude = [53/1 (53.0), 13/1 (13.0), 24519/2500 (9.8076)] +0000004606 0x0003 GPSLongitudeRef = E +0000004618 0x0004 GPSLongitude = [8/1 (8.0), 14/1 (14.0), 56949/2500 (22.7796)] + +---- Directory IFD1 @ 4682 ---- +0000004684 0x00fe NewSubfileType = 1 +0000004696 0x0100 ImageWidth = 256 +0000004708 0x0101 ImageHeight = 170 +0000004720 0x0102 BitsPerSample = [8, 8, 8] +0000004732 0x0103 Compression = 6 +0000004744 0x0106 PhotometricInterpretation = 6 +0000004756 0x0115 SamplesPerPixel = 3 +0000004768 0x0201 JpgFromRawStart = 4802 +0000004780 0x0202 JpgFromRawLength = 5056 + +---- Directory MakerNoteCanon @ 840 ---- +0000000842 0x0003 Unknown = [0, 0, 0, 0] +0000000854 0x0018 Unknown = 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0000000866 0x0019 Unknown = 1 +0000000878 0x001c Unknown = 0 +0000000890 0x001e Unknown = 16843008 +0000000902 0x0022 Unknown = 416 0 0 16 8 1 1 640 480 0 0 0 0 0 8 384 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0000000914 0x0023 Unknown = 8 0 +0000000926 0x0027 Unknown = 10 0 65535 0 65535 42 65535 0 0 65535 65535 65535 65535 65535 65535 65535 0 65535 65535 65535 65535 +0000000938 0x0028 Unknown = 109 12 231 51 175 248 209 220 90 235 56 130 94 129 4 47 +0000000950 0x002d Unknown = 0 +0000000962 0x002e Unknown = 54 32767 32767 65535 65535 32767 32767 32767 0 65535 1 65535 65535 65535 65535 32767 32767 32767 65535 65535 65535 65535 65535 0 0 0 0 +0000000974 0x002f Unknown = 34 2 65535 65535 65535 65535 65535 65535 65535 65535 65535 65535 65535 65535 65535 65535 65535 +0000000986 0x0031 Unknown = 12 1 65535 65535 65535 65535 +0000000998 0x0033 Unknown = 2801211429 3704704190 2184768346 788824414 +0000001010 0x0037 Unknown = 8 0 +0000001022 0x0038 Unknown = 8 0 0 0 112 41 213 123 +0000001034 0x003c Unknown = 436 13 49 1 2304 1536 6000 4000 600 156 12880 0 29995 20 0 12880 0 0 27472 27492 62825 206 12744 78 148 56112 1638 56112 10 2 56112 257 0 2 0 1 62825 97 65535 162 156 12880 0 29995 20 0 12880 0 12744 78 83 56112 1550 56112 10 2 56112 800 56112 1644 56112 10 2 56112 257 0 2 0 1 62825 103 65535 172 156 12880 0 29995 20 0 12880 0 0 27472 27492 62825 204 12744 78 156 56112 1650 56112 10 2 56112 257 0 65535 8421 156 12880 0 29995 20 0 12880 0 12744 78 83 56112 1600 56112 10 2 56112 257 0 2 0 1 62825 115 65535 8421 156 12880 0 29995 20 0 12880 0 0 27472 27492 62825 202 56112 504 160 584 0 56112 10 2 56112 257 0 2 0 1 62825 99 65535 0 65535 8421 156 12880 0 29995 20 0 12880 0 0 27472 27492 62825 192 12744 78 83 56112 1631 56112 10 2 56112 257 0 2 0 1 62825 103 12880 200 12956 12952 29771 29995 20 0 12880 0 0 27472 27492 62825 206 12744 78 1 0 0 0 0 0 0 0 0 0 0 0 0 65531 +0000001046 0x003d Unknown = 32 1 0 0 0 0 0 0 +0000001058 0x003f Unknown = 1 +0000001070 0x009a Unknown = 0 2304 1536 0 0 +0000001082 0x4008 Unknown = 135 135 135 +0000001094 0x4009 Unknown = 255 255 255 +0000001106 0x4016 Unknown = 32 0 1 0 1 1 1 0 +0000001118 0x4018 Unknown = 36 0 0 0 0 0 1 0 1 +0000001130 0x4020 Unknown = 28 0 0 0 0 0 0 +0000001142 0x4023 Unknown = 16 1 4320 2880 +0000001154 0x4024 Unknown = 212 7 1 20 1 257 1 4294967295 2 20 1 513 1 4294967295 3 20 1 769 1 4294967295 4 56 4 1025 1 4294967295 1026 1 4294967295 1027 1 4294967295 1028 1 4294967295 5 20 1 1281 1 4294967295 6 20 1 1537 1 4294967295 7 20 1 1793 1 4294967295 +0000001166 0x402b Unknown = 24 0 0 0 0 0 +0000001178 0x402c Unknown = 8 0 +0000001190 0x000f Unknown = [34 shorts] +0000001202 0x0008 FileNumber = 1237368 +0000001214 0x0007 CanonFirmwareVersion = Firmware Version 1.01 +0000001226 0x0006 CanonImageType = IMG:EOS M3 JPEG +0000001238 0x0096 InternalSerialNumber = SA0151220 +0000001250 0x00aa Unknown = [12, 392, 545, 546, 2614, 0] +0000001262 0x0010 CanonModelID = 57933824 +0000001274 0x0013 Unknown = [0, 159, 7, 112] +0000001286 0x00d0 Unknown = 0 +0000001298 0x0001 CanonCameraSettings = [48 shorts] +0000001310 0x0093 Unknown = [33 shorts] +0000001322 0x00a0 Unknown = [28, 0, 0, -1, -1, -1, -1, -1, -1, -1, 132, 0, 9, -1] +0000001334 0x0004 Unknown = [34 shorts] +0000001346 0x0035 Unknown = [16, 0, 32766, 0] + +---- IPTC ---- +Caption/Abstract (120) = 'time lapse photography of fire' +Date Created (55) = '2023-07-12' +Keywords (25) = 'human' +Keywords (25) = 'person' +Keywords (25) = 'people' +Time Created (60) = '15:28:58-15:28' + +---- XMP ---- + + + + + + + + + + + //CRASH + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.no_metadata.png b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.no_metadata.png index a654873c..8ebafc6e 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.no_metadata.png and b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.no_metadata.png differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.no_metadata.png.txt b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.no_metadata.png.txt index 80067085..183ef9e4 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.no_metadata.png.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.no_metadata.png.txt @@ -10,7 +10,7 @@ Time Created (60) = '15:28:58-15:28' ---- XMP ---- - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png index 09f793aa..68032bbd 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png and b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png.txt b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png.txt index bd13379f..b0bf41c9 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png.txt @@ -130,7 +130,7 @@ Time Created (60) = '15:28:58-15:28' ---- XMP ---- - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png index 4a115ff1..1cb62bbd 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png and b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png.txt b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png.txt index 0c9a9e0a..b8621ab9 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png.txt @@ -130,7 +130,7 @@ Time Created (60) = '15:28:58-15:28' ---- XMP ---- - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_title.png b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_title.png index 1c0d13ee..25c5dd77 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_title.png and b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_title.png differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_title.png.txt b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_title.png.txt index 62a9e57b..51cd41c0 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_title.png.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_title.png.txt @@ -130,7 +130,7 @@ Time Created (60) = '15:28:58-15:28' ---- XMP ---- - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_description.webp b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_description.webp index 7384503c..c39c7e38 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_description.webp and b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_description.webp differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_description.webp.txt b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_description.webp.txt index 1867272c..61f3b5b8 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_description.webp.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_description.webp.txt @@ -63,7 +63,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + - + - + + + + + + + + + + + //CRASH + + + + + + + + + + \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_gps_coordinates_and_location_shown.webp b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_gps_coordinates_and_location_shown.webp index 9dc88873..1007de41 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_gps_coordinates_and_location_shown.webp and b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_gps_coordinates_and_location_shown.webp differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_gps_coordinates_and_location_shown.webp.txt b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_gps_coordinates_and_location_shown.webp.txt new file mode 100644 index 00000000..c6cae20f --- /dev/null +++ b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_gps_coordinates_and_location_shown.webp.txt @@ -0,0 +1,300 @@ +File format : WEBP +Resolution : 5184 x 3456 +---- TIFF ---- +Version 42 +Little-endian (Intel, II) +---- Directory IFD0 @ 8 ---- +0000000010 0x0100 ImageWidth = 5184 +0000000022 0x0101 ImageHeight = 3456 +0000000034 0x0102 BitsPerSample = [8, 8, 8] +0000000046 0x010f Make = Canon +0000000058 0x0110 Model = Canon EOS Rebel T6 +0000000070 0x0112 Orientation = 1 +0000000082 0x011a XResolution = 240/1 (240.0) +0000000094 0x011b YResolution = 240/1 (240.0) +0000000106 0x0128 ResolutionUnit = 2 +0000000118 0x0131 Software = GIMP 2.10.30 +0000000130 0x0132 ModifyDate = 2022:09:26 14:42:58 +0000000142 0x8769 ExifOffset = 252 +0000000154 0x8825 GPSInfo = 936 + +---- Directory ExifIFD @ 252 ---- +0000000254 0x829a ExposureTime = 1/60 (0.016667) +0000000266 0x829d FNumber = 8/1 (8.0) +0000000278 0x8822 ExposureProgram = 8 +0000000290 0x8827 ISO = 100 +0000000302 0x8830 SensitivityType = 2 +0000000314 0x8832 RecommendedExposureIndex = 100 +0000000326 0x9000 ExifVersion = [0x30, 0x32, 0x33, 0x30] +0000000338 0x9003 DateTimeOriginal = 2019:07:24 17:15:41 +0000000350 0x9004 DateTimeDigitized = 2019:07:24 17:15:41 +0000000362 0x9201 ShutterSpeedValue = 5906891/1000000 (5.906891) +0000000374 0x9202 ApertureValue = 6/1 (6.0) +0000000386 0x9204 ExposureCompensation = 0/1 (0.0) +0000000398 0x9205 MaxApertureValue = 3625/1000 (3.625) +0000000410 0x9207 MeteringMode = 5 +0000000422 0x9209 Flash = 16 +0000000434 0x920a FocalLength = 18/1 (18.0) +0000000446 0x9291 SubSecTimeOriginal = 09 +0000000458 0x9292 SubSecTimeDigitized = 09 +0000000470 0xa001 ColorSpace = 1 +0000000482 0xa20e FocalPlaneXResolution = 5184000/905 (5728.176796) +0000000494 0xa20f FocalPlaneYResolution = 3456000/595 (5808.403361) +0000000506 0xa210 FocalPlaneResolutionUnit = 2 +0000000518 0xa401 CustomRendered = 0 +0000000530 0xa402 ExposureMode = 0 +0000000542 0xa403 WhiteBalance = 0 +0000000554 0xa406 SceneCaptureType = 0 +0000000566 0xa431 BodySerialNumber = 222073077744 +0000000578 0xa432 LensSpecification = [18/1 (18.0), 55/1 (55.0), Invalid rational (0/0), Invalid rational (0/0)] +0000000590 0xa434 LensModel = EF-S18-55mm f/3.5-5.6 IS II +0000000602 0xa435 LensSerialNumber = 000001a354 + +---- Directory GPS @ 936 ---- +0000000938 0x0000 GPSVersionID = [0x02, 0x03, 0x00, 0x00] +0000000950 0x0001 GPSLatitudeRef = N +0000000962 0x0002 GPSLatitude = [53/1 (53.0), 13/1 (13.0), 24519/2500 (9.8076)] +0000000974 0x0003 GPSLongitudeRef = E +0000000986 0x0004 GPSLongitude = [8/1 (8.0), 14/1 (14.0), 56949/2500 (22.7796)] + +---- Directory IFD1 @ 816 ---- +0000000818 0x00fe NewSubfileType = 1 +0000000830 0x0100 ImageWidth = 256 +0000000842 0x0101 ImageHeight = 170 +0000000854 0x0102 BitsPerSample = [8, 8, 8] +0000000866 0x0103 Compression = 6 +0000000878 0x0106 PhotometricInterpretation = 6 +0000000890 0x0115 SamplesPerPixel = 3 +0000000902 0x0201 JpgFromRawStart = 8170 +0000000914 0x0202 JpgFromRawLength = 7245 + +---- XMP ---- + + + + + + + + + + + //CRASH + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.no_metadata.webp b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.no_metadata.webp index 1e0b1e73..e37423cb 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.no_metadata.webp and b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.no_metadata.webp differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.no_metadata.webp.txt b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.no_metadata.webp.txt index 07a64cbe..1f6fc978 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.no_metadata.webp.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.no_metadata.webp.txt @@ -2,7 +2,7 @@ File format : WEBP Resolution : 5184 x 3456 ---- XMP ---- - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp index 6983da28..11d03147 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp and b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp.txt b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp.txt index 7d46ecd1..497139e2 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp.txt @@ -62,7 +62,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp index ca7dde91..abc6e142 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp and b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp.txt b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp.txt index 07266d88..837a246a 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp.txt @@ -62,7 +62,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_title.webp b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_title.webp index 798420f5..2f8ce245 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_title.webp and b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_title.webp differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_title.webp.txt b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_title.webp.txt index 249f9d85..ec764776 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_title.webp.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_title.webp.txt @@ -62,7 +62,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - +