/* don't forget to release pi */
opj_pi_destroy(l_pi,l_nb_pocs);
- *p_data_read = l_current_data - p_src;
+ assert( l_current_data - p_src < UINT32_MAX );
+ *p_data_read = (OPJ_UINT32)(l_current_data - p_src);
return OPJ_TRUE;
}
c[1] = 145;
c[2] = 0;
c[3] = 4;
+#if 0
c[4] = (tile->packno % 65536) / 256;
c[5] = (tile->packno % 65536) % 256;
+#else
+ c[4] = (tile->packno >> 8) & 0xff; /* packno is uint32_t */
+ c[5] = tile->packno & 0xff;
+#endif
c += 6;
length -= 6;
}
return OPJ_FALSE; /* modified to eliminate longjmp !! */
}
- l_nb_bytes = opj_bio_numbytes(bio);
+ l_nb_bytes = (OPJ_UINT32)opj_bio_numbytes(bio);
c += l_nb_bytes;
length -= l_nb_bytes;
++band;
}
- * p_data_written += (c - dest);
+ assert( c >= dest );
+ * p_data_written += (OPJ_UINT32)(c - dest);
return OPJ_TRUE;
}
else { /* Normal Case */
l_header_data_start = &(l_current_data);
l_header_data = *l_header_data_start;
- l_remaining_length = p_src_data+p_max_length-l_header_data;
+ l_remaining_length = (OPJ_UINT32)(p_src_data+p_max_length-l_header_data);
l_modified_length_ptr = &(l_remaining_length);
}
}
}
- l_header_length = (l_header_data - *l_header_data_start);
+ l_header_length = (OPJ_UINT32)(l_header_data - *l_header_data_start);
*l_modified_length_ptr -= l_header_length;
*l_header_data_start += l_header_length;
/* INDEX >> */
* p_is_data_present = OPJ_FALSE;
- *p_data_read = l_current_data - p_src_data;
+ *p_data_read = (OPJ_UINT32)(l_current_data - p_src_data);
return OPJ_TRUE;
}
}
}
- l_header_length = (l_header_data - *l_header_data_start);
+ l_header_length = (OPJ_UINT32)(l_header_data - *l_header_data_start);
*l_modified_length_ptr -= l_header_length;
*l_header_data_start += l_header_length;
/* INDEX >> */
*p_is_data_present = OPJ_TRUE;
- *p_data_read = l_current_data - p_src_data;
+ *p_data_read = (OPJ_UINT32)(l_current_data - p_src_data);
return OPJ_TRUE;
}
++l_band;
}
- *(p_data_read) = l_current_data - p_src_data;
+ *(p_data_read) = (OPJ_UINT32)(l_current_data - p_src_data);
return OPJ_TRUE;
}