beagle r4708 - trunk/beagle/Filters

[dbera svn gnome org]

Author: dbera
Date: Sun Apr 13 21:36:36 2008
New Revision: 4708
URL: http://svn.gnome.org/viewvc/beagle?rev=4708&view=rev

Log:
Update the namespace and other minor changes wrt the new F-Spot code.


Modified:
   trunk/beagle/Filters/FilterBmp.cs
   trunk/beagle/Filters/FilterGif.cs
   trunk/beagle/Filters/FilterImage.cs
   trunk/beagle/Filters/FilterJpeg.cs
   trunk/beagle/Filters/FilterPdf.cs
   trunk/beagle/Filters/FilterPng.cs
   trunk/beagle/Filters/FilterTiff.cs

Modified: trunk/beagle/Filters/FilterBmp.cs
==============================================================================
--- trunk/beagle/Filters/FilterBmp.cs	(original)
+++ trunk/beagle/Filters/FilterBmp.cs	Sun Apr 13 21:36:36 2008
@@ -29,7 +29,7 @@
 
 using Beagle.Util;
 using Beagle.Daemon;
-using BitConverter = Beagle.Util.BitConverter;
+using BitConverter = FSpot.BitConverter;
 
 namespace Beagle.Filters
 {

Modified: trunk/beagle/Filters/FilterGif.cs
==============================================================================
--- trunk/beagle/Filters/FilterGif.cs	(original)
+++ trunk/beagle/Filters/FilterGif.cs	Sun Apr 13 21:36:36 2008
@@ -30,7 +30,7 @@
 
 using Beagle.Util;
 using Beagle.Daemon;
-using BitConverter = Beagle.Util.BitConverter;
+using BitConverter = FSpot.BitConverter;
 
 namespace Beagle.Filters {
 

Modified: trunk/beagle/Filters/FilterImage.cs
==============================================================================
--- trunk/beagle/Filters/FilterImage.cs	(original)
+++ trunk/beagle/Filters/FilterImage.cs	Sun Apr 13 21:36:36 2008
@@ -30,7 +30,8 @@
 using System.Text;
 
 using Beagle.Util;
-using Beagle.Util.Xmp;
+using FSpot;
+using FSpot.Xmp;
 using SemWeb;
 
 namespace Beagle.Filters {

Modified: trunk/beagle/Filters/FilterJpeg.cs
==============================================================================
--- trunk/beagle/Filters/FilterJpeg.cs	(original)
+++ trunk/beagle/Filters/FilterJpeg.cs	Sun Apr 13 21:36:36 2008
@@ -29,10 +29,10 @@
 using System.Text;
 
 using Beagle.Util;
-using Beagle.Util.Exif;
-using Beagle.Util.Xmp;
-using Beagle.Util.Iptc;
-using Tiff = Beagle.Util.Tiff;
+using Exif;
+using FSpot.Xmp;
+using FSpot.Iptc;
+using Tiff = FSpot.Tiff;
 using Beagle.Daemon;
 
 using SemWeb;
@@ -67,52 +67,52 @@
 
 			string str;
 			
-			str = exif.LookupFirstValue (ExifTag.UserComment);
+			str = exif.LookupFirstValue (Exif.Tag.UserComment);
 			AddProperty (Beagle.Property.New ("exif:UserComment", str));
 
-			str = exif.LookupFirstValue (ExifTag.ImageDescription);
+			str = exif.LookupFirstValue (Exif.Tag.ImageDescription);
 			AddProperty (Beagle.Property.New ("exif:ImageDescription", str));
 
-			str = exif.LookupFirstValue (ExifTag.PixelXDimension);
+			str = exif.LookupFirstValue (Exif.Tag.PixelXDimension);
 			if (str != null && str != String.Empty) {
 				Width = Int32.Parse (str);
 				AddProperty (Beagle.Property.NewUnsearched ("exif:PixelXDimension", str));
 			}
 
-			str = exif.LookupFirstValue (ExifTag.PixelYDimension);
+			str = exif.LookupFirstValue (Exif.Tag.PixelYDimension);
 			if (str != null && str != String.Empty) {
 				Height = Int32.Parse (str);
 				AddProperty (Beagle.Property.NewUnsearched ("exif:PixelYDimension", str));
 			}
 
-			str = exif.LookupFirstValue (ExifTag.ISOSpeedRatings);
+			str = exif.LookupFirstValue (Exif.Tag.ISOSpeedRatings);
 			AddProperty (Beagle.Property.NewUnsearched ("exif:ISOSpeedRatings", str));
 
-			str = exif.LookupFirstValue (ExifTag.ShutterSpeedValue);
+			str = exif.LookupFirstValue (Exif.Tag.ShutterSpeedValue);
 			AddProperty (Beagle.Property.NewUnsearched ("exif:ShutterSpeedValue", str));
 
-			str = exif.LookupFirstValue (ExifTag.ExposureTime);
+			str = exif.LookupFirstValue (Exif.Tag.ExposureTime);
 			AddProperty (Beagle.Property.NewUnsearched ("exif:ExposureTime", str));
 
-			str = exif.LookupFirstValue (ExifTag.FNumber);
+			str = exif.LookupFirstValue (Exif.Tag.FNumber);
 			AddProperty (Beagle.Property.NewUnsearched ("exif:FNumber", str));
 
-			str = exif.LookupFirstValue (ExifTag.ApertureValue);
+			str = exif.LookupFirstValue (Exif.Tag.ApertureValue);
 			AddProperty (Beagle.Property.NewUnsearched ("exif:ApertureValue", str));
 
-			str = exif.LookupFirstValue (ExifTag.FocalLength);
+			str = exif.LookupFirstValue (Exif.Tag.FocalLength);
 			AddProperty (Beagle.Property.NewUnsearched ("exif:FocalLength", str));
 
-			str = exif.LookupFirstValue (ExifTag.Flash);
+			str = exif.LookupFirstValue (Exif.Tag.Flash);
 			AddProperty (Beagle.Property.NewUnsearched ("exif:Flash", str));
 
-			str = exif.LookupFirstValue (ExifTag.Model);
+			str = exif.LookupFirstValue (Exif.Tag.Model);
 			AddProperty (Beagle.Property.New ("exif:Model", str));
 
-			str = exif.LookupFirstValue (ExifTag.Copyright);
+			str = exif.LookupFirstValue (Exif.Tag.Copyright);
 			AddProperty (Beagle.Property.New ("dc:rights", str));
 
-			str = exif.LookupFirstValue (ExifTag.DateTime);
+			str = exif.LookupFirstValue (Exif.Tag.DateTime);
 			if (str != null && str != String.Empty) {
 				try {
 					DateTime dt = ExifUtil.DateTimeFromString (str);

Modified: trunk/beagle/Filters/FilterPdf.cs
==============================================================================
--- trunk/beagle/Filters/FilterPdf.cs	(original)
+++ trunk/beagle/Filters/FilterPdf.cs	Sun Apr 13 21:36:36 2008
@@ -13,7 +13,8 @@
 
 using Beagle.Util;
 using Beagle.Daemon;
-using Beagle.Util.Xmp;
+using FSpot;
+using FSpot.Xmp;
 using SemWeb;
 
 namespace Beagle.Filters {

Modified: trunk/beagle/Filters/FilterPng.cs
==============================================================================
--- trunk/beagle/Filters/FilterPng.cs	(original)
+++ trunk/beagle/Filters/FilterPng.cs	Sun Apr 13 21:36:36 2008
@@ -29,7 +29,9 @@
 
 using Beagle.Util;
 using Beagle.Daemon;
-using Beagle.Util.Xmp;
+using FSpot.Xmp;
+using FSpot.Png;
+using PngHeader = FSpot.Png.PngFile.PngHeader;
 
 using SemWeb;
 
@@ -50,9 +52,9 @@
 		{
 			PngHeader png = new PngHeader (Stream);
 			
-			foreach (PngHeader.Chunk chunk in png.Chunks){
-				if (chunk is PngHeader.IhdrChunk) {
-					PngHeader.IhdrChunk ihdr = (PngHeader.IhdrChunk)chunk;
+			foreach (PngFile.Chunk chunk in png.Chunks){
+				if (chunk is PngFile.IhdrChunk) {
+					PngFile.IhdrChunk ihdr = (PngFile.IhdrChunk)chunk;
 
 					Width = (int)ihdr.Width;
 					Height = (int)ihdr.Height;
@@ -62,23 +64,23 @@
 					string colorType = null;
 					
 					switch (ihdr.Color) {
-					case PngHeader.ColorType.Gray:
+					case PngFile.ColorType.Gray:
 						colorType = "Greyscale";
 						hasAlpha = false;
 						break;
-					case PngHeader.ColorType.Rgb:
+					case PngFile.ColorType.Rgb:
 						colorType = "Truecolor";
 						hasAlpha = false;
 						break;
-					case PngHeader.ColorType.Indexed:
+					case PngFile.ColorType.Indexed:
 						colorType = "Indexed";
 						hasAlpha = false;
 						break;
-					case PngHeader.ColorType.GrayAlpha:
+					case PngFile.ColorType.GrayAlpha:
 						colorType = "Greyscale";
 						hasAlpha = true;
 						break;
-					case PngHeader.ColorType.RgbA:
+					case PngFile.ColorType.RgbA:
 						colorType = "Truecolor";
 						hasAlpha = true;
 						break;
@@ -86,15 +88,15 @@
 
 					AddProperty (Beagle.Property.NewUnsearched ("fixme:colortype", colorType));
 					AddProperty (Beagle.Property.NewBool ("fixme:hasalpha", hasAlpha));
-				} else if (chunk is PngHeader.TextChunk) {
-					ExtractTextProperty ((PngHeader.TextChunk) chunk);
+				} else if (chunk is PngFile.TextChunk) {
+					ExtractTextProperty ((PngFile.TextChunk) chunk);
 				}
 			}
 
 			Finished ();
 		}
 
-		private void ExtractTextProperty (PngHeader.TextChunk tchunk)
+		private void ExtractTextProperty (PngFile.TextChunk tchunk)
 		{
 			switch (tchunk.Keyword) {
 			case "Title":

Modified: trunk/beagle/Filters/FilterTiff.cs
==============================================================================
--- trunk/beagle/Filters/FilterTiff.cs	(original)
+++ trunk/beagle/Filters/FilterTiff.cs	Sun Apr 13 21:36:36 2008
@@ -30,8 +30,8 @@
 
 using Beagle.Util;
 using Beagle.Daemon;
-using Beagle.Util.Tiff;
-using Beagle.Util.Xmp;
+using FSpot.Tiff;
+using FSpot.Xmp;
 
 using SemWeb;