lib/matlab/driver/native/conversions.rb in matlab-ruby-1.0.0 vs lib/matlab/driver/native/conversions.rb in matlab-ruby-1.0.1

@@ -121,11 +121,11 @@
       
       index = 0
       n.times do |column_index|
         m.times do |row_index|
           value = Matlab::Driver::Native::API.mxGetCell(matrix, index).to_ruby
-          cell_matrix[row_index, column_index] = (value.to_s == nil.to_matlab.to_s ? nil : value)
+          cell_matrix[row_index, column_index] = (value.nil? || value.to_s == nil.to_matlab.to_s ? nil : value)
           index += 1
         end
       end
       
       cell_matrix
@@ -163,10 +163,10 @@
       index = 0
       m.times do |row_index|
         n.times do |column_index|
           names.each do |name|
             value = Matlab::Driver::Native::API.mxGetField(matrix, index, name)
-            struct_matrix[row_index, column_index][name] = (Matlab::Driver::Native::API.mxIsEmpty(value) || value.to_ruby.to_s == nil.to_matlab.to_s ? nil : value.to_ruby)
+            struct_matrix[row_index, column_index][name] = (value.nil? || Matlab::Driver::Native::API.mxIsEmpty(value) || value.to_ruby.to_s == nil.to_matlab.to_s ? nil : value.to_ruby)
           end
           index += 1
         end
       end
       
\ No newline at end of file