diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2003-03-30 19:53:04 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2003-03-30 19:53:04 (GMT) |
| commit | 535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd (patch) | |
| tree | dcb3e2354df7b19ebd9458aca416a61d4922bc5c /libpng | |
| parent | 5eeee0ed4c1692c9a367a1232b74e44f1c4a460a (diff) | |
| download | Doxygen-535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd.zip Doxygen-535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd.tar.gz Doxygen-535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd.tar.bz2 | |
Release-1.3-rc3-20030330
Diffstat (limited to 'libpng')
| -rw-r--r-- | libpng/inftrees.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpng/inftrees.c b/libpng/inftrees.c index 901204d..e7aa918 100644 --- a/libpng/inftrees.c +++ b/libpng/inftrees.c @@ -213,7 +213,7 @@ local int huft_build(uIntf *b, uInt n, uInt s, const uIntf *d, const uIntf *e, i /* compute minimum size table less than or equal to l bits */ z = g - w; - z = z > (uInt)l ? l : z; /* table size upper limit */ + z = z > (uInt)l ? (uInt)l : z; /* table size upper limit */ if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ { /* too few codes for k-w bit table */ f -= a + 1; /* deduct codes from patterns left */ @@ -445,6 +445,8 @@ int inflate_trees_fixed(uIntf *bl, uIntf *bd, inflate_huft **tl, inflate_huft ** ZFREE(z, c); fixed_built = 1; } +#else + z=z; // DvH: added to avoid compiler warning #endif *bl = fixed_bl; *bd = fixed_bd; |