Skip to content

Commit

Permalink
Merge pull request #666 from mhutch/cairo-fix-3.0
Browse files Browse the repository at this point in the history
Mono.Cairo improvements
  • Loading branch information
migueldeicaza committed Jun 20, 2013
2 parents 1065fe4 + 86b0767 commit 60834f6
Show file tree
Hide file tree
Showing 30 changed files with 1,483 additions and 947 deletions.
6 changes: 6 additions & 0 deletions mcs/class/Mono.Cairo/Mono.Cairo.dll.sources
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
../../build/common/Locale.cs
./Mono.Cairo/Antialias.cs
./Mono.Cairo/Cairo.cs
./Mono.Cairo/CairoDebug.cs
./Mono.Cairo/Color.cs
./Mono.Cairo/Content.cs
./Mono.Cairo/Context.cs
./Mono.Cairo/DirectFBSurface.cs
./Mono.Cairo/Distance.cs
./Mono.Cairo/Extend.cs
./Mono.Cairo/FillRule.cs
./Mono.Cairo/Filter.cs
Expand All @@ -32,9 +35,12 @@
./Mono.Cairo/Pattern.cs
./Mono.Cairo/PatternType.cs
./Mono.Cairo/PdfSurface.cs
./Mono.Cairo/Point.cs
./Mono.Cairo/PointD.cs
./Mono.Cairo/PSSurface.cs
./Mono.Cairo/RadialGradient.cs
./Mono.Cairo/Rectangle.cs
./Mono.Cairo/Region.cs
./Mono.Cairo/ScaledFont.cs
./Mono.Cairo/SolidPattern.cs
./Mono.Cairo/Status.cs
Expand Down
79 changes: 79 additions & 0 deletions mcs/class/Mono.Cairo/Mono.Cairo/CairoDebug.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
//
// CairoDebug.cs
//
// Author:
// Michael Hutchinson (mhutch@xamarin.com)
//
// Copyright (C) 2013 Xamarin Inc. (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

using System;

namespace Cairo {

static class CairoDebug
{
static System.Collections.Generic.Dictionary<IntPtr,string> traces;

public static readonly bool Enabled;

static CairoDebug ()
{
var dbg = Environment.GetEnvironmentVariable ("MONO_CAIRO_DEBUG_DISPOSE");
if (dbg == null)
return;
Enabled = true;
traces = new System.Collections.Generic.Dictionary<IntPtr,string> ();
}

public static void OnAllocated (IntPtr obj)
{
if (!Enabled)
throw new InvalidOperationException ();

traces[obj] = Environment.StackTrace;
}

public static void OnDisposed<T> (IntPtr obj, bool disposing)
{
if (disposing && !Enabled)
throw new InvalidOperationException ();

if (!disposing) {
Console.Error.WriteLine ("{0} is leaking, programmer is missing a call to Dispose", typeof(T).FullName);
if (Enabled) {
string val;
if (traces.TryGetValue (obj, out val)) {
Console.Error.WriteLine ("Allocated from:");
Console.Error.WriteLine (val);
}
} else {
Console.Error.WriteLine ("Set MONO_CAIRO_DEBUG_DISPOSE to track allocation traces");
}
}

if (Enabled)
traces.Remove (obj);
}
}

}
75 changes: 75 additions & 0 deletions mcs/class/Mono.Cairo/Mono.Cairo/Color.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
//
// Mono.Cairo.Context.cs
//
// Author:
// Duncan Mak (duncan@ximian.com)
// Miguel de Icaza (miguel@novell.com)
// Hisham Mardam Bey (hisham.mardambey@gmail.com)
// Alp Toker (alp@atoker.com)
//
// (C) Ximian Inc, 2003.
// (C) Novell Inc, 2003.
//
// This is an OO wrapper API for the Cairo API.
//
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

namespace Cairo {

public struct Color
{
public Color(double r, double g, double b) : this (r, g, b, 1.0)
{
}

public Color(double r, double g, double b, double a)
{
this.r = r;
this.g = g;
this.b = b;
this.a = a;
}

double r, g, b, a;

public double R {
get { return r; }
set { r = value; }
}

public double G {
get { return g; }
set { g = value; }
}

public double B {
get { return b; }
set { b = value; }
}

public double A {
get { return a; }
set { a = value; }
}
}
}
Loading

0 comments on commit 60834f6

Please sign in to comment.