From 6069d16c077daacebfc001c2558373533e6d9890 Mon Sep 17 00:00:00 2001
From: Alexander Luzgarev <mahalex@gmail.com>
Date: Thu, 3 Apr 2025 18:33:03 +0200
Subject: [PATCH] Better treatment of embedded objects

---
 MatFileHandler.Tests/MatFileReaderTests.cs    |  25 ++++++++++++++++++
 .../test-data/good/table-with-strings.mat     | Bin 0 -> 1033 bytes
 MatFileHandler/MatFileHandler.csproj          |   2 +-
 MatFileHandler/SubsystemDataReader.cs         |  10 +++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 MatFileHandler.Tests/test-data/good/table-with-strings.mat

diff --git a/MatFileHandler.Tests/MatFileReaderTests.cs b/MatFileHandler.Tests/MatFileReaderTests.cs
index a06ad71..44e1e21 100755
--- a/MatFileHandler.Tests/MatFileReaderTests.cs
+++ b/MatFileHandler.Tests/MatFileReaderTests.cs
@@ -390,6 +390,31 @@ namespace MatFileHandler.Tests
             Assert.Equal(new[] { 1.0, 3.0, 5.0, 2.0, 4.0, 6.0 }, variable2.ConvertToDoubleArray());
         }
 
+        /// <summary>
+        /// Test reading a table with strings
+        /// </summary>
+        [Fact]
+        public void TestTableWithStrings()
+        {
+            var matFile = GetTests("good")["table-with-strings"];
+            var obj = matFile["t"].Value as IMatObject;
+            var table = new TableAdapter(obj);
+            Assert.Equal(5, table.NumberOfRows);
+            Assert.Equal(2, table.NumberOfVariables);
+            Assert.Equal(new[] { "Numbers", "Names" }, table.VariableNames);
+            var variable = table["Names"] as ICellArray;
+            var name0 = new StringAdapter(variable[0]);
+            Assert.Equal("One", name0[0]);
+            var name1 = new StringAdapter(variable[1]);
+            Assert.Equal("Two", name1[0]);
+            var name2 = new StringAdapter(variable[2]);
+            Assert.Equal("Three", name2[0]);
+            var name3 = new StringAdapter(variable[3]);
+            Assert.Equal("Four", name3[0]);
+            var name4 = new StringAdapter(variable[4]);
+            Assert.Equal("Five", name4[0]);
+        }
+
         /// <summary>
         /// Test subobjects within objects.
         /// </summary>
diff --git a/MatFileHandler.Tests/test-data/good/table-with-strings.mat b/MatFileHandler.Tests/test-data/good/table-with-strings.mat
new file mode 100644
index 0000000000000000000000000000000000000000..eb71b0adf1c94dfb2b3afbdd1197085fe9abe26b
GIT binary patch
literal 1033
zcmV+k1orz)K~zjZLLfCRFd$7qR4ry{Y-KDUP;6mzW^ZzBIv`L(S4mDbG%O%Pa%Ew3
zWn>_4ZaN@TXmub#aB?6ZGaxZIIx;glG&dkJFfuhDARr(hARr(hARr(hARr(hARr(h
zARr(hARr(hARr(hARr(hARr*p00000000000ZB~{0000=0001Zoa19)U}ykhHX!Bz
zVnGH7U<ASvFwMf?>+B!Q2xPMYaY<rQPAZV*17Z&(eY{Y8tWZ81ST6)KK=~37=3OQv
zIS>Z%0qz?G@ecq1051ao0C=3uSi5f9FciI#CC5&iXFCL)I(F=stpOYa>5!yo9?h02
zv5*k3C_|DR<PZ7@9Xs|DI`$L#1Kl%b?AS|@w5}LQjv_lP0h+wxIrl+bKCEQ`*mwcZ
z#<qjC3$nOMwy@r=%T^Ry$zZ+T6Y?_F-Sv!b7w~nJ&z*G4QkcEo!J*azM9-SSTa(sF
zu|i(Ly2A$kr^p)){pjpW@qeym{LEgakNP3-TXuQet9Bl5t7i_ji&(F)e#LqxS_J*U
z+OcI7xW1Qo;PD%XlZf$4;C&Xvz@zXw2K?b(;G;P9q8RW;io+-z#*ldD10RY?%a9if
zFqZPwDv&KhHrtjVJB40k^I_Vh^92=syX1MR<hfJw+%52Hf%xGnuIRUwY$;4z^*e;q
zg)Da#l`Q(t3hd~zOxn+o<<koBQR~z;MG-mt7V`N;<I}C4lLO%3KY^VixQ0;Kxtd~U
z0rGY>A7Dqnvm?|VVMIF9=M|UEogIv7gcj#-hrt-55_V2o<@=GjPSg3e%JDjPDSng0
z(Js(W@jAC<xqH`)4_nRnore6?hWwW)|3}UF-X->y41C+b3wc9!f7AU}_h+TAHDi6w
zjP<!Q*4HNb{$2jc{CNZA`J>Bh)~odQdxgEC{e;?c3h;FQURCn`C^+}=Qt}YKYw(4<
zpWbAo{a<dqd*Lf3f5V?q?4NiM6L+Ch<w3+Q8TSV1$Tkan9<z|=hkBzp34;&mEh=BM
zs{4pB28)Ugy|LfliNYY`1dR8>VCW?bi6;^!M;O0Q18l&Oo4xpQVy9HwwjW<aY?w@x
z-1E%{Q*d%&QclSPU^$NcXj|Mp?-gx_coOGFjyX%>LQXH_3F9LSR*#7HE6&Bq{n@U5
zzqaZ%;n942NIq4amreOkdtS-&n$DZK9(AGXaaMjm)^6SXvF`p><rh60rC%-h7+%Z&
zeN%W{$j2jOy%O~LcuaiMU-Lbf_%7kqwKH%0Z3SM>d7X6!IX(5)?Y#M0g#Ua>ye`4e
zBJ{kjxNrWC^ERBqH}^~WU8k?kplSJK`XTUN2)^ih)G5K+O3r<cYT$S7dlZ(x^kCM;
DEokxQ

literal 0
HcmV?d00001

diff --git a/MatFileHandler/MatFileHandler.csproj b/MatFileHandler/MatFileHandler.csproj
index 903b54f..0a43df5 100755
--- a/MatFileHandler/MatFileHandler.csproj
+++ b/MatFileHandler/MatFileHandler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
-    <PackageVersion>1.4.0-beta3</PackageVersion>
+    <PackageVersion>1.4.0-beta4</PackageVersion>
     <PackageId>MatFileHandler</PackageId>
     <Title>A library for reading and writing MATLAB .mat files.</Title>
     <Authors>Alexander Luzgarev</Authors>
diff --git a/MatFileHandler/SubsystemDataReader.cs b/MatFileHandler/SubsystemDataReader.cs
index b6141d8..aca0bcd 100644
--- a/MatFileHandler/SubsystemDataReader.cs
+++ b/MatFileHandler/SubsystemDataReader.cs
@@ -334,6 +334,16 @@ namespace MatFileHandler
                 }
             }
 
+            if (array is MatCellArray cellArray)
+            {
+                for (var i = 0; i < cellArray.Data.Length; i++)
+                {
+                    var cell = cellArray.Data[i];
+                    var transformedCell = TransformOpaqueData(cell, subsystemData);
+                    cellArray.Data[i] = transformedCell;
+                }
+            }
+
             return array;
         }
 
-- 
2.45.2