[cl-jpeg-cvs] CVS cljl

[charmon]

Update of /project/cl-jpeg/cvsroot/cljl
In directory cl-net:/tmp/cvs-serv19139

Modified Files:
	cl-jpeg.asd jpeg.lisp 
Log Message:
put reader conditionals in minus macro instead of at call site and make abcl use - instead of fixnum'ized -


--- /project/cl-jpeg/cvsroot/cljl/cl-jpeg.asd	2011/03/14 21:44:58	1.3
+++ /project/cl-jpeg/cvsroot/cljl/cl-jpeg.asd	2011/03/14 22:49:00	1.4
@@ -2,7 +2,7 @@
 
 (asdf:defsystem :cl-jpeg
   :name "cl-jpeg"
-  :version 1.024
+  :version 1.025
   :licence "BSD"
   :components ((:file "jpeg")))
 
--- /project/cl-jpeg/cvsroot/cljl/jpeg.lisp	2011/03/14 21:44:58	1.5
+++ /project/cl-jpeg/cvsroot/cljl/jpeg.lisp	2011/03/14 22:49:00	1.6
@@ -1,6 +1,6 @@
 ;;  -*- Mode: LISP; Package: (JPEG :use (common-lisp)) -*-
 ;;; Generic Common Lisp JPEG encoder/decoder implementation
-;;; $Id: jpeg.lisp,v 1.5 2011/03/14 21:44:58 charmon Exp $
+;;; $Id: jpeg.lisp,v 1.6 2011/03/14 22:49:00 charmon Exp $
 ;;; Version 1.023, May 2008
 ;;; Written by Eugene Zaikonnikov [viking at funcall.org]
 ;;; Copyright [c] 1999, Eugene Zaikonnikov <viking at funcall.org>
@@ -85,6 +85,9 @@
   `(the fixnum (+ (the fixnum ,a) (the fixnum ,b))))
 
 (defmacro minus (a b)
+  #+(or clisp abcl)
+  `(- ,a ,b)
+  #-(or clisp abcl)
   `(the fixnum (- (the fixnum ,a) (the fixnum ,b))))
 
 (defmacro mul (a b)
@@ -268,7 +271,7 @@
               (loop for row across *q-luminance* do
                     (loop for q-coef fixnum across row
                           maximize (round (random 128) q-coef))))
-        (#+clisp - #-clisp minus (get-internal-run-time) time1))
+        (minus (get-internal-run-time) time1))
       (let ((time1 (get-internal-run-time)))
         (loop for i fixnum from 1 to 3000 do
               (loop for q-row across *q-luminance* do
@@ -292,7 +295,7 @@
                                      2)))
                                 (t
                                  (round val qc))))))
-                    (#+clisp - #-clisp minus (get-internal-run-time) time1))))
+                    (minus (get-internal-run-time) time1))))
 (format t "Done.~%")
 (finish-output)
 )