]> git.datanom.net - lensdb.git/commitdiff
fix spelling error. add more precise maker finder
authorMichael Rasmussen <mir@datanom.net>
Sat, 16 Nov 2024 21:53:17 +0000 (22:53 +0100)
committerMichael Rasmussen <mir@datanom.net>
Sat, 16 Nov 2024 21:53:17 +0000 (22:53 +0100)
Signed-off-by: Michael Rasmussen <mir@datanom.net>
lib/main.cpp
lib/main.hpp
lib/scanner.cpp

index 5bf9c43e405956f2ead8cf10fb53e2dfe3a9bb52..2826858e73686b4e185b50eb620e84c91947dd48 100644 (file)
@@ -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;
+}
index 4112540a125b0c7a926b5a7698df83ed5e2ad7a4..d3ee3c803a20c713be4940376ce173d81c80c66f 100644 (file)
@@ -40,7 +40,7 @@ public:
     std::string get_lens();
     std::string get_serial_number();
     std::string get_error();
-    gchar* get_cscring(std::string s);
+    gchar* get_cstring(std::string s);
     
 
 private:
@@ -49,6 +49,7 @@ private:
     GHashTable* exif_tags;
     
     void get_data_from_image();
+    bool match_maker(const gchar* maker);
  
 };
 
index 4498ca00168e3a5ab04e70104972d9d3c47978ef..a8a04342f62be71d49475918deca147bf2862dd9 100644 (file)
@@ -55,7 +55,7 @@ gchar* get_lens_maker(Scanner_t* s) {
                return NULL;
 
        obj = static_cast<ExifScanner *>(s->obj);
-       return obj->get_cscring(obj->get_maker());
+       return obj->get_cstring(obj->get_maker());
 }
 
 gchar* get_lens_serial_number(Scanner_t* s) {
@@ -65,7 +65,7 @@ gchar* get_lens_serial_number(Scanner_t* s) {
                return NULL;
 
        obj = static_cast<ExifScanner *>(s->obj);
-       return obj->get_cscring(obj->get_serial_number());
+       return obj->get_cstring(obj->get_serial_number());
 }
 
 gchar* get_lens_info(Scanner_t* s) {
@@ -75,5 +75,5 @@ gchar* get_lens_info(Scanner_t* s) {
                return NULL;
 
        obj = static_cast<ExifScanner *>(s->obj);
-       return obj->get_cscring(obj->get_lens());
+       return obj->get_cstring(obj->get_lens());
 }
This page took 0.571753 seconds and 5 git commands to generate.