diff options
| author | Antonin Descampe <antonin@gmail.com> | 2016-07-05 16:54:17 +0200 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2016-07-05 16:54:17 +0200 |
| commit | 53f25200ed696cf5dc71d5fe12faad2570861b20 (patch) | |
| tree | b04fed04dbb7754c371a72d4b5db8f2ad709980a /src | |
| parent | 788dff0a3650f8897eaafe951512a4bae63808dd (diff) | |
| parent | fef144283f070e24a0a8f9e86158ec6353e99cf1 (diff) | |
Merge branch 'master' into openjpeg-2.1v2.1.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp3d/tcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/openjp3d/tcd.c b/src/lib/openjp3d/tcd.c index 1d0d0f52..ee0b2d16 100644 --- a/src/lib/openjp3d/tcd.c +++ b/src/lib/openjp3d/tcd.c @@ -9,7 +9,7 @@ * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium - * Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain + * Copyright (c) 2006, Mónica DÃez, LPI-UVA, Spain * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1389,7 +1389,7 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_volume_i /* ----------------------------------------------------------------------- */ int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_volume_info_t * volume_info) { int compno; - int l, i, npck = 0; + int l = 0, i, npck = 0; double encoding_time; opj_tcd_tile_t *tile = NULL; |