[tracker/tracker-0.10] src/libtracker-extract: move fix_region_type to ifdef-free area



commit 6d9569174cb2021f71c1ccecbfd13202e7c289d8
Author: Ivan Frade <ivan frade gmail com>
Date:   Fri Sep 9 19:25:58 2011 +0300

    src/libtracker-extract: move fix_region_type to ifdef-free area
    
    The function was defined inside an ifdef and used outside.

 src/libtracker-extract/tracker-xmp.c |   42 +++++++++++++++++----------------
 1 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index 49c8233..f511802 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -315,26 +315,6 @@ fix_orientation (const gchar *orientation)
 	return  "nfo:orientation-top";
 }
 
-static const gchar *
-fix_region_type (const gchar *region_type)
-{
-        if (region_type == NULL) {
-                return "nfo:region-content-undefined";
-        }
-
-        if (g_ascii_strcasecmp (region_type, "Face")) {
-                return "nfo:roi-content-face";
-        } else if (g_ascii_strcasecmp (region_type, "Pet")) {
-                return "nfo:roi-content-pet";
-        } else if (g_ascii_strcasecmp (region_type, "Focus")) {
-                return "nfo:roi-content-focus";
-        } else if (g_ascii_strcasecmp (region_type, "BarCode")) {
-                return "nfo:roi-content-barcode";
-        }
-
-        return "nfo:roi-content-undefined";
-}
-
 /* We have a simple element. Add any data we know about to the
  * hash table.
  */
@@ -831,6 +811,28 @@ tracker_xmp_free (TrackerXmpData *data)
 	g_free (data);
 }
 
+
+static const gchar *
+fix_region_type (const gchar *region_type)
+{
+        if (region_type == NULL) {
+                return "nfo:region-content-undefined";
+        }
+
+        if (g_ascii_strcasecmp (region_type, "Face")) {
+                return "nfo:roi-content-face";
+        } else if (g_ascii_strcasecmp (region_type, "Pet")) {
+                return "nfo:roi-content-pet";
+        } else if (g_ascii_strcasecmp (region_type, "Focus")) {
+                return "nfo:roi-content-focus";
+        } else if (g_ascii_strcasecmp (region_type, "BarCode")) {
+                return "nfo:roi-content-barcode";
+        }
+
+        return "nfo:roi-content-undefined";
+}
+
+
 /**
  * tracker_xmp_apply:
  * @metadata: the metadata object to apply XMP data to.



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