make octavezmat work on matlab

NeuroJSON · Nov 8, 2023 · 3ff781f · 3ff781f
1 parent ea4a4fd
commit 3ff781f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Name: jsonlab
 Version: 2.9.8
-Date: 2022-29-04
+Date: 2023-11-11
 Title: A JSON/UBJSON/MessagePack encoder/decoder for MATLAB/Octave
 Author: Qianqian Fang <[email protected]>
 Maintainer: Qianqian Fang <[email protected]>

diff --git a/INDEX b/INDEX
@@ -25,6 +25,8 @@ JSON Mmap
 Compression and Decompression
  base64decode
  base64encode
+ blosc2decode
+ blosc2encode
  gzipdecode
  gzipencode
  lz4decode
@@ -37,6 +39,8 @@ Compression and Decompression
  lzmaencode
  zlibdecode
  zlibencode
+ zstddecode
+ zstdencode
  octavezmat
 Helper Functions
  decodevarname

diff --git a/octavezmat.m b/octavezmat.m
@@ -117,7 +117,11 @@
 if(~iscompress)
     if(strcmp(zipmethod, 'zlib'))
         outputfile=unzip(tmpfile, tempdir);
-        outputfile=[tempdir filesep outputfile{1}];
+        if((exist('OCTAVE_VERSION','builtin')~=0))
+            outputfile=[tempdir filesep outputfile{1}];
+        else
+            outputfile = outputfile{1};
+        end
     elseif(strcmp(zipmethod, 'gzip'))
         gunzip(tmpfile);
     end