X-Git-Url: http://git.datanom.net/lensdb.git/blobdiff_plain/2c9438951b2f16a0470e7240bcb6f2da230ee547..refs/heads/release/0.9.1:/lib/scanner.cpp diff --git a/lib/scanner.cpp b/lib/scanner.cpp index 961f64d..4498ca0 100644 --- a/lib/scanner.cpp +++ b/lib/scanner.cpp @@ -33,7 +33,7 @@ Scanner_t* scanner_create(const char* file) { Scanner_t* s; ExifScanner* obj; - s = (typeof(s))malloc(sizeof(*s)); + s = g_new0(Scanner_t, 1); obj = new ExifScanner(file); s->obj = obj; @@ -48,12 +48,32 @@ void scanner_destroy(Scanner_t* s) { free(s); } -void scanner_do_work(Scanner_t* s) { +gchar* get_lens_maker(Scanner_t* s) { ExifScanner* obj; if (s == NULL) - return; + return NULL; + + obj = static_cast(s->obj); + return obj->get_cscring(obj->get_maker()); +} + +gchar* get_lens_serial_number(Scanner_t* s) { + ExifScanner* obj; + + if (s == NULL) + return NULL; + + obj = static_cast(s->obj); + return obj->get_cscring(obj->get_serial_number()); +} + +gchar* get_lens_info(Scanner_t* s) { + ExifScanner* obj; + + if (s == NULL) + return NULL; obj = static_cast(s->obj); - obj->scanner_do_work(); + return obj->get_cscring(obj->get_lens()); }