Drop the ras loader

This is another very rarely seen, ancient image format,
and nobody is maintaining this laoder inside gdk-pxibuf.

https://bugzilla.gnome.org/show_bug.cgi?id=721372

3 files changed, 1 insertions, 567 deletions

diff --git a/configure.ac b/configure.ac
index b294dd99a..b722e6423 100644
--- a/configure.ac
+++ b/configure.ac
@@ -679,7 +679,7 @@ fi
 # because some important apps like GIMP need to read and write
 # arbitrary tEXt chunks which doesn't seem to be possible through GDI+
 
-all_loaders="ani,icns,pcx,ras,tga,png,pnm,xbm,xpm,qtif"
+all_loaders="ani,icns,pcx,tga,png,pnm,xbm,xpm,qtif"
 if test x$with_libjasper = xyes; then
   all_loaders="$all_loaders,jasper"
 fi
@@ -741,7 +741,6 @@ AM_CONDITIONAL(INCLUDE_ICO, [test x"$INCLUDE_ico" = xyes])
 AM_CONDITIONAL(INCLUDE_ANI, [test x"$INCLUDE_ani" = xyes])
 AM_CONDITIONAL(INCLUDE_JPEG, [test x"$INCLUDE_jpeg" = xyes])
 AM_CONDITIONAL(INCLUDE_PNM, [test x"$INCLUDE_pnm" = xyes])
-AM_CONDITIONAL(INCLUDE_RAS, [test x"$INCLUDE_ras" = xyes])
 AM_CONDITIONAL(INCLUDE_TIFF, [test x"$INCLUDE_tiff" = xyes])
 AM_CONDITIONAL(INCLUDE_XPM, [test x"$INCLUDE_xpm" = xyes])
 AM_CONDITIONAL(INCLUDE_XBM, [test x"$INCLUDE_xbm" = xyes])
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index b082c03b9..0e96b418a 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -123,14 +123,6 @@ libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libpixbufloader_pnm_la_LIBADD = $(module_libs)
 
 #
-# The RAS loader
-#
-libstatic_pixbufloader_ras_la_SOURCES = io-ras.c
-libpixbufloader_ras_la_SOURCES = io-ras.c
-libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_ras_la_LIBADD = $(module_libs)
-
-#
 # The TIFF loader
 #
 libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c
@@ -397,12 +389,6 @@ else
 PNM_LIB = libpixbufloader-pnm.la
 endif
 
-if INCLUDE_RAS
-STATIC_RAS_LIB = libstatic-pixbufloader-ras.la
-else
-RAS_LIB = libpixbufloader-ras.la
-endif
-
 if INCLUDE_XPM
 STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la
 else
@@ -460,7 +446,6 @@ loader_LTLIBRARIES = 	\
 	$(ANI_LIB)	\
 	$(JPEG_LIB)	\
 	$(PNM_LIB)	\
-	$(RAS_LIB)	\
 	$(TIFF_LIB)	\
 	$(XPM_LIB)	\
 	$(XBM_LIB)	\
@@ -483,7 +468,6 @@ noinst_LTLIBRARIES =		\
 	$(STATIC_ANI_LIB)	\
 	$(STATIC_JPEG_LIB)	\
 	$(STATIC_PNM_LIB)	\
-	$(STATIC_RAS_LIB)	\
 	$(STATIC_TIFF_LIB)	\
 	$(STATIC_XPM_LIB)	\
 	$(STATIC_XBM_LIB)	\
@@ -683,7 +667,6 @@ gdk_pixbuf_FILES = \
 	$(libstatic_pixbufloader_pnm_la_SOURCES)	\
 	$(libstatic_pixbufloader_png_la_SOURCES)	\
 	$(libstatic_pixbufloader_qtif_la_SOURCES)	\
-	$(libstatic_pixbufloader_ras_la_SOURCES)	\
 	$(libstatic_pixbufloader_tga_la_SOURCES)	\
 	$(libstatic_pixbufloader_xpm_la_SOURCES)	\
 	$(libstatic_pixbufloader_xbm_la_SOURCES)	\
diff --git a/gdk-pixbuf/io-ras.c b/gdk-pixbuf/io-ras.c
deleted file mode 100644
index 913bb83b6..000000000
--- a/gdk-pixbuf/io-ras.c
+++ /dev/null
@@ -1,548 +0,0 @@
-/* -*- mode: C; c-file-style: "linux" -*- */
-/* GdkPixbuf library - SUNRAS image loader
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Arjan van de Ven <arjan@fenrus.demon.nl>
- *          Federico Mena-Quintero <federico@gimp.org>
- *
- * Based on io-gif.c, io-tiff.c and io-png.c
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
-
-Known bugs:
-	* Compressed rasterfiles don't work yet
-
-*/
-
-#include "config.h"
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <string.h>
-#include "gdk-pixbuf-private.h"
-
-
-
-/* 
-   Header structure for sunras files.
-   All values are in big-endian order on disk
-   
-   Note: Every scanline is padded to be a multiple of 16 bits
- */
-
-struct rasterfile {
-	guint magic;
-	guint width;
-	guint height;
-	guint depth;
-	guint length;
-	guint type;
-	guint maptype;
-	guint maplength;
-};
-
-/* 
-	This does a byte-order swap. Does glib have something like
-	be32_to_cpu() ??
-*/
-
-/* Progressive loading */
-
-struct ras_progressive_state {
-	GdkPixbufModuleSizeFunc size_func;
-	GdkPixbufModulePreparedFunc prepared_func;
-	GdkPixbufModuleUpdatedFunc updated_func;
-	gpointer user_data;
-
-	gint HeaderSize;	/* The size of the header-part (incl colormap) */
-	guchar *HeaderBuf;	/* The buffer for the header (incl colormap) */
-	gint HeaderDone;	/* The nr of bytes actually in HeaderBuf */
-
-	gint LineWidth;		/* The width of a line in bytes */
-	guchar *LineBuf;	/* Buffer for 1 line */
-	gint LineDone;		/* # of bytes in LineBuf */
-	gint Lines;		/* # of finished lines */
-
-	gint RasType;		/*  32 = BGRA
-				   24 = BGR
-				   8 = 8 bit colormapped
-				   1  = 1 bit bitonal 
-				 */
-	gint DecoderState;        
-
-	struct rasterfile Header;	/* Decoded (BE->CPU) header */
-
-
-	GdkPixbuf *pixbuf;	/* Our "target" */
-};
-
-static gpointer
-gdk_pixbuf__ras_image_begin_load(GdkPixbufModuleSizeFunc size_func,
-                                 GdkPixbufModulePreparedFunc prepared_func,
-				 GdkPixbufModuleUpdatedFunc updated_func,
-				 gpointer user_data,
-                                 GError **error);
-static gboolean gdk_pixbuf__ras_image_stop_load(gpointer data, GError **error);
-static gboolean gdk_pixbuf__ras_image_load_increment(gpointer data,
-                                                     const guchar * buf, guint size,
-                                                     GError **error);
-
-static gboolean RAS2State(struct rasterfile *RAS,
-			  struct ras_progressive_state *State,
-			  GError **error)
-{
-	State->Header.width = GUINT32_FROM_BE(RAS->width);
-	State->Header.height = GUINT32_FROM_BE(RAS->height);
-	State->Header.depth = GUINT32_FROM_BE(RAS->depth);
-	State->Header.type = GUINT32_FROM_BE(RAS->type);
-	State->Header.maptype = GUINT32_FROM_BE(RAS->maptype);
-	State->Header.maplength = GUINT32_FROM_BE(RAS->maplength);
-
-	if ((gint)State->Header.width <= 0 ||
-	    (gint)State->Header.height <= 0 || 
-	    State->Header.maplength > 768) {
-		g_set_error_literal (error,
-                                     GDK_PIXBUF_ERROR,
-                                     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                     _("RAS image has bogus header data"));
-		return FALSE;
-	}
-
-	State->RasType = State->Header.depth;	/* This may be less trivial someday */
-	State->HeaderSize = 32 + State->Header.maplength;
-
-	if (State->RasType == 32)
-		State->LineWidth = State->Header.width * 4;
-	else if (State->RasType == 24)
-		State->LineWidth = State->Header.width * 3;
-	else if (State->RasType == 8)
-		State->LineWidth = State->Header.width * 1;
-	else if (State->RasType == 1) {
-		State->LineWidth = State->Header.width / 8;
-		if ((State->Header.width & 7) != 0)
-			State->LineWidth++;
-	}
-	else {
-		g_set_error_literal (error,
-                                     GDK_PIXBUF_ERROR,
-                                     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                     _("RAS image has unknown type"));
-		return FALSE;
-	}
-
-	if (State->Header.type > 2 || State->Header.maptype > 1) {
-		g_set_error_literal (error,
-                                     GDK_PIXBUF_ERROR,
-                                     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                     _("unsupported RAS image variation"));
-		return FALSE;
-	}
-
-	/* Now pad the line to be a multiple of 16 bits */
-	if ((State->LineWidth & 1) != 0)
-		State->LineWidth++;
-
-	if (!State->LineBuf) {
-		State->LineBuf = g_try_malloc (State->LineWidth);
-
-		if (!State->LineBuf) {
-			g_set_error_literal (error,
-                                             GDK_PIXBUF_ERROR,
-                                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                                             _("Not enough memory to load RAS image"));
-			return FALSE;
-		}
-	}
-
-
-	if (!State->pixbuf) {
-		if (State->size_func) {
-			gint width = State->Header.width;
-			gint height = State->Header.height;
-			
-			(*State->size_func) (&width, &height, State->user_data);
-			if (width == 0 || height == 0)
-				return FALSE;
-		}
-
-		if (State->RasType == 32)
-			State->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-							(gint) State->Header.width,
-							(gint) State->Header.height);
-		else
-			State->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
-							(gint) State->Header.width,
-							(gint) State->Header.height);
-		
-                if (!State->pixbuf) {
-                        g_set_error_literal (error,
-                                             GDK_PIXBUF_ERROR,
-                                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                                             _("Not enough memory to load RAS image"));
-                        return FALSE;
-                }
-
-		if (State->prepared_func != NULL)
-			/* Notify the client that we are ready to go */
-			(*State->prepared_func) (State->pixbuf,
-                                                 NULL,
-						 State->user_data);
-
-	}
-	
-	if ((State->Header.maplength == 0) && (State->RasType == 1)) {
-		State->HeaderBuf[32] = 255;
-		State->HeaderBuf[33] = 0;
-		State->HeaderBuf[34] = 255;
-		State->HeaderBuf[35] = 0;
-		State->HeaderBuf[36] = 255;
-		State->HeaderBuf[37] = 0;
-	}
-
-	return TRUE;
-}
-
-/* 
- * func - called when we have pixmap created (but no image data)
- * user_data - passed as arg 1 to func
- * return context (opaque to user)
- */
-
-static gpointer
-gdk_pixbuf__ras_image_begin_load(GdkPixbufModuleSizeFunc size_func, 
-                                 GdkPixbufModulePreparedFunc prepared_func,
-				 GdkPixbufModuleUpdatedFunc updated_func,
-				 gpointer user_data,
-                                 GError **error)
-{
-	struct ras_progressive_state *context;
-
-	context = g_new0(struct ras_progressive_state, 1);
-	context->size_func = size_func;
-	context->prepared_func = prepared_func;
-	context->updated_func = updated_func;
-	context->user_data = user_data;
-
-	context->HeaderSize = 32;
-	context->HeaderBuf = g_malloc(32 + 768);	/* 32 for rasheader,
-							   768 for the colormap */
-	context->HeaderDone = 0;
-
-	context->LineWidth = 0;
-	context->LineBuf = NULL;
-	context->LineDone = 0;
-	context->Lines = 0;
-
-	context->RasType = 0;
-	context->DecoderState = 0;
-	
-	memset(&context->Header, 0, sizeof(struct rasterfile));
-
-
-	context->pixbuf = NULL;
-
-
-	return (gpointer) context;
-}
-
-/*
- * context - returned from image_begin_load
- *
- * free context, unref gdk_pixbuf
- */
-static gboolean
-gdk_pixbuf__ras_image_stop_load(gpointer data, GError **error)
-{
-	struct ras_progressive_state *context =
-	    (struct ras_progressive_state *) data;
-
-        /* FIXME this thing needs to report errors if
-         * we have unused image data
-         */
-
-	g_return_val_if_fail(context != NULL, TRUE);
-
-	g_free(context->LineBuf);
-	g_free(context->HeaderBuf);
-
-	if (context->pixbuf)
-		g_object_unref(context->pixbuf);
-
-	g_free(context);
-
-        return TRUE;
-}
-
-/* 
- OneLine is called when enough data is received to process 1 line 
- of pixels 
- */
-
-static void OneLine32(struct ras_progressive_state *context)
-{
-	gint X;
-	guchar *Pixels;
-
-	X = 0;
-	Pixels = context->pixbuf->pixels + context->pixbuf->rowstride * context->Lines;
-	while (X < context->Header.width) {
-		/* The joys of having a BGR byteorder */
-		Pixels[X * 4 + 0] = context->LineBuf[X * 4 + 2];
-		Pixels[X * 4 + 1] = context->LineBuf[X * 4 + 1];
-		Pixels[X * 4 + 2] = context->LineBuf[X * 4 + 0];
-		Pixels[X * 4 + 3] = context->LineBuf[X * 4 + 3];
-		X++;
-	}
-}
-
-static void OneLine24(struct ras_progressive_state *context)
-{
-	gint X;
-	guchar *Pixels;
-
-	X = 0;
-	Pixels = context->pixbuf->pixels + context->pixbuf->rowstride * context->Lines;
-	while (X < context->Header.width) {
-		/* The joys of having a BGR byteorder */
-		Pixels[X * 3 + 0] = context->LineBuf[X * 3 + 2];
-		Pixels[X * 3 + 1] = context->LineBuf[X * 3 + 1];
-		Pixels[X * 3 + 2] = context->LineBuf[X * 3 + 0];
-		X++;
-	}
-
-}
-
-static void OneLine8(struct ras_progressive_state *context)
-{
-	gint X;
-	guchar *Pixels;
-	int offset = context->Header.maplength / 3;
-
-	X = 0;
-	Pixels = context->pixbuf->pixels + context->pixbuf->rowstride * context->Lines;
-	while (X < context->Header.width) {
-		/* The joys of having a BGR byteorder */
-		Pixels[X * 3 + 0] =
-		    context->HeaderBuf[context->LineBuf[X] + 32];
-		Pixels[X * 3 + 1] =
-		    context->HeaderBuf[context->LineBuf[X] + offset + 32];
-		Pixels[X * 3 + 2] =
-		    context->HeaderBuf[context->LineBuf[X] + 2*offset + 32];
-		X++;
-	}
-}
-
-static void OneLine1(struct ras_progressive_state *context)
-{
-	gint X;
-	guchar *Pixels;
-
-	X = 0;
-	Pixels = context->pixbuf->pixels + context->pixbuf->rowstride * context->Lines;
-	while (X < context->Header.width) {
-		int Bit;
-		
-		Bit = (context->LineBuf[X/8])>>(7-(X&7));
-		Bit = Bit & 1;
-		/* The joys of having a BGR byteorder */
-		Pixels[X * 3 + 0] =
-		    context->HeaderBuf[Bit + 32];
-		Pixels[X * 3 + 1] =
-		    context->HeaderBuf[Bit + 2 + 32];
-		Pixels[X * 3 + 2] =
-		    context->HeaderBuf[Bit + 4 + 32];
-		X++;
-	}
-}
-
-
-static void OneLine(struct ras_progressive_state *context)
-{
-	context->LineDone = 0;
-	if (context->Lines >= context->Header.height)
-		return;
-	if (context->RasType == 32)
-		OneLine32(context);
-	if (context->RasType == 24)
-		OneLine24(context);
-	if (context->RasType == 8)
-		OneLine8(context);
-	if (context->RasType == 1)
-		OneLine1(context);
-
-	context->LineDone = 0;
-	context->Lines++;
-
-	if (context->updated_func != NULL) {
-		(*context->updated_func) (context->pixbuf,
-					  0,
-					  context->Lines,
-					  context->Header.width,
-					  1,
-					  context->user_data);
-
-	}
-}
-
-static gboolean
-DoCompressed (struct ras_progressive_state *context,
-	      const guchar * buf, guint size,
-	      GError **error)
-{
-	int i;
-
-	for (i = 0; i < size; i++) {
-		switch (context->DecoderState) {
-		    case 0:
-			    if (buf[i] == 0x80)
-				    context->DecoderState = 1;
-			    else
-				    context->LineBuf[context->LineDone++] = buf[i];
-			    break;
-		    case 1:
-			    if (buf[i] == 0) {
-				    context->LineBuf[context->LineDone++] = 0x80;
-				    context->DecoderState = 0;
-			    }
-			    else
-				    context->DecoderState = buf[i] + 1;
-			    break;
-		    default:
-			    for (; context->DecoderState; context->DecoderState--) {
-				    context->LineBuf[context->LineDone++] = buf[i];
-				    if ((context->LineDone >= context->LineWidth) && (context->LineWidth > 0))
-					    OneLine(context);
-			    }
-		}
-		if ((context->LineDone >= context->LineWidth) && (context->LineWidth > 0))
-			OneLine(context);
-	}
-	return TRUE;
-}
-
-/*
- * context - from image_begin_load
- * buf - new image data
- * size - length of new image data
- *
- * append image data onto incrementally built output image
- */
-static gboolean
-gdk_pixbuf__ras_image_load_increment(gpointer data,
-                                     const guchar * buf, guint size,
-                                     GError **error)
-{
-	struct ras_progressive_state *context =
-	    (struct ras_progressive_state *) data;
-
-	gint BytesToCopy;
-
-	while (size > 0) {
-		if (context->HeaderDone < context->HeaderSize) {	/* We still 
-									   have headerbytes to do */
-			BytesToCopy =
-			    context->HeaderSize - context->HeaderDone;
-			if (BytesToCopy > size)
-				BytesToCopy = size;
-
-			memmove(context->HeaderBuf + context->HeaderDone,
-			       buf, BytesToCopy);
-
-			size -= BytesToCopy;
-			buf += BytesToCopy;
-			context->HeaderDone += BytesToCopy;
-
-		} else if (context->Header.type == 2) {
-			if (!DoCompressed (context, buf, size, error)) {
-				return FALSE;
-			}
-			size = 0;
-		}
-		else {
-			BytesToCopy =
-			    context->LineWidth - context->LineDone;
-			if (BytesToCopy > size)
-				BytesToCopy = size;
-
-			if (BytesToCopy > 0) {
-				memmove(context->LineBuf +
-				       context->LineDone, buf,
-				       BytesToCopy);
-
-				size -= BytesToCopy;
-				buf += BytesToCopy;
-				context->LineDone += BytesToCopy;
-			}
-			if ((context->LineDone >= context->LineWidth) &&
-			    (context->LineWidth > 0))
-				OneLine(context);
-
-
-		}
-
-		if (context->HeaderDone >= 32)
-			if (!RAS2State((struct rasterfile *) context->HeaderBuf,
-				       context, error)) {
-				return FALSE;
-			}
-
-
-	}
-
-	return TRUE;
-}
-
-#ifndef INCLUDE_ras
-#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
-#else
-#define MODULE_ENTRY(function) void _gdk_pixbuf__ras_ ## function
-#endif
-
-MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
-{
-	module->begin_load = gdk_pixbuf__ras_image_begin_load;
-	module->stop_load = gdk_pixbuf__ras_image_stop_load;
-	module->load_increment = gdk_pixbuf__ras_image_load_increment;
-}
-
-MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
-{
-	static const GdkPixbufModulePattern signature[] = {
-		{ "\x59\xa6\x6a\x95", NULL, 100 },
-		{ NULL, NULL, 0 }
-	};
-	static const gchar *mime_types[] = {
-		"image/x-cmu-raster",
-		"image/x-sun-raster",
-		NULL
-	};
-	static const gchar *extensions[] = {
-		"ras",
-		NULL
-	};
-
-	info->name = "ras";
-	info->signature = (GdkPixbufModulePattern *) signature;
-	info->description = NC_("image format", "Sun raster");
-	info->mime_types = (gchar **) mime_types;
-	info->extensions = (gchar **) extensions;
-	info->flags = GDK_PIXBUF_FORMAT_THREADSAFE;
-	info->license = "LGPL";
-}
-