GNOME.org
 

f-spot r3952 - in trunk: . Tests/src Tests/src/Cms src src/Cms

Author: sdelcroix
Date: Tue May 20 14:11:31 2008
New Revision: 3952
URL: http://svn.gnome.org/viewvc/f-spot?rev=3952&view=rev

Log:
fixing gendarme warning on Cms, part 1

Added:
   trunk/Tests/src/Cms/
   trunk/Tests/src/Cms/Cms.cs
Modified:
   trunk/Tests/src/Makefile
   trunk/f-spot.pc.in
   trunk/src/Cms/Cms.cs
   trunk/src/Makefile.am

Added: trunk/Tests/src/Cms/Cms.cs
==============================================================================
--- (empty file)
+++ trunk/Tests/src/Cms/Cms.cs	Tue May 20 14:11:31 2008
@@ -0,0 +1,61 @@
+#if ENABLE_NUNIT
+using NUnit.Framework;
+
+namespace Cms.Tests
+{
+	[TestFixture]
+	public class ProfileTests {
+		[Test]
+		public void LoadSave ()
+		{
+			Profile srgb = Profile.CreateStandardRgb ();
+			byte [] data = srgb.Save ();
+			Assert.IsNotNull (data);
+			Profile result = new Profile (data);
+			Assert.AreEqual (result.ProductName, srgb.ProductName);
+			Assert.AreEqual (result.ProductDescription, srgb.ProductDescription);
+			Assert.AreEqual (result.Model, srgb.Model);
+		}
+	}
+
+	[TestFixture]
+	public class GammaTableTests {
+		[Test]
+		public void TestAlloc ()
+		{
+			ushort [] values = new ushort [] { 0, 0x00ff, 0xffff };
+			GammaTable t = new GammaTable (values);
+			for (int i = 0; i < values.Length; i++) {
+				Assert.AreEqual (t[i], values [i]);
+			}
+		} 
+	}
+
+	[TestFixture]
+	public class ColorCIExyYTests
+	{
+		[Test]
+		public void TestTempTable1000 ()
+		{
+			ColorCIExyY wp = WhitePointFromTemperature (1000);
+			Assert.AreEqual (0.652756059, wp.x);
+			Assert.AreEqual (0.344456906, wp.y);
+		}
+
+		[Test]
+		public void TestTempReader ()
+		{
+			for (int i = 1000; i <= 25000; i += 10000)
+				WhitePointFromTemperature (i);
+		}
+		
+		[Test]
+		public void TestTempTable10000 ()
+		{
+			ColorCIExyY wp = WhitePointFromTemperature (10000);
+			Assert.AreEqual (0.280635904, wp.x);
+			Assert.AreEqual (0.288290916, wp.y);
+		}
+	}
+}
+#endif 		

Modified: trunk/Tests/src/Makefile
==============================================================================
--- trunk/Tests/src/Makefile	(original)
+++ trunk/Tests/src/Makefile	Tue May 20 14:11:31 2008
@@ -7,7 +7,8 @@
 	PhotoStore.cs			\
 	TagStore.cs			\
 	ThumbnailGenerator.cs		\
-	Query/LogicalTerm.cs		
+	Query/LogicalTerm.cs		\
+	Cms/Cms.cs
 
 PKGS = 					\
 	-pkg:mono-nunit			\
@@ -20,6 +21,7 @@
 	-r:../../src/FSpot.Core.dll	\
 	-r:../../src/FSpot.Query.dll	\
 	-r:../../src/FSpot.Utils.dll	\
+	-r:../../src/Cms.dll		\
 	-r:../../semweb/SemWeb.dll
 
 RESOURCES =							\

Modified: trunk/f-spot.pc.in
==============================================================================
--- trunk/f-spot.pc.in	(original)
+++ trunk/f-spot.pc.in	Tue May 20 14:11:31 2008
@@ -6,4 +6,4 @@
 Name: F-Spot
 Description: F-Spot, Organise, enjoy and share your pictures
 Version: @VERSION@
-Libs: -r:${libdir}/f-spot/f-spot.exe -r:${libdir}/f-spot/FSpot.Core.dll -r:${libdir}/f-spot/FSpot.Utils.dll -r:${libdir}/f-spot/Cms.dll -r:${libdir}/f-spot/FSpot.Query.dll
+Libs: -r:${libdir}/f-spot/f-spot.exe -r:${libdir}/f-spot/FSpot.Core.dll -r:${libdir}/f-spot/FSpot.Utils.dll -r:${libdir}/f-spot/Cms.dll -r:${libdir}/f-spot/FSpot.Query.dll -r:${libdir}/f-spot/FSpot.JobScheduler.dll -r:${libdir}/f-spot/FSpot.Widgets.dll

Modified: trunk/src/Cms/Cms.cs
==============================================================================
--- trunk/src/Cms/Cms.cs	(original)
+++ trunk/src/Cms/Cms.cs	Tue May 20 14:11:31 2008
@@ -5,12 +5,8 @@
 using System;
 using System.IO;
 using System.Collections;
-using System.Reflection;
 using System.Runtime.InteropServices;
-
-#if ENABLE_NUNIT
-using NUnit.Framework;
-#endif
+using System.Reflection;
 
 namespace Cms {
 	public enum Format : uint {
@@ -83,13 +79,10 @@
 			return new ColorCIExyY (x, y, 1.0);
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern bool cmsWhitePointFromTemp(int TempSrc,  out ColorCIExyY white_point);
-
 		public static ColorCIExyY WhitePointFromTemperatureCIE (int temp)
 		{
 			ColorCIExyY wp;
-			cmsWhitePointFromTemp (temp, out wp);
+			NativeMethods.CmsWhitePointFromTemp (temp, out wp);
 			return wp;
 		}
 
@@ -118,23 +111,17 @@
 			}			
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsxyY2XYZ (out ColorCIEXYZ dest, ref ColorCIExyY src);
-
 		public ColorCIEXYZ ToXYZ ()
 		{
 			ColorCIEXYZ dest;
-			cmsxyY2XYZ (out dest, ref this);
+			NativeMethods.CmsxyY2XYZ (out dest, ref this);
 			
 			return dest;
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern IntPtr cmsD50_xyY();
-
 		public static ColorCIExyY D50 {
 			get {
-				IntPtr ptr = cmsD50_xyY ();
+				IntPtr ptr = NativeMethods.CmsD50_xyY ();
 				return (ColorCIExyY) Marshal.PtrToStructure (ptr, typeof (ColorCIExyY));
 			}
 		}
@@ -153,34 +140,6 @@
 		{
 			return String.Format ("(x={0}, y={1}, Y={2})", x, y, Y);
 		}
-		
-#if ENABLE_NUNIT
-		[TestFixture]
-		public class Tests {
-			[Test]
-			public void TestTempTable1000 ()
-			{
-				ColorCIExyY wp = WhitePointFromTemperature (1000);
-				Assert.AreEqual (0.652756059, wp.x);
-				Assert.AreEqual (0.344456906, wp.y);
-			}
-
-			[Test]
-			public void TestTempReader ()
-			{
-				for (int i = 1000; i <= 25000; i += 10000)
-					WhitePointFromTemperature (i);
-			}
-			
-			[Test]
-			public void TestTempTable10000 ()
-			{
-				ColorCIExyY wp = WhitePointFromTemperature (10000);
-				Assert.AreEqual (0.280635904, wp.x);
-				Assert.AreEqual (0.288290916, wp.y);
-			}
-		}
-#endif
 	}
 
 	public struct ColorCIEXYZ {
@@ -195,34 +154,25 @@
 			this.z = z;
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsXYZ2xyY (out ColorCIExyY dest, ref ColorCIEXYZ source);
-		
 		public ColorCIExyY ToxyY ()
 		{
 			ColorCIExyY dest;
-			cmsXYZ2xyY (out dest, ref this);
+			NativeMethods.CmsXYZ2xyY (out dest, ref this);
 			
 			return dest;
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsXYZ2Lab (ref ColorCIEXYZ wp, out ColorCIELab lab, ref ColorCIEXYZ xyz);
-
 		public ColorCIELab ToLab (ColorCIEXYZ wp)
 		{
 			ColorCIELab lab;
-			cmsXYZ2Lab (ref wp, out lab, ref this);
+			NativeMethods.CmsXYZ2Lab (ref wp, out lab, ref this);
 
 			return lab;
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern IntPtr cmsD50_XYZ();
-
 		public static ColorCIEXYZ D50 {
 			get {
-				IntPtr ptr = cmsD50_XYZ ();
+				IntPtr ptr = NativeMethods.CmsD50_XYZ ();
 				return (ColorCIEXYZ) Marshal.PtrToStructure (ptr, typeof (ColorCIEXYZ));
 			}
 		}
@@ -245,24 +195,18 @@
 		public double a;
 		public double b;
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsLab2LCh (out ColorCIELCh lch, ref ColorCIELab lab);
-
 		public ColorCIELCh ToLCh ()
 		{
 			ColorCIELCh lch;
-			cmsLab2LCh (out lch, ref this);
+			NativeMethods.CmsLab2LCh (out lch, ref this);
 
 			return lch;
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsLab2XYZ (ref ColorCIEXYZ wp, out ColorCIEXYZ xyz, ref ColorCIELab lab);
-		
 		public ColorCIEXYZ ToXYZ (ColorCIEXYZ wp)
 		{
 			ColorCIEXYZ xyz;
-			cmsLab2XYZ (ref wp, out xyz, ref this);
+			NativeMethods.CmsLab2XYZ (ref wp, out xyz, ref this);
 
 			return xyz;
 		}
@@ -278,13 +222,10 @@
 		public double C;
 		public double h;
 		
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsLCh2Lab (out ColorCIELab lab, ref ColorCIELCh lch);
-		
 		public ColorCIELab ToLab ()
 		{
 			ColorCIELab lab;
-			cmsLCh2Lab (out lab, ref this);
+			NativeMethods.CmsLCh2Lab (out lab, ref this);
 
 			return lab;
 		}
@@ -329,12 +270,9 @@
 //			public ushort StartOfData;  // ushort array Count entries long
 //		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern IntPtr cmsBuildGamma (int entry_count, double gamma);
-
 		public GammaTable (int count, double gamma)
 		{
-			handle = new HandleRef (this, cmsBuildGamma (count, gamma));
+			handle = new HandleRef (this, NativeMethods.CmsBuildGamma (count, gamma));
 		}
 
 		/*
@@ -368,40 +306,25 @@
 		*/
 
 		// FIXME type should be an enum
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern IntPtr cmsBuildParametricGamma (int entry_count, int type, double [] values);
-		
 		public GammaTable (int entry_count, int type, double [] values)
 		{
-			handle = new HandleRef (this, cmsBuildParametricGamma (entry_count, type, values));
+			handle = new HandleRef (this, NativeMethods.CmsBuildParametricGamma (entry_count, type, values));
 		}
 		
 
-//		[DllImport("liblcms-1.0.0.dll")]
-//		static extern IntPtr cmsAllocGamma (int entry_count);
-
-		[DllImport ("libfspot")]
-		static extern IntPtr f_cms_gamma_table_new (ushort [] values, int start, int length);
-
-		[DllImport ("libfspot")]
-		static extern IntPtr f_cms_gamma_table_get_values (HandleRef table);
-
-		[DllImport ("libfspot")]
-		static extern int f_cms_gamma_table_get_count (HandleRef table);
-
 		public GammaTable (ushort [] values) : this (values, 0, values.Length)
 		{
 		}
 
 		public int Count {
 			get {
-				return f_cms_gamma_table_get_count (handle);
+				return NativeMethods.f_cms_gamma_table_get_count (handle);
 			}
 		}
 
 		public IntPtr Values {
 			get {
-				return f_cms_gamma_table_get_values (handle);
+				return NativeMethods.f_cms_gamma_table_get_values (handle);
 			}
 		}
 
@@ -436,7 +359,7 @@
 		public GammaTable (ushort [] values, int start_offset, int length)
 		{
 #if true
-			handle = new HandleRef (this, f_cms_gamma_table_new (values, start_offset, length));
+			handle = new HandleRef (this, NativeMethods.f_cms_gamma_table_new (values, start_offset, length));
 			//System.Console.WriteLine ("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXhandle = {0}", handle.Handle);
 #else
 			handle = new HandleRef (this, cmsAllocGamma (length));
@@ -446,12 +369,9 @@
 #endif
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsFreeGamma (HandleRef handle);
-		
 		protected virtual void Cleanup ()
 		{
-			cmsFreeGamma (handle);
+			NativeMethods.CmsFreeGamma (handle);
 		}
 		
 		public void Dispose ()
@@ -464,23 +384,6 @@
 		{
 			Cleanup ();
 		}
-
-
-#if ENABLE_NUNIT
-		[TestFixture]
-		public class Tests {
-			[Test]
-			public void TestAlloc ()
-			{
-				ushort [] values = new ushort [] { 0, 0x00ff, 0xffff };
-				GammaTable t = new GammaTable (values);
-				for (int i = 0; i < values.Length; i++) {
-					Assert.AreEqual (t[i], values [i]);
-				}
-			} 
-		}
-#endif 
-
 	}
 	
 	public class Transform : IDisposable {
@@ -491,14 +394,6 @@
 			}
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern IntPtr cmsCreateMultiprofileTransform (HandleRef [] hProfiles,
-								     int nProfiles,
-								     Format InputFormat,
-								     Format OutputFormat,
-								     int Intent,
-								     uint dwFlags);
-
 		public Transform (Profile [] profiles,
 				  Format input_format,
 				  Format output_format,
@@ -509,41 +404,27 @@
 				handles [i] = profiles [i].Handle;
 			}
 			
-			this.handle = new HandleRef (this, cmsCreateMultiprofileTransform (handles, handles.Length, 
+			this.handle = new HandleRef (this, NativeMethods.CmsCreateMultiprofileTransform (handles, handles.Length, 
 											   input_format,
 											   output_format, 
 											   (int)intent, flags));
 		}
 		
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern IntPtr cmsCreateTransform(HandleRef Input,
-							Format InputFormat,
-							HandleRef Output,
-							Format OutputFormat,
-							int Intent,
-							uint dwFlags);
-
 		public Transform (Profile input, Format input_format,
 				  Profile output, Format output_format,
 				  Intent intent, uint flags)
 		{
-			this.handle = new HandleRef (this, cmsCreateTransform (input.Handle, input_format,
+			this.handle = new HandleRef (this, NativeMethods.CmsCreateTransform (input.Handle, input_format,
 									       output.Handle, output_format,
 									       (int)intent, flags));
 		}
 		
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsDoTransform (HandleRef hTransform, IntPtr InputBuffer, IntPtr OutputBuffer, uint size);
-		
 		// Fixme this should probably be more type stafe 
 		public void Apply (IntPtr input, IntPtr output, uint size)
 		{
-			cmsDoTransform (Handle, input, output, size);
+			NativeMethods.CmsDoTransform (Handle, input, output, size);
 		}
 		
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern void cmsDeleteTransform(HandleRef hTransform);
-		
 		public void Dispose () 
 		{
 			Cleanup ();
@@ -552,7 +433,7 @@
 		
 		protected virtual void Cleanup ()
 		{
-			cmsDeleteTransform (this.handle);
+			NativeMethods.CmsDeleteTransform (this.handle);
 		}
 		
 		~Transform () 
@@ -829,62 +710,62 @@
 				this.handle = new HandleRef (this, profileh);
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		extern static bool cmsTakeMediaWhitePoint (out ColorCIEXYZ wp, HandleRef handle);
+		[DllImport("liblcms-1.0.0.dll", EntryPoint = "cmsTakeMediaWhitePoint")]
+		extern static bool CmsTakeMediaWhitePoint (out ColorCIEXYZ wp, HandleRef handle);
 		
 		public ColorCIEXYZ MediaWhitePoint {
 			get {
 				ColorCIEXYZ wp;
-				if (!cmsTakeMediaWhitePoint (out wp, handle))
+				if (!CmsTakeMediaWhitePoint (out wp, handle))
 					throw new ApplicationException ("unable to retrieve white point from profile");
 				return wp;
 			}
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		extern static bool cmsTakeMediaBlackPoint (out ColorCIEXYZ black, HandleRef handle);
+		[DllImport("liblcms-1.0.0.dll", EntryPoint = "cmsTakeMediaBlackPoint")]
+		extern static bool CmsTakeMediaBlackPoint (out ColorCIEXYZ black, HandleRef handle);
 		
 		public ColorCIEXYZ MediaBlackPoint {
 			get {
 				ColorCIEXYZ black;
-				if (!cmsTakeMediaBlackPoint (out black, handle))
+				if (!CmsTakeMediaBlackPoint (out black, handle))
 					throw new ApplicationException ("unable to retrieve white point from profile");
 				
 				return black;
 			}
 		}
 		
-		[DllImport("liblcms-1.0.0.dll")]
-		extern static bool cmsTakeColorants (out ColorCIEXYZTriple colors, HandleRef handle);
+		[DllImport("liblcms-1.0.0.dll", EntryPoint = "cmsTakeColorants")]
+		extern static bool CmsTakeColorants (out ColorCIEXYZTriple colors, HandleRef handle);
 
 		public ColorCIEXYZTriple Colorants {
 			get {
 				ColorCIEXYZTriple colors;
-				if (! cmsTakeColorants (out colors, handle))
+				if (! CmsTakeColorants (out colors, handle))
 					throw new ApplicationException ("Unable to retrieve profile colorants");
 				
 				return colors;
 			}				
 		}
 		
-		[DllImport("liblcms-1.0.0.dll")]
-		extern static IntPtr cmsTakeModel (HandleRef handle);
+		[DllImport("liblcms-1.0.0.dll", EntryPoint = "cmsTakeModel")]
+		extern static IntPtr CmsTakeModel (HandleRef handle);
 		
 		public string Model {
 			get {
 				lock (srgb) {
-					return Marshal.PtrToStringAnsi (cmsTakeModel (handle));
+					return Marshal.PtrToStringAnsi (CmsTakeModel (handle));
 				}
 			}
 		}
 
-		[DllImport("liblcms-1.0.0.dll")]
-		extern static IntPtr cmsTakeProductName (HandleRef handle);
+		[DllImport("liblcms-1.0.0.dll", EntryPoint = "cmsTakeProductName")]
+		extern static IntPtr CmsTakeProductName (HandleRef handle);
 
 		public string ProductName {
 			get {
 				lock (srgb) {
-					return Marshal.PtrToStringAnsi (cmsTakeProductName (handle));
+					return Marshal.PtrToStringAnsi (CmsTakeProductName (handle));
 				}
 			}
 		}
@@ -942,22 +823,6 @@
 			Cleanup ();
 		}
 
-#if ENABLE_NUNIT
-		[TestFixture]
-		public class Tests {
-			[Test]
-			public void LoadSave ()
-			{
-				Profile srgb = CreateStandardRgb ();
-				byte [] data = srgb.Save ();
-				Assert.IsNotNull (data);
-				Profile result = new Profile (data);
-				Assert.AreEqual (result.ProductName, srgb.ProductName);
-				Assert.AreEqual (result.ProductDescription, srgb.ProductDescription);
-				Assert.AreEqual (result.Model, srgb.Model);
-			}
-		}
-#endif 		
 	}
 
 	public class SaveException : System.Exception {

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue May 20 14:11:31 2008
@@ -5,7 +5,8 @@
 
 CMS_CSDISTFILES =				\
 	$(srcdir)/Cms/Cms.cs			\
-	$(srcdir)/Cms/CctTable.cs
+	$(srcdir)/Cms/CctTable.cs		\
+	$(srcdir)/Cms/NativeMethods.cs
 
 CORE_CSDISTFILES =				\
 	$(srcdir)/Core/Animator.cs		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]