From 52bff50f10e546a7fa4ddae722dd88523cb7e4c7 Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Wed, 30 Aug 2017 17:14:00 -0400
Subject: [PATCH] clean dimension numbers from pencil end message
---
.../bigbluebutton/core/apps/WhiteboardModel.scala | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala
index c93fbfbd26..47db6b08ed 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala
@@ -110,7 +110,7 @@ class WhiteboardModel {
var dimensions: List[Int] = List[Int]()
annotation.annotationInfo.get("dimensions").foreach(d => {
d match {
- case d2: List[_] => dimensions = d2.asInstanceOf[List[Int]]
+ case d2: List[_] => dimensions = convertListNumbersToInt(d2)
}
})
@@ -230,11 +230,19 @@ class WhiteboardModel {
ann.copy(annotationInfo = updatedAnnotationInfo)
}
- def convertListNumbersToFloat(list: List[_]): List[Float] = {
+ private def convertListNumbersToFloat(list: List[_]): List[Float] = {
list.map {
case f: Double => f.toFloat
case f: Float => f
case f: Int => f.toFloat
}.asInstanceOf[List[Float]]
}
+
+ private def convertListNumbersToInt(list: List[_]): List[Int] = {
+ list.map {
+ case f: Double => f.toInt
+ case f: Float => f.toInt
+ case f: Int => f
+ }.asInstanceOf[List[Int]]
+ }
}
--
GitLab