From 79f65d040d72f778f66f8eefdaffb6acd9799a38 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Tue, 10 May 2005 07:59:48 +0000
Subject: Merge of the newly developped postscript code (still not fully
 functional).

---
 generic/Image.h | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

(limited to 'generic/Image.h')

diff --git a/generic/Image.h b/generic/Image.h
index 6e72907..426c0df 100644
--- a/generic/Image.h
+++ b/generic/Image.h
@@ -29,28 +29,21 @@ typedef void    *ZnImage;
 #define ZnGetBitmapPixel(bits, stride, x, y)\
   (((bits)[(y)*(stride)+((x)>>3)]<<((x)&7))&0x80)
 
-ZnImage
-ZnGetImage(struct _ZnWInfo *wi, Tk_Uid image_name,
-           void (*inv_proc)(void *cd), void *cd);
-ZnImage
-ZnGetImageByValue(ZnImage image, void (*inv_proc)(void *cd), void *cd);
-void
-ZnFreeImage(ZnImage image, void (*inv_proc)(void *cd), void *cd);
-char *
-ZnNameOfImage(ZnImage image);
-void
-ZnSizeOfImage(ZnImage image, int *width, int *height);
-Pixmap
-ZnImagePixmap(ZnImage image, Tk_Window win);
-ZnBool
-ZnImageIsBitmap(ZnImage image);
-TkRegion
-ZnImageRegion(ZnImage image);
+ZnImage ZnGetImage(struct _ZnWInfo *wi, Tk_Uid image_name,
+                   void (*inv_proc)(void *cd), void *cd);
+ZnImage ZnGetImageByValue(ZnImage image, void (*inv_proc)(void *cd), void *cd);
+void ZnFreeImage(ZnImage image, void (*inv_proc)(void *cd), void *cd);
+char * ZnNameOfImage(ZnImage image);
+void ZnSizeOfImage(ZnImage image, int *width, int *height);
+Pixmap ZnImagePixmap(ZnImage image, Tk_Window win);
+ZnBool ZnImageIsBitmap(ZnImage image);
+TkRegion ZnImageRegion(ZnImage image);
+Tk_Image ZnImageTkImage(ZnImage image);
+Tk_PhotoHandle ZnImageTkPhoto(ZnImage image);
 ZnBool
 ZnPointInImage(ZnImage image, int x, int y);
 #ifdef GL
-GLuint
-ZnImageTex(ZnImage image, ZnReal *t, ZnReal *s);
+GLuint ZnImageTex(ZnImage image, ZnReal *t, ZnReal *s);
 
 typedef struct _ZnTexGlyphVertexInfo {
   GLfloat       t0x;
-- 
cgit v1.1