walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] backout wrong changeset 1091 - see issue 123

This commit is contained in:
Julien Malik 2011-11-27 20:28:24 +00:00
parent c974cb1b8e
commit 674d702257
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
November 27, 2011
* [jmalik] reverted changeset 1091 (see issue #103)
November 24, 2011 November 24, 2011
* [jmalik] support seeking in files larger than 2 GB * [jmalik] support seeking in files larger than 2 GB

20
libopenjpeg/openjpeg.c
View File

@ -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) opj_bool opj_seek_from_file (OPJ_SIZE_T p_nb_bytes, FILE * p_user_data)
{ {
/* if (fseek(p_user_data,p_nb_bytes,SEEK_SET)) {
* 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)) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }

1
libopenjpeg/opj_includes.h
View File

@ -41,7 +41,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <ctype.h> #include <ctype.h>
#include <assert.h> #include <assert.h>
#include <limits.h>
/* /*
========================================================== ==========================================================