Skip to content

Commit a8dea7d

Browse files
StefanOltmannStefanOltmann
committed
Update to Kim 0.29.0
1 parent 8d1c97c commit a8dea7d

5 files changed

Lines changed: 48 additions & 32 deletions

File tree

‎.idea/codeStyles/Project.xml‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/codeStyles/codeStyleConfig.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/commonMain/kotlin/HtmlGenerator.kt‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import de.stefan_oltmann.kim.common.MetadataType
2121
import de.stefan_oltmann.kim.common.toFourCCTypeString
22-
import de.stefan_oltmann.kim.format.ImageMetadata
22+
import de.stefan_oltmann.kim.format.MediaMetadata
2323
import de.stefan_oltmann.kim.format.bmff.BoxReader
2424
import de.stefan_oltmann.kim.format.bmff.BoxType
2525
import de.stefan_oltmann.kim.format.bmff.box.ItemInfoEntryBox
@@ -43,7 +43,7 @@ import de.stefan_oltmann.kim.format.webp.WebPChunkType
4343
import de.stefan_oltmann.kim.format.webp.WebPConstants
4444
import de.stefan_oltmann.kim.format.webp.WebPImageParser
4545
import de.stefan_oltmann.kim.input.ByteArrayByteReader
46-
import de.stefan_oltmann.kim.model.ImageFormat
46+
import de.stefan_oltmann.kim.model.MediaFormat
4747

4848
/* Show byte positions up to 99 MB. Hopefully that's enough. */
4949
private const val POS_COUNTER_LENGTH = 8
@@ -66,7 +66,7 @@ private const val BOLD_HR_HTML =
6666
"<hr style=\"height:2px;margin:1px;padding:0;border-width:0;" +
6767
"color:#dddddd;background-color:#dddddd\">"
6868

69-
fun ImageMetadata.toExifHtmlString(): String =
69+
fun MediaMetadata.toExifHtmlString(): String =
7070
buildString {
7171

7272
if (exif == null) {
@@ -119,7 +119,7 @@ fun ImageMetadata.toExifHtmlString(): String =
119119
append("</table>")
120120
}
121121

122-
fun ImageMetadata.toIptcHtmlString(): String =
122+
fun MediaMetadata.toIptcHtmlString(): String =
123123
buildString {
124124

125125
if (iptc == null) {
@@ -162,7 +162,7 @@ fun ImageMetadata.toIptcHtmlString(): String =
162162
append("</table>")
163163
}
164164

165-
fun ImageMetadata.toXmpHtmlString(): String =
165+
fun MediaMetadata.toXmpHtmlString(): String =
166166
buildString {
167167

168168
if (xmp == null) {
@@ -177,7 +177,7 @@ fun ImageMetadata.toXmpHtmlString(): String =
177177
)
178178
}
179179

180-
fun ImageMetadata.toGeoTiffHtmlString(): String =
180+
fun MediaMetadata.toGeoTiffHtmlString(): String =
181181
buildString {
182182

183183
val geoTiffDirectory = exif?.geoTiffDirectory
@@ -219,33 +219,33 @@ fun ImageMetadata.toGeoTiffHtmlString(): String =
219219

220220
fun generateHexHtml(bytes: ByteArray): String {
221221

222-
val format = ImageFormat.detect(bytes) ?: return "Image format was not recognized."
222+
val format = MediaFormat.detect(bytes) ?: return "Image format was not recognized."
223223

224224
return when (format) {
225225

226-
ImageFormat.JPEG ->
226+
MediaFormat.JPEG ->
227227
generateHtmlFromSlices(bytes, createJpegSlices(bytes))
228228

229-
ImageFormat.TIFF,
230-
ImageFormat.CR2,
231-
ImageFormat.NEF,
232-
ImageFormat.ARW,
233-
ImageFormat.RW2,
234-
ImageFormat.ORF ->
229+
MediaFormat.TIFF,
230+
MediaFormat.CR2,
231+
MediaFormat.NEF,
232+
MediaFormat.ARW,
233+
MediaFormat.RW2,
234+
MediaFormat.ORF ->
235235
generateHtmlFromSlices(bytes, createTiffSlices(bytes, exifBytes = false))
236236

237-
ImageFormat.PNG ->
237+
MediaFormat.PNG ->
238238
generateHtmlFromSlices(bytes, createPngSlices(bytes))
239239

240-
ImageFormat.WEBP ->
240+
MediaFormat.WEBP ->
241241
generateHtmlFromSlices(bytes, createWebPSlices(bytes))
242242

243-
ImageFormat.HEIC,
244-
ImageFormat.AVIF,
245-
ImageFormat.JXL ->
243+
MediaFormat.HEIC,
244+
MediaFormat.AVIF,
245+
MediaFormat.JXL ->
246246
generateHtmlFromSlices(bytes, createBaseMediaFileFormatSlices(bytes))
247247

248-
ImageFormat.GIF ->
248+
MediaFormat.GIF ->
249249
generateHtmlFromSlices(bytes, createGifSlices(bytes))
250250

251251
else -> "HEX view for $format is not (yet) supported."
@@ -1130,15 +1130,15 @@ private fun createGifSlices(bytes: ByteArray): List<LabeledSlice> {
11301130

11311131
slices.add(
11321132
LabeledSlice(
1133-
range = 0 .. 2,
1133+
range = 0..2,
11341134
label = "GIF Signature",
11351135
separatorLineType = SeparatorLineType.NONE
11361136
)
11371137
)
11381138

11391139
slices.add(
11401140
LabeledSlice(
1141-
range = 3 .. 5,
1141+
range = 3..5,
11421142
label = "GIF Version",
11431143
separatorLineType = SeparatorLineType.NONE
11441144
)
@@ -1149,39 +1149,39 @@ private fun createGifSlices(bytes: ByteArray): List<LabeledSlice> {
11491149

11501150
slices.add(
11511151
LabeledSlice(
1152-
range = startPosition .. startPosition + 1,
1152+
range = startPosition..startPosition + 1,
11531153
label = "Canvas Width",
11541154
separatorLineType = SeparatorLineType.BOLD
11551155
)
11561156
)
11571157

11581158
slices.add(
11591159
LabeledSlice(
1160-
range = startPosition + 2 .. startPosition + 3,
1160+
range = startPosition + 2..startPosition + 3,
11611161
label = "Canvas Height",
11621162
separatorLineType = SeparatorLineType.NONE
11631163
)
11641164
)
11651165

11661166
slices.add(
11671167
LabeledSlice(
1168-
range = startPosition + 4 .. startPosition + 4,
1168+
range = startPosition + 4..startPosition + 4,
11691169
label = "Packed fields",
11701170
separatorLineType = SeparatorLineType.NONE
11711171
)
11721172
)
11731173

11741174
slices.add(
11751175
LabeledSlice(
1176-
range = startPosition + 5 .. startPosition + 5,
1176+
range = startPosition + 5..startPosition + 5,
11771177
label = "Background Color Index",
11781178
separatorLineType = SeparatorLineType.NONE
11791179
)
11801180
)
11811181

11821182
slices.add(
11831183
LabeledSlice(
1184-
range = startPosition + 6 .. startPosition + 6,
1184+
range = startPosition + 6..startPosition + 6,
11851185
label = "Pixel Aspect Ratio",
11861186
separatorLineType = SeparatorLineType.NONE
11871187
)
@@ -1192,7 +1192,7 @@ private fun createGifSlices(bytes: ByteArray): List<LabeledSlice> {
11921192

11931193
slices.add(
11941194
LabeledSlice(
1195-
range = startPosition .. startPosition,
1195+
range = startPosition..startPosition,
11961196
label = "Extension introducer",
11971197
separatorLineType = SeparatorLineType.BOLD,
11981198
snipAfterLineCount = 1
@@ -1201,7 +1201,7 @@ private fun createGifSlices(bytes: ByteArray): List<LabeledSlice> {
12011201

12021202
slices.add(
12031203
LabeledSlice(
1204-
range = startPosition + 1 .. startPosition + 1,
1204+
range = startPosition + 1..startPosition + 1,
12051205
label = "Application extension",
12061206
separatorLineType = SeparatorLineType.NONE,
12071207
snipAfterLineCount = 1

‎app/src/wasmJsMain/kotlin/Main.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import de.stefan_oltmann.kim.format.png.PngImageParser
2424
import de.stefan_oltmann.kim.format.png.chunk.PngTextChunk
2525
import de.stefan_oltmann.kim.format.tiff.constant.TiffTag
2626
import de.stefan_oltmann.kim.input.ByteArrayByteReader
27-
import de.stefan_oltmann.kim.model.ImageFormat
27+
import de.stefan_oltmann.kim.model.MediaFormat
2828
import de.stefan_oltmann.kim.model.TiffOrientation
2929
import kotlinx.browser.document
3030
import org.khronos.webgl.ArrayBuffer
@@ -229,7 +229,7 @@ private fun processFile(uint8Array: Uint8Array) {
229229

230230
var displayTextChunk = false
231231

232-
if (metadata.imageFormat == ImageFormat.PNG) {
232+
if (metadata.mediaFormat == MediaFormat.PNG) {
233233

234234
val textChunks = PngImageParser.readChunks(
235235
byteReader = ByteArrayByteReader(bytes),

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin = "2.3.20"
33
kotlinx-io = "0.9.0"
4-
kim = "0.27.0"
4+
kim = "0.29.0"
55

66
[libraries]
77
kotlinx-io = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version.ref = "kotlinx-io" }

0 commit comments

Comments
 (0)