diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-01-30 21:33:55 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-01-30 21:33:55 +0000 |
| commit | a1920bc5c2e61614ebe330ce8ebb36b4fd2ca83f (patch) | |
| tree | 494561a068d32d539b90c062b81b09e7644d661a /libopenjpeg | |
| parent | 9a811cb52a9c82345731488b91269d3b5ccbc481 (diff) | |
fixed warnings in jp2.c (signed compared to unsigned) and dwt.c (bad cast) ; removed depcomp file from trunk (automatically copied by automake in main folder)
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/dwt.c | 2 | ||||
| -rw-r--r-- | libopenjpeg/jp2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libopenjpeg/dwt.c b/libopenjpeg/dwt.c index a8d579fa..6f25debd 100644 --- a/libopenjpeg/dwt.c +++ b/libopenjpeg/dwt.c @@ -570,7 +570,7 @@ static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, in int count = w->sn; int i, k; for(k = 0; k < 2; ++k){ - if (count + 3 * x < size && ((int) a & 0x0f) == 0 && ((int) bi & 0x0f) == 0 && (x & 0x0f) == 0) { + if (count + 3 * x < size && ((long) a & 0x0f) == 0 && ((long) bi & 0x0f) == 0 && (x & 0x0f) == 0) { /* Fast code path */ for(i = 0; i < count; ++i){ int j = i; diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 8ea3f51f..9c14a6be 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -593,7 +593,7 @@ static bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio, bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color) { opj_jp2_box_t box; - unsigned int jp2h_end; + int jp2h_end; opj_common_ptr cinfo = jp2->cinfo; |