[aravis] gv_device: Use bare filename for local file XML, and set size from file



commit 0d17d9f53e81a0133d3525448ed46c61327ed2cd
Author: Peter Boettcher <boettcher ll mit edu>
Date:   Thu May 22 09:55:37 2014 -0400

    gv_device: Use bare filename for local file XML, and set size from file

 src/arvgvdevice.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/arvgvdevice.c b/src/arvgvdevice.c
index c69ca86..ecc8dab 100644
--- a/src/arvgvdevice.c
+++ b/src/arvgvdevice.c
@@ -552,7 +552,10 @@ _load_genicam (ArvGvDevice *gv_device, guint32 address, size_t  *size)
 
        if (tokens[0] != NULL && tokens[1] != NULL) {
                if (g_ascii_strcasecmp (tokens[1], "file:") == 0) {
-                       g_file_get_contents (filename, &genicam, NULL, NULL);
+                       gsize len;
+                       g_file_get_contents (tokens[2], &genicam, &len, NULL);
+                       if (genicam)
+                               *size = len;
                } else if (g_ascii_strcasecmp (tokens[1], "local:") == 0 &&
                         tokens[2] != NULL &&
                         tokens[3] != NULL &&


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