X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/43e8a182b5a4b41d3b5bb063cecb15d12ae3964b..1f091d0115dbcf40f1d01b14ffcdd8d76cd92a44:/gdk/pixbuf.lisp

diff --git a/gdk/pixbuf.lisp b/gdk/pixbuf.lisp
index 143567e..334bb9d 100644
--- a/gdk/pixbuf.lisp
+++ b/gdk/pixbuf.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2004 Espen S. Johnsen <espen@users.sf.net>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2004-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; 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:
 ;;
-;; This library 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.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; 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.
 
-;; $Id: pixbuf.lisp,v 1.1 2004-12-28 20:26:01 espen Exp $
+;; $Id: pixbuf.lisp,v 1.3 2005-04-23 16:48:50 espen Exp $
 
 
 (in-package "GDK")
@@ -26,13 +31,13 @@
 
 (defbinding %pixbuf-new-from-file () (referenced pixbuf)
   (filename pathname)
-  (nil null))
+  (nil gerror :out))
 
 (defbinding %pixbuf-new-from-file-at-size () (referenced pixbuf)
   (filename pathname)
   (width int)
   (height int)
-  (nil null))
+  (nil gerror :out))
 
 #+gtk2.6
 (defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
@@ -40,23 +45,27 @@
   (width int)
   (height int)
   (preserve-aspect-ratio boolean)
-  (nil null))
+  (nil gerror :out))
 
 (defun pixbuf-load (filename &key width height size (preserve-aspect-ratio t))
   #-gtk2.6
   (unless preserve-aspect-ratio 
     (warn ":preserve-aspect-ratio not supported with this version of Gtk"))
 
-  (cond
-   (size 
-    #-gtk2.6(%pixbuf-new-from-file-at-size filename size size)
-    #+gtk2.6(%pixbuf-new-from-file-at-scale filename size size preserve-aspect-ratio))
-   ((and width height)
-    #-gtk2.6(%pixbuf-new-from-file-at-size filename width height)
-    #+gtk2.6(%pixbuf-new-from-file-at-scale filename width height preserve-aspect-ratio))
-   ((or width height)
-    (error "Both :width and :height must be specified"))
-   ((%pixbuf-new-from-file filename))))
+  (multiple-value-bind (pixbuf gerror)
+      (cond
+       (size 
+	#-gtk2.6(%pixbuf-new-from-file-at-size filename size size)
+	#+gtk2.6(%pixbuf-new-from-file-at-scale filename size size preserve-aspect-ratio))
+       ((and width height)
+	#-gtk2.6(%pixbuf-new-from-file-at-size filename width height)
+	#+gtk2.6(%pixbuf-new-from-file-at-scale filename width height preserve-aspect-ratio))
+       ((or width height)
+	(error "Both :width and :height must be specified"))
+       (t (%pixbuf-new-from-file filename)))
+    (if gerror
+	(signal-gerror gerror)
+      pixbuf)))
 
 
 ;; (defbinding pixbuf-get-file-info () (copy-of pixbuf-format)
@@ -68,9 +77,9 @@
   (pixbuf pixbuf)
   (filename pathname)
   (type string)
-  (keys (vector (or null string)))
-  (values (vector (or null string)))
-  (nil null))
+  (keys strings)
+  (values string)
+  (nil gerror :out))
 
 (defun pixbuf-save (pixbuf filename type &rest options)
   (let ((keys (make-array 0 :adjustable t :fill-pointer t))
@@ -84,9 +93,10 @@
 	   (symbol (string-downcase value))
 	   (number (format nil "~A" value)))
 	 values))
-    (vector-push-extend nil keys)
-    (vector-push-extend nil values)
-    (%pixbuf-savev pixbuf filename type keys values)))
+    (multiple-value-bind (ok-p gerror)
+	(%pixbuf-savev pixbuf filename type keys values)
+      (unless ok-p
+	(signal-gerror gerror)))))
 
 (defbinding pixbuf-new-from-xpm-data () (referenced pixbuf)
   (data (vector string)))