Merge branch 'master' into experimental-0.6

# Conflicts: # build.sbt
JD557 · Oct 7, 2023 · a7ece0e · a7ece0e
2 parents 688ccfe + ab0caaa
commit a7ece0e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/backend/js/src/main/scala/eu/joaocosta/minart/backend/ImageDataOpaqueSurface.scala b/backend/js/src/main/scala/eu/joaocosta/minart/backend/ImageDataOpaqueSurface.scala
@@ -14,7 +14,7 @@ final class ImageDataOpaqueSurface(val data: ImageData) extends MutableSurface {
 
   val width: Int         = data.width
   val height: Int        = data.height
-  private val dataBuffer = new Int32Array(data.data.asInstanceOf[Uint8ClampedArray].buffer)
+  private val dataBuffer = new Int32Array(data.data.buffer)
 
   def unsafeGetPixel(x: Int, y: Int): Color = Color.fromBGR(dataBuffer(y * width + x))
 

diff --git a/backend/js/src/main/scala/eu/joaocosta/minart/backend/ImageDataSurface.scala b/backend/js/src/main/scala/eu/joaocosta/minart/backend/ImageDataSurface.scala
@@ -14,7 +14,7 @@ final class ImageDataSurface(val data: ImageData) extends MutableSurface {
 
   val width: Int         = data.width
   val height: Int        = data.height
-  private val dataBuffer = new Int32Array(data.data.asInstanceOf[Uint8ClampedArray].buffer)
+  private val dataBuffer = new Int32Array(data.data.buffer)
 
   def unsafeGetPixel(x: Int, y: Int): Color = Color.fromABGR(dataBuffer(y * width + x))
 

diff --git a/build.sbt b/build.sbt
@@ -61,7 +61,7 @@ val publishSettings = Seq(
 
 val jsSettings = Seq(
   libraryDependencies ++= Seq(
-    "org.scala-js" %%% "scalajs-dom" % "2.7.0"
+    "org.scala-js" %%% "scalajs-dom" % "2.8.0"
   )
 )