X-Git-Url: http://git.datanom.net/lensdb.git/blobdiff_plain/b01860ccaf0d6dc76407aa83f15f502539000305..5728ed8a96de33019f902248f83a6be26f4fa674:/lib/main.cpp diff --git a/lib/main.cpp b/lib/main.cpp index 5bf9c43..2826858 100644 --- a/lib/main.cpp +++ b/lib/main.cpp @@ -4,6 +4,52 @@ using namespace std; +static const char* LensMakers[] = { + "7Artisans", + "Canon", + "Carl Zeiss", + "Chinon", + "Cosina", + "Essilor", + "EssilorLuxottica", + "Fujifilm", + "Goerz", + "Hoya", + "Kenko", + "Konica", + "Leica", + "Leidolf", + "Lumix", + "Meopta", + "Meyer Optik Görlitz", + "Minolta", + "Nikon", + "Nisi", + "Olympus", + "OM Digital Solutions", + "Pentacon", + "Pentax", + "Pergear", + "Rodenstock", + "Samyang", + "Schneider Kreuznach", + "Seagull", + "Seiko", + "Sigma", + "Silor", + "Schneider Kreuznach", + "Soligor", + "Sony", + "Tamron", + "Tokina", + "Topcon", + "TTArtisan", + "Yongnuo", + "Viltrox", + "Voigtländer", + NULL +}; + static void print_all(gpointer key, gpointer value, gpointer user_data) { cout << (gchar*)key << " = " << (gchar*)value << endl; } @@ -51,7 +97,7 @@ string ExifScanner::get_maker() { string maker; //g_hash_table_foreach(exif_tags, print_all, NULL); - const gchar* lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensMake"); + gchar* lensId = g_strdup((gchar *)g_hash_table_lookup(exif_tags, "LensMake")); gulong len = g_utf8_strlen(lensId, -1); if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) { const gchar* s = (gchar *)g_hash_table_lookup(exif_tags, "LensID"); @@ -60,12 +106,18 @@ string ExifScanner::get_maker() { //cout << pos << endl; if (pos) { //cout << "S length: " << strlen(s) << "POS length: " << strlen(pos) << endl; + g_free(lensId); lensId = g_strndup(s, strlen(s) - strlen(pos)); } len = g_utf8_strlen(lensId, -1); } } + if (match_maker(lensId) == false) { + g_free(lensId); + lensId = NULL; + } + if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) { const gchar* s = (gchar *)g_hash_table_lookup(exif_tags, "LensModel"); if (s) { @@ -73,15 +125,23 @@ string ExifScanner::get_maker() { //cout << pos << endl; if (pos) { //cout << "S length: " << strlen(s) << "POS length: " << strlen(pos) << endl; + g_free(lensId); lensId = g_strndup(s, strlen(s) - strlen(pos)); len = g_utf8_strlen(lensId, -1); } } } + + if (match_maker(lensId) == false) { + g_free(lensId); + lensId = NULL; + } + if (!lensId || len < 1) - maker = get_cscring("Unknown"); + maker = get_cstring("Unknown"); else - maker = get_cscring(lensId); + maker = get_cstring(lensId); + g_free(lensId); return maker; } @@ -97,9 +157,9 @@ string ExifScanner::get_serial_number() { } if (!id || len < 1) - sn = get_cscring("Unknown"); + sn = get_cstring("Unknown"); else - sn = get_cscring(id); + sn = get_cstring(id); return sn; } @@ -119,15 +179,33 @@ string ExifScanner::get_lens() { } if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) - lens = get_cscring("Unknown"); + lens = get_cstring("Unknown"); else - lens = get_cscring(lensId); + lens = get_cstring(lensId); return lens; } -gchar* ExifScanner::get_cscring(string s) { +gchar* ExifScanner::get_cstring(string s) { gchar* cstring = g_strdup(s.c_str()); return cstring; } + +bool ExifScanner::match_maker(const gchar* maker) { + int i = 0; + const char* lensmaker = NULL; + + if (maker == NULL) return false; + + lensmaker = LensMakers[i]; + while (lensmaker) { + if (g_ascii_strcasecmp(lensmaker, maker) == 0) { + return true; + } + i++; + lensmaker = LensMakers[i]; + } + + return false; +}