[trunk] merge r1197, r1199, r1228, r1230 and r1232 from branch 1.5 over to trunk

This commit is contained in:
Mathieu Malaterre
2012-03-02 15:02:48 +00:00
parent 54c65fdad0
commit 79f090d92b
3 changed files with 6 additions and 0 deletions

View File

@@ -88,6 +88,8 @@ int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b
opj_packet_info_t packet;
int resno, precno, layno, num_packet;
int numOfres, numOfprec, numOflayers;
packet.end_ph_pos = packet.start_pos = -1;
(void)EPHused; /* unused ? */
if( j2klen > pow( 2, 32)){
size_of_coding = 8;