bench.c without dict uses ZSTD_compressCCtx

diff --git a/.gitignore b/.gitignore
index 220a1e0eb1a7b345b92de19e81b5609c2b4781b8..6f792e6158ecb540043ee41dce567fa2e3231230 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ _zstdbench/
 .DS_Store
 googletest/
 *.d
+
+build/VS2010/zwrapbench/zwrapbench.vcxproj
\ No newline at end of file

diff --git a/programs/bench.c b/programs/bench.c
index 7b6e25206debdbb28a8c1fe4438c63a1a09e1cdd..df68d0adaa8b37cd4a2e3482d09548d68f72b34f 100644 (file)
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -213,11 +213,18 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                 if (cdict==NULL) EXM_THROW(1, "ZSTD_createCDict_advanced() allocation failure");
                 do {
                     U32 blockNb;
+                    size_t rSize;
                     for (blockNb=0; blockNb<nbBlocks; blockNb++) {
-                        size_t const rSize = ZSTD_compress_usingCDict(ctx,
+                        if (dictBufferSize) {
+                            rSize = ZSTD_compress_usingCDict(ctx,
                                             blockTable[blockNb].cPtr,  blockTable[blockNb].cRoom,
                                             blockTable[blockNb].srcPtr,blockTable[blockNb].srcSize,
                                             cdict);
+                        } else {
+                            rSize = ZSTD_compressCCtx (ctx,
+                                            blockTable[blockNb].cPtr,  blockTable[blockNb].cRoom,
+                                            blockTable[blockNb].srcPtr,blockTable[blockNb].srcSize, cLevel);
+                        }
                         if (ZSTD_isError(rSize)) EXM_THROW(1, "ZSTD_compress_usingCDict() failed : %s", ZSTD_getErrorName(rSize));
                         blockTable[blockNb].cSize = rSize;
                     }