Signed-off-by: Michael Rasmussen <mir@datanom.net>
//g_hash_table_foreach(exif_tags, print_all, NULL);
gchar* lensId = g_strdup((gchar *)g_hash_table_lookup(exif_tags, "LensMake"));
//g_hash_table_foreach(exif_tags, print_all, NULL);
gchar* lensId = g_strdup((gchar *)g_hash_table_lookup(exif_tags, "LensMake"));
- gulong len = g_utf8_strlen(lensId, -1);
+ gulong len = char_len(lensId);
if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
const gchar* s = (gchar *)g_hash_table_lookup(exif_tags, "LensID");
if (s && g_strcmp0("Unknown (2822)", s) != 0) {
if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
const gchar* s = (gchar *)g_hash_table_lookup(exif_tags, "LensID");
if (s && g_strcmp0("Unknown (2822)", s) != 0) {
//cout << "S length: " << strlen(s) << "POS length: " << strlen(pos) << endl;
g_free(lensId);
lensId = g_strndup(s, strlen(s) - strlen(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);
+ len = char_len(lensId);
string sn;
const gchar* id = (gchar *)g_hash_table_lookup(exif_tags, "LensSerialNumber");
string sn;
const gchar* id = (gchar *)g_hash_table_lookup(exif_tags, "LensSerialNumber");
- gulong len = g_utf8_strlen(id, -1);
+ gulong len = char_len(id);
if (!id || len < 1) {
id = (gchar *)g_hash_table_lookup(exif_tags, "SerialNumber");
if (!id || len < 1) {
id = (gchar *)g_hash_table_lookup(exif_tags, "SerialNumber");
- len = g_utf8_strlen(id, -1);
string lens;
const gchar* lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensID");
string lens;
const gchar* lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensID");
- gulong len = g_utf8_strlen(lensId, -1);
+ gulong len = char_len(lensId);
if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensModel");
if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensModel");
- len = g_utf8_strlen(lensId, -1);
+ len = char_len(lensId);
if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensSpec");
if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensSpec");
- len = g_utf8_strlen(lensId, -1);
+ len = char_len(lensId);
+
+gulong ExifScanner::char_len(const gchar* elem) {
+ if (!elem) return 0;
+
+ return g_utf8_strlen(elem, -1);
+}
void get_data_from_image();
bool match_maker(const gchar* maker);
void get_data_from_image();
bool match_maker(const gchar* maker);
+ gulong char_len(const gchar* elem);