X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/c379590ec9f52576afcb723d29dba19cd42fc62a..82f3b33c68792b4a7c0a3f45a1720f365e61dbf6:/gdk/pixbuf.lisp?ds=sidebyside

diff --git a/gdk/pixbuf.lisp b/gdk/pixbuf.lisp
index f0598ef..47ec7aa 100644
--- a/gdk/pixbuf.lisp
+++ b/gdk/pixbuf.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: pixbuf.lisp,v 1.5 2006-06-07 13:18:20 espen Exp $
+;; $Id: pixbuf.lisp,v 1.7 2008-04-11 19:47:39 espen Exp $
 
 
 (in-package "GDK")
@@ -31,13 +31,13 @@
 
 (defbinding %pixbuf-new-from-file () (referenced pixbuf)
   (filename pathname)
-  (nil gerror :out))
+  (nil (or null gerror) :out))
 
 (defbinding %pixbuf-new-from-file-at-size () (referenced pixbuf)
   (filename pathname)
   (width int)
   (height int)
-  (nil gerror :out))
+  (nil (or null gerror) :out))
 
 #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
 (defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
@@ -45,7 +45,7 @@
   (width int)
   (height int)
   (preserve-aspect-ratio boolean)
-  (nil gerror :out))
+  (nil (or null gerror) :out))
 
 (defun pixbuf-load (filename &key width height size (preserve-aspect-ratio t))
   #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
@@ -82,14 +82,15 @@
   (filename pathname)
   (type string)
   (keys strings)
-  (values string)
-  (nil gerror :out))
+  (values strings)
+  (nil (or null gerror) :out))
 
 (defun pixbuf-save (pixbuf filename type &rest options)
   (let ((keys (make-array 0 :adjustable t :fill-pointer t))
 	(values (make-array 0 :adjustable t :fill-pointer t)))
     (loop 
      as (key value . rest) = options then rest
+     while key
      do (vector-push-extend (string-downcase key) keys)
         (vector-push-extend 
 	 (etypecase value 
@@ -98,7 +99,7 @@
 	   (number (format nil "~A" value)))
 	 values))
     (multiple-value-bind (ok-p gerror)
-	(%pixbuf-savev pixbuf filename type keys values)
+	(%pixbuf-savev pixbuf filename (string-downcase type) keys values)
       (unless ok-p
 	(signal-gerror gerror)))))
 
@@ -117,7 +118,7 @@
       (%pixbuf-copy pixbuf)
     (%pixbuf-new-subpixbuf pixbuf x y width height)))
 
-(defbinding %pixbuf-get-from-drawable () (referenced pixbuf)
+(defbinding %pixbuf-get-from-drawable () (or null (referenced pixbuf))
   (dest (or null pixbuf))
   (drawable drawable)
   (colormap (or null colormap))