[aravis] build: avoid warnings on 64bit platform.



commit c3cbb55bdf01ce052ed341699dd89c16115c792f
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Thu Aug 19 18:45:06 2010 +0200

    build: avoid warnings on 64bit platform.

 src/arvfakecamera.c    |    2 +-
 src/arvtools.c         |   20 ++++++++++----------
 tests/arvcameratest.c  |    6 +++---
 tests/arvgenicamtest.c |    6 +++---
 tests/arvtest.c        |    6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/src/arvfakecamera.c b/src/arvfakecamera.c
index 460e67f..c6f3fc4 100644
--- a/src/arvfakecamera.c
+++ b/src/arvfakecamera.c
@@ -385,7 +385,7 @@ arv_fake_camera_new (const char *serial_number)
 	xml_url = g_strdup_printf ("Local:arv-fake-camera-%s.xml;%x;%x",
 				   PACKAGE_VERSION,
 				   ARV_FAKE_CAMERA_MEMORY_SIZE,
-				   fake_camera->priv->genicam_data_size);
+				   (unsigned int) fake_camera->priv->genicam_data_size);
 	strcpy (memory + ARV_GVBS_FIRST_XML_URL, xml_url);
 	g_free (xml_url);
 
diff --git a/src/arvtools.c b/src/arvtools.c
index ebe94c1..d2b6429 100644
--- a/src/arvtools.c
+++ b/src/arvtools.c
@@ -37,13 +37,13 @@ typedef struct _ArvHistogram ArvHistogram;
 struct _ArvHistogram {
 	char *		name;
 
-	gint64 		and_more;
-	gint64	 	and_less;
-	gint64	 	last_seen_worst;
+	guint64		and_more;
+	guint64	 	and_less;
+	guint64	 	last_seen_worst;
 	int 	      	worst;
 	int 	        best;
 
-	gint64 *	bins;
+	guint64 *	bins;
 };
 
 struct _ArvStatistic {
@@ -104,7 +104,7 @@ arv_statistic_new (unsigned int n_histograms, unsigned n_bins, unsigned int bin_
 
 	for (i = 0; i < statistic->n_histograms; i++) {
 		statistic->histograms[i].name = NULL;
-		statistic->histograms[i].bins = g_new (gint64, statistic->n_bins);
+		statistic->histograms[i].bins = g_new (guint64, statistic->n_bins);
 		if (statistic->histograms[i].bins == NULL) {
 			arv_statistic_free (statistic);
 			g_warning ("[TolmStatistic::new] failed to allocate bin memory");
@@ -251,7 +251,7 @@ arv_statistic_to_string (const ArvStatistic *statistic)
 		for (j = 0; j < statistic->n_histograms; j++) {
 			if (j == 0)
 				g_string_append_printf (string, "%8d", i * statistic->bin_step + statistic->offset);
-			g_string_append_printf (string, ";%8Lu", statistic->histograms[j].bins[i]);
+			g_string_append_printf (string, ";%8Lu", (unsigned long long) statistic->histograms[j].bins[i]);
 		}
 		g_string_append (string, "\n");
 	}
@@ -261,14 +261,14 @@ arv_statistic_to_string (const ArvStatistic *statistic)
 	for (j = 0; j < statistic->n_histograms; j++) {
 		if (j == 0)
 			g_string_append_printf (string, ">=%6d", i * statistic->bin_step + statistic->offset);
-		g_string_append_printf (string, ";%8Ld", statistic->histograms[j].and_more);
+		g_string_append_printf (string, ";%8Lu", (unsigned long long) statistic->histograms[j].and_more);
 	}
 	g_string_append (string, "\n");
 
 	for (j = 0; j < statistic->n_histograms; j++) {
 		if (j == 0)
 			g_string_append_printf (string, "< %6d", statistic->offset);
-		g_string_append_printf (string, ";%8Ld", statistic->histograms[j].and_less);
+		g_string_append_printf (string, ";%8Lu", (unsigned long long) statistic->histograms[j].and_less);
 	}
 	g_string_append (string, "\n");
 
@@ -295,11 +295,11 @@ arv_statistic_to_string (const ArvStatistic *statistic)
 	for (j = 0; j < statistic->n_histograms; j++) {
 		if (j == 0)
 			g_string_append (string, "last max\nat:     ");
-		g_string_append_printf (string, ";%8Ld", statistic->histograms[j].last_seen_worst);
+		g_string_append_printf (string, ";%8Lu", (unsigned long long) statistic->histograms[j].last_seen_worst);
 	}
 	g_string_append (string, "\n");
 
-	g_string_append_printf (string, "Counter = %8Ld", statistic->counter);
+	g_string_append_printf (string, "Counter = %8Lu", (unsigned long long) statistic->counter);
 
 	str = string->str;
 	g_string_free (string, FALSE);
diff --git a/tests/arvcameratest.c b/tests/arvcameratest.c
index 9c8ce04..7da99a4 100644
--- a/tests/arvcameratest.c
+++ b/tests/arvcameratest.c
@@ -147,9 +147,9 @@ main (int argc, char **argv)
 
 		arv_stream_get_statistics (stream, &n_completed_buffers, &n_failures, &n_underruns);
 
-		g_print ("Completed buffers = %Ld\n", n_completed_buffers);
-		g_print ("Failures          = %Ld\n", n_failures);
-		g_print ("Underruns         = %Ld\n", n_underruns);
+		g_print ("Completed buffers = %Lu\n", (unsigned long long) n_completed_buffers);
+		g_print ("Failures          = %Lu\n", (unsigned long long) n_failures);
+		g_print ("Underruns         = %Lu\n", (unsigned long long) n_underruns);
 
 		arv_camera_stop_acquisition (camera);
 
diff --git a/tests/arvgenicamtest.c b/tests/arvgenicamtest.c
index f189be3..c6d3895 100644
--- a/tests/arvgenicamtest.c
+++ b/tests/arvgenicamtest.c
@@ -57,14 +57,14 @@ main (int argc, char **argv)
 			node = arv_gc_get_node (genicam, "RegAcquisitionCommand");
 			if (node != NULL) {
 				g_print ("RegAcquisitionCommand address = 0x%Lx - length = 0x%Lx\n",
-					 arv_gc_register_get_address (ARV_GC_REGISTER (node)),
-					 arv_gc_register_get_length (ARV_GC_REGISTER (node)));
+					 (unsigned long long) arv_gc_register_get_address (ARV_GC_REGISTER (node)),
+					 (unsigned long long) arv_gc_register_get_length (ARV_GC_REGISTER (node)));
 			}
 
 			node = arv_gc_get_node (genicam, "IntWidthIncrement");
 			if (node != NULL) {
 				g_print ("IntWidthIncrement value = %Ld\n",
-					 arv_gc_integer_get_value (ARV_GC_INTEGER (node)));
+					 (long long) arv_gc_integer_get_value (ARV_GC_INTEGER (node)));
 			}
 
 			node = arv_gc_get_node (genicam, "WhitebalValueMin");
diff --git a/tests/arvtest.c b/tests/arvtest.c
index ac66da4..77b1fbc 100644
--- a/tests/arvtest.c
+++ b/tests/arvtest.c
@@ -236,9 +236,9 @@ main (int argc, char **argv)
 
 		arv_stream_get_statistics (stream, &n_processed_buffers, &n_failures, &n_underruns);
 
-		g_print ("Processed buffers = %Ld\n", n_processed_buffers);
-		g_print ("Failures          = %Ld\n", n_failures);
-		g_print ("Underruns         = %Ld\n", n_underruns);
+		g_print ("Processed buffers = %Lu\n", (unsigned long long) n_processed_buffers);
+		g_print ("Failures          = %Lu\n", (unsigned long long) n_failures);
+		g_print ("Underruns         = %Lu\n", (unsigned long long) n_underruns);
 
 		node = arv_gc_get_node (genicam, "AcquisitionStop");
 		arv_gc_command_execute (ARV_GC_COMMAND (node));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]