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

[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (marker_param_t)

This commit is contained in:
Mathieu Malaterre 2012-03-26 13:18:09 +00:00
parent 34b4ec3624
commit cc47b5a78c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/jpip/libopenjpip/marker_manager.c
View File

@ -39,7 +39,7 @@
#define logstream stderr #define logstream stderr
#endif /*SERVER */ #endif /*SERVER */
marker_param_t set_marker( codestream_param_t cs, Byte2_t code, Byte8_t offset, Byte2_t length) marker_param_t set_marker( codestream_param_t cs, Byte2_t code, OPJ_OFF_T offset, Byte2_t length)
{ {
marker_param_t mkr; marker_param_t mkr;
@ -52,17 +52,17 @@ marker_param_t set_marker( codestream_param_t cs, Byte2_t code, Byte8_t offset,
} }
Byte_t fetch_marker1byte( marker_param_t marker, long offset) Byte_t fetch_marker1byte( marker_param_t marker, OPJ_OFF_T offset)
{ {
return fetch_codestream1byte( &(marker.cs), marker.offset+offset); return fetch_codestream1byte( &(marker.cs), marker.offset+offset);
} }
Byte2_t fetch_marker2bytebigendian( marker_param_t marker, long offset) Byte2_t fetch_marker2bytebigendian( marker_param_t marker, OPJ_OFF_T offset)
{ {
return fetch_codestream2bytebigendian( &(marker.cs), marker.offset+offset); return fetch_codestream2bytebigendian( &(marker.cs), marker.offset+offset);
} }
Byte4_t fetch_marker4bytebigendian( marker_param_t marker, long offset) Byte4_t fetch_marker4bytebigendian( marker_param_t marker, OPJ_OFF_T offset)
{ {
return fetch_codestream4bytebigendian( &(marker.cs), marker.offset+offset); return fetch_codestream4bytebigendian( &(marker.cs), marker.offset+offset);
} }

10
applications/jpip/libopenjpip/marker_manager.h
View File

@ -38,7 +38,7 @@
typedef struct marker_param{ typedef struct marker_param{
codestream_param_t cs; /**< corresponding codestream*/ codestream_param_t cs; /**< corresponding codestream*/
Byte2_t code; /**< marker code*/ Byte2_t code; /**< marker code*/
Byte8_t offset; /**< offset relative to the start of the codestream ( including the length parameter but not the marker itself)*/ OPJ_OFF_T offset; /**< offset relative to the start of the codestream ( including the length parameter but not the marker itself)*/
Byte2_t length; /**< marker segment length*/ Byte2_t length; /**< marker segment length*/
} marker_param_t; } marker_param_t;
@ -52,7 +52,7 @@ typedef struct marker_param{
* @param[in] length marker segment length * @param[in] length marker segment length
* @return structure of generated marker parameters * @return structure of generated marker parameters
*/ */
marker_param_t set_marker( codestream_param_t cs, Byte2_t code, Byte8_t offset, Byte2_t length); marker_param_t set_marker( codestream_param_t cs, Byte2_t code, OPJ_OFF_T offset, Byte2_t length);
/** /**
@ -63,7 +63,7 @@ marker_param_t set_marker( codestream_param_t cs, Byte2_t code, Byte8_t offset,
* @param[in] size Byte length * @param[in] size Byte length
* @return fetched code * @return fetched code
*/ */
Byte_t fetch_marker1byte( marker_param_t marker, long offset); Byte_t fetch_marker1byte( marker_param_t marker, OPJ_OFF_T offset);
/** /**
* fetch marker content 2-byte big endian Byte codes in file stream * fetch marker content 2-byte big endian Byte codes in file stream
@ -72,7 +72,7 @@ Byte_t fetch_marker1byte( marker_param_t marker, long offset);
* @param[in] offset start Byte position in marker * @param[in] offset start Byte position in marker
* @return fetched code * @return fetched code
*/ */
Byte2_t fetch_marker2bytebigendian( marker_param_t marker, long offset); Byte2_t fetch_marker2bytebigendian( marker_param_t marker, OPJ_OFF_T offset);
/** /**
* fetch marker content 4-byte big endian Byte codes in file stream * fetch marker content 4-byte big endian Byte codes in file stream
@ -81,7 +81,7 @@ Byte2_t fetch_marker2bytebigendian( marker_param_t marker, long offset);
* @param[in] offset start Byte position in marker * @param[in] offset start Byte position in marker
* @return fetched code * @return fetched code
*/ */
Byte4_t fetch_marker4bytebigendian( marker_param_t marker, long offset); Byte4_t fetch_marker4bytebigendian( marker_param_t marker, OPJ_OFF_T offset);
#endif /* !MARKER_MANAGER_H_ */ #endif /* !MARKER_MANAGER_H_ */