[mcclim-cvs] CVS mcclim/Extensions/Bitmap-formats

[thenriksen]

Update of /project/mcclim/cvsroot/mcclim/Extensions/Bitmap-formats
In directory clnet:/tmp/cvs-serv15385/Extensions/Bitmap-formats

Added Files:
	gif.lisp jpeg.lisp 
Log Message:
Converted MCCLIM-IMAGES to CLIM 2.2 bitmap functions (with extensions).

Includes new demo application.



--- /project/mcclim/cvsroot/mcclim/Extensions/Bitmap-formats/gif.lisp	2008/04/14 16:46:30	NONE
+++ /project/mcclim/cvsroot/mcclim/Extensions/Bitmap-formats/gif.lisp	2008/04/14 16:46:30	1.1
;;; -*- Mode: Lisp; Package: MCCLIM-IMAGES -*-

;;;  (c) copyright 2008 by
;;;           Troels Henriksen (athas at sigkill.dk)

;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Library General Public
;;; License as published by the Free Software Foundation; either
;;; version 2 of the License, or (at your option) any later version.
;;;
;;; 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
;;; Library General Public License for more details.
;;;
;;; You should have received a copy of the GNU Library 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.

(in-package :clim-internals)

(define-bitmap-file-reader :gif (image-pathname)
  (let* ((data-stream (skippy:load-data-stream image-pathname))
         (first-image (aref (skippy:images data-stream) 0))
         (image-height (skippy:height first-image))
         (image-width (skippy:width first-image))
         (pattern-array (make-array (list image-height image-width)))
         (designs (coerce (loop with color-table = (skippy:color-table data-stream)
                                with transparency-index = (skippy:transparency-index first-image)
                                for i below (skippy:color-table-size color-table)
                                when (and transparency-index (= i transparency-index))
                                collect +transparent-ink+
                                else collect
                                (multiple-value-bind (r g b) 
                                    (skippy:color-rgb (skippy:color-table-entry color-table i))
                                  (make-rgb-color (/ r 255) (/ g 255) (/ b 255))))
                          'vector)))
    (dotimes (y image-height)
      (dotimes (x image-width)
        (setf (aref pattern-array y x) (skippy:pixel-ref first-image x y))))
    (values pattern-array designs)))
--- /project/mcclim/cvsroot/mcclim/Extensions/Bitmap-formats/jpeg.lisp	2008/04/14 16:46:30	NONE
+++ /project/mcclim/cvsroot/mcclim/Extensions/Bitmap-formats/jpeg.lisp	2008/04/14 16:46:30	1.1
;;; -*- Mode: Lisp; Package: MCCLIM-IMAGES -*-

;;;  (c) copyright 2008
;;;           Eric Marsden
;;;  (c) copyright 2008 by
;;;           Troels Henriksen (athas at sigkill.dk)

;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Library General Public
;;; License as published by the Free Software Foundation; either
;;; version 2 of the License, or (at your option) any later version.
;;;
;;; 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
;;; Library General Public License for more details.
;;;
;;; You should have received a copy of the GNU Library 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.

(in-package :clim-internals)

(define-bitmap-file-reader :jpeg (pathname)
  (with-open-file (stream pathname :direction :input)
    (multiple-value-bind (rgb height width)
        (jpeg::decode-image stream)
      (let* ((array (make-array (list height width)
                     :element-type '(unsigned-byte 32))))
        (dotimes (x width)
          (dotimes (y height)
            (let ((blue (aref rgb (+ (* x 3) (* y width 3))))
                  (green (aref rgb (+ (* x 3) (* y width 3) 1)))
                  (red (aref rgb (+ (* x 3) (* y width 3) 2))))
              (setf (aref array y x)
                    (dpb red (byte 8 0)
                         (dpb green (byte 8 8)
                              (dpb blue (byte 8 16)
                                   (dpb (- 255 0) (byte 8 24) 0))))))))
        array))))

(define-bitmap-file-reader :jpg (pathname)
  (read-bitmap-file pathname :format :jpeg))