* rsvg/Pixbuf.custom: new custom file

* rsvg/Makefile.am: add Pixbuf.custom to build
        * rsvg/Tool.cs: remove double ; that cause warnings
        * rsvg/rsvg-sharp.pc.in: add Requires: gtk-sharp art-sharp

svn path=/trunk/gtk-sharp/; revision=32792

ChangeLog

@@ -3,6 +3,10 @@
 	* gtk/Makefile.am: add Menu.custom
 	* gtk/Menu.custom: new custom for Popup () overload
 	[Fixes #60668]
+	* rsvg/Pixbuf.custom: new custom file
+	* rsvg/Makefile.am: add Pixbuf.custom to build
+	* rsvg/Tool.cs: remove double ; that cause warnings
+	* rsvg/rsvg-sharp.pc.in: add Requires: gtk-sharp art-sharp
 
 2004-08-24  Larry Ewing  <lewing@ximian.com>
 

rsvg/Makefile.am

@@ -28,7 +28,7 @@ sources =			\
 
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
 
-customs =
+customs = Pixbuf.custom
 
 build_customs = $(addprefix $(srcdir)/, $(customs))
 

rsvg/Pixbuf.custom

@@ -0,0 +1,45 @@
+// Rsvg.Pixbuf.custom - Rsvg Pixbuf class customizations
+//
+// Author: John Luke  <jluke@cfl.rr.com>
+//
+// Copyright (C) 2004 Novell, Inc.
+//
+// This code is inserted after the automatically generated code.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+	public static Gdk.Pixbuf LoadFromResource (string resource)
+	{
+		if (resource == null)
+			throw new ArgumentNullException ("resource");
+		
+		System.IO.Stream s = System.Reflection.Assembly.GetCallingAssembly ().GetManifestResourceStream (resource);
+		if (s == null)
+			throw new ArgumentException ("resource must be a valid resource name of 'assembly'.");
+
+		return LoadFromStream (s);
+	}
+
+	public static Gdk.Pixbuf LoadFromStream (System.IO.Stream input)
+	{
+		Handle loader = new Handle ();
+		byte [] buffer = new byte [8192];
+		int n;                                                                                 
+		while ((n = input.Read (buffer, 0, 8192)) != 0)
+			loader.Write (buffer, (uint) n);
+                                                                                
+		loader.Close ();
+		return loader.Pixbuf;
+	}

rsvg/Rsvg.metadata

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
 <metadata>
+  <!-- mark parameter as an array -->
   <attr path="/api/namespace/struct[@cname='RsvgHandle']/method[@name='Write']/*/*[@name='buf']" name="array">1</attr>
 </metadata>

rsvg/Tool.cs

@@ -101,7 +101,7 @@
                     System.IntPtr raw_pixbuf = rsvg_pixbuf_from_file_at_zoom(file_name, x_zoom, y_zoom, out error);
 
                     if (System.IntPtr.Zero != error) {
-                        throw new GLib.GException( error );;
+                        throw new GLib.GException( error );
                     } else {
                         return new Gdk.Pixbuf( raw_pixbuf );
                     }
@@ -114,7 +114,7 @@
                     System.IntPtr raw_pixbuf = rsvg_pixbuf_from_file_at_size(file_name, width, height, out error);
 
                     if (System.IntPtr.Zero != error) {
-                        throw new GLib.GException( error );;
+                        throw new GLib.GException( error );
                     } else {
                         return new Gdk.Pixbuf( raw_pixbuf );
                     }
@@ -127,7 +127,7 @@
                     System.IntPtr raw_pixbuf = rsvg_pixbuf_from_file_at_max_size(file_name, max_width, max_height, out error);
 
                     if (System.IntPtr.Zero != error) {
-                        throw new GLib.GException( error );;
+                        throw new GLib.GException( error );
                     } else {
                         return new Gdk.Pixbuf( raw_pixbuf );
                     }
@@ -140,7 +140,7 @@
                     System.IntPtr raw_pixbuf = rsvg_pixbuf_from_file_at_zoom_with_max(file_name, x_zoom, y_zoom, max_width, max_height, out error);
 
                     if (System.IntPtr.Zero != error) {
-                        throw new GLib.GException( error );;
+                        throw new GLib.GException( error );
                     } else {
                         return new Gdk.Pixbuf( raw_pixbuf );
                     }

rsvg/rsvg-sharp.pc.in

@@ -6,4 +6,5 @@ libdir=${exec_prefix}/lib
 Name: Rsvg#
 Description: Rsvg# - librsvg .NET Binding
 Version: @VERSION@
+Requires: gtk-sharp art-sharp
 Libs: -r:${libdir}/mono/@PACKAGE@/rsvg-sharp.dll