X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest_tile_encoder.c;h=dbc3f037c1cd948f9ba686bb3fc0574dcc5522dd;hb=ff1a30d80a8b9817f00656173a2a883bb47ffaee;hp=e1d93b3da19d51c14cff7b2a89941d95e9a01c05;hpb=6767ea24561fb4ac7137bc5734dc4befcdc830aa;p=openjpeg.git

diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c
index e1d93b3d..dbc3f037 100644
--- a/tests/test_tile_encoder.c
+++ b/tests/test_tile_encoder.c
@@ -38,35 +38,35 @@
 /**
 sample error callback expecting a FILE* client object
 */
-void error_callback_file(const char *msg, void *client_data) {
+static void error_callback_file(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[ERROR] %s", msg);
 }
 /**
 sample warning callback expecting a FILE* client object
 */
-void warning_callback_file(const char *msg, void *client_data) {
+static void warning_callback_file(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[WARNING] %s", msg);
 }
 /**
 sample error debug callback expecting no client object
 */
-void error_callback(const char *msg, void *client_data) {
+static void error_callback(const char *msg, void *client_data) {
 	(void)client_data;
 	fprintf(stdout, "[ERROR] %s", msg);
 }
 /**
 sample warning debug callback expecting no client object
 */
-void warning_callback(const char *msg, void *client_data) {
+static void warning_callback(const char *msg, void *client_data) {
 	(void)client_data;
 	fprintf(stdout, "[WARNING] %s", msg);
 }
 /**
 sample debug callback expecting no client object
 */
-void info_callback(const char *msg, void *client_data) {
+static void info_callback(const char *msg, void *client_data) {
 	(void)client_data;
 	fprintf(stdout, "[INFO] %s", msg);
 }
@@ -80,7 +80,6 @@ int main (int argc, char *argv[])
 	opj_codec_t * l_codec;
 	opj_image_t * l_image;
 	opj_image_cmptparm_t l_params [NUM_COMPS_MAX];
-	FILE * l_file;
 	opj_stream_t * l_stream;
 	OPJ_UINT32 l_nb_tiles;
 	OPJ_UINT32 l_data_size;
@@ -147,7 +146,7 @@ int main (int argc, char *argv[])
 
 	fprintf(stdout, "Encoding random values -> keep in mind that this is very hard to compress\n");
 	for (i=0;i<l_data_size;++i)	{
-		l_data[i] = i; //rand();
+		l_data[i] = i; /*rand();*/
 	}
 
 	opj_set_default_encoder_parameters(&l_param);
@@ -175,7 +174,7 @@ int main (int argc, char *argv[])
 	l_param.irreversible = irreversible;
 
 	/* do not bother with mct, the rsiz is set when calling opj_set_MCT*/
-	/*l_param.cp_rsiz = STD_RSIZ;*/
+	/*l_param.cp_rsiz = OPJ_STD_RSIZ;*/
 
 	/* no cinema */
 	/*l_param.cp_cinema = 0;*/
@@ -203,8 +202,8 @@ int main (int argc, char *argv[])
 	l_param.numresolution = 6;
 
 	/** progression order to use*/
-	/** LRCP, RLCP, RPCL, PCRL, CPRL */
-	l_param.prog_order = LRCP;
+	/** OPJ_LRCP, OPJ_RLCP, OPJ_RPCL, PCRL, CPRL */
+	l_param.prog_order = OPJ_LRCP;
 
 	/** no "region" of interest, more precisally component */
 	/* l_param.roi_compno = -1; */
@@ -240,15 +239,15 @@ int main (int argc, char *argv[])
 		++l_current_param_ptr;
 	}
 
-  // should we do j2k or jp2 ?
+  /* should we do j2k or jp2 ?*/
   len = strlen( output_file );
   if( strcmp( output_file + len - 4, ".jp2" ) == 0 )
     {
-    l_codec = opj_create_compress(CODEC_JP2);
+    l_codec = opj_create_compress(OPJ_CODEC_JP2);
     }
   else
     {
-    l_codec = opj_create_compress(CODEC_J2K);
+    l_codec = opj_create_compress(OPJ_CODEC_J2K);
     }
 	if (!l_codec) {
 		return 1;
@@ -259,7 +258,7 @@ int main (int argc, char *argv[])
 	opj_set_warning_handler(l_codec, warning_callback,00);
 	opj_set_error_handler(l_codec, error_callback,00);
 
-	l_image = opj_image_tile_create(num_comps,l_params,CLRSPC_SRGB);
+	l_image = opj_image_tile_create(num_comps,l_params,OPJ_CLRSPC_SRGB);
 	if (! l_image) {
 		opj_destroy_codec(l_codec);
 		return 1;
@@ -269,7 +268,7 @@ int main (int argc, char *argv[])
 	l_image->y0 = 0;
 	l_image->x1 = image_width;
 	l_image->y1 = image_height;
-	l_image->color_space = CLRSPC_SRGB;
+	l_image->color_space = OPJ_CLRSPC_SRGB;
 
 	if (! opj_setup_encoder(l_codec,&l_param,l_image)) {
 		fprintf(stderr, "ERROR -> test_tile_encoder: failed to setup the codec!\n");
@@ -278,20 +277,17 @@ int main (int argc, char *argv[])
 		return 1;
 	}
 
-	l_file = fopen(output_file,"wb");
-	if (! l_file) {
-		fprintf(stderr, "ERROR -> test_tile_encoder: failed to create the output file!\n");
+	l_stream = opj_stream_create_default_file_stream_v3(output_file, OPJ_FALSE);
+    if (! l_stream) {
+		fprintf(stderr, "ERROR -> test_tile_encoder: failed to create the stream from the output file %s !\n",output_file );
 		opj_destroy_codec(l_codec);
 		opj_image_destroy(l_image);
 		return 1;
 	}
 
-	l_stream = opj_stream_create_default_file_stream(l_file, OPJ_FALSE);
-
 	if (! opj_start_compress(l_codec,l_image,l_stream)) {
 		fprintf(stderr, "ERROR -> test_tile_encoder: failed to start compress!\n");
-		opj_stream_destroy(l_stream);
-		fclose(l_file);
+		opj_stream_destroy_v3(l_stream);
 		opj_destroy_codec(l_codec);
 		opj_image_destroy(l_image);
 		return 1;
@@ -300,8 +296,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(l_stream);
-			fclose(l_file);
+			opj_stream_destroy_v3(l_stream);
 			opj_destroy_codec(l_codec);
 			opj_image_destroy(l_image);
 			return 1;
@@ -310,22 +305,20 @@ int main (int argc, char *argv[])
 
 	if (! opj_end_compress(l_codec,l_stream)) {
 		fprintf(stderr, "ERROR -> test_tile_encoder: failed to end compress!\n");
-		opj_stream_destroy(l_stream);
-		fclose(l_file);
+		opj_stream_destroy_v3(l_stream);
 		opj_destroy_codec(l_codec);
 		opj_image_destroy(l_image);
 		return 1;
 	}
 
-	opj_stream_destroy(l_stream);
-	fclose(l_file);
+	opj_stream_destroy_v3(l_stream);
 	opj_destroy_codec(l_codec);
 	opj_image_destroy(l_image);
 
 	free(l_data);
 
-	// Print profiling
-	//PROFPRINT();
+	/* Print profiling*/
+	/*PROFPRINT();*/
 
 	return 0;
 }