diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-02-17 21:11:29 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-02-17 21:11:29 +0000 |
| commit | 89456eed517d6ecd768373f340e0e7f613e467ab (patch) | |
| tree | c365ca31e0e7028b186908f85fbda41cb62a7b59 | |
| parent | e023107e97039221f408e0ff9eca8a5a5e23466b (diff) | |
replaced "long" by "size_t" in dwt.c to be sure to cast to a pointer size.
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | libopenjpeg/dwt.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -6,6 +6,7 @@ What's New for OpenJPEG + : added February 17, 2011 +* [antonin] replaced 'long' by 'size_t' in dwt.c to be sure to cast to a pointer size. * [antonin] now allows 16-bit precision for mj2 encoding and decoding (solves Issue 49 and Issue 63). Credit to Winfried. February 9, 2011 diff --git a/libopenjpeg/dwt.c b/libopenjpeg/dwt.c index 6f25debd..3436b103 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 && ((long) a & 0x0f) == 0 && ((long) bi & 0x0f) == 0 && (x & 0x0f) == 0) { + if (count + 3 * x < size && ((size_t) a & 0x0f) == 0 && ((size_t) bi & 0x0f) == 0 && (x & 0x0f) == 0) { /* Fast code path */ for(i = 0; i < count; ++i){ int j = i; |