diff options
| author | Julien Malik <julien.malik@paraiso.me> | 2011-11-27 20:28:24 +0000 |
|---|---|---|
| committer | Julien Malik <julien.malik@paraiso.me> | 2011-11-27 20:28:24 +0000 |
| commit | 674d70225723c1deeb7d79b8d3aa869a8a30f558 (patch) | |
| tree | 8b998c93655500e2a1769e79bd04640ca416c3b0 /libopenjpeg | |
| parent | c974cb1b8ebe678fe126a7392d0b8279bb154ebc (diff) | |
[trunk] backout wrong changeset 1091 - see issue 123
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/openjpeg.c | 20 | ||||
| -rw-r--r-- | libopenjpeg/opj_includes.h | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index f1efde1f..73b136d6 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -165,25 +165,7 @@ OPJ_SIZE_T opj_skip_from_file (OPJ_SIZE_T p_nb_bytes, FILE * p_user_data) opj_bool opj_seek_from_file (OPJ_SIZE_T p_nb_bytes, FILE * p_user_data) { - /* - * p_nb_bytes is 'OPJ_SIZE_T' but fseek takes a 'signed long' - * - * As such, fseek can seek to a maximum of 2^31-1 bytes (2 GB) - * To support seeking in files between 2 GB and 4 GB : - * - first, do a seek with the max supported by fseek - * - secondly, seek of the remaining bytes - */ - if (p_nb_bytes > LONG_MAX) { - if (fseek(p_user_data,LONG_MAX,SEEK_SET)) { - return EXIT_FAILURE; - } - p_nb_bytes -= LONG_MAX; - - if (fseek(p_user_data,p_nb_bytes,SEEK_CUR)) { - return EXIT_FAILURE; - } - } - else if (fseek(p_user_data,p_nb_bytes,SEEK_SET)) { + if (fseek(p_user_data,p_nb_bytes,SEEK_SET)) { return EXIT_FAILURE; } diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h index 8aefbafe..d94237e7 100644 --- a/libopenjpeg/opj_includes.h +++ b/libopenjpeg/opj_includes.h @@ -41,7 +41,6 @@ #include <stdarg.h> #include <ctype.h> #include <assert.h> -#include <limits.h> /* ========================================================== |