Ignore:
Timestamp:
Oct 24, 2012, 7:56:20 PM (13 years ago)
Author:
Silvan Scherrer
Message:

SMplayer: update vendor to 0.8.1

Location:
smplayer/vendor/current/zlib
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • smplayer/vendor/current/zlib/inflate.c

    r121 r133  
    11/* inflate.c -- zlib decompression
    2  * Copyright (C) 1995-2011 Mark Adler
     2 * Copyright (C) 1995-2012 Mark Adler
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
     
    520520    } while (0)
    521521
    522 /* Reverse the bytes in a 32-bit value */
    523 #define REVERSE(q) \
    524     ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
    525      (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
    526 
    527522/*
    528523   inflate() uses a state machine to process as much input data and generate as
     
    818813        case DICTID:
    819814            NEEDBITS(32);
    820             strm->adler = state->check = REVERSE(hold);
     815            strm->adler = state->check = ZSWAP32(hold);
    821816            INITBITS();
    822817            state->mode = DICT;
     
    11901185                     state->flags ? hold :
    11911186#endif
    1192                      REVERSE(hold)) != state->check) {
     1187                     ZSWAP32(hold)) != state->check) {
    11931188                    strm->msg = (char *)"incorrect data check";
    11941189                    state->mode = BAD;
     
    12761271{
    12771272    struct inflate_state FAR *state;
    1278     unsigned long id;
     1273    unsigned long dictid;
    12791274    unsigned char *next;
    12801275    unsigned avail;
     
    12871282        return Z_STREAM_ERROR;
    12881283
    1289     /* check for correct dictionary id */
     1284    /* check for correct dictionary identifier */
    12901285    if (state->mode == DICT) {
    1291         id = adler32(0L, Z_NULL, 0);
    1292         id = adler32(id, dictionary, dictLength);
    1293         if (id != state->check)
     1286        dictid = adler32(0L, Z_NULL, 0);
     1287        dictid = adler32(dictid, dictionary, dictLength);
     1288        if (dictid != state->check)
    12941289            return Z_DATA_ERROR;
    12951290    }
Note: See TracChangeset for help on using the changeset viewer.