From: Julian Squires <julian@cipht.net>
Date: Wed, 13 May 2009 21:42:51 +0000 (-0400)
Subject: Added DETERMINE-TYPE; exported ENABLED-P.
X-Git-Url: https://repo.or.cz/w/cl-devil.git/commitdiff_plain/eda6f192738a92f6ee3ee7876b2a0b841afa3185

Added DETERMINE-TYPE; exported ENABLED-P.
---

diff --git a/cl-devil.asd b/cl-devil.asd
index f3e1a3e..11f6460 100644
--- a/cl-devil.asd
+++ b/cl-devil.asd
@@ -10,6 +10,6 @@
     ((:file "package")
      (:file "il" :depends-on ("package"))
      #+(or)(:file "ilu" :depends-on ("package" "il"))
-     ;;(:file "ilut" :depends-on ("package" "il"))
+     (:file "ilut" :depends-on ("package" "il"))
      (:file "utilities" :depends-on ("package" "il"))))
 
diff --git a/il.lisp b/il.lisp
index 61d200a..c31d3f7 100644
--- a/il.lisp
+++ b/il.lisp
@@ -93,9 +93,14 @@
   (:lib-mng-error #x05E5)
   (:unknown-error #x05FF))
                         
-(defcenum mode                          ; there are some awfully
-  (:version-num #x0DE2)                 ; non-descript names in
-  (:image-width #x0DE4)                 ; DevIL...
+(defcenum mode
+  (:file-overwrite #x0620)
+  (:file-mode #x0621)
+  (:conv-pal #x0630)
+  (:use-key-color #x0635)
+  (:png-alpha-index #x0724)
+  (:version-num #x0DE2)
+  (:image-width #x0DE4)
   (:image-height #x0DE5)
   (:image-depth #x0DE6)
   (:image-size-of-data #x0DE7)
@@ -123,9 +128,7 @@
   (:image-offy #x0DFC)
   (:image-cubeflags #x0DFD)
   (:image-origin #x0DFE)
-  (:image-channels #x0DFF)
-  (:use-key-color #x0635)
-  (:png-alpha-index #x0724))
+  (:image-channels #x0DFF))
 
 (define-foreign-type pathname-string-type ()
   ()
@@ -173,3 +176,5 @@
 
 (defcfun ("ilConvertImage" convert-image) :boolean (format data-format) (type data-type))
 (defcfun ("ilFlipImage" flip-image) :boolean)
+
+(defcfun ("ilDetermineType" determine-type) image-type (pathname pathname-string))
\ No newline at end of file
diff --git a/package.lisp b/package.lisp
index a77f8c4..af0c509 100644
--- a/package.lisp
+++ b/package.lisp
@@ -16,8 +16,10 @@
    #:COPY-IMAGE
    #:COPY-PIXELS
    #:DELETE-IMAGES
+   #:DETERMINE-TYPE
    #:DISABLE
    #:ENABLE
+   #:ENABLED-P
    #:FLIP-IMAGE
    #:GEN-IMAGES
    #:GET-DATA