f-spot r4207 - in trunk: . src src/ColorAdjustment src/Filters



Author: rubenv
Date: Fri Jul 25 23:37:55 2008
New Revision: 4207
URL: http://svn.gnome.org/viewvc/f-spot?rev=4207&view=rev

Log:
2008-07-26  Ruben Vermeersch  <ruben savanne be>

	* src/ColorAdjustment/Adjustment.cs:
	* src/ColorAdjustment/AutoStretch.cs:
	* src/ColorAdjustment/Desaturate.cs:
	* src/ColorAdjustment/SepiaTone.cs:
	* src/Filters/ColorFilter.cs:
	* src/Makefile.am: Rename ColorAdjustment to Adjustment, having
	conflicting namespaces and type names is something C# does not handle
	well.


Added:
   trunk/src/ColorAdjustment/Adjustment.cs
      - copied, changed from r4206, /trunk/src/ColorAdjustment/ColorAdjustment.cs
Removed:
   trunk/src/ColorAdjustment/ColorAdjustment.cs
Modified:
   trunk/ChangeLog
   trunk/f-spot.csproj
   trunk/src/ColorAdjustment/AutoStretch.cs
   trunk/src/ColorAdjustment/Desaturate.cs
   trunk/src/ColorAdjustment/SepiaTone.cs
   trunk/src/Filters/ColorFilter.cs
   trunk/src/Makefile.am

Modified: trunk/f-spot.csproj
==============================================================================
--- trunk/f-spot.csproj	(original)
+++ trunk/f-spot.csproj	Fri Jul 25 23:37:55 2008
@@ -2624,7 +2624,6 @@
     <Content Include="gtk-gui\gui.stetic" />
     <Content Include="libfspot\.libs\libfspot.so.0.0.0T" />
     <Content Include="src\ColorAdjustment\AutoStretch.cs" />
-    <Content Include="src\ColorAdjustment\ColorAdjustment.cs" />
     <Content Include="src\ColorAdjustment\Desaturate.cs" />
     <Content Include="src\ColorAdjustment\SepiaTone.cs" />
   </ItemGroup>

Copied: trunk/src/ColorAdjustment/Adjustment.cs (from r4206, /trunk/src/ColorAdjustment/ColorAdjustment.cs)
==============================================================================
--- /trunk/src/ColorAdjustment/ColorAdjustment.cs	(original)
+++ trunk/src/ColorAdjustment/Adjustment.cs	Fri Jul 25 23:37:55 2008
@@ -1,5 +1,5 @@
 /*
- * ColorAdjustment.cs
+ * Adjustment.cs
  * 
  * Copyright 2006, 2007 Novell Inc.
  *
@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 
 namespace FSpot.ColorAdjustment {
-	public abstract class ColorAdjustment {
+	public abstract class Adjustment {
 		private List <Cms.Profile> profiles;
 		protected int nsteps = 20;
 		private Cms.Intent intent = Cms.Intent.Perceptual;
@@ -47,7 +47,7 @@
 			set { destination_profile = value; }
 		}
 
-		public ColorAdjustment (Pixbuf input, Cms.Profile input_profile)
+		public Adjustment (Pixbuf input, Cms.Profile input_profile)
 		{
 			Input = input;
 			InputProfile = input_profile;

Modified: trunk/src/ColorAdjustment/AutoStretch.cs
==============================================================================
--- trunk/src/ColorAdjustment/AutoStretch.cs	(original)
+++ trunk/src/ColorAdjustment/AutoStretch.cs	Fri Jul 25 23:37:55 2008
@@ -14,7 +14,7 @@
 using System.Collections.Generic;
 
 namespace FSpot.ColorAdjustment {
-	public class AutoStretch : ColorAdjustment {
+	public class AutoStretch : Adjustment {
 		public AutoStretch (Pixbuf input, Cms.Profile input_profile) : base (input, input_profile)
 		{
 		}

Modified: trunk/src/ColorAdjustment/Desaturate.cs
==============================================================================
--- trunk/src/ColorAdjustment/Desaturate.cs	(original)
+++ trunk/src/ColorAdjustment/Desaturate.cs	Fri Jul 25 23:37:55 2008
@@ -15,7 +15,7 @@
 using System.Collections.Generic;
 
 namespace FSpot.ColorAdjustment {
-	public class Desaturate : ColorAdjustment {
+	public class Desaturate : Adjustment {
 		public Desaturate (Pixbuf input, Cms.Profile input_profile) : base (input, input_profile)
 		{
 		}

Modified: trunk/src/ColorAdjustment/SepiaTone.cs
==============================================================================
--- trunk/src/ColorAdjustment/SepiaTone.cs	(original)
+++ trunk/src/ColorAdjustment/SepiaTone.cs	Fri Jul 25 23:37:55 2008
@@ -15,7 +15,7 @@
 using System.Collections.Generic;
 
 namespace FSpot.ColorAdjustment {
-	public class SepiaTone : ColorAdjustment {
+	public class SepiaTone : Adjustment {
 		public SepiaTone (Pixbuf input, Cms.Profile input_profile) : base (input, input_profile)
 		{
 		}

Modified: trunk/src/Filters/ColorFilter.cs
==============================================================================
--- trunk/src/Filters/ColorFilter.cs	(original)
+++ trunk/src/Filters/ColorFilter.cs	Fri Jul 25 23:37:55 2008
@@ -30,7 +30,7 @@
 				Pixbuf pixbuf = img.Load ();
 				Profile profile = img.GetProfile ();
 
-				FSpot.ColorAdjustment.ColorAdjustment adjustment = CreateAdjustment (pixbuf, profile);
+				Adjustment adjustment = CreateAdjustment (pixbuf, profile);
 				Gdk.Pixbuf final = adjustment.Adjust ();
 
 				Uri dest_uri = req.TempUri (Path.GetExtension (source.LocalPath));
@@ -44,11 +44,11 @@
 			}
 		}
 
-		protected abstract FSpot.ColorAdjustment.ColorAdjustment CreateAdjustment (Pixbuf input, Cms.Profile input_profile);
+		protected abstract Adjustment CreateAdjustment (Pixbuf input, Cms.Profile input_profile);
 	}
 
 	public class AutoStretchFilter : ColorFilter {
-		protected override FSpot.ColorAdjustment.ColorAdjustment CreateAdjustment (Pixbuf input, Cms.Profile input_profile) {
+		protected override Adjustment CreateAdjustment (Pixbuf input, Cms.Profile input_profile) {
 			return new FSpot.ColorAdjustment.AutoStretch (input, input_profile);
 		}
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Jul 25 23:37:55 2008
@@ -82,8 +82,8 @@
 	$(srcdir)/BitConverter.cs		\
 	$(srcdir)/PhotoArray.cs 		\
 	$(srcdir)/PhotoList.cs 		\
+	$(srcdir)/ColorAdjustment/Adjustment.cs		\
 	$(srcdir)/ColorAdjustment/AutoStretch.cs		\
-	$(srcdir)/ColorAdjustment/ColorAdjustment.cs		\
 	$(srcdir)/ColorAdjustment/Desaturate.cs		\
 	$(srcdir)/ColorAdjustment/SepiaTone.cs		\
 	$(srcdir)/CompatFileChooser.cs		\



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