[tracker/libtracker-extract-fixes] squash



commit 771a82763d79d9b17e024a6f831e7d9fd6a401ea
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Apr 13 18:05:36 2010 +0200

    squash

 src/tracker-extract/tracker-extract-jpeg.c |   10 +++++-----
 src/tracker-extract/tracker-extract-png.c  |    6 +++---
 src/tracker-extract/tracker-extract-tiff.c |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index 6dc6781..15284be 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -35,7 +35,7 @@
 
 #include "tracker-main.h"
 
-#define INCH_TO_CM              0.393700787
+#define CM_TO_INCH              0.393700787
 
 #ifdef HAVE_LIBEXIF
 #define EXIF_NAMESPACE          "Exif"
@@ -581,12 +581,12 @@ extract_jpeg (const gchar          *uri,
 			if (ed->resolution_unit == 1)
 				value = g_strtod (ed->x_resolution, NULL);
 			else
-				value = g_strtod (ed->x_resolution, NULL) * INCH_TO_CM;
+				value = g_strtod (ed->x_resolution, NULL) * CM_TO_INCH;
 		} else {
 			if (cinfo.density_unit == 1)
 				value = cinfo.X_density;
 			else
-				value = cinfo.X_density * INCH_TO_CM;
+				value = cinfo.X_density * CM_TO_INCH;
 		}
 
 		tracker_sparql_builder_predicate (metadata, "nfo:horizontalResolution");
@@ -600,12 +600,12 @@ extract_jpeg (const gchar          *uri,
 			if (ed->resolution_unit == 1)
 				value = g_strtod (ed->y_resolution, NULL);
 			else
-				value = g_strtod (ed->y_resolution, NULL) * INCH_TO_CM;
+				value = g_strtod (ed->y_resolution, NULL) * CM_TO_INCH;
 		} else {
 			if (cinfo.density_unit == 1)
 				value = cinfo.Y_density;
 			else
-				value = cinfo.Y_density * INCH_TO_CM;
+				value = cinfo.Y_density * CM_TO_INCH;
 		}
 
 		tracker_sparql_builder_predicate (metadata, "nfo:verticalResolution");
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 6c8a4b4..b79769f 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -31,7 +31,7 @@
 #include <libtracker-extract/tracker-extract.h>
 
 #define RFC1123_DATE_FORMAT "%d %B %Y %H:%M:%S %z"
-#define INCH_TO_CM          0.393700787
+#define CM_TO_INCH          0.393700787
 
 typedef struct {
 	const gchar *title;
@@ -472,7 +472,7 @@ read_metadata (TrackerSparqlBuilder *preupdate,
 	if (ed->x_resolution) {
 		gdouble value;
 
-		value = ed->resolution_unit == 1 ? g_strtod (ed->x_resolution, NULL) : g_strtod (ed->x_resolution, NULL) * INCH_TO_CM;
+		value = ed->resolution_unit == 1 ? g_strtod (ed->x_resolution, NULL) : g_strtod (ed->x_resolution, NULL) * CM_TO_INCH;
 		tracker_sparql_builder_predicate (metadata, "nfo:horizontalResolution");
 		tracker_sparql_builder_object_double (metadata, value);
 	}
@@ -480,7 +480,7 @@ read_metadata (TrackerSparqlBuilder *preupdate,
 	if (ed->y_resolution) {
 		gdouble value;
 
-		value = ed->resolution_unit == 1 ? g_strtod (ed->y_resolution, NULL) : g_strtod (ed->y_resolution, NULL) * INCH_TO_CM;
+		value = ed->resolution_unit == 1 ? g_strtod (ed->y_resolution, NULL) : g_strtod (ed->y_resolution, NULL) * CM_TO_INCH;
 		tracker_sparql_builder_predicate (metadata, "nfo:verticalResolution");
 		tracker_sparql_builder_object_double (metadata, value);
 	}
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 78b9e02..e326c17 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -27,7 +27,7 @@
 #include <libtracker-client/tracker-client.h>
 #include <libtracker-extract/tracker-extract.h>
 
-#define INCH_TO_CM          0.393700787
+#define CM_TO_INCH          0.393700787
 
 typedef enum {
 	TAG_TYPE_UNDEFINED = 0,
@@ -681,7 +681,7 @@ extract_tiff (const gchar          *uri,
 	if (ed->x_resolution) {
 		gdouble value;
 
-		value = ed->resolution_unit == 1 ? g_strtod (ed->x_resolution, NULL) : g_strtod (ed->x_resolution, NULL) * INCH_TO_CM;
+		value = ed->resolution_unit == 1 ? g_strtod (ed->x_resolution, NULL) : g_strtod (ed->x_resolution, NULL) * CM_TO_INCH;
 		tracker_sparql_builder_predicate (metadata, "nfo:horizontalResolution");
 		tracker_sparql_builder_object_double (metadata, value);
 	}
@@ -689,7 +689,7 @@ extract_tiff (const gchar          *uri,
 	if (ed->y_resolution) {
 		gdouble value;
 
-		value = ed->resolution_unit == 1 ? g_strtod (ed->y_resolution, NULL) : g_strtod (ed->y_resolution, NULL) * INCH_TO_CM;
+		value = ed->resolution_unit == 1 ? g_strtod (ed->y_resolution, NULL) : g_strtod (ed->y_resolution, NULL) * CM_TO_INCH;
 		tracker_sparql_builder_predicate (metadata, "nfo:verticalResolution");
 		tracker_sparql_builder_object_double (metadata, value);
 	}



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