[trunk] rename opj_encode_v2 to opj_encode

This commit is contained in:
Mickael Savinaud 2012-08-09 12:42:46 +00:00
parent 7b88544d46
commit 5d0ace0577
3 changed files with 5 additions and 5 deletions

View File

@ -1861,9 +1861,9 @@ int main(int argc, char **argv) {
free(l_data);
}
else {
bSuccess = bSuccess && opj_encode_v2(l_codec, l_stream);
bSuccess = bSuccess && opj_encode(l_codec, l_stream);
if (!bSuccess) {
fprintf(stderr, "failed to encode image: opj_encode_v2\n");
fprintf(stderr, "failed to encode image: opj_encode\n");
}
}
bSuccess = bSuccess && opj_end_compress(l_codec, l_stream);

View File

@ -675,7 +675,7 @@ opj_bool OPJ_CALLCONV opj_start_compress ( opj_codec_t *p_codec,
return OPJ_FALSE;
}
opj_bool OPJ_CALLCONV opj_encode_v2(opj_codec_t *p_info, opj_stream_t *p_stream)
opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_info, opj_stream_t *p_stream)
{
if (p_info && p_stream) {
opj_codec_private_t * l_codec = (opj_codec_private_t *) p_info;

View File

@ -1423,8 +1423,8 @@ OPJ_API opj_bool OPJ_CALLCONV opj_end_compress (opj_codec_t *p_codec,
*
* @return Returns true if successful, returns false otherwise
*/
OPJ_API opj_bool OPJ_CALLCONV opj_encode_v2(opj_codec_t *p_codec,
opj_stream_t *p_stream);
OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_codec,
opj_stream_t *p_stream);
/**