[Rawstudio-commit] r3012 - in branches/rawstudio-ng-color: librawstudio plugins/meta-tiff

[Anders Kvist]

Author: akv
Date: 2010-01-16 21:12:25 +0100 (Sat, 16 Jan 2010)
New Revision: 3012

Modified:
   branches/rawstudio-ng-color/librawstudio/rs-metadata.c
   branches/rawstudio-ng-color/librawstudio/rs-metadata.h
   branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c
Log:
Changed lens_id from float to short.

Modified: branches/rawstudio-ng-color/librawstudio/rs-metadata.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-metadata.c	2010-01-16 17:55:45 UTC (rev 3011)
+++ branches/rawstudio-ng-color/librawstudio/rs-metadata.c	2010-01-16 20:12:25 UTC (rev 3012)
@@ -98,7 +98,7 @@
 	metadata->thumbnail = NULL;
 
 	/* Lens info */
-	metadata->lens_id = -1.0;
+	metadata->lens_id = -1;
 	metadata->lens_min_focal = -1.0;
 	metadata->lens_max_focal = -1.0;
 	metadata->lens_min_aperture = -1.0;
@@ -166,8 +166,8 @@
 		if (metadata->focallength > 0)
 			xmlTextWriterWriteFormatElement(writer, BAD_CAST "focallength", "%d", metadata->focallength);
 		if (metadata->lens_id > -1.0)
-			xmlTextWriterWriteFormatElement(writer, BAD_CAST "lens_id", "%f", metadata->lens_id);
-		if (metadata->lens_min_focal > -1.0)
+			xmlTextWriterWriteFormatElement(writer, BAD_CAST "lens_id", "%d", metadata->lens_id);
+		if (metadata->lens_min_focal > -1)
 			xmlTextWriterWriteFormatElement(writer, BAD_CAST "lens_min_focal", "%f", metadata->lens_min_focal);
 		if (metadata->lens_max_focal > -1.0)
 			xmlTextWriterWriteFormatElement(writer, BAD_CAST "lens_max_focal", "%f", metadata->lens_max_focal);

Modified: branches/rawstudio-ng-color/librawstudio/rs-metadata.h
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-metadata.h	2010-01-16 17:55:45 UTC (rev 3011)
+++ branches/rawstudio-ng-color/librawstudio/rs-metadata.h	2010-01-16 20:12:25 UTC (rev 3012)
@@ -82,7 +82,7 @@
 	GdkPixbuf *thumbnail;
 
 	/* Lens info */
-	gfloat lens_id;
+	gshort lens_id;
 	gdouble lens_min_focal;
 	gdouble lens_max_focal;
 	gdouble lens_min_aperture;

Modified: branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c	2010-01-16 17:55:45 UTC (rev 3011)
+++ branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c	2010-01-16 20:12:25 UTC (rev 3012)
@@ -218,7 +218,7 @@
 
 				/* Lens ID */
 				raw_get_short(rawfile, ifd.value_offset+44, &temp);
-				meta->lens_id = (gfloat) temp;
+				meta->lens_id = temp;
 
 				/* Focalunits */
 				raw_get_short(rawfile, ifd.value_offset+50, &focalunits);
@@ -1555,7 +1555,7 @@
 	/* Build identifier string */
 	GString *identifier = g_string_new("");
 	if (meta->lens_id > 0)
-		g_string_append_printf(identifier, "ID:%.1f ",meta->lens_id);
+		g_string_append_printf(identifier, "ID:%d ",meta->lens_id);
 	if (meta->lens_max_focal > 0)
 		g_string_append_printf(identifier, "maxF:%.0f ",meta->lens_max_focal);
 	if (meta->lens_min_focal > 0)