- updated to 0.8.0
[packages/aravis.git] / aravis-format.patch
CommitLineData
da53ea92
JB
1--- aravis-0.8.0/src/arvgvstream.c.orig 2020-08-17 15:26:01.681058000 +0200
2+++ aravis-0.8.0/src/arvgvstream.c 2020-08-19 18:19:13.369731905 +0200
3@@ -314,7 +314,7 @@
4 block_end = block_size + block_offset;
5
6 if (block_end > frame->buffer->priv->size) {
7- arv_debug_stream_thread ("[GvStream::process_data_block] %" G_GUINT64_FORMAT " unexpected bytes in packet %u "
8+ arv_debug_stream_thread ("[GvStream::process_data_block] %" G_GINTPTR_FORMAT " unexpected bytes in packet %u "
9 " for frame %" G_GUINT64_FORMAT,
10 block_end - frame->buffer->priv->size,
11 packet_id, frame->frame_id);
12@@ -1333,7 +1333,7 @@
13 thread_data = priv->thread_data;
14
15 statistic_string = arv_statistic_to_string (thread_data->statistic);
16- arv_debug_stream (statistic_string);
17+ arv_debug_stream ("%s", statistic_string);
18 g_free (statistic_string);
19 arv_statistic_free (thread_data->statistic);
20
21--- aravis-0.8.0/src/arvuvdevice.c.orig 2020-08-17 15:26:01.683058000 +0200
22+++ aravis-0.8.0/src/arvuvdevice.c 2020-08-19 18:36:37.887406601 +0200
23@@ -468,9 +468,9 @@
24 }
25
26 arv_debug_device ("MAX_DEVICE_RESPONSE_TIME = 0x%08x", response_time);
27- arv_debug_device ("DEVICE_CAPABILITY = 0x%016lx", device_capability);
28- arv_debug_device ("SRBM_ADDRESS = 0x%016lx", offset);
29- arv_debug_device ("MANIFEST_TABLE_ADDRESS = 0x%016lx", manifest_table_address);
30+ arv_debug_device ("DEVICE_CAPABILITY = 0x%016" G_GINT64_MODIFIER "x", device_capability);
31+ arv_debug_device ("SRBM_ADDRESS = 0x%016" G_GINT64_MODIFIER "x", offset);
32+ arv_debug_device ("MANIFEST_TABLE_ADDRESS = 0x%016" G_GINT64_MODIFIER "x", manifest_table_address);
33
34 priv->timeout_ms = MAX (ARV_UVCP_DEFAULT_RESPONSE_TIME_MS, response_time);
35
36@@ -486,7 +486,7 @@
37 arv_debug_device ("U3VCP_CAPABILITY = 0x%08x", u3vcp_capability);
38 arv_debug_device ("MAX_CMD_TRANSFER = 0x%08x", max_cmd_transfer);
39 arv_debug_device ("MAX_ACK_TRANSFER = 0x%08x", max_ack_transfer);
40- arv_debug_device ("SIRM_OFFSET = 0x%016lx", sirm_offset);
41+ arv_debug_device ("SIRM_OFFSET = 0x%016" G_GINT64_MODIFIER "x", sirm_offset);
42
43 priv->cmd_packet_size_max = MIN (priv->cmd_packet_size_max, max_cmd_transfer);
44 priv->ack_packet_size_max = MIN (priv->ack_packet_size_max, max_ack_transfer);
45@@ -509,7 +509,7 @@
46
47 arv_debug_device ("SI_INFO = 0x%08x", si_info);
48 arv_debug_device ("SI_CONTROL = 0x%08x", si_control);
49- arv_debug_device ("SI_REQ_PAYLOAD_SIZE = 0x%016lx", si_req_payload_size);
50+ arv_debug_device ("SI_REQ_PAYLOAD_SIZE = 0x%016" G_GINT64_MODIFIER "x", si_req_payload_size);
51 arv_debug_device ("SI_REQ_LEADER_SIZE = 0x%08x", si_req_leader_size);
52 arv_debug_device ("SI_REQ_TRAILER_SIZE = 0x%08x", si_req_trailer_size);
53 arv_debug_device ("SI_MAX_LEADER_SIZE = 0x%08x", si_max_leader_size);
54@@ -526,15 +526,15 @@
55 return FALSE;
56 }
57
58- arv_debug_device ("MANIFEST_N_ENTRIES = 0x%016lx", manifest_n_entries);
59+ arv_debug_device ("MANIFEST_N_ENTRIES = 0x%016" G_GINT64_MODIFIER "x", manifest_n_entries);
60
61 string = g_string_new ("");
62 arv_g_string_append_hex_dump (string, &entry, sizeof (entry));
63 arv_debug_device ("MANIFEST ENTRY\n%s", string->str);
64 g_string_free (string, TRUE);
65
66- arv_debug_device ("genicam address = 0x%016lx", entry.address);
67- arv_debug_device ("genicam size = 0x%016lx", entry.size);
68+ arv_debug_device ("genicam address = 0x%016" G_GINT64_MODIFIER "x", entry.address);
69+ arv_debug_device ("genicam size = 0x%016" G_GINT64_MODIFIER "x", entry.size);
70
71 data = g_malloc0 (entry.size);
72 success = success && arv_device_read_memory (device, entry.address, entry.size, data, NULL);
73--- aravis-0.8.0/src/arvuvstream.c.orig 2020-08-17 15:26:01.683058000 +0200
74+++ aravis-0.8.0/src/arvuvstream.c 2020-08-19 18:39:27.603153838 +0200
75@@ -171,7 +171,7 @@
76 case ARV_UVSP_PACKET_TYPE_TRAILER:
77 if (buffer != NULL) {
78 arv_log_stream_thread ("Received %" G_GUINT64_FORMAT
79- " bytes - expected %" G_GUINT64_FORMAT,
80+ " bytes - expected %zu",
81 offset, buffer->priv->size);
82
83 /* If the image was incomplete, drop the frame and try again. */
84@@ -287,7 +287,7 @@
85 alignment = 1 << ((si_info & ARV_SI_INFO_ALIGNMENT_MASK) >> ARV_SI_INFO_ALIGNMENT_SHIFT);
86
87 arv_debug_stream ("SI_INFO = 0x%08x", si_info);
88- arv_debug_stream ("SI_REQ_PAYLOAD_SIZE = 0x%016lx", si_req_payload_size);
89+ arv_debug_stream ("SI_REQ_PAYLOAD_SIZE = 0x%016" G_GINT64_MODIFIER "x", si_req_payload_size);
90 arv_debug_stream ("SI_REQ_LEADER_SIZE = 0x%08x", si_req_leader_size);
91 arv_debug_stream ("SI_REQ_TRAILER_SIZE = 0x%08x", si_req_trailer_size);
92
93--- aravis-0.8.0/src/arvzip.c.orig 2020-08-17 15:26:01.683058000 +0200
94+++ aravis-0.8.0/src/arvzip.c 2020-08-19 18:50:28.016242740 +0200
95@@ -86,7 +86,7 @@
96 ptr = zip->buffer + zip->header_size + offset;
97 if (ARV_GUINT32_FROM_LE_PTR (ptr, 0) != 0x02014b50) {
98 arv_debug_misc ("[Zip::build_file_list] Magic number of central directory not found (0x02014b50)");
99- arv_debug_misc ("[Zip::build_file_list] Expected at 0x%" G_GINT64_MODIFIER "x - found 0x%08x instead",
100+ arv_debug_misc ("[Zip::build_file_list] Expected at 0x%" G_GSIZE_MODIFIER "x - found 0x%08x instead",
101 zip->header_size + offset, ARV_GUINT32_FROM_LE_PTR (ptr, 0));
102 return;
103 }
104@@ -191,9 +191,9 @@
105 zip->header_size = zip->directory_position - (zip->directory_offset + zip->directory_size);
106
107 arv_log_misc ("[Zip::new] number of files = %d", zip->n_files);
108- arv_log_misc ("[Zip::new] directory position = 0x%08" G_GINT64_MODIFIER "x", zip->directory_position);
109+ arv_log_misc ("[Zip::new] directory position = 0x%08" G_GINTPTR_MODIFIER "x", zip->directory_position);
110 arv_log_misc ("[Zip::new] directory size = %" G_GSIZE_FORMAT, zip->directory_size);
111- arv_log_misc ("[Zip::new] directory offset = 0x%08" G_GINT64_MODIFIER "x", zip->directory_offset);
112+ arv_log_misc ("[Zip::new] directory offset = 0x%08" G_GINTPTR_MODIFIER "x", zip->directory_offset);
113 arv_log_misc ("[Zip::new] header size = %" G_GSIZE_FORMAT, zip->header_size);
114
115 arv_zip_build_file_list (zip);
116--- aravis-0.8.0/src/arvgvsp.c.orig 2020-08-17 15:26:01.681058000 +0200
117+++ aravis-0.8.0/src/arvgvsp.c 2020-08-19 18:51:36.585871266 +0200
118@@ -180,7 +180,7 @@
119 arv_gvsp_packet_get_frame_id (packet),
120 arv_gvsp_packet_has_extended_ids (packet) ? " extended" : "");
121 g_string_append_printf (string, "packet_id = %8u\n", arv_gvsp_packet_get_packet_id (packet));
122- g_string_append_printf (string, "data_size = %8" G_GUINT64_FORMAT "\n", arv_gvsp_packet_get_data_size (packet, packet_size));
123+ g_string_append_printf (string, "data_size = %8" G_GSIZE_FORMAT "\n", arv_gvsp_packet_get_data_size (packet, packet_size));
124
125 switch (content_type) {
126 case ARV_GVSP_CONTENT_TYPE_DATA_LEADER:
127--- aravis-0.8.0/tests/loadhttptest.c.orig 2020-08-17 15:26:01.685058000 +0200
128+++ aravis-0.8.0/tests/loadhttptest.c 2020-08-19 18:52:16.952319249 +0200
129@@ -45,7 +45,7 @@
130
131 g_strfreev (tokens);
132
133- printf ("size = %lu\n", len);
134+ printf ("size = %" G_GSIZE_FORMAT "\n", len);
135 printf ("%s\n", genicam != NULL ? genicam : "NULL");
136
137 g_free (genicam);
This page took 0.144635 seconds and 4 git commands to generate.