beagle r4697 - trunk/beagle/Util/F-Spot/upstream-changes

From: dbera svn gnome org
To: svn-commits-list gnome org
Subject: beagle r4697 - trunk/beagle/Util/F-Spot/upstream-changes
Date: Sun, 13 Apr 2008 20:27:49 +0100 (BST)
Author: dbera
Date: Sun Apr 13 20:27:49 2008
New Revision: 4697
URL: http://svn.gnome.org/viewvc/beagle?rev=4697&view=rev

Log:
Oops. Diff was generated in the reverse direction. Generate the right diff.


Modified:
   trunk/beagle/Util/F-Spot/upstream-changes/01-initial-diff-r3823.diff

Modified: trunk/beagle/Util/F-Spot/upstream-changes/01-initial-diff-r3823.diff
==============================================================================
--- trunk/beagle/Util/F-Spot/upstream-changes/01-initial-diff-r3823.diff	(original)
+++ trunk/beagle/Util/F-Spot/upstream-changes/01-initial-diff-r3823.diff	Sun Apr 13 20:27:49 2008
@@ -1,464 +1,464 @@
 Initial diff against F-Spot r3823.
 
-diff -u -r ./Imaging/Ciff.cs ../../../FSpot/Imaging/Ciff.cs
---- ./Imaging/Ciff.cs	2008-04-13 13:52:26.000000000 -0400
-+++ ../../../FSpot/Imaging/Ciff.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -454,7 +454,6 @@
+diff -u -r ../../../FSpot/Imaging/Ciff.cs ./Imaging/Ciff.cs
+--- ../../../FSpot/Imaging/Ciff.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/Ciff.cs	2008-04-13 13:52:26.000000000 -0400
+@@ -454,6 +454,7 @@
  				return DCRawFile.RawPixbufStream (uri);
  		}
  
--#if false
++#if false
  		public override Gdk.Pixbuf Load (int width, int height)
  		{
  			Gdk.Pixbuf full = this.Load ();
-@@ -462,7 +461,7 @@
+@@ -461,7 +462,7 @@
  			full.Dispose ();
  			return scaled;
  		}
--#endif
-+
+-
++#endif
  		public void Dump ()
  		{
  			Root.Dump ();
-diff -u -r ./Imaging/DCRawFile.cs ../../../FSpot/Imaging/DCRawFile.cs
---- ./Imaging/DCRawFile.cs	2008-04-13 14:17:22.000000000 -0400
-+++ ../../../FSpot/Imaging/DCRawFile.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -89,18 +89,14 @@
+diff -u -r ../../../FSpot/Imaging/DCRawFile.cs ./Imaging/DCRawFile.cs
+--- ../../../FSpot/Imaging/DCRawFile.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/DCRawFile.cs	2008-04-13 14:17:22.000000000 -0400
+@@ -89,14 +89,18 @@
  
  		internal static System.IO.Stream RawPixbufStream (Uri location)
  		{
--#if false
++#if false
  			string path = location.LocalPath;
  			string [] args = new string [] { dcraw_command, "-h", "-w", "-c", "-t", "0", path };
  			
  			InternalProcess proc = new InternalProcess (System.IO.Path.GetDirectoryName (path), args);
  			proc.StandardInput.Close ();
  			return proc.StandardOutput;
--#else
--			return null;
--#endif
++#else
++			return null;
++#endif
  		}
--	
-+		
+-		
++	
  		public static System.IO.Stream RawPixbufStreamOld (string path)
  		{
  			// FIXME this filename quoting is super lame
-@@ -114,7 +110,6 @@
+@@ -110,6 +114,7 @@
  			return new Pipe (process, process.StandardOutput.BaseStream);
  		}
  		
--#if false
++#if false
  		public static Gdk.Pixbuf Load (string path, string args)
  		{
  			// FIXME this filename quoting is super lame
-@@ -130,6 +125,5 @@
+@@ -125,5 +130,6 @@
  				return PixbufUtils.LoadFromStream (process.StandardOutput.BaseStream);
  			}
  		}
--#endif
++#endif
  	}
  }
-diff -u -r ./Imaging/ImageFile.cs ../../../FSpot/Imaging/ImageFile.cs
---- ./Imaging/ImageFile.cs	2008-04-13 14:11:44.000000000 -0400
-+++ ../../../FSpot/Imaging/ImageFile.cs	2008-04-13 13:25:54.000000000 -0400
+diff -u -r ../../../FSpot/Imaging/ImageFile.cs ./Imaging/ImageFile.cs
+--- ../../../FSpot/Imaging/ImageFile.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/ImageFile.cs	2008-04-13 14:11:44.000000000 -0400
 @@ -1,6 +1,6 @@
  using System;
  using System.IO;
--using UriUtils = Beagle.Util.UriFu;
-+using FSpot.Utils;
+-using FSpot.Utils;
++using UriUtils = Beagle.Util.UriFu;
  
  namespace FSpot {
  	public class ImageFormatException : ApplicationException {
-@@ -30,12 +30,10 @@
+@@ -30,10 +30,12 @@
  			// FIXME, this seems like the sane thing to do, but vfs streams seem to 
  			// actually be faster and they need more testing.
  			//if (vfs.IsLocal)
--			return File.OpenRead (uri.LocalPath);
-+			//	return File.OpenRead (uri.LocalPath);
+-			//	return File.OpenRead (uri.LocalPath);
++			return File.OpenRead (uri.LocalPath);
  
--#if false
++#if false
  			System.Console.WriteLine ("open uri = {0}", uri.ToString ());
  			return new Gnome.Vfs.VfsStream (uri.ToString (), FileMode.Open);
--#endif
++#endif
  		}
  
  		public virtual Stream PixbufStream ()
-@@ -83,7 +81,6 @@
+@@ -81,6 +83,7 @@
  			get { return null; }
  		}
  		
--#if false
++#if false
  		public virtual void Save (Gdk.Pixbuf pixbuf, System.IO.Stream stream)
  		{
  			throw new NotImplementedException ();
-@@ -125,23 +122,21 @@
+@@ -122,21 +125,23 @@
  				return aspect.Load (stream, Orientation);
  			}	
  		}
--#endif
-+	
+-	
++#endif
  		public virtual PixbufOrientation GetOrientation () 
  		{
  			return PixbufOrientation.TopLeft;
  		}
--#if false		
-+		
+-		
++#if false		
  		// FIXME this need to have an intent just like the loading stuff.
  		public virtual Cms.Profile GetProfile ()
  		{
  			return null;
  		}
--#endif	
-+		
+-		
++#endif	
  		public virtual System.DateTime Date 
  		{
  			get {
--				return System.IO.File.GetCreationTimeUtc (uri.LocalPath);
--#if false
++				return System.IO.File.GetCreationTimeUtc (uri.LocalPath);
++#if false
  				// FIXME mono uses the file change time (ctime) incorrectly
  				// as the creation time so we try to work around that slightly
  				Gnome.Vfs.FileInfo info = new Gnome.Vfs.FileInfo (uri.ToString ());
-@@ -153,7 +148,6 @@
+@@ -148,6 +153,7 @@
  					return create;
  				else 
  					return write;
--#endif
++#endif
  			}
  		}
  
-diff -u -r ./Imaging/JpegFile.cs ../../../FSpot/Imaging/JpegFile.cs
---- ./Imaging/JpegFile.cs	2008-04-13 14:20:17.000000000 -0400
-+++ ../../../FSpot/Imaging/JpegFile.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -10,9 +10,7 @@
+diff -u -r ../../../FSpot/Imaging/JpegFile.cs ./Imaging/JpegFile.cs
+--- ../../../FSpot/Imaging/JpegFile.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/JpegFile.cs	2008-04-13 14:20:17.000000000 -0400
+@@ -10,7 +10,9 @@
  
  namespace FSpot {
  	public interface IThumbnailContainer {
--#if false
++#if false
  		Gdk.Pixbuf GetEmbeddedThumbnail ();
--#endif
++#endif
  	}
  
  	public class JpegFile : ImageFile, IThumbnailContainer, SemWeb.StatementSource {
-@@ -64,12 +62,11 @@
+@@ -62,11 +64,12 @@
  			Header.Select (sink);
  		}
  
--#if false
++#if false
  		public override Cms.Profile GetProfile ()
  		{
  			return Header.GetProfile ();
  		}
--#endif
-+
+-
++#endif
  		public override string Description {
  			get {
  #if USE_TIFF
-@@ -120,7 +117,7 @@
+@@ -117,7 +120,7 @@
  		private void UpdateMeta ()
  		{
  			Exif.ExifContent image_content = this.ExifData.GetContents (Exif.Ifd.Zero);
--			image_content.GetEntry (Exif.Tag.Software).SetData ("F-Spot" + " version " + "r3823");
-+			image_content.GetEntry (Exif.Tag.Software).SetData (FSpot.Defines.PACKAGE + " version " + FSpot.Defines.VERSION);
+-			image_content.GetEntry (Exif.Tag.Software).SetData (FSpot.Defines.PACKAGE + " version " + FSpot.Defines.VERSION);
++			image_content.GetEntry (Exif.Tag.Software).SetData ("F-Spot" + " version " + "r3823");
  
  			// set the write time in the datetime tag
  			image_content.GetEntry (Exif.Tag.DateTime).Reset ();
-@@ -141,7 +138,6 @@
+@@ -138,6 +141,7 @@
  			// Console.WriteLine ("saved");
  		}
  		
--#if false
++#if false
  		public void SaveMetaData (string path)
  		{
  			UpdateMeta ();
-@@ -187,7 +183,6 @@
+@@ -183,6 +187,7 @@
  			// now update the exif data
  			ExifData.Data = thumb_data;
  		}
--#endif
++#endif
  
  		public void SetDimensions (int width, int height)
  		{
-@@ -213,7 +208,6 @@
+@@ -208,6 +213,7 @@
  			image_content.GetEntry (Exif.Tag.PixelYDimension).SetData ((uint)height);
  		}
  
--#if false
++#if false
  		public override void Save (Gdk.Pixbuf pixbuf, System.IO.Stream stream)
  		{
  
-@@ -252,7 +246,7 @@
+@@ -246,7 +252,7 @@
  			}
  			return null;
  		}
--#endif	
-+		
+-		
++#endif	
  		public Exif.ExifData ExifData {
  			get {
  				if (exif_data == null) {
-diff -u -r ./Imaging/JpegHeader.cs ../../../FSpot/Imaging/JpegHeader.cs
---- ./Imaging/JpegHeader.cs	2008-04-13 13:55:40.000000000 -0400
-+++ ../../../FSpot/Imaging/JpegHeader.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -294,7 +294,6 @@
+diff -u -r ../../../FSpot/Imaging/JpegHeader.cs ./Imaging/JpegHeader.cs
+--- ../../../FSpot/Imaging/JpegHeader.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/JpegHeader.cs	2008-04-13 14:37:22.000000000 -0400
+@@ -294,6 +294,7 @@
  		return FindMarker (new Signature (id, name));
  	}
  
--#if false
++#if false
  	public Cms.Profile GetProfile ()
  	{
  		Marker m = FindMarker (IccProfileSignature);
-@@ -312,7 +311,7 @@
+@@ -311,7 +312,7 @@
  		
  		return null;
  	}
--#endif
-+	
+-	
++#endif
  	public FSpot.Tiff.Header GetExifHeader ()
  	{
  		string name = ExifSignature.Name;
-diff -u -r ./Imaging/MrwFile.cs ../../../FSpot/Imaging/MrwFile.cs
---- ./Imaging/MrwFile.cs	2008-04-13 13:53:37.000000000 -0400
-+++ ../../../FSpot/Imaging/MrwFile.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -217,7 +217,6 @@
+diff -u -r ../../../FSpot/Imaging/MrwFile.cs ./Imaging/MrwFile.cs
+--- ../../../FSpot/Imaging/MrwFile.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/MrwFile.cs	2008-04-13 13:53:37.000000000 -0400
+@@ -217,6 +217,7 @@
  			return DCRawFile.RawPixbufStream (uri);
  		}
  		
--#if false
++#if false
  		public override Gdk.Pixbuf Load ()
  		{
  			using (System.IO.Stream stream = Open ()) {
-@@ -229,7 +228,7 @@
+@@ -228,7 +229,7 @@
  		{
  			return PixbufUtils.ScaleToMaxSize (this.Load (), width, height);
  		}
--#endif
-+
+-
++#endif
  		protected void LoadBlocks () 
  		{
  			using (System.IO.Stream file = Open ()) {
-diff -u -r ./Imaging/PngFile.cs ../../../FSpot/Imaging/PngFile.cs
---- ./Imaging/PngFile.cs	2008-04-13 14:21:09.000000000 -0400
-+++ ../../../FSpot/Imaging/PngFile.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -1,5 +1,6 @@
+diff -u -r ../../../FSpot/Imaging/PngFile.cs ./Imaging/PngFile.cs
+--- ../../../FSpot/Imaging/PngFile.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/PngFile.cs	2008-04-13 14:21:09.000000000 -0400
+@@ -1,6 +1,5 @@
  using ICSharpCode.SharpZipLib.Zip.Compression;
  using SemWeb;
-+using Cms;
+-using Cms;
  using System.IO;
  using FSpot.Xmp;
  using System.Collections;
-@@ -427,7 +428,7 @@
+@@ -428,7 +427,7 @@
  				this.Time = System.DateTime.Now;
  			}
  		}
--#if false
-+
+-
++#if false
  		public class StandardRgbChunk : Chunk {
  			public StandardRgbChunk (string name, byte [] data) : base (name, data) {}
  			
-@@ -437,7 +438,7 @@
+@@ -438,7 +437,7 @@
  				}
  			}
  		}
--#endif
-+
+-
++#endif
  		public class GammaChunk : Chunk {
  			public GammaChunk (string name, byte [] data) : base (name, data) {}
  			private const int divisor = 100000;
-@@ -687,9 +688,7 @@
+@@ -688,7 +687,9 @@
  				name_table ["cHRM"] = typeof (ColorChunk);
  				name_table ["pHYs"] = typeof (PhysChunk);
  				name_table ["gAMA"] = typeof (GammaChunk);
--#if false
++#if false
  				name_table ["sRGB"] = typeof (StandardRgbChunk);
--#endif
++#endif
  			}
  			
  			protected Chunk ()
-@@ -851,7 +850,6 @@
+@@ -850,6 +851,7 @@
  			}
  		}
  
--#if false
++#if false
  		public class ScanlineDecoder {
  			int width;
  			int height;
-@@ -1168,7 +1166,7 @@
+@@ -1166,7 +1168,7 @@
  			}
  			return pixbuf;
  		}
--#endif
-+
+-
++#endif
  		private static byte [] magic = new byte [] { 137, 80, 78, 71, 13, 10, 26, 10 };
  
  				
-@@ -1273,7 +1271,6 @@
+@@ -1271,6 +1273,7 @@
  			Header.Save (stream);
  		}
  
--#if false
++#if false
  		public void Save (string path)
  		{
  			string  temp_path = path + ".tmp.png";
-@@ -1360,7 +1357,7 @@
+@@ -1357,7 +1360,7 @@
  			
  			return null;
  		}
--#endif
-+
+-
++#endif
  		public override string Description {
  			get {
  				string description = Header.LookupText ("Description");
-diff -u -r ./Imaging/PnmFile.cs ../../../FSpot/Imaging/PnmFile.cs
---- ./Imaging/PnmFile.cs	2008-04-13 13:34:17.000000000 -0400
-+++ ../../../FSpot/Imaging/PnmFile.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -1,3 +1,4 @@
-+using FSpot.Imaging;
+diff -u -r ../../../FSpot/Imaging/PnmFile.cs ./Imaging/PnmFile.cs
+--- ../../../FSpot/Imaging/PnmFile.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/PnmFile.cs	2008-04-13 13:34:17.000000000 -0400
+@@ -1,4 +1,3 @@
+-using FSpot.Imaging;
  using SemWeb;
  using System;
  using System.IO;
-@@ -116,7 +117,6 @@
+@@ -117,6 +116,7 @@
  			return data;
  		}
  
--#if false
++#if false
  		static Gdk.Pixbuf LoadRGB16 (Stream stream, int width, int height)
  		{
  			Gdk.Pixbuf pixbuf = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, false, 8, width, height);
-@@ -280,7 +280,6 @@
+@@ -280,6 +280,7 @@
  				throw new System.Exception (System.String.Format ("unknown pnm type {0}", header.Magic));
  			}			
  		}
--#endif
++#endif
  	}
  
  #if ENABLE_NUNIT
-diff -u -r ./Imaging/RafFile.cs ../../../FSpot/Imaging/RafFile.cs
---- ./Imaging/RafFile.cs	2008-04-13 13:53:16.000000000 -0400
-+++ ../../../FSpot/Imaging/RafFile.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -69,7 +69,6 @@
+diff -u -r ../../../FSpot/Imaging/RafFile.cs ./Imaging/RafFile.cs
+--- ../../../FSpot/Imaging/RafFile.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/RafFile.cs	2008-04-13 13:53:16.000000000 -0400
+@@ -69,6 +69,7 @@
  				return DCRawFile.RawPixbufStream (uri);
  		}
   
--#if false
++#if false
  		public override Gdk.Pixbuf Load ()
  		{
  			return new Gdk.Pixbuf (PixbufStream ());
-@@ -83,7 +82,7 @@
+@@ -82,7 +83,7 @@
  			full.Dispose ();
  			return scaled;
  		}
--#endif
-+
+-
++#endif
  		public void Select (SemWeb.StatementSink sink)
  		{
  			byte [] data = GetEmbeddedJpeg ();
-diff -u -r ./Imaging/Tiff.cs ../../../FSpot/Imaging/Tiff.cs
---- ./Imaging/Tiff.cs	2008-04-13 13:55:18.000000000 -0400
-+++ ../../../FSpot/Imaging/Tiff.cs	2008-04-13 13:25:54.000000000 -0400
-@@ -1318,7 +1318,6 @@
+diff -u -r ../../../FSpot/Imaging/Tiff.cs ./Imaging/Tiff.cs
+--- ../../../FSpot/Imaging/Tiff.cs	2008-04-13 13:25:54.000000000 -0400
++++ ./Imaging/Tiff.cs	2008-04-13 13:55:18.000000000 -0400
+@@ -1318,6 +1318,7 @@
  			return new DirectoryEntry (input, start, header_endian);
  		}
  		
--#if false
++#if false
  		public Cms.Profile GetProfile ()
  		{
  			Cms.ColorCIExyY whitepoint = new Cms.ColorCIExyY (0, 0, 0);
-@@ -1405,7 +1404,6 @@
+@@ -1404,6 +1405,7 @@
  				
  			return new Cms.Profile (whitepoint, primaries, transfer);
  		}
--#endif
++#endif
  
  		public void Dump (string name) 
  		{
-@@ -1583,7 +1581,6 @@
+@@ -1581,6 +1583,7 @@
  		}
  
  
--#if false
++#if false
  		public Gdk.Pixbuf LoadPixbuf (System.IO.Stream stream) 
  		{
  			Gdk.Pixbuf dest = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, false, width, height);
-@@ -1598,7 +1595,6 @@
+@@ -1595,6 +1598,7 @@
  				}
  			}
  		}
--#endif
++#endif
  	}
  #endif
  
-@@ -2108,7 +2104,6 @@
+@@ -2104,6 +2108,7 @@
  			return file;
  		}
  
--#if false
++#if false
  		public Gdk.Pixbuf LoadJpegInterchangeFormat (ImageDirectory directory)
  		{
  			uint offset = directory.Lookup (TagId.JPEGInterchangeFormat).ValueAsLong [0];
-@@ -2135,7 +2130,6 @@
+@@ -2130,6 +2135,7 @@
  				return result; 
  			}
  		}
--#endif
++#endif
  	}
  
  	public class DngFile : TiffFile {
-@@ -2266,7 +2260,6 @@
+@@ -2260,6 +2266,7 @@
  			} while (i < sub.Directory.Length);
  		}
  
--#if false
++#if false
  		public Gdk.Pixbuf GetEmbeddedThumbnail ()
  		{
  			using (System.IO.Stream stream = Open ()) {
-@@ -2284,7 +2277,6 @@
+@@ -2277,6 +2284,7 @@
  				return DCRawFile.RawPixbufStream (uri);
  			}
  		}
--#endif
++#endif
  	}
  		
  
-@@ -2304,14 +2296,13 @@
+@@ -2296,13 +2304,14 @@
  		}
  		*/
  
--#if false
++#if false
  		public Gdk.Pixbuf GetEmbeddedThumbnail ()
  		{
  			ImageDirectory directory;
  			directory = Header.Directory.NextDirectory;
  			return TransformAndDispose (LoadJpegInterchangeFormat (directory));
  		}
--#endif
-+
+-
++#endif
  
  		public override System.IO.Stream PixbufStream ()
  		{
-diff -u -r ./PixbufUtils.cs ../../../FSpot/PixbufUtils.cs
---- ./PixbufUtils.cs	2008-04-13 13:50:20.000000000 -0400
-+++ ../../../FSpot/PixbufUtils.cs	2008-04-13 13:45:27.000000000 -0400
-@@ -1,8 +1,10 @@
-+using Gdk;
+diff -u -r ../../../FSpot/PixbufUtils.cs ./PixbufUtils.cs
+--- ../../../FSpot/PixbufUtils.cs	2008-04-13 13:45:27.000000000 -0400
++++ ./PixbufUtils.cs	2008-04-13 13:50:20.000000000 -0400
+@@ -1,10 +1,8 @@
+-using Gdk;
  using System.Collections;
  using System.Runtime.InteropServices;
  using System;
  using System.IO;
  using FSpot;
-+using FSpot.Utils;
+-using FSpot.Utils;
  
  /**
    1        2       3      4         5            6           7          8
-@@ -55,7 +57,6 @@
+@@ -57,6 +55,7 @@
  		return orientation;
  	}
  
--#if false
++#if false
  	static Pixbuf error_pixbuf = null;
  	public static Pixbuf ErrorPixbuf {
  		get {
-@@ -940,5 +941,4 @@
+@@ -941,4 +940,5 @@
  		return gtksharp_object_get_ref_count (obj.Handle);
  	}
  #endif
--#endif
++#endif
  }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]