Skip to content

Rename z_inflate to jk_z_inflate. #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jesterKing wants to merge 1 commit into
base: 8.x
Choose a base branch
from
Open

Rename z_inflate to jk_z_inflate. #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion freetype263/src/gzip/infcodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ int r )
if (m >= 258 && n >= 10)
{
UPDATE
r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
r = jk_inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
LOAD
if (r != Z_OK)
{
Expand Down
2 changes: 1 addition & 1 deletion freetype263/src/gzip/zconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# define deflate z_deflate
# define deflateEnd z_deflateEnd
# define inflateInit_ z_inflateInit_
# define inflate z_inflate
# define inflate jk_z_inflate
# define inflateEnd z_inflateEnd
# define deflateInit2_ z_deflateInit2_
# define deflateSetDictionary z_deflateSetDictionary
Expand Down
4 changes: 2 additions & 2 deletions opennurbs_compress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ bool ON_UncompressStream::In( ON__UINT64 size, const void* compressed_buffer )
// calculate compression
ON__UINT32 avail_in0 = strm.avail_in;
ON__UINT32 avail_out0 = strm.avail_out;
zrc = z_inflate( &strm, Z_NO_FLUSH );
zrc = jk_z_inflate( &strm, Z_NO_FLUSH );
if ( zrc < 0 )
{
// Something went haywire - bail out.
Expand Down Expand Up @@ -557,7 +557,7 @@ bool ON_UncompressStream::End()
strm.avail_out = sizeof_out_buffer;

// finish compression calculation
zrc = z_inflate( &strm, Z_FINISH );
zrc = jk_z_inflate( &strm, Z_FINISH );
if ( zrc < 0 )
{
// Something went haywire - bail out.
Expand Down
4 changes: 2 additions & 2 deletions opennurbs_zlib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ bool ON_BinaryArchive::ReadInflate(
// no compressed input is left - switch to finish mode
flush = Z_FINISH;
}
zrc = z_inflate( &m_zlib.m_strm, flush );
zrc = jk_z_inflate( &m_zlib.m_strm, flush );
if ( zrc < 0 )
{
// Something went haywire - bail out.
Expand Down Expand Up @@ -1341,7 +1341,7 @@ bool ON_CompressedBuffer::InflateHelper(
// no compressed input is left - switch to finish mode
flush = Z_FINISH;
}
zrc = z_inflate( &m_zlib.m_strm, flush );
zrc = jk_z_inflate( &m_zlib.m_strm, flush );
if ( zrc < 0 )
{
// Something went haywire - bail out.
Expand Down
2 changes: 1 addition & 1 deletion zlib/infback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ void FAR *out_desc;
RESTORE();
if (state->whave < state->wsize)
state->whave = state->wsize - left;
inflate_fast(strm, state->wsize);
jk_inflate_fast(strm, state->wsize);
LOAD();
break;
}
Expand Down
2 changes: 1 addition & 1 deletion zlib/inffast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
requires strm->avail_out >= 258 for each loop to avoid checking for
output space.
*/
void inflate_fast(strm, start)
void jk_inflate_fast(strm, start)
z_streamp strm;
unsigned start; /* inflate()'s starting value for strm->avail_out */
{
Expand Down
2 changes: 1 addition & 1 deletion zlib/inffast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
subject to change. Applications should only use zlib.h.
*/

void inflate_fast OF((z_streamp strm, unsigned start));
void jk_inflate_fast OF((z_streamp strm, unsigned start));
2 changes: 1 addition & 1 deletion zlib/inflate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ int flush;
case LEN:
if (have >= 6 && left >= 258) {
RESTORE();
inflate_fast(strm, out);
jk_inflate_fast(strm, out);
LOAD();
break;
}
Expand Down
2 changes: 1 addition & 1 deletion zlib/zconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ warning C4127: conditional expression is constant
# define deflate z_deflate
# define deflateEnd z_deflateEnd
# define inflateInit_ z_inflateInit_
# define inflate z_inflate
# define inflate jk_z_inflate
# define inflateEnd z_inflateEnd
# define deflateInit2_ z_deflateInit2_
# define deflateSetDictionary z_deflateSetDictionary
Expand Down