fix zstd default clevel, force make rebuild, update octave mex

fangq · Sep 18, 2022 · e5107bb · e5107bb
1 parent 2be1661
commit e5107bb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -30,3 +30,4 @@ clean:
 
 .DEFAULT_GOAL := mex
 
+.PHONY: all lib dll mex oct example clean
diff --git a/octave/x86_64-pc-linux-gnu/zipmat.mex b/octave/x86_64-pc-linux-gnu/zipmat.mex
diff --git a/src/blosc2/Makefile b/src/blosc2/Makefile
@@ -9,15 +9,14 @@ LIBBLOSC2=$(BLOSC_SRC)/lib/libblosc2.a
 
 all: lib zstd
 
-lib: $(LIBBLOSC2)
-
-$(LIBBLOSC2):
+lib:
 	-$(MAKE) -C $(BLOSC_SRC) lib
 zstd:
 	-$(MAKE) -C $(ZSTD_SRC) libzstd.a
 clean:
 	-$(MAKE) -C $(BLOSC_SRC) clean
 	-$(MAKE) -C $(ZSTD_SRC) clean
 
-.DEFAULT_GOAL := all
+.PHONY: all lib zstd clean
 
+.DEFAULT_GOAL := all
diff --git a/src/zmatlib.c b/src/zmatlib.c
@@ -275,7 +275,7 @@ int zmat_run(const size_t inputsize, unsigned char* inputstr, size_t* outputsize
                 return -5;
             }
 
-            *ret = ZSTD_compress((char*)(*outputbuf), *outputsize, (const char*)inputstr, inputsize, (clevel > 0) ? 8 : (-clevel));
+            *ret = ZSTD_compress((char*)(*outputbuf), *outputsize, (const char*)inputstr, inputsize, (clevel > 0) ? ZSTD_CLEVEL_DEFAULT : (-clevel));
 
             if (ZSTD_isError(*ret)) {
                 return -9;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,4 @@ clean:

		.DEFAULT_GOAL := mex

		.PHONY: all lib dll mex oct example clean