Skip to content

Commit 5331f63

Browse files
committed
update dependencies
1 parent d9fba8c commit 5331f63

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

scala/build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ pomExtra := (
5555
)
5656

5757
libraryDependencies ++= Seq(
58-
"com.google.guava" % "guava" % "21.0",
59-
"net.jpountz.lz4" % "lz4" % "1.3.0",
60-
"net.liftweb" % "lift-common_2.10" % "2.6-M3",
61-
"net.liftweb" % "lift-util_2.10" % "3.0-M1",
62-
"org.apache.commons" % "commons-lang3" % "3.1",
63-
"commons-io" % "commons-io" % "2.9.0",
58+
"com.google.guava" % "guava" % "23.0",
59+
"org.lz4" % "lz4-java" % "1.8.0",
60+
"net.liftweb" %% "lift-common" % "3.5.0",
61+
"net.liftweb" %% "lift-util" % "3.5.0",
62+
"org.apache.commons" % "commons-lang3" % "3.13.0",
63+
"commons-io" % "commons-io" % "2.13.0",
6464
)
6565

6666
releasePublishArtifactsAction := PgpKeys.publishSigned.value

scala/src/main/scala/com/scalableminds/webknossos/wrap/WKWFile.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.nio.channels.FileChannel
55
import java.nio.file.{Files, Paths, StandardCopyOption}
66

77
import org.apache.commons.io.IOUtils
8-
import com.google.common.io.{LittleEndianDataInputStream => DataInputStream}
8+
import com.google.common.io.LittleEndianDataInputStream
99
import com.scalableminds.webknossos.wrap.util.ExtendedMappedByteBuffer
1010
import com.scalableminds.webknossos.wrap.util.{BoxImplicits, ResourceBox}
1111
import net.jpountz.lz4.LZ4Factory
@@ -279,7 +279,7 @@ object WKWFile extends WKWCompressionHelper {
279279
}
280280

281281
def read[T](is: InputStream)(f: (WKWHeader, Iterator[Array[Byte]]) => T): Box[T] = {
282-
ResourceBox.manage(new DataInputStream(is)) { dataStream =>
282+
ResourceBox.manage(new LittleEndianDataInputStream(is)) { dataStream =>
283283
for {
284284
header <- WKWHeader(dataStream, readJumpTable = true)
285285
} yield {
@@ -297,7 +297,7 @@ object WKWFile extends WKWCompressionHelper {
297297
(0 until header.numBlocksPerCube).foldLeft[Box[Array[Int]]](Full(Array.emptyIntArray)) {
298298
case (Full(blockLengths), _) =>
299299
if (blocks.hasNext) {
300-
val data = blocks.next
300+
val data = blocks.next()
301301
for {
302302
_ <- (data.length == header.numBytesPerBlock) ?~! error("Unexpected block size", header.numBytesPerBlock, data.length)
303303
compressedBlock <- if (header.isCompressed) compressBlock(header.blockType)(data) else Full(data)

0 commit comments

Comments
 (0)