[trunk]Replaced deprecated opj_stream_set_user_data function from API

with its 'v3' version, and removed all other 'v3' suffixes from API.

7 files changed, 40 insertions, 56 deletions

diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c
index 96401941..4da8eaee 100644
--- a/src/bin/jp2/opj_compress.c
+++ b/src/bin/jp2/opj_compress.c
@@ -1747,7 +1747,7 @@ int main(int argc, char **argv) {
         }
         default:
             fprintf(stderr, "skipping file..\n");
-            opj_stream_destroy_v3(l_stream);
+            opj_stream_destroy(l_stream);
             continue;
         }
 
@@ -1766,7 +1766,7 @@ int main(int argc, char **argv) {
         opj_setup_encoder(l_codec, &parameters, image);
 
         /* open a byte stream for writing and allocate memory for all tiles */
-        l_stream = opj_stream_create_default_file_stream_v3(parameters.outfile,OPJ_FALSE);
+        l_stream = opj_stream_create_default_file_stream(parameters.outfile,OPJ_FALSE);
         if (! l_stream){
             return 1;
         }
@@ -1785,7 +1785,7 @@ int main(int argc, char **argv) {
             for (i=0;i<l_nb_tiles;++i) {
                 if (! opj_write_tile(l_codec,i,l_data,l_data_size,l_stream)) {
                     fprintf(stderr, "ERROR -> test_tile_encoder: failed to write the tile %d!\n",i);
-                    opj_stream_destroy_v3(l_stream);
+                    opj_stream_destroy(l_stream);
                     opj_destroy_codec(l_codec);
                     opj_image_destroy(image);
                     return 1;
@@ -1805,7 +1805,7 @@ int main(int argc, char **argv) {
         }
 
         if (!bSuccess)  {
-            opj_stream_destroy_v3(l_stream);
+            opj_stream_destroy(l_stream);
             opj_destroy_codec(l_codec);
             opj_image_destroy(image);
             fprintf(stderr, "failed to encode image\n");
@@ -1814,7 +1814,7 @@ int main(int argc, char **argv) {
 
         fprintf(stdout,"[INFO] Generated outfile %s\n",parameters.outfile);
         /* close and free the byte stream */
-        opj_stream_destroy_v3(l_stream);
+        opj_stream_destroy(l_stream);
 
         /* free remaining compression structures */
         opj_destroy_codec(l_codec);
diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c
index 1164f061..78957e85 100644
--- a/src/bin/jp2/opj_decompress.c
+++ b/src/bin/jp2/opj_decompress.c
@@ -762,7 +762,7 @@ int main(int argc, char **argv)
 		/* read the input file and put it in memory */
 		/* ---------------------------------------- */
 
-		l_stream = opj_stream_create_default_file_stream_v3(parameters.infile,1);
+		l_stream = opj_stream_create_default_file_stream(parameters.infile,1);
 		if (!l_stream){
 			fprintf(stderr, "ERROR -> failed to create the stream from the file %s\n", parameters.infile);
 			return EXIT_FAILURE;
@@ -792,7 +792,7 @@ int main(int argc, char **argv)
 			}
 			default:
 				fprintf(stderr, "skipping file..\n");
-				opj_stream_destroy_v3(l_stream);
+				opj_stream_destroy(l_stream);
 				continue;
 		}
 
@@ -804,7 +804,7 @@ int main(int argc, char **argv)
 		/* Setup the decoder decoding parameters using user parameters */
 		if ( !opj_setup_decoder(l_codec, &parameters) ){
 			fprintf(stderr, "ERROR -> opj_compress: failed to setup the decoder\n");
-			opj_stream_destroy_v3(l_stream);
+			opj_stream_destroy(l_stream);
 			opj_destroy_codec(l_codec);
 			return EXIT_FAILURE;
 		}
@@ -813,7 +813,7 @@ int main(int argc, char **argv)
 		/* Read the main header of the codestream and if necessary the JP2 boxes*/
 		if(! opj_read_header(l_stream, l_codec, &image)){
 			fprintf(stderr, "ERROR -> opj_decompress: failed to read the header\n");
-			opj_stream_destroy_v3(l_stream);
+			opj_stream_destroy(l_stream);
 			opj_destroy_codec(l_codec);
 			opj_image_destroy(image);
 			return EXIT_FAILURE;
@@ -824,7 +824,7 @@ int main(int argc, char **argv)
 			if (!opj_set_decode_area(l_codec, image, (OPJ_INT32)parameters.DA_x0,
 					(OPJ_INT32)parameters.DA_y0, (OPJ_INT32)parameters.DA_x1, (OPJ_INT32)parameters.DA_y1)){
 				fprintf(stderr,	"ERROR -> opj_decompress: failed to set the decoded area\n");
-				opj_stream_destroy_v3(l_stream);
+				opj_stream_destroy(l_stream);
 				opj_destroy_codec(l_codec);
 				opj_image_destroy(image);
 				return EXIT_FAILURE;
@@ -834,7 +834,7 @@ int main(int argc, char **argv)
 			if (!(opj_decode(l_codec, l_stream, image) && opj_end_decompress(l_codec,	l_stream))) {
 				fprintf(stderr,"ERROR -> opj_decompress: failed to decode image!\n");
 				opj_destroy_codec(l_codec);
-				opj_stream_destroy_v3(l_stream);
+				opj_stream_destroy(l_stream);
 				opj_image_destroy(image);
 				return EXIT_FAILURE;
 			}
@@ -845,7 +845,7 @@ int main(int argc, char **argv)
 			/*if (!opj_set_decoded_resolution_factor(l_codec, 5)) {
 				fprintf(stderr, "ERROR -> opj_decompress: failed to set the resolution factor tile!\n");
 				opj_destroy_codec(l_codec);
-				opj_stream_destroy_v3(l_stream);
+				opj_stream_destroy(l_stream);
 				opj_image_destroy(image);
 				return EXIT_FAILURE;
 			}*/
@@ -853,7 +853,7 @@ int main(int argc, char **argv)
 			if (!opj_get_decoded_tile(l_codec, l_stream, image, parameters.tile_index)) {
 				fprintf(stderr, "ERROR -> opj_decompress: failed to decode tile!\n");
 				opj_destroy_codec(l_codec);
-				opj_stream_destroy_v3(l_stream);
+				opj_stream_destroy(l_stream);
 				opj_image_destroy(image);
 				return EXIT_FAILURE;
 			}
@@ -861,7 +861,7 @@ int main(int argc, char **argv)
 		}
 
 		/* Close the byte stream */
-		opj_stream_destroy_v3(l_stream);
+		opj_stream_destroy(l_stream);
 
 		if(image->color_space == OPJ_CLRSPC_SYCC){
 			color_sycc_to_rgb(image); /* FIXME */
diff --git a/src/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c
index 3121aa4f..7a841d53 100644
--- a/src/bin/jp2/opj_dump.c
+++ b/src/bin/jp2/opj_dump.c
@@ -498,7 +498,7 @@ int main(int argc, char *argv[])
 		/* Read the input file and put it in memory */
 		/* ---------------------------------------- */
 
-		l_stream = opj_stream_create_default_file_stream_v3(parameters.infile,1);
+		l_stream = opj_stream_create_default_file_stream(parameters.infile,1);
 		if (!l_stream){
 			fprintf(stderr, "ERROR -> failed to create the stream from the file %s\n",parameters.infile);
 			return EXIT_FAILURE;
@@ -528,7 +528,7 @@ int main(int argc, char *argv[])
 			}
 			default:
 				fprintf(stderr, "skipping file..\n");
-				opj_stream_destroy_v3(l_stream);
+				opj_stream_destroy(l_stream);
 				continue;
 		}
 
@@ -540,7 +540,7 @@ int main(int argc, char *argv[])
 		/* Setup the decoder decoding parameters using user parameters */
 		if ( !opj_setup_decoder(l_codec, &parameters) ){
 			fprintf(stderr, "ERROR -> opj_dump: failed to setup the decoder\n");
-			opj_stream_destroy_v3(l_stream);
+			opj_stream_destroy(l_stream);
 			opj_destroy_codec(l_codec);
 			fclose(fout);
 			return EXIT_FAILURE;
@@ -549,7 +549,7 @@ int main(int argc, char *argv[])
 		/* Read the main header of the codestream and if necessary the JP2 boxes*/
 		if(! opj_read_header(l_stream, l_codec, &image)){
 			fprintf(stderr, "ERROR -> opj_dump: failed to read the header\n");
-			opj_stream_destroy_v3(l_stream);
+			opj_stream_destroy(l_stream);
 			opj_destroy_codec(l_codec);
 			opj_image_destroy(image);
 			fclose(fout);
@@ -563,7 +563,7 @@ int main(int argc, char *argv[])
 		cstr_index = opj_get_cstr_index(l_codec);
 
 		/* close the byte stream */
-		opj_stream_destroy_v3(l_stream);
+		opj_stream_destroy(l_stream);
 
 		/* free remaining structures */
 		if (l_codec) {
diff --git a/src/lib/openjp2/cio.c b/src/lib/openjp2/cio.c
index 6cba658a..1fc23937 100644
--- a/src/lib/openjp2/cio.c
+++ b/src/lib/openjp2/cio.c
@@ -204,11 +204,6 @@ void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream)
 	}
 }
 
-void OPJ_CALLCONV opj_stream_destroy_v3(opj_stream_t* p_stream)
-{
-	opj_stream_destroy(p_stream);
-}
-
 void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function)
 {
 	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
@@ -252,15 +247,7 @@ void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_strea
 	l_stream->m_skip_fn = p_function;
 }
 
-void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data)
-{
-	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-	if (!l_stream)
-		return;
-	l_stream->m_user_data = p_data;
-}
-
-void OPJ_CALLCONV opj_stream_set_user_data_v3(opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function)
+void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function)
 {
 	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
 	if (!l_stream)
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 1e6024eb..677a0b61 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -6126,21 +6126,25 @@ void opj_j2k_setup_encoder(     opj_j2k_t *p_j2k,
 
         /* FIXME ADE: to be removed once deprecated cp_cinema and cp_rsiz have been removed */
         if (parameters->rsiz == OPJ_PROFILE_NONE) { /* consider deprecated fields only if RSIZ has not been set */
+            OPJ_BOOL deprecated_used = OPJ_FALSE;
             switch (parameters->cp_cinema){
             case OPJ_CINEMA2K_24:
                 parameters->rsiz = OPJ_PROFILE_CINEMA_2K;
                 parameters->max_cs_size = OPJ_CINEMA_24_CS;
                 parameters->max_comp_size = OPJ_CINEMA_24_COMP;
+                deprecated_used = OPJ_TRUE;
                 break;
             case OPJ_CINEMA2K_48:
                 parameters->rsiz = OPJ_PROFILE_CINEMA_2K;
                 parameters->max_cs_size = OPJ_CINEMA_48_CS;
                 parameters->max_comp_size = OPJ_CINEMA_48_COMP;
+                deprecated_used = OPJ_TRUE;
                 break;
             case OPJ_CINEMA4K_24:
                 parameters->rsiz = OPJ_PROFILE_CINEMA_4K;
                 parameters->max_cs_size = OPJ_CINEMA_24_CS;
                 parameters->max_comp_size = OPJ_CINEMA_24_COMP;
+                deprecated_used = OPJ_TRUE;
                 break;
             case OPJ_OFF:
             default:
@@ -6149,16 +6153,25 @@ void opj_j2k_setup_encoder(     opj_j2k_t *p_j2k,
             switch (parameters->cp_rsiz){
             case OPJ_CINEMA2K:
                 parameters->rsiz = OPJ_PROFILE_CINEMA_2K;
+                deprecated_used = OPJ_TRUE;
                 break;
             case OPJ_CINEMA4K:
                 parameters->rsiz = OPJ_PROFILE_CINEMA_4K;
+                deprecated_used = OPJ_TRUE;
                 break;
             case OPJ_MCT:
                 parameters->rsiz = OPJ_PROFILE_PART2 | OPJ_EXTENSION_MCT;
+                deprecated_used = OPJ_TRUE;
             case OPJ_STD_RSIZ:
             default:
                 break;
             }
+            if (deprecated_used) {
+                opj_event_msg(p_manager, EVT_WARNING,
+                        "Deprecated fields cp_cinema or cp_rsiz are used\n"
+                        "Please consider using only the rsiz field\n"
+                        "See openjpeg.h documentation for more details\n");
+            }
         }
 
         /* see if max_codestream_size does limit input rate */
diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c
index c53604d3..4665d906 100644
--- a/src/lib/openjp2/openjpeg.c
+++ b/src/lib/openjp2/openjpeg.c
@@ -921,12 +921,12 @@ void OPJ_CALLCONV opj_destroy_cstr_index(opj_codestream_index_t **p_cstr_index)
 	}
 }
 
-opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream_v3 (const char *fname, OPJ_BOOL p_is_read_stream)
+opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (const char *fname, OPJ_BOOL p_is_read_stream)
 {
-    return opj_stream_create_file_stream_v3(fname, OPJ_J2K_STREAM_CHUNK_SIZE, p_is_read_stream);
+    return opj_stream_create_file_stream(fname, OPJ_J2K_STREAM_CHUNK_SIZE, p_is_read_stream);
 }
 
-opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream_v3 (
+opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (
         const char *fname, 
 		OPJ_SIZE_T p_size, 
         OPJ_BOOL p_is_read_stream)
@@ -953,7 +953,7 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream_v3 (
         return NULL;
     }
 
-    opj_stream_set_user_data_v3(l_stream, p_file, (opj_stream_free_user_data_fn) fclose);
+    opj_stream_set_user_data(l_stream, p_file, (opj_stream_free_user_data_fn) fclose);
     opj_stream_set_user_data_length(l_stream, opj_get_data_length_from_file(p_file));
     opj_stream_set_read_function(l_stream, (opj_stream_read_fn) opj_read_from_file);
     opj_stream_set_write_function(l_stream, (opj_stream_write_fn) opj_write_from_file);
diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
index c8d80617..988db720 100644
--- a/src/lib/openjp2/openjpeg.h
+++ b/src/lib/openjp2/openjpeg.h
@@ -1116,14 +1116,6 @@ OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size, O
  * @param	p_stream	the stream to destroy.
  */
 OPJ_API void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream);
-
-/**
- * Destroys a stream created by opj_create_stream. This function does NOT close the abstract stream. 
- * If needed the user must close its own implementation of the stream.
- *
- * @param	p_stream	the stream to destroy.
- */
-OPJ_API void OPJ_CALLCONV opj_stream_destroy_v3(opj_stream_t* p_stream);
  
 /**
  * Sets the given function to be used as a read function.
@@ -1157,17 +1149,9 @@ OPJ_API void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stream, o
  * Sets the given data to be used as a user data for the stream.
  * @param		p_stream	the stream to modify
  * @param		p_data		the data to set.
- * @warning depending on your source object p_stream this function may leak, use opj_stream_set_user_data_v3
-*/
-OPJ_DEPRECATED(OPJ_API void OPJ_CALLCONV opj_stream_set_user_data (opj_stream_t* p_stream, void * p_data));
-
-/**
- * Sets the given data to be used as a user data for the stream.
- * @param		p_stream	the stream to modify
- * @param		p_data		the data to set.
  * @param		p_function	the function to free p_data when opj_stream_destroy() is called.
 */
-OPJ_API void OPJ_CALLCONV opj_stream_set_user_data_v3 (opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function);
+OPJ_API void OPJ_CALLCONV opj_stream_set_user_data (opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function);
 
 /**
  * Sets the length of the user data for the stream.
@@ -1182,14 +1166,14 @@ OPJ_API void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream
  * @param fname             the filename of the file to stream
  * @param p_is_read_stream  whether the stream is a read stream (true) or not (false)
 */
-OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream_v3 (const char *fname, OPJ_BOOL p_is_read_stream);
+OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (const char *fname, OPJ_BOOL p_is_read_stream);
  
 /** Create a stream from a file identified with its filename with a specific buffer size
  * @param fname             the filename of the file to stream
  * @param p_buffer_size     size of the chunk used to stream
  * @param p_is_read_stream  whether the stream is a read stream (true) or not (false)
 */
-OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream_v3 (const char *fname, 
+OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (const char *fname,
                                                                      OPJ_SIZE_T p_buffer_size,
                                                                      OPJ_BOOL p_is_read_stream);