fix test error measureObjects

Author: lassedochreden

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: cytomapper
-Version: 1.15.2
+Version: 1.15.3
 Title: Visualization of highly multiplexed imaging data in R
 Description: 
     Highly multiplexed imaging acquires the single-cell expression of
@@ -67,5 +67,5 @@ biocViews: ImmunoOncology, Software, SingleCell, OneChannel, TwoChannel, Multipl
 VignetteBuilder: knitr
 URL: https://github.com/BodenmillerGroup/cytomapper
 BugReports: https://github.com/BodenmillerGroup/cytomapper/issues
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Encoding: UTF-8

R/measureObjects.R

@@ -254,8 +254,8 @@ measureObjects <- function(mask,
     cur_colData <- colData(object)
     cur_df <- cbind(mcols(image), mcols(mask))
     cur_df <- cur_df[,unique(names(cur_df)), drop=FALSE]
-    cur_colData <- merge(as.data.frame(cur_colData), 
-                         as.data.frame(cur_df), 
+    cur_colData <- merge(as.data.frame(as.matrix(cur_colData)), 
+                         as.data.frame(as.matrix(cur_df)), 
                          by = img_id, sort = FALSE)
     colData(object) <- as(cur_colData, "DataFrame")