Skip to content

Commit 1a950ae

Browse files
committed
- fixed a couple of assertions after the removal of ByteBuffer.size
- kotlintest issue
1 parent 62783da commit 1a950ae

File tree

5 files changed

+27
-13
lines changed

5 files changed

+27
-13
lines changed

build.gradle

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,24 @@ jar {
6969
manifest.attributes('Automatic-Module-Name': moduleName)
7070
}
7171

72-
test.useJUnitPlatform()
72+
test {
73+
useJUnitPlatform()
74+
75+
testLogging {
76+
// Make sure output from
77+
// standard out or error is shown
78+
// in Gradle output.
79+
// showStandardStreams = true
80+
81+
// Or we use events method:
82+
// events 'standard_out', 'standard_error'
83+
84+
// Or set property events:
85+
// events = ['standard_out', 'standard_error']
86+
87+
// Instead of string values we can
88+
// use enum values:
89+
// events org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_OUT,
90+
// org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR,
91+
}
92+
}

src/main/kotlin/gli_/loadDds.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ interface loadDds {
126126
val texture = Texture(getTarget(header, header10), format, Vec3i(header.width, header.height, depthCount),
127127
glm.max(header10.arraySize, 1), faceCount, mipMapCount)
128128

129-
assert(data.rem == data.pos + texture.size)
129+
assert(data.cap == data.pos + texture.size)
130130

131131
memCopy(data.adr, texture.data().adr, texture.size)
132132

src/main/kotlin/gli_/loadKmg.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ package gli_
22

33
import glm_.i
44
import glm_.vec3.Vec3i
5-
import kool.Buffer
6-
import kool.adr
7-
import kool.pos
8-
import kool.rem
5+
import kool.*
96
import java.net.URI
107
import java.nio.ByteBuffer
118
import java.nio.ByteOrder
@@ -75,7 +72,7 @@ interface loadKmg {
7572
memCopy(data.adr, dst.adr, faceSize)
7673

7774
data.pos += faceSize
78-
assert(data.pos <= data.rem)
75+
assert(data.pos <= data.cap)
7976
}
8077
}
8178

src/main/kotlin/gli_/saveKmg.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package gli_
22

3-
import kool.Buffer
4-
import kool.adr
5-
import kool.pos
6-
import kool.rem
3+
import kool.*
74
import java.nio.channels.FileChannel
85
import java.nio.file.Path
96
import java.nio.file.StandardOpenOption
@@ -57,7 +54,7 @@ interface saveKmg {
5754
memCopy(src.adr, data.adr, faceSize)
5855

5956
data.pos += faceSize
60-
assert(data.pos <= data.rem)
57+
assert(data.pos <= data.cap)
6158
}
6259
}
6360

src/main/kotlin/gli_/saveKtx.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ interface saveKtx {
6565
imageSize += paddedSize
6666
data.pos += paddedSize
6767

68-
assert(data.pos <= data.rem)
68+
assert(data.pos <= data.cap)
6969
}
7070

7171
imageSize = glm.ceilMultiple(imageSize, 4)

0 commit comments

Comments
 (0)