From 7af9207daa872c8a0a1c71c4a81a91fc0ee1c025 Mon Sep 17 00:00:00 2001 From: Pieter Slabbert Date: Fri, 23 Aug 2013 17:49:52 +0200 Subject: Add (ice-9 format) module to imports for freeimage and ftgl freeimage.scm and ftgl.scm were throwing warnings when running make about a unsupported format option GEN 2d/wrappers/freeimage.go 2d/wrappers/freeimage.scm:120:6: warning: "": unsupported format option ~x, use (ice-9 format) instead wrote `2d/wrappers/freeimage.go' GEN 2d/wrappers/ftgl.go 2d/wrappers/ftgl.scm:62:6: warning: "": unsupported format option ~x, use (ice-9 format) instead 2d/wrappers/ftgl.scm:100:6: warning: "": unsupported format option ~x, use (ice-9 format) instead wrote `2d/wrappers/ftgl.go' GEN 2d/wrappers/gl.go wrote `2d/wrappers/gl.go' adding the modules to the module definition of each file fixes it --- 2d/wrappers/freeimage.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '2d/wrappers/freeimage.scm') diff --git a/2d/wrappers/freeimage.scm b/2d/wrappers/freeimage.scm index 3192dbb..b29e950 100644 --- a/2d/wrappers/freeimage.scm +++ b/2d/wrappers/freeimage.scm @@ -23,7 +23,8 @@ (define-module (2d wrappers freeimage) #:use-module (system foreign) - #:use-module (2d wrappers util)) + #:use-module (2d wrappers util) + #:use-module (ice-9 format)) (define libfreeimage (dynamic-link "libfreeimage")) -- cgit v1.2.3 From 0a4da8e7193cb82c6b188de19bb0ba616a912de4 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 24 Aug 2013 15:33:04 -0400 Subject: Tidy up freeimage module. --- 2d/wrappers/freeimage.scm | 57 ++++++++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 21 deletions(-) (limited to '2d/wrappers/freeimage.scm') diff --git a/2d/wrappers/freeimage.scm b/2d/wrappers/freeimage.scm index b29e950..964eff7 100644 --- a/2d/wrappers/freeimage.scm +++ b/2d/wrappers/freeimage.scm @@ -84,7 +84,8 @@ ;;; General functions ;;; -(define-foreign %freeimage-get-version '* "FreeImage_GetVersion" '()) +(define-foreign %freeimage-get-version + '* "FreeImage_GetVersion" '()) (define-foreign %freeimage-set-output-message void "FreeImage_SetOutputMessage" '(*)) @@ -125,8 +126,10 @@ (%freeimage-get-height bitmap) (%freeimage-get-bpp bitmap))))) -(define-foreign %freeimage-load '* "FreeImage_Load" (list unsigned-int '* unsigned-int)) -(define-foreign %freeimage-unload void "FreeImage_Unload" '(*)) +(define-foreign %freeimage-load + '* "FreeImage_Load" (list unsigned-int '* unsigned-int)) +(define-foreign %freeimage-unload + void "FreeImage_Unload" '(*)) (define (freeimage-load image-format filename) (wrap-freeimage-bitmap @@ -135,22 +138,33 @@ (define (freeimage-unload bitmap) (%freeimage-unload (unwrap-freeimage-bitmap bitmap))) -(export freeimage-load +(export + freeimage-bitmap? + freeimage-load freeimage-unload) ;;; ;;; Bitmap information functions ;;; -(define-foreign %freeimage-get-image-type unsigned-int "FreeImage_GetImageType" '(*)) -(define-foreign %freeimage-get-bpp unsigned-int "FreeImage_GetBPP" '(*)) -(define-foreign %freeimage-get-width unsigned-int "FreeImage_GetWidth" '(*)) -(define-foreign %freeimage-get-height unsigned-int "FreeImage_GetHeight" '(*)) -(define-foreign %freeimage-get-pitch unsigned-int "FreeImage_GetPitch" '(*)) -(define-foreign %freeimage-get-red-mask unsigned-int "FreeImage_GetRedMask" '(*)) -(define-foreign %freeimage-get-green-mask unsigned-int "FreeImage_GetGreenMask" '(*)) -(define-foreign %freeimage-get-blue-mask unsigned-int "FreeImage_GetBlueMask" '(*)) -(define-foreign %freeimage-has-pixels unsigned-int "FreeImage_HasPixels" '(*)) +(define-foreign %freeimage-get-image-type + unsigned-int "FreeImage_GetImageType" '(*)) +(define-foreign %freeimage-get-bpp + unsigned-int "FreeImage_GetBPP" '(*)) +(define-foreign %freeimage-get-width + unsigned-int "FreeImage_GetWidth" '(*)) +(define-foreign %freeimage-get-height + unsigned-int "FreeImage_GetHeight" '(*)) +(define-foreign %freeimage-get-pitch + unsigned-int "FreeImage_GetPitch" '(*)) +(define-foreign %freeimage-get-red-mask + unsigned-int "FreeImage_GetRedMask" '(*)) +(define-foreign %freeimage-get-green-mask + unsigned-int "FreeImage_GetGreenMask" '(*)) +(define-foreign %freeimage-get-blue-mask + unsigned-int "FreeImage_GetBlueMask" '(*)) +(define-foreign %freeimage-has-pixels + unsigned-int "FreeImage_HasPixels" '(*)) (define (freeimage-get-image-type bitmap) (%freeimage-get-image-type (unwrap-freeimage-bitmap bitmap))) @@ -193,10 +207,11 @@ ;;; Filetype functions ;;; -(define-foreign %freeimage-get-file-type unsigned-int "FreeImage_GetFileType" '(*)) +(define-foreign %freeimage-get-file-type + unsigned-int "FreeImage_GetFileType" (list '* int)) (define (freeimage-get-file-type filename) - (%freeimage-get-file-type (string->pointer filename))) + (%freeimage-get-file-type (string->pointer filename) 0)) (export freeimage-get-file-type) @@ -218,11 +233,10 @@ ;;; Conversion functions ;;; -(define-foreign %freeimage-convert-to-24-bits '* "FreeImage_ConvertTo24Bits" '(*)) -(define-foreign %freeimage-convert-to-32-bits '* "FreeImage_ConvertTo32Bits" '(*)) -(define-foreign %freeimage-convert-to-raw-bits - void "FreeImage_ConvertToRawBits" - (list '* '* int unsigned-int unsigned-int unsigned-int unsigned-int uint8)) +(define-foreign %freeimage-convert-to-24-bits + '* "FreeImage_ConvertTo24Bits" '(*)) +(define-foreign %freeimage-convert-to-32-bits + '* "FreeImage_ConvertTo32Bits" '(*)) (define (freeimage-convert-to-24-bits bitmap) (wrap-freeimage-bitmap @@ -239,7 +253,8 @@ ;;; Rotation and flipping ;;; -(define-foreign %freeimage-flip-vertical uint8 "FreeImage_FlipVertical" '(*)) +(define-foreign %freeimage-flip-vertical + uint8 "FreeImage_FlipVertical" '(*)) (define (freeimage-flip-vertical bitmap) (number->boolean -- cgit v1.2.3