[trunk] rename opj_encode_v2 to opj_encode
This commit is contained in:
parent
7b88544d46
commit
5d0ace0577
|
@ -1861,9 +1861,9 @@ int main(int argc, char **argv) {
|
||||||
free(l_data);
|
free(l_data);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
bSuccess = bSuccess && opj_encode_v2(l_codec, l_stream);
|
bSuccess = bSuccess && opj_encode(l_codec, l_stream);
|
||||||
if (!bSuccess) {
|
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);
|
bSuccess = bSuccess && opj_end_compress(l_codec, l_stream);
|
||||||
|
|
|
@ -675,7 +675,7 @@ opj_bool OPJ_CALLCONV opj_start_compress ( opj_codec_t *p_codec,
|
||||||
return OPJ_FALSE;
|
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) {
|
if (p_info && p_stream) {
|
||||||
opj_codec_private_t * l_codec = (opj_codec_private_t *) p_info;
|
opj_codec_private_t * l_codec = (opj_codec_private_t *) p_info;
|
||||||
|
|
|
@ -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
|
* @return Returns true if successful, returns false otherwise
|
||||||
*/
|
*/
|
||||||
OPJ_API opj_bool OPJ_CALLCONV opj_encode_v2(opj_codec_t *p_codec,
|
OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_codec,
|
||||||
opj_stream_t *p_stream);
|
opj_stream_t *p_stream);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue