diff options
Diffstat (limited to 'src/scan.c')
| -rw-r--r-- | src/scan.c | 71 |
1 files changed, 0 insertions, 71 deletions
@@ -37,11 +37,6 @@ * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94 */ -/* - * The code related to AMIGA has been added by - * Lorens Younes (d93-hyo@nada.kth.se) 4/96 - */ - /* October 2004, source code review by Thomas Biege <thomas@suse.de> */ #ifdef HAVE_CONFIG_H @@ -82,7 +77,6 @@ typedef int (*storeFuncPtr)(Pixel pixel, PixelsMap *pmap, unsigned int *index_return); #ifndef FOR_MSW -# ifndef AMIGA LFUNC(GetImagePixels, int, (XImage *image, unsigned int width, unsigned int height, PixelsMap *pmap)); @@ -98,11 +92,6 @@ LFUNC(GetImagePixels8, int, (XImage *image, unsigned int width, LFUNC(GetImagePixels1, int, (XImage *image, unsigned int width, unsigned int height, PixelsMap *pmap, storeFuncPtr storeFunc)); -# else /* AMIGA */ -LFUNC(AGetImagePixels, int, (XImage *image, unsigned int width, - unsigned int height, PixelsMap *pmap, - storeFuncPtr storeFunc)); -# endif/* AMIGA */ #else /* ndef FOR_MSW */ LFUNC(MSWGetImagePixels, int, (Display *d, XImage *image, unsigned int width, unsigned int height, PixelsMap *pmap, @@ -256,13 +245,8 @@ XpmCreateXpmImageFromImage( */ if (shapeimage) { #ifndef FOR_MSW -# ifndef AMIGA ErrorStatus = GetImagePixels1(shapeimage, width, height, &pmap, storeMaskPixel); -# else - ErrorStatus = AGetImagePixels(shapeimage, width, height, &pmap, - storeMaskPixel); -# endif #else ErrorStatus = MSWGetImagePixels(display, shapeimage, width, height, &pmap, storeMaskPixel); @@ -281,7 +265,6 @@ XpmCreateXpmImageFromImage( if (image) { #ifndef FOR_MSW -# ifndef AMIGA if (((image->bits_per_pixel | image->depth) == 1) && (image->byte_order == image->bitmap_bit_order)) ErrorStatus = GetImagePixels1(image, width, height, &pmap, @@ -295,10 +278,6 @@ XpmCreateXpmImageFromImage( ErrorStatus = GetImagePixels32(image, width, height, &pmap); } else ErrorStatus = GetImagePixels(image, width, height, &pmap); -# else - ErrorStatus = AGetImagePixels(image, width, height, &pmap, - storePixel); -# endif #else ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap, storePixel); @@ -579,7 +558,6 @@ ScanOtherColors( } #ifndef FOR_MSW -# ifndef AMIGA /* * The functions below are written from X11R5 MIT's code (XImUtil.c) * @@ -903,53 +881,6 @@ GetImagePixels1( return (XpmSuccess); } -# else /* AMIGA */ - -#define CLEAN_UP(status) \ -do {\ - if (pixels) XpmFree (pixels);\ - if (tmp_img) FreeXImage (tmp_img);\ - return (status);\ -} while(0) - -static int -AGetImagePixels ( - XImage *image, - unsigned int width, - unsigned int height, - PixelsMap *pmap, - int (*storeFunc) (Pixel, PixelsMap *, unsigned int *)) -{ - unsigned int *iptr; - unsigned int x, y; - unsigned char *pixels; - XImage *tmp_img; - - pixels = XpmMalloc ((((width+15)>>4)<<4)*sizeof (*pixels)); - if (pixels == NULL) - return XpmNoMemory; - - tmp_img = AllocXImage ((((width+15)>>4)<<4), 1, image->rp->BitMap->Depth); - if (tmp_img == NULL) - CLEAN_UP (XpmNoMemory); - - iptr = pmap->pixelindex; - for (y = 0; y < height; ++y) - { - ReadPixelLine8 (image->rp, 0, y, width, pixels, tmp_img->rp); - for (x = 0; x < width; ++x, ++iptr) - { - if ((*storeFunc) (pixels[x], pmap, iptr)) - CLEAN_UP (XpmNoMemory); - } - } - - CLEAN_UP (XpmSuccess); -} - -#undef CLEAN_UP - -# endif/* AMIGA */ #else /* ndef FOR_MSW */ static int MSWGetImagePixels( @@ -980,7 +911,6 @@ MSWGetImagePixels( #endif #ifndef FOR_MSW -# ifndef AMIGA int XpmCreateXpmImageFromPixmap( Display *display, @@ -1020,5 +950,4 @@ XpmCreateXpmImageFromPixmap( return (ErrorStatus); } -# endif/* not AMIGA */ #endif /* ndef FOR_MSW */ |