X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fopenjp2%2Fraw.c;h=516d63fb56f4f527997cace1dc69f535a074c6de;hb=563bd8499e63db976ca8358216138647593354bc;hp=d3581d1a0e9760e697fd709295668b270c4004fe;hpb=d4e54e9f35d532062533f1d369c159810b01d224;p=openjpeg.git diff --git a/src/lib/openjp2/raw.c b/src/lib/openjp2/raw.c index d3581d1a..516d63fb 100644 --- a/src/lib/openjp2/raw.c +++ b/src/lib/openjp2/raw.c @@ -1,12 +1,12 @@ /* - * The copyright in this software is being made available under the 2-clauses - * BSD License, included below. This software may be subject to other third + * The copyright in this software is being made available under the 2-clauses + * BSD License, included below. This software may be subject to other third * party and contributor rights, including patent rights, and no such rights * are granted under this license. * * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium * Copyright (c) 2002-2014, Professor Benoit Macq - * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2007, Francois-Olivier Devaux * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. @@ -35,61 +35,66 @@ #include "opj_includes.h" -/* +/* ========================================================== local functions ========================================================== */ -/* +/* ========================================================== RAW encoding interface ========================================================== */ -opj_raw_t* opj_raw_create(void) { - opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t)); - return raw; +opj_raw_t* opj_raw_create(void) +{ + opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t)); + return raw; } -void opj_raw_destroy(opj_raw_t *raw) { - if(raw) { - opj_free(raw); - } +void opj_raw_destroy(opj_raw_t *raw) +{ + if (raw) { + opj_free(raw); + } } -OPJ_UINT32 opj_raw_numbytes(opj_raw_t *raw) { - const ptrdiff_t diff = raw->bp - raw->start; - assert( diff <= (ptrdiff_t)0xffffffff && diff >= 0 ); /* UINT32_MAX */ - return (OPJ_UINT32)diff; +OPJ_UINT32 opj_raw_numbytes(opj_raw_t *raw) +{ + const ptrdiff_t diff = raw->bp - raw->start; + assert(diff <= (ptrdiff_t)0xffffffff && diff >= 0); /* UINT32_MAX */ + return (OPJ_UINT32)diff; } -void opj_raw_init_dec(opj_raw_t *raw, OPJ_BYTE *bp, OPJ_UINT32 len) { - raw->start = bp; - raw->lenmax = len; - raw->len = 0; - raw->c = 0; - raw->ct = 0; +void opj_raw_init_dec(opj_raw_t *raw, OPJ_BYTE *bp, OPJ_UINT32 len) +{ + raw->start = bp; + raw->lenmax = len; + raw->len = 0; + raw->c = 0; + raw->ct = 0; } -OPJ_UINT32 opj_raw_decode(opj_raw_t *raw) { - OPJ_UINT32 d; - if (raw->ct == 0) { - raw->ct = 8; - if (raw->len == raw->lenmax) { - raw->c = 0xff; - } else { - if (raw->c == 0xff) { - raw->ct = 7; - } - raw->c = *(raw->start + raw->len); - raw->len++; - } - } - raw->ct--; - d = ((OPJ_UINT32)raw->c >> raw->ct) & 0x01U; - - return d; +OPJ_UINT32 opj_raw_decode(opj_raw_t *raw) +{ + OPJ_UINT32 d; + if (raw->ct == 0) { + raw->ct = 8; + if (raw->len == raw->lenmax) { + raw->c = 0xff; + } else { + if (raw->c == 0xff) { + raw->ct = 7; + } + raw->c = *(raw->start + raw->len); + raw->len++; + } + } + raw->ct--; + d = ((OPJ_UINT32)raw->c >> raw->ct) & 0x01U; + + return d; }