Skip to content

Commit 64f474d

Browse files
StefanOltmannStefanOltmann
authored
XMP Core Update for RDF fix (#129)
1 parent 89d267f commit 64f474d

File tree

269 files changed

+3619
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+3619
-121
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/.idea/deploymentTargetDropDown.xml
1010
/.idea/gradle.xml
1111
/.idea/jarRepositories.xml
12-
/.idea/kim.iml
12+
/.idea/*.iml
1313
/.idea/kotlinScripting.xml
1414
/.idea/kotlinc.xml
1515
/.idea/libraries/

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,14 @@ kotlin {
197197
*
198198
* Not available in commonMain due to missing WASM support.
199199
*/
200-
api(libs.ktor.io)
200+
implementation(libs.ktor.io)
201201

202202
/*
203203
* Multiplatform file access
204204
*
205205
* Not available in commonMain due to missing JS browser support.
206206
*/
207-
api(libs.kotlinx.io.core)
207+
implementation(libs.kotlinx.io.core)
208208
}
209209
}
210210

@@ -374,7 +374,7 @@ mavenPublishing {
374374

375375
licenses {
376376
license {
377-
name = "The Apache License, Version 2.0"
377+
name = "Apache License 2.0"
378378
url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
379379
}
380380
}

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ resources = "0.10.1"
1212
versions-plugin = "0.52.0"
1313
maven-publish = "0.34.0"
1414

15-
ktor = "3.2.2"
16-
xmpcore = "1.6.0"
15+
ktor = "3.2.3"
16+
xmpcore = "1.6.1"
1717
kotlinx-datetime = "0.7.1"
1818
kotlinx-io = "0.8.0"
19-
kotlinx-browser = "0.3"
19+
kotlinx-browser = "0.4"
2020
pako = "2.1.0"
2121

2222
[libraries]

‎src/commonTest/kotlin/com/ashampoo/kim/format/jxl/new_description.jxl‎

881 KB
Binary file not shown.

‎src/commonTest/kotlin/com/ashampoo/kim/format/jxl/new_description.jxl.txt‎

Lines changed: 290 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,290 @@
1+
File format : JXL
2+
Resolution : null
3+
---- TIFF ----
4+
Version 42
5+
Little-endian (Intel, II)
6+
---- Directory IFD0 @ 8 ----
7+
0000000010 0x010e ImageDescription = Äußerst süße Vögel fliegen durch die Lüfte.
8+
0000000022 0x010f Make = SONY
9+
0000000034 0x0110 Model = DSC-RX100
10+
0000000046 0x0112 Orientation = 1
11+
0000000058 0x011a XResolution = 240/1 (240.0)
12+
0000000070 0x011b YResolution = 240/1 (240.0)
13+
0000000082 0x0128 ResolutionUnit = 2
14+
0000000094 0x0131 Software = Adobe Photoshop Lightroom Classic 8.3.1 (Windows)
15+
0000000106 0x0132 ModifyDate = 2019:08:04 21:22:41
16+
0000000118 0x8769 ExifOffset = 286
17+
18+
---- Directory ExifIFD @ 286 ----
19+
0000000288 0x829a ExposureTime = 1/250 (0.004)
20+
0000000300 0x829d FNumber = 8/1 (8.0)
21+
0000000312 0x8822 ExposureProgram = 1
22+
0000000324 0x8827 ISO = 125
23+
0000000336 0x8830 SensitivityType = 2
24+
0000000348 0x8832 RecommendedExposureIndex = 125
25+
0000000360 0x9000 ExifVersion = [0x30, 0x32, 0x33, 0x31]
26+
0000000372 0x9003 DateTimeOriginal = 2019:02:25 06:14:16
27+
0000000384 0x9004 DateTimeDigitized = 2019:02:25 06:14:16
28+
0000000396 0x9010 OffsetTime = +02:00
29+
0000000408 0x9201 ShutterSpeedValue = 7965784/1000000 (7.965784)
30+
0000000420 0x9202 ApertureValue = 6/1 (6.0)
31+
0000000432 0x9203 BrightnessValue = 17574/2560 (6.864844)
32+
0000000444 0x9204 ExposureCompensation = 0/10 (0.0)
33+
0000000456 0x9205 MaxApertureValue = 434/256 (1.695313)
34+
0000000468 0x9207 MeteringMode = 3
35+
0000000480 0x9208 LightSource = 0
36+
0000000492 0x9209 Flash = 15
37+
0000000504 0x920a FocalLength = 1040/100 (10.4)
38+
0000000516 0xa001 ColorSpace = 1
39+
0000000528 0xa20e FocalPlaneXResolution = 135838255/32768 (4145.454559)
40+
0000000540 0xa20f FocalPlaneYResolution = 135838255/32768 (4145.454559)
41+
0000000552 0xa210 FocalPlaneResolutionUnit = 3
42+
0000000564 0xa300 FileSource = 3
43+
0000000576 0xa301 SceneType = 1
44+
0000000588 0xa401 CustomRendered = 0
45+
0000000600 0xa402 ExposureMode = 1
46+
0000000612 0xa403 WhiteBalance = 0
47+
0000000624 0xa404 DigitalZoomRatio = 16/16 (1.0)
48+
0000000636 0xa405 FocalLengthIn35mmFormat = 28
49+
0000000648 0xa406 SceneCaptureType = 0
50+
0000000660 0xa408 Contrast = 0
51+
0000000672 0xa409 Saturation = 0
52+
0000000684 0xa40a Sharpness = 0
53+
0000000696 0xa432 LensSpecification = [1040/100 (10.4), 3710/100 (37.1), 18/10 (1.8), 49/10 (4.9)]
54+
0000000708 0xa434 LensModel = 28-100mm F1.8-4.9
55+
56+
---- Directory IFD1 @ 910 ----
57+
0000000912 0x0103 Compression = 6
58+
0000000924 0x011a XResolution = 72/1 (72.0)
59+
0000000936 0x011b YResolution = 72/1 (72.0)
60+
0000000948 0x0128 ResolutionUnit = 2
61+
0000000960 0x0201 JpgFromRawStart = 1004
62+
0000000972 0x0202 JpgFromRawLength = 11246
63+
64+
---- XMP ----
65+
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
66+
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Ashampoo XMP Core 1.6.1">
67+
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
68+
<rdf:Description rdf:about=""
69+
xmlns:aux="http://ns.adobe.com/exif/1.0/aux/"
70+
xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/"
71+
xmlns:dc="http://purl.org/dc/elements/1.1/"
72+
xmlns:exifEX="http://cipa.jp/exif/1.0/"
73+
xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
74+
xmlns:xmp="http://ns.adobe.com/xap/1.0/"
75+
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
76+
xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
77+
xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
78+
aux:DistortionCorrectionAlreadyApplied="True"
79+
aux:LateralChromaticAberrationCorrectionAlreadyApplied="True"
80+
aux:Lens="28-100mm F1.8-4.9"
81+
aux:LensDistortInfo="34683/32768 -219328315/1073741824 52441832/1073741824 -7678158/1073741824"
82+
aux:LensInfo="1040/100 3710/100 18/10 49/10"
83+
crs:AlreadyApplied="True"
84+
crs:AutoLateralCA="0"
85+
crs:Blacks2012="0"
86+
crs:BlueHue="0"
87+
crs:BlueSaturation="0"
88+
crs:CameraProfile="Embedded"
89+
crs:CameraProfileDigest="54650A341B5B5CCAE8442D0B43A92BCE"
90+
crs:Clarity2012="0"
91+
crs:ColorNoiseReduction="0"
92+
crs:Contrast2012="0"
93+
crs:ConvertToGrayscale="False"
94+
crs:DefringeGreenAmount="0"
95+
crs:DefringeGreenHueHi="60"
96+
crs:DefringeGreenHueLo="40"
97+
crs:DefringePurpleAmount="0"
98+
crs:DefringePurpleHueHi="70"
99+
crs:DefringePurpleHueLo="30"
100+
crs:Dehaze="0"
101+
crs:Exposure2012="+0.40"
102+
crs:GrainAmount="0"
103+
crs:GreenHue="0"
104+
crs:GreenSaturation="0"
105+
crs:HasCrop="False"
106+
crs:HasSettings="True"
107+
crs:Highlights2012="0"
108+
crs:HueAdjustmentAqua="0"
109+
crs:HueAdjustmentBlue="0"
110+
crs:HueAdjustmentGreen="0"
111+
crs:HueAdjustmentMagenta="0"
112+
crs:HueAdjustmentOrange="0"
113+
crs:HueAdjustmentPurple="0"
114+
crs:HueAdjustmentRed="0"
115+
crs:HueAdjustmentYellow="0"
116+
crs:IncrementalTemperature="0"
117+
crs:IncrementalTint="0"
118+
crs:LensManualDistortionAmount="0"
119+
crs:LensProfileEnable="0"
120+
crs:LensProfileSetup="LensDefaults"
121+
crs:LuminanceAdjustmentAqua="0"
122+
crs:LuminanceAdjustmentBlue="0"
123+
crs:LuminanceAdjustmentGreen="0"
124+
crs:LuminanceAdjustmentMagenta="0"
125+
crs:LuminanceAdjustmentOrange="0"
126+
crs:LuminanceAdjustmentPurple="0"
127+
crs:LuminanceAdjustmentRed="0"
128+
crs:LuminanceAdjustmentYellow="0"
129+
crs:LuminanceSmoothing="0"
130+
crs:OverrideLookVignette="False"
131+
crs:ParametricDarks="0"
132+
crs:ParametricHighlightSplit="75"
133+
crs:ParametricHighlights="0"
134+
crs:ParametricLights="0"
135+
crs:ParametricMidtoneSplit="50"
136+
crs:ParametricShadowSplit="25"
137+
crs:ParametricShadows="0"
138+
crs:PerspectiveAspect="0"
139+
crs:PerspectiveHorizontal="0"
140+
crs:PerspectiveRotate="0.0"
141+
crs:PerspectiveScale="100"
142+
crs:PerspectiveUpright="0"
143+
crs:PerspectiveVertical="0"
144+
crs:PerspectiveX="0.00"
145+
crs:PerspectiveY="0.00"
146+
crs:PostCropVignetteAmount="0"
147+
crs:ProcessVersion="11.0"
148+
crs:RawFileName=""
149+
crs:RedHue="0"
150+
crs:RedSaturation="0"
151+
crs:Saturation="0"
152+
crs:SaturationAdjustmentAqua="0"
153+
crs:SaturationAdjustmentBlue="0"
154+
crs:SaturationAdjustmentGreen="0"
155+
crs:SaturationAdjustmentMagenta="0"
156+
crs:SaturationAdjustmentOrange="0"
157+
crs:SaturationAdjustmentPurple="0"
158+
crs:SaturationAdjustmentRed="0"
159+
crs:SaturationAdjustmentYellow="0"
160+
crs:ShadowTint="0"
161+
crs:Shadows2012="0"
162+
crs:SharpenDetail="25"
163+
crs:SharpenEdgeMasking="0"
164+
crs:SharpenRadius="+1.0"
165+
crs:Sharpness="0"
166+
crs:SplitToningBalance="0"
167+
crs:SplitToningHighlightHue="0"
168+
crs:SplitToningHighlightSaturation="0"
169+
crs:SplitToningShadowHue="0"
170+
crs:SplitToningShadowSaturation="0"
171+
crs:Texture="0"
172+
crs:ToneCurveName="Linear"
173+
crs:ToneCurveName2012="Linear"
174+
crs:ToneMapStrength="0"
175+
crs:UprightCenterMode="0"
176+
crs:UprightCenterNormX="0.5"
177+
crs:UprightCenterNormY="0.5"
178+
crs:UprightFocalLength35mm="35"
179+
crs:UprightFocalMode="0"
180+
crs:UprightFourSegmentsCount="0"
181+
crs:UprightPreview="False"
182+
crs:UprightTransformCount="6"
183+
crs:UprightVersion="151388160"
184+
crs:Version="11.3"
185+
crs:Vibrance="0"
186+
crs:VignetteAmount="0"
187+
crs:WhiteBalance="As Shot"
188+
crs:Whites2012="0"
189+
dc:format="image/jpeg"
190+
exifEX:LensModel="28-100mm F1.8-4.9"
191+
photoshop:DateCreated="2019-02-25T06:14:16"
192+
xmp:CreateDate="2019-02-25T06:14:16"
193+
xmp:CreatorTool="Adobe Photoshop Lightroom Classic 8.3.1 (Windows)"
194+
xmp:MetadataDate="2019-08-04T21:22:41+02:00"
195+
xmp:ModifyDate="2019-08-04T21:22:41+02:00"
196+
xmp:Rating="0"
197+
xmpMM:DocumentID="xmp.did:ce2000f3-5b24-1346-bf4e-cd945cb900a8"
198+
xmpMM:InstanceID="xmp.iid:ce2000f3-5b24-1346-bf4e-cd945cb900a8"
199+
xmpMM:OriginalDocumentID="F44F7718D2EE77F231D30D6F8BD43643">
200+
<crs:Look
201+
crs:Name=""/>
202+
<crs:ToneCurve>
203+
<rdf:Seq>
204+
<rdf:li>0, 0</rdf:li>
205+
<rdf:li>255, 255</rdf:li>
206+
</rdf:Seq>
207+
</crs:ToneCurve>
208+
<crs:ToneCurveBlue>
209+
<rdf:Seq>
210+
<rdf:li>0, 0</rdf:li>
211+
<rdf:li>255, 255</rdf:li>
212+
</rdf:Seq>
213+
</crs:ToneCurveBlue>
214+
<crs:ToneCurveGreen>
215+
<rdf:Seq>
216+
<rdf:li>0, 0</rdf:li>
217+
<rdf:li>255, 255</rdf:li>
218+
</rdf:Seq>
219+
</crs:ToneCurveGreen>
220+
<crs:ToneCurvePV2012>
221+
<rdf:Seq>
222+
<rdf:li>0, 0</rdf:li>
223+
<rdf:li>255, 255</rdf:li>
224+
</rdf:Seq>
225+
</crs:ToneCurvePV2012>
226+
<crs:ToneCurvePV2012Blue>
227+
<rdf:Seq>
228+
<rdf:li>0, 0</rdf:li>
229+
<rdf:li>255, 255</rdf:li>
230+
</rdf:Seq>
231+
</crs:ToneCurvePV2012Blue>
232+
<crs:ToneCurvePV2012Green>
233+
<rdf:Seq>
234+
<rdf:li>0, 0</rdf:li>
235+
<rdf:li>255, 255</rdf:li>
236+
</rdf:Seq>
237+
</crs:ToneCurvePV2012Green>
238+
<crs:ToneCurvePV2012Red>
239+
<rdf:Seq>
240+
<rdf:li>0, 0</rdf:li>
241+
<rdf:li>255, 255</rdf:li>
242+
</rdf:Seq>
243+
</crs:ToneCurvePV2012Red>
244+
<crs:ToneCurveRed>
245+
<rdf:Seq>
246+
<rdf:li>0, 0</rdf:li>
247+
<rdf:li>255, 255</rdf:li>
248+
</rdf:Seq>
249+
</crs:ToneCurveRed>
250+
<dc:description>
251+
<rdf:Alt>
252+
<rdf:li xml:lang="x-default">Äußerst süße Vögel fliegen durch die Lüfte.</rdf:li>
253+
</rdf:Alt>
254+
</dc:description>
255+
<xmpMM:DerivedFrom
256+
stRef:documentID="adobe:docid:photoshop:402c59b6-9b47-284c-bf69-c29ff9849814"
257+
stRef:instanceID="xmp.iid:5ed51343-dc41-7a4d-bbc9-d779a5a42cf5"
258+
stRef:originalDocumentID="F44F7718D2EE77F231D30D6F8BD43643"/>
259+
<xmpMM:History>
260+
<rdf:Seq>
261+
<rdf:li
262+
stEvt:action="derived"
263+
stEvt:parameters="converted from image/x-sony-arw to image/tiff"/>
264+
<rdf:li
265+
stEvt:action="saved"
266+
stEvt:changed="/"
267+
stEvt:instanceID="xmp.iid:1b7c7f7f-f2d3-3644-beb2-46bf86b3b9f7"
268+
stEvt:softwareAgent="Adobe Photoshop Camera Raw 11.0 (Windows)"
269+
stEvt:when="2019-03-14T22:13:19+01:00"/>
270+
<rdf:li
271+
stEvt:action="saved"
272+
stEvt:changed="/"
273+
stEvt:instanceID="xmp.iid:5ed51343-dc41-7a4d-bbc9-d779a5a42cf5"
274+
stEvt:softwareAgent="Adobe Photoshop CC 2019 (Windows)"
275+
stEvt:when="2019-03-14T22:29:25+01:00"/>
276+
<rdf:li
277+
stEvt:action="derived"
278+
stEvt:parameters="converted from image/tiff to image/jpeg, saved to new location"/>
279+
<rdf:li
280+
stEvt:action="saved"
281+
stEvt:changed="/"
282+
stEvt:instanceID="xmp.iid:ce2000f3-5b24-1346-bf4e-cd945cb900a8"
283+
stEvt:softwareAgent="Adobe Photoshop Lightroom Classic 8.3.1 (Windows)"
284+
stEvt:when="2019-08-04T21:22:41+02:00"/>
285+
</rdf:Seq>
286+
</xmpMM:History>
287+
</rdf:Description>
288+
</rdf:RDF>
289+
</x:xmpmeta>
290+
<?xpacket end="w"?>

‎src/commonTest/kotlin/com/ashampoo/kim/format/jxl/new_description.no_metadata.jxl‎

861 KB
Binary file not shown.

‎src/commonTest/kotlin/com/ashampoo/kim/format/jxl/new_description.no_metadata.jxl.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
File format : JXL
2+
Resolution : null
3+
---- TIFF ----
4+
Version 42
5+
Big-endian (Motorola, MM)
6+
---- Directory IFD0 @ 8 ----
7+
0000000010 0x010e ImageDescription = Äußerst süße Vögel fliegen durch die Lüfte.
8+
0000000022 0x8769 ExifOffset = 92
9+
10+
---- Directory ExifIFD @ 92 ----
11+
12+
---- XMP ----
13+
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
14+
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Ashampoo XMP Core 1.6.1">
15+
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
16+
<rdf:Description rdf:about=""
17+
xmlns:dc="http://purl.org/dc/elements/1.1/">
18+
<dc:description>
19+
<rdf:Alt>
20+
<rdf:li xml:lang="x-default">Äußerst süße Vögel fliegen durch die Lüfte.</rdf:li>
21+
</rdf:Alt>
22+
</dc:description>
23+
</rdf:Description>
24+
</rdf:RDF>
25+
</x:xmpmeta>
26+
<?xpacket end="w"?>

‎src/commonTest/kotlin/com/ashampoo/kim/format/jxl/new_flagged.jxl‎

881 KB
Binary file not shown.

0 commit comments

Comments
 (0)