aboutsummaryrefslogtreecommitdiffstats
path: root/woff.c
diff options
context:
space:
mode:
authorLibravatarLarge Libravatar Benjamin Beasley <codemusicinmybrainnet>2020-10-20 14:43:05 -0400
committerLibravatarLarge Libravatar Benjamin Beasley <codemusicinmybrainnet>2020-10-20 14:43:05 -0400
commit9ed2430baaf3558d0844c8bc74fa904007133db7 (patch)
treed5cc63b6b49401144e4f4d3632982bbfcd302a02 /woff.c
parent3e6cf7a7b29698b69f96e848f84196aeda57b4a4 (diff)
downloadsfnt2woff-zopfli-9ed2430baaf3558d0844c8bc74fa904007133db7.tar.gz
sfnt2woff-zopfli-9ed2430baaf3558d0844c8bc74fa904007133db7.tar.bz2
sfnt2woff-zopfli-9ed2430baaf3558d0844c8bc74fa904007133db7.tar.lz
sfnt2woff-zopfli-9ed2430baaf3558d0844c8bc74fa904007133db7.zip

Use only Zopfli public API functions from zopfli.h.

The Zopfli library is normally installed only with zopfli.h (and zopflipng_lib.h). Using only APIs in this header makes it easier to use an external Zopfli library. This means including zopfli.h instead of zlib_container.h, and calling ZopfliCompress with ZOPFLI_FORMAT_ZLIB instead of calling ZopfliZlibCompress directly.

Diffstat (limited to 'woff.c')
-rw-r--r--woff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/woff.c b/woff.c
index c0f1192..dc77c42 100644
--- a/woff.c
+++ b/woff.c
@@ -42,7 +42,7 @@
#include <stdlib.h>
#include <string.h>
#include <zlib.h>
-#include "zlib_container.h"
+#include "zopfli.h"
#ifdef WOFF_MOZILLA_CLIENT /* define this when building as part of Gecko */
# include "prmem.h"
@@ -288,7 +288,7 @@ woffEncode(const uint8_t * sfntData, uint32_t sfntLen,
FAIL(eWOFF_invalid);
}
- ZopfliZlibCompress(&options, (const uint8_t *) (sfntData + sourceOffset), sourceLen, &dest, &destLen);
+ ZopfliCompress(&options, ZOPFLI_FORMAT_ZLIB, (const uint8_t *) (sfntData + sourceOffset), sourceLen, &dest, &destLen);
if (destLen < sourceLen) {
/* compressed table was smaller */
@@ -548,7 +548,7 @@ woffSetMetadata(const uint8_t * woffData, uint32_t * woffLen,
ZopfliOptions options;
ZopfliInitOptions(&options);
- ZopfliZlibCompress(&options, (const uint8_t *) metaData, metaLen, &compData, &compLen);
+ ZopfliCompress(&options, ZOPFLI_FORMAT_ZLIB, (const uint8_t *) metaData, metaLen, &compData, &compLen);
}
woffData = rebuildWoff(woffData, woffLen,