Merge lp:~ballogy/gloobus-preview/drop-loaders into lp:gloobus-preview

[Balló György]

Remove custom gdk-pixbuf loaders

These are buggy and not needed anymore, since PSD and XCF formats are supported by the new imagemagick plugin.

=== modified file 'configure.ac'
--- configure.ac	2014-12-25 16:27:26 +0000
+++ configure.ac	2014-12-26 04:45:12 +0000
@@ -32,12 +32,8 @@
 AC_CHECK_LIB(gthread, g_thread_init)
 AC_CHECK_LIB(pthread, pthread_create)
 
-# To compile XCF loader ==> sudo apt-get install libtool libbz2-dev
-AC_CHECK_LIB(bz2,BZ2_bzDecompressInit,,AC_MSG_ERROR(Can not find libbz2))
-
 # *** checks for headers ***************************************************** #
 AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
-AC_CHECK_HEADER(bzlib.h,,AC_MSG_ERROR(Can not find bzlib header)) # To compile XCF loader
 
 # *** checks for modules ***************************************************** #
 PKG_CHECK_MODULES(ATK, atk)
@@ -57,9 +53,6 @@
 PKG_CHECK_MODULES(DBUS, dbus-glib-1)
 PKG_CHECK_MODULES(X11, x11)
 
-PKG_CHECK_MODULES(GMODULE, gmodule-2.0)           # To compile XCF loader
-PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0)      # To compile XCF loader
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
 
@@ -90,8 +83,6 @@
     src/plugin-text/Makefile
     src/plugin-ttf/Makefile
     src/plugin-xps/Makefile
-    src/loaders/PSD/Makefile
-    src/loaders/XCF/Makefile
     src/gloobus-sushi/Makefile
     data/Makefile
     data/images/Makefile
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-12-25 16:27:26 +0000
+++ src/Makefile.am	2014-12-26 04:45:12 +0000
@@ -1,7 +1,5 @@
 SUBDIRS = \
     gloobus-sushi \
-    loaders/PSD \
-    loaders/XCF \
     plugin-comic \
     plugin-folder \
     plugin-compressed \
 
=== removed directory 'src/loaders'
=== removed directory 'src/loaders/PSD'
=== removed file 'src/loaders/PSD/Makefile.am'
--- src/loaders/PSD/Makefile.am	2010-08-21 18:06:49 +0000
+++ src/loaders/PSD/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#pluginexecdir = $(prefix)/lib/gtk-2.0/2.10.0/loaders/
-pluginexecdir = $(prefix)/lib/gdk-pixbuf-2.0/2.10.0/loaders/
-
-AM_CPPFLAGS += $(GTK_CFLAGS) -shared -fpic -std=c99 -DGDK_PIXBUF_ENABLE_BACKEND
-AM_LDFLAGS = $(GTK_LIBS) 
-
-pluginexec_LTLIBRARIES = libpixbufloader-psd.la 
-libpixbufloader_psd_la_SOURCES = io-psd.c
-libpixbufloader_psd_la_LDFLAGS = -module -export-dynamic $(AM_LDFLAGS)
-
-#install-exec-hook:
-#	install -d $(prefix)/lib/gdk-pixbuf-2.0/2.10.0/loaders/
 
=== removed file 'src/loaders/PSD/io-psd.c'
--- src/loaders/PSD/io-psd.c	2009-12-23 17:50:28 +0000
+++ src/loaders/PSD/io-psd.c	1970-01-01 00:00:00 +0000
@@ -1,598 +0,0 @@
-/* -*- mode: C; c-file-style: "linux" -*- */
-/* GdkPixbuf library - PSD image loader
- *
- * Copyright (C) 2008 Jan Dudek
- *
- * Authors: Jan Dudek <[e-mail]>
- *
- * 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
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * TODO
- * - use http://library.gnome.org/devel/glib/unstable/glib-Byte-Order-Macros.html
- * - report errors from parse_psd_header
- * - other color modes (CMYK at least)
- * - i18n
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf-io.h>
-#include <glib/gstdio.h>
-
-
-typedef struct
-{
-	guchar  signature[4];  /* file ID, always "8BPS" */
-	guint16 version;       /* version number, always 1 */
-	guchar  resetved[6];
-	guint16 channels;      /* number of color channels (1-24) */
-	guint32 rows;          /* height of image in pixels (1-30000) */
-	guint32 columns;       /* width of image in pixels (1-30000) */
-	guint16 depth;         /* number of bits per channel (1, 8, and 16) */
-	guint16 color_mode;    /* color mode as defined below */
-} PsdHeader;
-
-#define PSD_HEADER_SIZE 26
-
-typedef enum
-{
-	PSD_MODE_MONO = 0,
-	PSD_MODE_GRAYSCALE = 1,
-	PSD_MODE_INDEXED = 2,
-	PSD_MODE_RGB = 3,
-	PSD_MODE_CMYK = 4,
-	PSD_MODE_MULTICHANNEL = 7,
-	PSD_MODE_DUOTONE = 8,
-	PSD_MODE_LAB = 9,
-} PsdColorMode;
-
-typedef enum
-{
-	PSD_COMPRESSION_NONE = 0,
-	PSD_COMPRESSION_RLE = 1
-} PsdCompressionType;
-
-typedef enum
-{
-	PSD_STATE_HEADER,
-	PSD_STATE_COLOR_MODE_BLOCK,
-	PSD_STATE_RESOURCES_BLOCK,
-	PSD_STATE_LAYERS_BLOCK,
-	PSD_STATE_COMPRESSION,
-	PSD_STATE_LINES_LENGTHS,
-	PSD_STATE_CHANNEL_DATA,
-	PSD_STATE_DONE
-} PsdReadState;
-
-typedef struct
-{
-	PsdReadState       state;
-	
-	GdkPixbuf*                  pixbuf;
-
-	GdkPixbufModuleSizeFunc     size_func;
-	GdkPixbufModuleUpdatedFunc  updated_func;
-	GdkPixbufModulePreparedFunc prepared_func; 
-	gpointer                    user_data;
-
-	guchar*            buffer;
-	guint              bytes_read;
-	guint32            bytes_to_skip;
-	gboolean           bytes_to_skip_known;
-
-	guint32            width;         /* width of image in pixels (1-30000) */
-	guint32            height;        /* height of image in pixels (1-30000) */
-	guint16            channels;      /* number of color channels (1-24) */
-	guint16            depth;         /* number of bits per channel (1/8/16) */
-	PsdColorMode       color_mode;
-	PsdCompressionType compression;
-
-	guchar**           ch_bufs;       /* channels buffers */
-	guint              curr_ch;       /* current channel */
-	guint              curr_row;
-	guint              pos;           // redundant?
-	guint16*           lines_lengths;
-	gboolean           finalized;
-	gboolean           use_alpha;
-} PsdContext;
-
-
-static guint16
-read_uint16 (guchar* buf)
-{
-	return (buf[0] << 8) | buf[1];
-}
-
-static guint32
-read_uint32 (guchar* buf)
-{
-	return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-}
-
-
-/*
- * Parse Psdheader from buffer
- *
- * str is expected to be at least PSD_HEADER_SIZE long
- */
-static PsdHeader
-psd_parse_header (guchar* str)
-{
-	PsdHeader hd;
-	
-	memcpy(hd.signature, str, 4);
-	hd.version = read_uint16(str + 4);
-	hd.channels = read_uint16(str + 12);
-	hd.rows = read_uint32(str + 14);
-	hd.columns = read_uint32(str + 18);
-	hd.depth = read_uint16(str + 22);
-	hd.color_mode = read_uint16(str + 24);
-
-	return hd;
-}
-
-/*
- * Attempts to read bytes_needed bytes from data and stores them in buffer.
- *
- * Returns true if there were enough bytes and false otherwise
- * (which means we need to call feed_buffer again)
- */
-static gboolean
-feed_buffer (guchar*        buffer,
-             guint*         bytes_read,
-             const guchar** data,
-             guint*         size,
-             guint          bytes_needed)
-{
-	gint how_many = bytes_needed - *bytes_read;
-	if (how_many > *size) {
-		how_many = *size;
-	}
-	memcpy(buffer + *bytes_read, *data, how_many);
-	*bytes_read += how_many;
-	*data += how_many;
-	*size -= how_many;
-	return (*bytes_read == bytes_needed);
-}
-
-/*
- * Attempts to read size of the block and then skip this block.
- *
- * Returns true when finishes consuming block data, otherwise false
- * (false means we need to call skip_block again)
- */
-static gboolean
-skip_block (PsdContext* context, const guchar** data, guint* size)
-{
-	static guint counter;
-
-	if (!context->bytes_to_skip_known) {
-		context->bytes_read = 0;
-		if (feed_buffer(context->buffer, &context->bytes_read, data, size, 4)) {
-			context->bytes_to_skip = read_uint32(context->buffer);
-			context->bytes_to_skip_known = TRUE;
-			counter = 0;
-		} else {
-			return FALSE;
-		}
-	}
-	if (*size < context->bytes_to_skip) {
-		*data += *size;
-		context->bytes_to_skip -= *size;
-		counter += *size;
-		*size = 0;
-		return FALSE;
-	} else {
-		counter += context->bytes_to_skip;
-		*size -= context->bytes_to_skip;
-		*data += context->bytes_to_skip;
-		return TRUE;
-	}
-}
-
-/*
- * Decodes RLE-compressed data
- */
-static void
-decompress_line(const guchar* src, guint line_length, guchar* dest)
-{
-	guint16 bytes_read = 0;
-	while (bytes_read < line_length) {
-		gchar byte = src[bytes_read];
-		++bytes_read;
-	
-		if (byte == -128) {
-			continue;
-		} else if (byte > -1) {
-			gint count = byte + 1;
-		
-			// copy next count bytes
-			for (int k = 0; k < count; ++k) {
-				*dest = src[bytes_read];
-				++dest;
-				++bytes_read;
-			}
-		} else {
-			gint count = -byte + 1;
-		
-			// copy next byte count times
-			guchar next_byte = src[bytes_read];
-			++bytes_read; 
-			for (int k = 0; k < count; ++k) {
-				*dest = next_byte;
-				++dest;
-			}
-		}
-	}
-}
-
-static void
-reset_context_buffer(PsdContext* ctx)
-{
-	ctx->bytes_read = 0;
-	ctx->bytes_to_skip = 0;
-	ctx->bytes_to_skip_known = FALSE;
-}
-
-static gpointer
-gdk_pixbuf__psd_image_begin_load (GdkPixbufModuleSizeFunc size_func,
-                                  GdkPixbufModulePreparedFunc prepared_func,
-                                  GdkPixbufModuleUpdatedFunc updated_func,
-                                  gpointer user_data,
-                                  GError **error)
-{
-	PsdContext* context = g_malloc(sizeof(PsdContext));
-	if (context == NULL) {
-		g_set_error (
-			error,
-			GDK_PIXBUF_ERROR,
-			GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-			("Not enough memory"));
-		return NULL;
-	}
-	context->size_func = size_func;
-	context->prepared_func = prepared_func;
-	context->updated_func = updated_func;
-	context->user_data = user_data;
-	
-	context->state = PSD_STATE_HEADER;
-
-	// we'll allocate larger buffer once we know image size
-	context->buffer = g_malloc(PSD_HEADER_SIZE);
-	reset_context_buffer(context);
-
-	context->ch_bufs = NULL;
-	context->curr_ch = 0;
-	context->curr_row = 0;
-	context->pos = 0;
-	context->lines_lengths = NULL;
-	context->finalized = FALSE;
-	context->use_alpha = FALSE;
-
-	return (gpointer) context;
-}
-
-static gboolean
-gdk_pixbuf__psd_image_stop_load (gpointer context_ptr, GError **error)
-{
-	PsdContext *ctx = (PsdContext *) context_ptr;
-	gboolean retval = TRUE;
-
-	if (ctx->state != PSD_STATE_DONE) {
-		g_set_error (
-			error,
-			GDK_PIXBUF_ERROR,
-			GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-			("PSD file was corrupted or incomplete."));
-		retval = FALSE;
-	}
-	
-	g_free(ctx->buffer);
-	g_free(ctx->lines_lengths);
-	if (ctx->ch_bufs) {
-		for (int i = 0; i < ctx->channels; i++) {
-			g_free(ctx->ch_bufs[i]);
-		}
-	}
-	g_free(ctx);
-	
-	return retval;
-}
-
-
-static gboolean
-gdk_pixbuf__psd_image_load_increment (gpointer      context_ptr,
-                                      const guchar *data,
-                                      guint         size,
-                                      GError      **error)
-{
-	PsdContext* ctx = (PsdContext*) context_ptr;
-	
-	while (size > 0) {
-		switch (ctx->state) {
-			case PSD_STATE_HEADER:
-				if (feed_buffer(
-						ctx->buffer, &ctx->bytes_read,
-						&data, &size, PSD_HEADER_SIZE))
-				{
-					PsdHeader hd = psd_parse_header(ctx->buffer);
-
-					ctx->width = hd.columns;
-					ctx->height = hd.rows;
-					ctx->channels = hd.channels;
-					ctx->depth = hd.depth;
-					ctx->color_mode = hd.color_mode;
-					
-					/*
-					if (ctx->color_mode == PSD_MODE_RGB && ctx->channels == 4) {
-						ctx->use_alpha = TRUE;
-					}*/
-					
-					//g_message("color_mode=%d, channels=%d, depth=%d",
-					//	ctx->color_mode, ctx->channels, ctx->depth);
-					
-					if (ctx->color_mode != PSD_MODE_RGB
-					    //&& ctx->color_mode != PSD_MODE_CMYK
-					) {
-						g_set_error (error, GDK_PIXBUF_ERROR,
-							GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-							("Unsupported color mode"));
-						return FALSE;
-					}
-					
-					if (ctx->depth != 8) {
-						g_set_error (error, GDK_PIXBUF_ERROR,
-							GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-							("Unsupported color depth"));
-						return FALSE;
-					}
-					
-					if (ctx->size_func) {
-						gint w = ctx->width;
-						gint h = ctx->height;
-						ctx->size_func(&w, &h, ctx->user_data);
-						if (w == 0 || h == 0) {
-							return FALSE;
-						}
-					}
-					
-					// we need buffer that can contain one channel data of one
-					// row in RLE compressed format. 2*width should be enough
-					g_free(ctx->buffer);
-					ctx->buffer = g_malloc(ctx->width * 2);
-					
-					// this will be needed for RLE decompression
-					ctx->lines_lengths =
-						g_malloc(2 * ctx->channels * ctx->height);
-					
-					ctx->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
-						ctx->use_alpha, 8, ctx->width, ctx->height);
-
-					if (ctx->lines_lengths == NULL || ctx->buffer == NULL ||
-						ctx->pixbuf == NULL)
-					{
-						g_set_error (error, GDK_PIXBUF_ERROR,
-							GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-							("Insufficient memory to load PSD image file"));
-						return FALSE;
-					}
-					
-					// create separate buffers for each channel
-					ctx->ch_bufs = g_malloc(sizeof(guchar*) * ctx->channels);
-					for (int i = 0; i <	ctx->channels; i++) {
-						ctx->ch_bufs[i] =
-							g_malloc(ctx->width * ctx->height);
-
-						if (ctx->ch_bufs[i] == NULL) {
-							g_set_error (error, GDK_PIXBUF_ERROR,
-								GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-								("Insufficient memory to load PSD image file"));
-							return FALSE;
-						}	
-					}
-					
-					ctx->prepared_func(ctx->pixbuf, NULL, ctx->user_data);
-					
-					ctx->state = PSD_STATE_COLOR_MODE_BLOCK;
-					reset_context_buffer(ctx);
-				}
-				break;
-			case PSD_STATE_COLOR_MODE_BLOCK:
-				if (skip_block(ctx, &data, &size)) {
-					ctx->state = PSD_STATE_RESOURCES_BLOCK;
-					reset_context_buffer(ctx);
-				}
-				break;
-			case PSD_STATE_RESOURCES_BLOCK:
-				if (skip_block(ctx, &data, &size)) {
-					ctx->state = PSD_STATE_LAYERS_BLOCK;
-					reset_context_buffer(ctx);
-				}
-				break;
-			case PSD_STATE_LAYERS_BLOCK:
-				if (skip_block(ctx, &data, &size)) {
-					ctx->state = PSD_STATE_COMPRESSION;
-					reset_context_buffer(ctx);
-				}
-				break;
-			case PSD_STATE_COMPRESSION:
-				if (feed_buffer(ctx->buffer, &ctx->bytes_read, &data, &size, 2))
-				{
-					ctx->compression = read_uint16(ctx->buffer);
-
-					if (ctx->compression == PSD_COMPRESSION_RLE) {
-						ctx->state = PSD_STATE_LINES_LENGTHS;
-						reset_context_buffer(ctx);
-					} else if (ctx->compression == PSD_COMPRESSION_NONE) {
-						ctx->state = PSD_STATE_CHANNEL_DATA;
-					} else {
-						g_set_error (error, GDK_PIXBUF_ERROR,
-							GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-							("Unsupported compression type"));
-						return FALSE;
-					}
-				}
-				break;
-			case PSD_STATE_LINES_LENGTHS:
-				if (feed_buffer(
-						(guchar*) ctx->lines_lengths, &ctx->bytes_read, &data,
-						 &size,	2 * ctx->height * ctx->channels))
-				{
-					// convert from different endianness
-					for (int i = 0; i <	ctx->height * ctx->channels; i++) {
-						ctx->lines_lengths[i] = read_uint16(
-							(guchar*) &ctx->lines_lengths[i]);
-					}
-					ctx->state = PSD_STATE_CHANNEL_DATA;
-					reset_context_buffer(ctx);
-				}
-				break;
-			case PSD_STATE_CHANNEL_DATA:
-				{
-					guint line_length = ctx->width;
-					if (ctx->compression == PSD_COMPRESSION_RLE) {
-						line_length = ctx->lines_lengths[
-							ctx->curr_ch * ctx->height + ctx->curr_row];
-					}
-					
-					if (feed_buffer(ctx->buffer, &ctx->bytes_read, &data, &size,
-							line_length))
-					{
-						reset_context_buffer(ctx);
-					
-						if (ctx->compression == PSD_COMPRESSION_RLE) {
-							decompress_line(ctx->buffer, line_length,
-								ctx->ch_bufs[ctx->curr_ch] + ctx->pos
-							);
-						} else {
-							memcpy(ctx->ch_bufs[ctx->curr_ch] + ctx->pos,
-								ctx->buffer, ctx->width);
-						}
-
-						ctx->pos += ctx->width;
-						++ctx->curr_row;
-					
-						if (ctx->curr_row >= ctx->height) {
-							++ctx->curr_ch;
-							ctx->curr_row = 0;
-							ctx->pos = 0;
-							if (ctx->curr_ch >= ctx->channels) {
-								ctx->state = PSD_STATE_DONE;
-							}
-						}
-					}
-				}
-				break;
-			case PSD_STATE_DONE:
-			default:
-				size = 0;
-				break;
-		}
-	}
-	
-	if (ctx->state == PSD_STATE_DONE && !ctx->finalized) {
-		// convert or copy channel buffers to our GdkPixbuf
-		if (ctx->color_mode == PSD_MODE_RGB && !ctx->use_alpha) {
-			guchar* pixels = gdk_pixbuf_get_pixels(ctx->pixbuf);
-			for (int i = 0; i < ctx->height; i++) {
-				for (int j = 0; j < ctx->width; j++) {
-					pixels[3*j+0] = ctx->ch_bufs[0][ctx->width*i + j];
-					pixels[3*j+1] = ctx->ch_bufs[1][ctx->width*i + j];
-					pixels[3*j+2] = ctx->ch_bufs[2][ctx->width*i + j];
-				}
-				pixels += gdk_pixbuf_get_rowstride(ctx->pixbuf);
-			}
-		} else if (ctx->color_mode == PSD_MODE_RGB && ctx->use_alpha) {
-			guchar* pixels = gdk_pixbuf_get_pixels(ctx->pixbuf);
-			for (int i = 0; i < ctx->height; i++) {
-				for (int j = 0; j < ctx->width; j++) {
-					pixels[4*j+0] = ctx->ch_bufs[0][ctx->width*i + j];
-					pixels[4*j+1] = ctx->ch_bufs[1][ctx->width*i + j];
-					pixels[4*j+2] = ctx->ch_bufs[2][ctx->width*i + j];
-					pixels[4*j+3] = ctx->ch_bufs[3][ctx->width*i + j];
-				}
-				pixels += gdk_pixbuf_get_rowstride(ctx->pixbuf);
-			}
-		} else if (ctx->color_mode == PSD_MODE_CMYK) {
-			// unfortunately, this doesn't seem to work correctly...
-		
-			guchar* pixels = gdk_pixbuf_get_pixels(ctx->pixbuf);
-			for (int i = 0; i < ctx->height; i++) {
-				for (int j = 0; j < ctx->width; j++) {
-					double c = 1.0 -
-						(double) ctx->ch_bufs[0][ctx->width*i + j] / 255.0;
-					double m = 1.0 -
-						(double) ctx->ch_bufs[1][ctx->width*i + j] / 255.0;
-					double y = 1.0 -
-						(double) ctx->ch_bufs[2][ctx->width*i + j] / 255.0;
-					double k = 1.0 -
-						(double) ctx->ch_bufs[3][ctx->width*i + j] / 255.0;
-					
-					pixels[3*j+0] = (1.0 - (c * (1.0 - k) + k)) * 255.0;
-					pixels[3*j+1] = (1.0 - (m * (1.0 - k) + k)) * 255.0;
-					pixels[3*j+2] = (1.0 - (y * (1.0 - k) + k)) * 255.0;
-				}
-				pixels += gdk_pixbuf_get_rowstride(ctx->pixbuf);
-			}
-		}
-		ctx->finalized = TRUE;
-	}
-	
-	return TRUE;
-}
-
-
-#ifndef INCLUDE_psd
-#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
-#else
-#define MODULE_ENTRY(function) void _gdk_pixbuf__psd_ ## function
-#endif
-
-MODULE_ENTRY (fill_vtable) (GdkPixbufModule* module)
-{
-	module->begin_load = gdk_pixbuf__psd_image_begin_load;
-	module->stop_load = gdk_pixbuf__psd_image_stop_load;
-	module->load_increment = gdk_pixbuf__psd_image_load_increment;
-}
-
-MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
-{
-	static GdkPixbufModulePattern signature[] = {
-		{ "8BPS", NULL, 100 },
-		{ NULL, NULL, 0 }
-	};
-	static gchar * mime_types[] = {
-		"image/x-psd",
-		NULL
-	};
-	static gchar * extensions[] = {
-		"psd",
-		NULL
-	};
-
-	info->name = "psd";
-	info->signature = signature;
-	//info->description = N_("Adobe Photoshop format");
-	info->description = "Adobe Photoshop format";
-	info->mime_types = mime_types;
-	info->extensions = extensions;
-	info->flags = GDK_PIXBUF_FORMAT_THREADSAFE;
-	info->flags = 0;
-	info->license = "LGPL";
-}
-
 
=== removed directory 'src/loaders/XCF'
=== removed file 'src/loaders/XCF/Makefile.am'
--- src/loaders/XCF/Makefile.am	2010-08-21 18:06:49 +0000
+++ src/loaders/XCF/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#pluginexecdir = $(prefix)/lib/gtk-2.0/2.10.0/loaders/
-pluginexecdir = $(prefix)/lib/gdk-pixbuf-2.0/2.10.0/loaders/
-
-AM_CPPFLAGS += $(GTK_CFLAGS) $(GDKPIXBUF_CFLAGS)	$(GLIB_CFLAGS) -shared -fpic -g -std=c99 -DGDK_PIXBUF_ENABLE_BACKEND
-AM_LDFLAGS = $(GTK_LIBS) $(GDKPIXBUF_LIBS) $(GLIB_LIBS)
-
-
-pluginexec_LTLIBRARIES = libpixbufloader-xcf.la 
-libpixbufloader_xcf_la_SOURCES = io-xcf.c
-libpixbufloader_xcf_la_LDFLAGS = -module -export-dynamic $(AM_LDFLAGS)
-
-#install-exec-hook:
-#	install -d $(prefix)/lib/gdk-pixbuf-2.0/2.10.0/loaders/
 
=== removed file 'src/loaders/XCF/io-xcf.c'
--- src/loaders/XCF/io-xcf.c	2010-05-24 09:46:52 +0000
+++ src/loaders/XCF/io-xcf.c	1970-01-01 00:00:00 +0000
@@ -1,1641 +0,0 @@
-/*
- * Pixbuf loader for xcf
- *
- * Author(s):
- *	Stephane Delcroix  <[e-mail]>
- *
- * Copyright (C) 2009 Novell, Inc
- *
- * This is a clean room implementation, based solely on
- * http://henning.makholm.net/xcftools/xcfspec.txt and hexdumps
- * of existing .xcf files.
- *
- * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * TODO:
- * - fix the spots/stains (where are they coming from) ?
- * - indexed mode
- * - if the bg layer mode is not Normal or Dissolve, change it to Normal
- * - file an enhancement request to gdk-pixbuf
- */
-
-//#define GDK_PIXBUF_ENABLE_BACKEND
-
-#include <gmodule.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gio/gio.h>
-#if GIO_2_23
-#include <gio/gzlibcompressor.h>
-#include <gio/gunixinputstream.h>
-#include <gio/gunixoutputstream.h>
-#endif
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <bzlib.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-
-//#define LOG(...) printf (__VA_ARGS__);
-#define LOG(...)
-
-#define _GNU_SOURCE 1
-#define POSIX_SOURCE 1
-
-#define PROP_END 		0
-#define PROP_COLORMAP 		1
-#define PROP_FLOATING_SELECTION	5
-#define PROP_OPACITY		6
-#define PROP_MODE		7
-#define PROP_VISIBLE		8
-#define PROP_LINKED		9
-#define PROP_APPLY_MASK		11
-#define PROP_OFFSETS		15
-#define PROP_COMPRESSION 	17
-#define PROP_GUIDES 		18
-#define PROP_RESOLUTION 	19
-#define PROP_TATOO		20
-#define PROP_PARASITES		21
-#define PROP_UNIT 		22
-#define PROP_PATHS 		23
-#define PROP_USER_UNIT 		24
-#define PROP_VECTORS		25
-
-#define COMPRESSION_NONE	0
-#define COMPRESSION_RLE		1
-
-#define LAYERTYPE_RGB		0
-#define LAYERTYPE_RGBA		1
-#define LAYERTYPE_GRAYSCALE	2
-#define LAYERTYPE_GRAYSCALEA	3
-#define LAYERTYPE_INDEXED	4
-#define LAYERTYPE_INDEXEDA	5
-
-#define LAYERMODE_NORMAL	0
-#define LAYERMODE_DISSOLVE	1
-#define LAYERMODE_BEHIND	2
-#define LAYERMODE_MULTIPLY	3
-#define LAYERMODE_SCREEN	4
-#define LAYERMODE_OVERLAY	5
-#define LAYERMODE_DIFFERENCE	6
-#define LAYERMODE_ADDITION	7
-#define LAYERMODE_SUBTRACT	8
-#define LAYERMODE_DARKENONLY	9
-#define LAYERMODE_LIGHTENONLY	10
-#define LAYERMODE_HUE		11
-#define LAYERMODE_SATURATION	12
-#define LAYERMODE_COLOR		13
-#define LAYERMODE_VALUE		14
-#define LAYERMODE_DIVIDE	15
-#define LAYERMODE_DODGE		16
-#define LAYERMODE_BURN		17
-#define LAYERMODE_HARDLIGHT	18
-#define LAYERMODE_SOFTLIGHT	19
-#define LAYERMODE_GRAINEXTRACT	20
-#define LAYERMODE_GRAINMERGE	21
-
-#define FILETYPE_STREAMCLOSED	-1
-#define FILETYPE_UNKNOWN	0
-#define FILETYPE_XCF		1
-#define FILETYPE_XCF_BZ2	2
-#if GIO_2_23
-#define FILETYPE_XCF_GZ		3
-#endif
-
-extern FILE *fdopen (int __fd, __const char *__modes) __THROW __wur;
-
-typedef struct _XcfContext XcfContext;
-struct _XcfContext {
-	GdkPixbufModuleSizeFunc size_func;
-	GdkPixbufModulePreparedFunc prepare_func;
-	GdkPixbufModuleUpdatedFunc update_func;
-	gpointer user_data;
-	gint type;
-	bz_stream *bz_stream;
-
-#if GIO_2_23
-	GInputStream *input, *stream;
-#endif
-
-	gchar *tempname;
-	FILE *file;
-};
-
-typedef struct _XcfChannel XcfChannel;
-struct _XcfChannel {
-	guint32 width;
-	guint32 height;
-	gboolean visible;
-	guint32 opacity;
-	guint32 lptr;
-};
-
-typedef struct _XcfLayer XcfLayer;
-struct _XcfLayer {
-	guint32	width;
-	guint32	height;
-	guint32 type;
-	guint32 mode;
-	gboolean apply_mask;
-	gboolean visible;
-	guint32 opacity;
-	gint32 dx;
-	gint32 dy;
-	XcfChannel* layer_mask;
-	guint32 lptr;;
-};
-
-void
-rle_decode (FILE *f, gchar *ptr, int count, int type)
-{
-	int channels;
-	switch (type) {
-		case LAYERTYPE_RGB : channels = 3; break;
-		case LAYERTYPE_RGBA: channels = 4; break;
-		case LAYERTYPE_GRAYSCALE: channels = 1; break;
-		case LAYERTYPE_GRAYSCALEA: channels = 2; break;
-		case LAYERTYPE_INDEXED: channels = 1; break;
-		case LAYERTYPE_INDEXEDA: channels = 2; break;
-	}
-
-	guchar opcode;
-	guchar buffer[3];
-	guchar ch[channels][count];
-	int channel;
-        size_t lfr;
-
-	//un-rle
-	for (channel = 0; channel < channels; channel++) {
-		int pixels_count = 0;
-		while (pixels_count < count) {
-			lfr = fread (&opcode, sizeof(guchar), 1, f);
-			if (opcode <= 126) {
-				lfr = fread (buffer, 1, 1, f);
-				opcode ++;
-				while (opcode --)
-					memcpy (ch[channel] + (pixels_count++), buffer, 1);
-			} else if (opcode == 127) {
-				lfr = fread (buffer, 3, 1, f);
-				int p = buffer[0];
-				int q = buffer[1];
-				int count = p*256+q;
-				while (count --)
-					memcpy (ch[channel] + (pixels_count++), buffer+2, 1);
-			} else if (opcode == 128) {
-				lfr = fread (buffer, 2, 1, f);
-				int p = buffer[0];
-				int q = buffer[1];
-				lfr = fread (ch[channel] + pixels_count, p*256+q, 1, f);
-				pixels_count += p*256+q;
-			} else if (opcode >= 129) {
-				lfr = fread (ch[channel] + pixels_count, 256 - opcode, 1, f);
-				pixels_count += 256 - opcode;
-			}
-		}
-	}
-
-	//reinterlace the channels
-	int i, j;
-	for (i=0; i <count; i++)
-		for (j=0; j<channels; j++)
-			memcpy (ptr + i * channels + j, ch[j] + i, 1);
-}
-
-void
-to_rgba (gchar *ptr, int count, int type)
-{
-	//pad to rgba
-	int i;
-
-	for (i=count-1; i>=0;i--)
-		switch (type) {
-		case LAYERTYPE_RGB:
-			memcpy (ptr + 4*i, ptr + 3*i, 3);
-			ptr[4*i + 3] = 0xff;
-			break;
-		case LAYERTYPE_RGBA:
-			///nothing to do
-			break;
-		case LAYERTYPE_GRAYSCALE:
-			memcpy (ptr + 4*i, ptr + i, 1);
-			memcpy (ptr + 4*i + 1, ptr + i, 1);
-			memcpy (ptr + 4*i + 2, ptr + i, 1);
-			ptr[4*i + 3] = 0xff;
-			break;
-		case LAYERTYPE_GRAYSCALEA:
-			memcpy (ptr + 4*i, ptr + i, 1);
-			memcpy (ptr + 4*i + 1, ptr + i, 1);
-			memcpy (ptr + 4*i + 2, ptr + i, 1);
-			memcpy (ptr + 4+i + 3, ptr + i + 1, 1);
-			break;
-		}
-}
-
-void
-apply_opacity (guchar* ptr, int size, guint32 opacity)
-{
-	int i;
-	for (i=0; i<size; i++)
-		ptr[4*i + 3] = (guchar)((ptr[4*i+3] * opacity) / 0xff);
-}
-
-void
-apply_mask (FILE *f, gchar compression, guchar *ptr, int size, XcfChannel *mask, int tile_id)
-{
-	//save file position
-	long pos = ftell (f);
-        size_t lfr;
-
-	guint32 tptr = mask->lptr + (2 + tile_id) * sizeof(guint32); //skip width and height
-	fseek (f, tptr, SEEK_SET);
-	lfr = fread (&tptr, sizeof(guint32), 1, f);
-	fseek (f, GUINT32_FROM_BE(tptr), SEEK_SET);
-
-	gchar pixels[4096];
-	if (compression == COMPRESSION_RLE)
-		rle_decode (f, pixels, size, LAYERTYPE_GRAYSCALE);
-	else //COMPRESSION_NONE
-		lfr = fread (pixels, sizeof(gchar), size, f);
-
-	int i;
-	for (i = 0; i<size; i++)
-		ptr[4*i + 3] = ptr[4 * i + 3] * pixels[i] / 0xff;
-
-	//rewind
-	fseek (f, pos, SEEK_SET);
-}
-
-
-void
-intersect_tile (guchar* ptr, int im_width, int im_height, int *ox, int *oy, int *tw, int *th)
-{
-	int i;
-	if (*ox < 0) {
-		for (i=0; i<*th; i++) {
-			memmove (ptr + 4 * i * (*tw + *ox), ptr + 4 * i * (*tw), 4 * (*tw + *ox));
-		}
-		*tw = *tw + *ox;
-		*ox = 0;
-	}
-	if (*oy < 0) {
-		memmove (ptr, ptr + 4 * *tw * -*oy, 4 * *tw * (*th + *oy));
-		*th = *th + *oy;
-		*oy = 0;
-	}
-	if (*ox + *tw > im_width) {
-		for (i=0; i<*th; i++) {
-			memmove (ptr + 4 * i * (im_width - *ox), ptr + 4 * i * (*tw), 4 * (im_width - *ox));
-		}
-		*tw = im_width - *ox;
-	}
-	if (*oy + *th > im_height) {
-		*th = im_height - *oy;
-	}
-}
-
-void blend (guchar* rgba0, guchar* rgba1)
-{
-	if (rgba0[3] == 0 && rgba1[3] == 0)
-		return;
-
-	guchar k = 0xff * rgba1[3] / (0xff - (0xff-rgba0[3])*(0xff-rgba1[3])/0xff);
-	rgba0[0] = ((0xff - k) * rgba0[0] + k * rgba1[0]) / 0xff;
-	rgba0[1] = ((0xff - k) * rgba0[1] + k * rgba1[1]) / 0xff;
-	rgba0[2] = ((0xff - k) * rgba0[2] + k * rgba1[2]) / 0xff;
-}
-
-typedef void (*composite_func) (guchar* rgb0, guchar* rgb1);
-
-void
-multiply (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = (rgb0[0] * rgb1[0] ) / 0xff;
-	rgb1[1] = (rgb0[1] * rgb1[1] ) / 0xff;
-	rgb1[2] = (rgb0[2] * rgb1[2] ) / 0xff;
-}
-
-void
-screen (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = 0xff - (0xff - rgb0[0]) * (0xff - rgb1[0]) / 0xff;
-	rgb1[1] = 0xff - (0xff - rgb0[1]) * (0xff - rgb1[1]) / 0xff;
-	rgb1[2] = 0xff - (0xff - rgb0[2]) * (0xff - rgb1[2]) / 0xff;
-}
-
-void
-overlay (guchar *rgb0, guchar *rgb1)
-{
-	//FIXME
-	//LOG ("Overlay (%d %d %d) (%d %d %d) : ", rgb0[0], rgb0[1], rgb0[2], rgb1[0], rgb1[1], rgb1[2]);
-	rgb1[0] = MIN (0xff, ((0xff - rgb1[0]) * rgb0[0] * rgb0[0] / 0xff + rgb0[0] * (0xff - (0xff - rgb1[0]) * (0xff - rgb1[0]) / 0xff)) / 0xff);
-	rgb1[1] = MIN (0xff, ((0xff - rgb1[1]) * rgb0[1] * rgb0[1] / 0xff + rgb0[1] * (0xff - (0xff - rgb1[1]) * (0xff - rgb1[1]) / 0xff)) / 0xff);
-	rgb1[2] = MIN (0xff, ((0xff - rgb1[2]) * rgb0[2] * rgb0[2] / 0xff + rgb0[2] * (0xff - (0xff - rgb1[2]) * (0xff - rgb1[2]) / 0xff)) / 0xff);
-	//LOG ("(%d %d %d)\n", rgb1[0], rgb1[1], rgb1[2]);
-}
-
-void
-difference (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = (rgb0[0] > rgb1[0]) ? rgb0[0] - rgb1[0] : rgb1[0] - rgb0[0];
-	rgb1[1] = (rgb0[1] > rgb1[1]) ? rgb0[1] - rgb1[1] : rgb1[1] - rgb0[1];
-	rgb1[2] = (rgb0[2] > rgb1[2]) ? rgb0[2] - rgb1[2] : rgb1[2] - rgb0[2];
-}
-
-void
-addition (guchar *rgb0, guchar *rgb1)
-{
-//	LOG ("addition (%d %d %d) (%d %d %d):", rgb0[0], rgb0[1], rgb0[2], rgb1[0], rgb1[1], rgb1[2]);
-	rgb1[0] = (rgb0[0] + rgb1[0]) > 0xff ? 0xff : rgb0[0] + rgb1[0];
-	rgb1[1] = (rgb0[1] + rgb1[1]) > 0xff ? 0xff : rgb0[1] + rgb1[1];
-	rgb1[2] = (rgb0[2] + rgb1[2]) > 0xff ? 0xff : rgb0[2] + rgb1[2];
-//	LOG ("(%d %d %d)\n", rgb1[0], rgb1[1], rgb1[2]);
-}
-
-void
-subtract (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = (rgb0[0] - rgb1[0]) < 0 ? 0 : rgb0[0] - rgb1[0];
-	rgb1[1] = (rgb0[1] - rgb1[1]) < 0 ? 0 : rgb0[1] - rgb1[1];
-	rgb1[2] = (rgb0[2] - rgb1[2]) < 0 ? 0 : rgb0[2] - rgb1[2];
-}
-
-void
-min (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = MIN (rgb0[0], rgb1[0]);
-	rgb1[1] = MIN (rgb0[1], rgb1[1]);
-	rgb1[2] = MIN (rgb0[2], rgb1[2]);
-}
-
-void
-max (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = MAX (rgb0[0], rgb1[0]);
-	rgb1[1] = MAX (rgb0[1], rgb1[1]);
-	rgb1[2] = MAX (rgb0[2], rgb1[2]);
-}
-
-void
-divide (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = rgb1[0] == 0 ? (rgb0[0] == 0 ? 0 : 0xff) : MIN (0xff, 0xff * rgb0[0] / rgb1[0]);
-	rgb1[1] = rgb1[1] == 0 ? (rgb0[1] == 0 ? 0 : 0xff) : MIN (0xff, 0xff * rgb0[1] / rgb1[1]);
-	rgb1[2] = rgb1[2] == 0 ? (rgb0[2] == 0 ? 0 : 0xff) : MIN (0xff, 0xff * rgb0[2] / rgb1[2]);
-}
-
-void
-dodge (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = rgb1[0] == 0xff ? (rgb0[0] == 0 ? 0 : 0xff) : MIN (0xff, 0xff * rgb0[0] / (0xff - rgb1[0]));
-	rgb1[1] = rgb1[1] == 0xff ? (rgb0[1] == 0 ? 0 : 0xff) : MIN (0xff, 0xff * rgb0[1] / (0xff - rgb1[1]));
-	rgb1[2] = rgb1[2] == 0xff ? (rgb0[2] == 0 ? 0 : 0xff) : MIN (0xff, 0xff * rgb0[2] / (0xff - rgb1[2]));
-}
-
-void
-burn (guchar *rgb0, guchar *rgb1) // 1-(1-x1)/x2
-{
-	rgb1[0] = rgb1[0] == 0 ? (rgb0[0] == 0xff ? 0xff : 0) : 0xff - MIN (0xff, 0xff * (0xff - rgb0[0]) / rgb1[0]);
-	rgb1[1] = rgb1[1] == 0 ? (rgb0[1] == 0xff ? 0xff : 0) : 0xff - MIN (0xff, 0xff * (0xff - rgb0[1]) / rgb1[1]);
-	rgb1[2] = rgb1[2] == 0 ? (rgb0[2] == 0xff ? 0xff : 0) : 0xff - MIN (0xff, 0xff * (0xff - rgb0[2]) / rgb1[2]);
-}
-
-void
-hardlight (guchar *rgb0, guchar *rgb1) //if x2 < 0.5 then 2*x1*x2 else 1-2*(1-x1)(1-x2)
-{
-	rgb1[0] = rgb1[0] < 0x80 ? 2 * rgb0[0] * rgb1[0] / 0xff : 0xff - 2 * (0xff - rgb0[0]) * (0xff - rgb1[0])/ 0xff;
-	rgb1[1] = rgb1[1] < 0x80 ? 2 * rgb0[1] * rgb1[1] / 0xff : 0xff - 2 * (0xff - rgb0[1]) * (0xff - rgb1[1])/ 0xff;
-	rgb1[2] = rgb1[2] < 0x80 ? 2 * rgb0[2] * rgb1[2] / 0xff : 0xff - 2 * (0xff - rgb0[2]) * (0xff - rgb1[2])/ 0xff;
-}
-
-void
-softlight(guchar *rgb0, guchar *rgb1)
-{
-	//FIXME
-	//LOG ("Softlight (%d %d %d) (%d %d %d) : ", rgb0[0], rgb0[1], rgb0[2], rgb1[0], rgb1[1], rgb1[2]);
-	rgb1[0] = ((0xff - rgb0[0]) * rgb0[0] * rgb1[0] / 0xff + rgb0[0] * (0xff - (0xff - rgb1[0]) * (0xff - rgb0[0]) / 0x100)) / 0x100;
-	rgb1[1] = ((0xff - rgb0[1]) * rgb0[1] * rgb1[1] / 0xff + rgb0[1] * (0xff - (0xff - rgb1[1]) * (0xff - rgb0[1]) / 0x100)) / 0x100;
-	rgb1[2] = ((0xff - rgb0[2]) * rgb0[2] * rgb1[2] / 0xff + rgb0[2] * (0xff - (0xff - rgb1[2]) * (0xff - rgb0[2]) / 0x100)) / 0x100;
-	//LOG ("(%d %d %d)\n", rgb1[0], rgb1[1], rgb1[2]);
-}
-
-void
-grainextract (guchar *rgb0, guchar *rgb1) //x1-x2+.5
-{
-	rgb1[0] = MAX (0, MIN (0xff, rgb0[0] - rgb1[0] + 0x80));
-	rgb1[1] = MAX (0, MIN (0xff, rgb0[1] - rgb1[1] + 0x80));
-	rgb1[2] = MAX (0, MIN (0xff, rgb0[2] - rgb1[2] + 0x80));
-}
-
-void
-grainmerge (guchar *rgb0, guchar *rgb1)
-{
-	rgb1[0] = MAX (0, MIN (0xff, rgb0[0] + rgb1[0] - 0x80));
-	rgb1[1] = MAX (0, MIN (0xff, rgb0[1] + rgb1[1] - 0x80));
-	rgb1[2] = MAX (0, MIN (0xff, rgb0[2] + rgb1[2] - 0x80));
-}
-
-
-//FIXME: any way to do the following 4 ones in integer arithmetic ?
-void
-hue (guchar *rgb0, guchar *rgb1)
-{
-	if (rgb1[0] == rgb1[1] == rgb1[2]) {
-		rgb1[0] = rgb0[0];
-		rgb1[1] = rgb0[1];
-		rgb1[2] = rgb0[2];
-		return;
-	}
-	//hue of rgb1, value and saturation of rgb0
-	guchar min0 = MIN (MIN (rgb0[0], rgb0[1]), rgb0[2]);
-	guchar max0 = MAX (MAX (rgb0[0], rgb0[1]), rgb0[2]);
-	guchar min1 = MIN (MIN (rgb1[0], rgb1[1]), rgb1[2]);
-	guchar max1 = MAX (MAX (rgb1[0], rgb1[1]), rgb1[2]);
-	if (max0 == 0) {
-		rgb1[0] = 0x00;
-		rgb1[1] = 0x00;
-		rgb1[2] = 0x00;
-		return;
-	}
-	double p = max0 * (max0 - min0) / (max1*(max0-min0) - min1*max0 + max1*min0);
-	double q = - max0 * (min1*max0 - max1*min0) / (max1*(max0-min0) - min1*max0 + max1*min0);
-	rgb1[0] = (guchar)(rgb1[0] * p + q);
-	rgb1[1] = (guchar)(rgb1[1] * p + q);
-	rgb1[2] = (guchar)(rgb1[2] * p + q);
-}
-
-void
-saturation (guchar *rgb0, guchar *rgb1)
-{
-	//hue and value of rgb0, saturation of rgb1
-	guchar min0 = MIN (MIN (rgb0[0], rgb0[1]), rgb0[2]);
-	guchar max0 = MAX (MAX (rgb0[0], rgb0[1]), rgb0[2]);
-	guchar min1 = MIN (MIN (rgb1[0], rgb1[1]), rgb1[2]);
-	guchar max1 = MAX (MAX (rgb1[0], rgb1[1]), rgb1[2]);
-	if (max0 == 0) {
-		rgb1[0] = 0x00;
-		rgb1[1] = 0x00;
-		rgb1[2] = 0x00;
-		return;
-	}
-	if (max0 == min0) {
-		rgb1[0] = max0;
-		rgb1[1] = min1*max0 / max0;
-		rgb1[2] = rgb1[1];
-		return;
-	}
-	double p = max0 * (min1 - max1) / (max0*(min1-max1) - min1*max0 + max1*min0);
-	double q = - max0 * (min1*max0 - max1*min0) / (max0*(min1-max1) - min1*max0 + max1*min0);
-	rgb1[0] = (guchar)(rgb0[0] * p + q);
-	rgb1[1] = (guchar)(rgb0[1] * p + q);
-	rgb1[2] = (guchar)(rgb0[2] * p + q);
-
-}
-
-void
-value (guchar *rgb0, guchar *rgb1)
-{
-	//hue and saturation ov rgb0, value of rgb1
-	guchar min0 = MIN (MIN (rgb0[0], rgb0[1]), rgb0[2]);
-	guchar max0 = MAX (MAX (rgb0[0], rgb0[1]), rgb0[2]);
-	guchar min1 = MIN (MIN (rgb1[0], rgb1[1]), rgb1[2]);
-	guchar max1 = MAX (MAX (rgb1[0], rgb1[1]), rgb1[2]);
-	if (max0 == 0) {
-		rgb1[0] = 0x00;
-		rgb1[1] = 0x00;
-		rgb1[2] = 0x00;
-		return;
-	}
-	if (max0 == min0) {
-		rgb1[0] = max1;
-		rgb1[1] = max1;
-		rgb1[2] = max1;
-		return;
-	}
-
-	double p = max1 / max0;
-
-	rgb1[0] = (guchar)(rgb0[0] * p);
-	rgb1[1] = (guchar)(rgb0[1] * p);
-	rgb1[2] = (guchar)(rgb0[2] * p);
-}
-
-void
-color (guchar *rgb0, guchar *rgb1)
-{
-	//hue and hsl-saturation or rgb1, luminosity of rgb0
-	guchar min0 = MIN (MIN (rgb0[0], rgb0[1]), rgb0[2]);
-	guchar max0 = MAX (MAX (rgb0[0], rgb0[1]), rgb0[2]);
-	guchar min1 = MIN (MIN (rgb1[0], rgb1[1]), rgb1[2]);
-	guchar max1 = MAX (MAX (rgb1[0], rgb1[1]), rgb1[2]);
-
-	double p = MIN ((min0+max0)/2, 0xff - (min0+max0)/2) / MIN ((min1+max1)/2, 0xff - (min1+max1)/2);
-	double q = (min0 + max0 - (min1 + max1) * p) / 2.0;
-
-	rgb1[0] = (guchar)(rgb1[0] * p + q);
-	rgb1[1] = (guchar)(rgb1[1] * p + q);
-	rgb1[2] = (guchar)(rgb1[2] * p + q);
-}
-
-void
-composite (gchar *pixbuf_pixels, int rowstride, gchar *tile_pixels, int ox, int oy, int tw, int th, guint32 layer_mode)
-{
-	composite_func f = NULL;
-	int origin = 4 * ox + rowstride * oy;
-	int i, j;
-
-	switch (layer_mode) {
-	case LAYERMODE_NORMAL:
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				//a0 = 1 - (1-a0)*(a-a1)
-				//rgb0 = BLEND (rgba0, rgba1)
-				gchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				gchar *src = tile_pixels + j*tw*4 + i*4;
-				guchar alpha = 0xff - (0xff - dest[3]) * (0xff - src [3]);
-				blend (dest, src);
-				dest[3] = alpha;
-			}
-		break;
-	case LAYERMODE_DISSOLVE:
-		srand(time(0));
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				guchar d = rand () % 0x100;
-				dest [0] = d <= src[3] ? src[0] : dest[0];
-				dest [1] = d <= src[3] ? src[1] : dest[1];
-				dest [2] = d <= src[3] ? src[2] : dest[2];
-				dest [3] = d <= src[3] ? 0xff : dest[3];
-			}
-		break;
-	case LAYERMODE_BEHIND: //ignore
-		break;
-	// 3<=mode<=10 || 15<=mode<=21
-	// a0 = a0
-	// rgba0 = blend (rgba0, F(rgb0, rgb1), MIN(a0, a1)
-	case LAYERMODE_MULTIPLY:
-		f = multiply;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_SCREEN:
-		f = screen;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_OVERLAY:
-		f = overlay;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_SOFTLIGHT:
-		f = softlight;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_DIFFERENCE:
-		f = difference;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_ADDITION:
-		f = addition;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_SUBTRACT:
-		f = subtract;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_DARKENONLY:
-		f = min;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_LIGHTENONLY:
-		f = max;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_DIVIDE:
-		f = divide;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_DODGE:
-		f = dodge;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_BURN:
-		f = burn;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_HARDLIGHT:
-		f = hardlight;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_GRAINEXTRACT:
-		f = grainextract;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_GRAINMERGE:
-		f = grainmerge;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_HUE:
-		f = hue;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_SATURATION:
-		f = saturation;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_VALUE:
-		f = value;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-	case LAYERMODE_COLOR:
-		f = color;
-		for (j=0;j<th;j++)
-			for (i=0;i<tw;i++) {
-				guchar *dest = pixbuf_pixels + origin + j * rowstride + 4 * i;
-				guchar *src = tile_pixels + j*tw*4 + i*4;
-				f (dest, src);
-				src[3] = MIN (dest[3], src[3]);
-				blend (dest, src);
-			}
-		break;
-
-	default:	//Pack layer on top of each other, without any blending at all
-		for (j=0; j<th;j++) {
-			memcpy (pixbuf_pixels + origin + j * rowstride, tile_pixels + j*tw*4 , tw*4);
-		}
-		break;
-	}
-
-}
-
-static GdkPixbuf*
-xcf_image_load_real (FILE *f, XcfContext *context, GError **error)
-{
-	guint32 width;
-	guint32 height;
-	guint32 color_mode;
-	gchar compression = 0;
-	GList *layers = NULL;
-	GdkPixbuf *pixbuf = NULL;
-
-	guchar buffer[32];
-	guint32 data[3];
-	guint32 property[2];
-        size_t lfr;
-
-	//Magic and version
-	lfr = fread (buffer, sizeof(guchar), 9, f);
-	//LOG ("%s\n", buffer);
-	if (strncmp (buffer, "gimp xcf ", 9)) {
-		g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, "Wrong magic");
-		return NULL;
-	}
-
-	lfr = fread (buffer, sizeof(guchar), 4, f);
-	if (strncmp (buffer, "file", 4) && strncmp (buffer, "v001", 4) && strncmp (buffer, "v002", 4)) {
-		g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE, "Unsupported version");
-		return NULL;
-	}
-	lfr = fread (buffer, sizeof(guchar), 1, f);
-
-	//Canvas size and Color mode
-	lfr = fread (data, sizeof(guint32), 3, f);
-
-	width = GUINT32_FROM_BE(data[0]);
-	height = GUINT32_FROM_BE(data[1]);
-	color_mode = GUINT32_FROM_BE(data[2]);
-	if (color_mode == 2) { //Indexed, not supported for now
-		g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE, "Indexed color mode unsupported");
-		return NULL;
-	}
-
-
-	LOG ("W: %d, H: %d, mode: %d\n", width, height, color_mode);
-
-	//Image Properties
-	while (1) {
-		lfr = fread (property, sizeof(guint32), 2, f); //read property and payload
-		if (!property[0])
-			break;
-		property[0] = GUINT32_FROM_BE(property[0]);
-		property[1] = GUINT32_FROM_BE(property[1]);
-		//LOG ("property %d, payload %d\n", property[0], property[1]);
-		switch (property[0]) {
-		case PROP_COMPRESSION:
-			lfr = fread (&compression, sizeof(gchar), 1, f);
-			LOG ("compression: %d\n", compression);
-			break;
-		case PROP_COLORMAP: //essential, need to parse this
-		case PROP_END:
-		default:
-			//skip the payload
-			fseek (f, property[1], SEEK_CUR);
-			break;
-		}
-	}
-
-	//Layer Pointer
-	guint32 layer_ptr;
-	while (1) {
-		lfr = fread (&layer_ptr, sizeof(guint32), 1, f);
-		layer_ptr = GUINT32_FROM_BE (layer_ptr);
-		if (!layer_ptr)
-			break;;
-
-		XcfLayer *layer = g_try_new (XcfLayer, 1);
-		if (!layer) {
-			g_set_error (error,
-			     GDK_PIXBUF_ERROR,
-			     GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-			     "Cannot allocate memory for loading XCF image");
-			return NULL;
-		}
-
-		gboolean ignore_layer = FALSE;
-
-		layer->mode = 0;
-		layer->apply_mask = FALSE;
-		layer->layer_mask = NULL;
-		layer->dx = layer->dy = 0;
-		layer->visible = TRUE;
-		layer->opacity = 0xff;
-
-		//LOG ("layer_ptr: %d\n", layer_ptr);
-		long pos = ftell (f);
-		//jump to the layer
-		fseek(f, layer_ptr, SEEK_SET);
-
-		//layer width, height, type
-		lfr = fread (data, sizeof(guint32), 3, f);
-		layer->width = GUINT32_FROM_BE(data[0]);
-		layer->height = GUINT32_FROM_BE(data[1]);
-		layer->type = GUINT32_FROM_BE(data[2]);
-		LOG("\tLayer w:%d h:%d type:%d\n", layer->width, layer->height, layer->type);
-
-		//Layer name, ignore
-		guint32 string_size;
-		lfr = fread (&string_size, sizeof(guint32), 1, f);
-		fseek (f, GUINT32_FROM_BE(string_size), SEEK_CUR);
-
-		//Layer properties
-		while (1) {
-			lfr = fread (property, sizeof(guint32), 2, f); //property and payload
-			if (!property[0])
-				break;		//break on PROP_END
-			property[0] = GUINT32_FROM_BE (property[0]);
-			property[1] = GUINT32_FROM_BE (property[1]);
-			//LOG ("\tproperty %d, payload %d\n", property[0], property[1]);
-			switch (property[0]) {
-			case PROP_OPACITY:
-				lfr = fread (data, sizeof(guint32), 1, f);
-				layer->opacity = GUINT32_FROM_BE(data[0]);
-				break;
-			case PROP_MODE:
-				lfr = fread (data, sizeof(guint32), 1, f);
-				layer->mode = GUINT32_FROM_BE (data[0]);
-				break;
-			case PROP_VISIBLE:
-				lfr = fread (data, sizeof(guint32), 1, f);
-				if (GUINT32_FROM_BE(data[0]) == 0) {
-					layer->visible = FALSE;
-					ignore_layer = TRUE;
-				}
-				break;
-			case PROP_APPLY_MASK:
-				lfr = fread (data, sizeof(guint32), 1, f);
-				if (GUINT32_FROM_BE(data[0]) == 1)
-					layer->apply_mask = TRUE;
-				break;
-			case PROP_OFFSETS:
-				lfr = fread(data, sizeof(gint32), 2, f);
-				layer->dx = GUINT32_FROM_BE(data[0]);
-				layer->dy = GUINT32_FROM_BE(data[1]);
-				break;
-			case PROP_FLOATING_SELECTION:
-				ignore_layer = TRUE;
-			default:
-				//skip the payload
-				fseek (f, property[1], SEEK_CUR);
-				break;
-			}
-		}
-
-		//Hierararchy Pointer
-		guint32 hptr;
-		lfr = fread (&hptr, sizeof(guint32), 1, f);
-		hptr = GUINT32_FROM_BE (hptr);
-		long pos1 = ftell (f);
-		//jump to hierarchy
-		fseek (f, hptr, SEEK_SET);
-
-		//Hierarchy w, h, bpp
-		lfr = fread (data, sizeof(guint32), 3, f);
-		data[0] = GUINT32_FROM_BE(data[0]);
-		data[1] = GUINT32_FROM_BE(data[1]);
-		data[2] = GUINT32_FROM_BE(data[2]);
-		//LOG ("\tHierarchy w:%d, h:%d, bpp:%d\n", data[0], data[1], data[2]);
-
-		guint32 lptr;
-		lfr = fread (&lptr, sizeof(guint32), 1, f);
-		layer->lptr = GUINT32_FROM_BE (lptr);
-		//Layer parsing is done at rendering time
-
-		//Here I could iterate over the unused dlevels and skip them
-
-		//rewind to the layer position
-		fseek (f, pos1, SEEK_SET);
-
-		//Mask Pointer
-		guint32 mptr;
-		lfr = fread (&mptr, sizeof(guint32), 1, f);
-		if (mptr)
-			mptr = GUINT32_FROM_BE(mptr);
-
-		//rewind to the previous position
-		fseek (f, pos, SEEK_SET);
-
-
-		if (!ignore_layer)
-			layers = g_list_prepend (layers, layer); //prepend so the layers are in a bottom-up order in the list
-		else {
-			g_free (layer);
-			continue;
-		}
-
-		if (!layer->apply_mask || !mptr)
-			continue;
-
-		LOG ("\t\tthis layer has a mask\n");
-		XcfChannel *mask = g_try_new (XcfChannel, 1);
-		if (!mask) {
-			g_set_error (error,
-			     GDK_PIXBUF_ERROR,
-			     GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-			     "Cannot allocate memory for loading XCF image");
-			return NULL;
-		}
-
-		mask->opacity = 0xff;
-		mask->visible = TRUE;
-
-		//LOG ("\t\tchannel_ptr: %d\n", mptr);
-		long mpos = ftell (f);
-		//jump to the channel
-		fseek(f, mptr, SEEK_SET);
-
-		//Channel w, h
-		lfr = fread (data, sizeof(guint32), 2, f);
-		data[0] = GUINT32_FROM_BE(data[0]);
-		data[1] = GUINT32_FROM_BE(data[1]);
-		LOG ("\t\tChannel w:%d, h:%d\n", data[0], data[1]);
-
-		//Channel name, ignore
-		lfr = fread (&string_size, sizeof(guint32), 1, f);
-		fseek (f, GUINT32_FROM_BE(string_size), SEEK_CUR);
-
-		//Channel properties
-		while (1) {
-			lfr = fread (property, sizeof(guint32), 2, f); //property and payload
-			if (!property[0])
-				break;		//break on PROP_END
-			property[0] = GUINT32_FROM_BE (property[0]);
-			property[1] = GUINT32_FROM_BE (property[1]);
-			//LOG ("\tproperty %d, payload %d\n", property[0], property[1]);
-			switch (property[0]) {
-			case PROP_OPACITY:
-				lfr = fread (data, sizeof(guint32), 1, f);
-				mask->opacity = GUINT32_FROM_BE(data[0]);
-				break;
-			case PROP_VISIBLE:
-				lfr = fread (data, sizeof(guint32), 1, f);
-				if (GUINT32_FROM_BE(data[0]) == 0)
-					mask->visible = FALSE;
-				break;
-			default:
-				//skip the payload
-				fseek (f, property[1], SEEK_CUR);
-				break;
-			}
-		}
-
-		//Hierararchy Pointer
-		lfr = fread (&hptr, sizeof(guint32), 1, f);
-		hptr = GUINT32_FROM_BE (hptr);
-		long mpos1 = ftell (f);
-		//jump to hierarchy
-		fseek (f, hptr, SEEK_SET);
-
-		//Hierarchy w, h, bpp
-		lfr = fread (data, sizeof(guint32), 3, f);
-		data[0] = GUINT32_FROM_BE(data[0]);
-		data[1] = GUINT32_FROM_BE(data[1]);
-		data[2] = GUINT32_FROM_BE(data[2]);
-		//LOG ("\tHierarchy w:%d, h:%d, bpp:%d\n", data[0], data[1], data[2]);
-
-		lfr = fread (&lptr, sizeof(guint32), 1, f);
-		mask->lptr = GUINT32_FROM_BE (lptr);
-		//level parsing is done at render time
-
-		if (mask->visible)
-			layer->layer_mask = mask;
-		else
-			g_free (mask);
-
-		//rewind...
-		fseek (f, mpos1, SEEK_SET);
-
-		//rewind to the previous position
-		fseek (f, mpos, SEEK_SET);
-	}
-
-	//Channels goes here, don't read
-
-	LOG("Done parsing\n");
-
-	//Compose the pixbuf
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-	LOG ("pixbuf %d %d\n", gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf));
-	LOG ("PrepareFunc\n");
-	if (context && context->prepare_func)
-		(* context->prepare_func) (pixbuf, NULL, context->user_data);
-
-	if (!pixbuf)
-		g_set_error (error,
-				     GDK_PIXBUF_ERROR,
-				     GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-				     "Cannot allocate memory for loading XCF image");
-
-	gdk_pixbuf_fill (pixbuf, 0x00000000);
-
-	GList *current;
-	gchar pixels[16384];
-	for (current = g_list_first (layers); current; current = g_list_next(current)) {
-		XcfLayer *layer = current->data;
-		if (!layer->visible)
-			continue;
-
-		fseek (f, layer->lptr, SEEK_SET);
-		//Ignore Level w and h (same as hierarchy)
-		fseek (f, 2 * sizeof(guint32), SEEK_CUR);
-
-
-		//Iterate on the tiles
-		guint32 tptr;
-		int tile_id = 0;
-		guchar *pixs = gdk_pixbuf_get_pixels (pixbuf);
-		int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-		int line_width = ceil ((layer->width) / 64.0);
-
-		while (1) {
-			lfr = fread (&tptr, sizeof(guint32), 1, f);
-			if (!tptr)
-				break;
-			tptr = GUINT32_FROM_BE(tptr);
-			long lpos = ftell (f);
-			fseek (f, tptr, SEEK_SET);
-
-			int ox = 64 * (tile_id % line_width);
-			int oy = 64 * (tile_id / line_width);
-			int tw = MIN (64, layer->width - ox);
-			int th = MIN (64, layer->height - oy);
-			ox += layer->dx;
-			oy += layer->dy;
-			//LOG("\tTile %d %d (%d %d) (%d %d)\n", tile_id, tptr, ox, oy, tw, th);
-
-			//if the tile doesn't intersect with the canvas, ignore
-			if (ox + tw < 0 || oy + th < 0 || ox > (int)width || oy > (int)height ) {
-				fseek (f, lpos, SEEK_SET);
-				tile_id++;
-				continue;
-			}
-
-			//decompress
-			if (compression == COMPRESSION_RLE)
-				rle_decode (f, pixels, tw*th, layer->type);
-			else {//COMPRESSION_NONE
-				int channels;
-				switch (layer->type) {
-					case LAYERTYPE_RGB : channels = 3; break;
-					case LAYERTYPE_RGBA: channels = 4; break;
-					case LAYERTYPE_GRAYSCALE: channels = 1; break;
-					case LAYERTYPE_GRAYSCALEA: channels = 2; break;
-					case LAYERTYPE_INDEXED: channels = 1; break;
-					case LAYERTYPE_INDEXEDA: channels = 2; break;
-				}
-				lfr = fread (pixels, sizeof(gchar), tw*th*channels, f);
-			}
-
-			//pad to rgba
-			to_rgba (pixels, tw*th, layer->type);
-
-			//apply mask
-			if (layer->layer_mask)
-				apply_mask (f, compression, pixels, tw*th, layer->layer_mask, tile_id);
-
-			//reduce the tile to its intersection with the canvas
-			intersect_tile (pixels, width, height, &ox, &oy, &tw, &th);
-
-			//apply layer opacity
-			apply_opacity (pixels, tw*th, layer->opacity);
-
-			//composite
-			composite (pixs, rowstride, pixels, ox, oy, tw, th, layer->mode);
-
-			//notify
-			if (context && context->update_func)
-				(* context->update_func) (pixbuf, ox, oy, tw, th, context->user_data);
-
-
-			fseek (f, lpos, SEEK_SET);
-			tile_id++;
-		}
-	}
-
-	//free the layers and masks
-	for (current = g_list_first (layers); current; current = g_list_next(current)) {
-		XcfLayer *layer = current->data;
-		if (layer->layer_mask)
-			g_free (layer->layer_mask);
-	}
-	g_list_free (layers);
-
-	return pixbuf;
-}
-
-/* Static Loader */
-
-static GdkPixbuf*
-xcf_image_load (FILE *f, GError **error)
-{
-        size_t lfr;
-	guchar buffer[4];
-	lfr = fread (buffer, sizeof(guchar), 4, f);
-	rewind (f);
-	if (!strncmp (buffer, "BZh", 3)) { //Decompress the xcf.bz2 file to a temp file
-		gchar *tempname;
-		gint fd = g_file_open_tmp ("gdkpixbuf-xcf-tmp.XXXXXX", &tempname, NULL);
-		if (fd < 0) {
-			gint save_errno = errno;
-			g_set_error (error,
-					G_FILE_ERROR,
-					g_file_error_from_errno (save_errno),
-					"Failed to create temporary file when loading Xcf image");
-			return NULL;
-		}
-
-		FILE *file = fdopen (fd, "w+");
-		if (!file) {
-			gint save_errno = errno;
-			g_set_error (error,
-					G_FILE_ERROR,
-					g_file_error_from_errno (save_errno),
-					"Failed to open temporary file when loading Xcf image");
-			g_free (tempname);
-			return NULL;
-		}
-
-		int bzerror;
-		BZFILE *b = BZ2_bzReadOpen (&bzerror, f, 0, 0, NULL, 0);
-		if (bzerror != BZ_OK) {
-			BZ2_bzReadClose (&bzerror, b);
-			fclose (file);
-			g_unlink (tempname);
-			g_free (tempname);
-			g_set_error (error,
-					GDK_PIXBUF_ERROR,
-					GDK_PIXBUF_ERROR_FAILED,
-					"Failed to initialize bz2 decompressor");
-			return NULL;
-		}
-
-		bzerror = BZ_OK;
-		gchar buf [65536];
-		gint nBuf;
-		while (bzerror == BZ_OK) {
-			nBuf = BZ2_bzRead (&bzerror, b, buf, 65536);
-			if (bzerror == BZ_OK || bzerror == BZ_STREAM_END)
-				if (fwrite (buf, sizeof (guchar), nBuf, file) != nBuf) {
-					gint save_errno = errno;
-					g_set_error (error,
-							     G_FILE_ERROR,
-							     g_file_error_from_errno (save_errno),
-							     "Failed to write to temporary file when loading Xcf image");
-					BZ2_bzReadClose (&bzerror, b);
-					fclose (file);
-					g_unlink (tempname);
-					g_free (tempname);
-					return NULL;
-				}
-		}
-
-		if (bzerror != BZ_STREAM_END) {
-			LOG ("bzerror = %d\n", bzerror);
-			BZ2_bzReadClose (&bzerror, b);
-			fclose (file);
-			g_unlink (tempname);
-			g_free (tempname);
-			g_set_error (error,
-					GDK_PIXBUF_ERROR,
-					GDK_PIXBUF_ERROR_FAILED,
-					"Decompression error while loading Xcf.bz2 file");
-			return NULL;
-		} else {
-			LOG ("bzerror = %d\n", bzerror);
-			BZ2_bzReadClose (&bzerror, b);
-		}
-
-		fflush (file);
-		rewind (file);
-		g_unlink (tempname);
-		g_free (tempname);
-
-		GdkPixbuf *pixbuf = xcf_image_load_real (file, NULL, error);
-		fclose (file);
-		return pixbuf;
-#if GIO_2_23
-	} else if (!strncmp (buffer, "\x1f\x8b", 2)) { //Decompress the .gz to a temp file
-		GZlibDecompressor *compressor;
-		GInputStream *input, *stream;
-
-		compressor = g_zlib_decompressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP);
-		input = g_unix_input_stream_new (fileno (f), FALSE);
-		stream = (GInputStream *) g_converter_input_stream_new (input, (GConverter *) (compressor));
-		g_object_unref (compressor);
-		g_object_unref (input);
-
-		gchar *tempname;
-		gint fd = g_file_open_tmp ("gdkpixbuf-xcf-tmp.XXXXXX", &tempname, NULL);
-		if (fd < 0) {
-			gint save_errno = errno;
-			g_set_error (error,
-					G_FILE_ERROR,
-					g_file_error_from_errno (save_errno),
-					"Failed to create temporary file when loading Xcf image");
-			return NULL;
-		}
-		GOutputStream *output;
-		output = g_unix_output_stream_new (fd, TRUE);
-		if (!g_output_stream_splice (G_OUTPUT_STREAM (output), stream,
-					     G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-					     NULL, NULL)) {
-			LOG ("splicing failed\n");
-			g_set_error (error,
-				     GDK_PIXBUF_ERROR,
-				     GDK_PIXBUF_ERROR_FAILED,
-				     "Decompression error while loading Xcf.gz file");
-			return NULL;
-		}
-
-		FILE *file;
-		file = fopen (tempname, "r");
-		g_unlink (tempname);
-		g_free (tempname);
-
-		GdkPixbuf *pixbuf = xcf_image_load_real (file, NULL, error);
-		fclose (file);
-
-		return pixbuf;
-#endif
-	} else
-		return xcf_image_load_real (f, NULL, error);
-}
-
-
-/* Progressive loader */
-
-/*
- * as the layers are packed top down in the xcf format, and we have to render them bottom-up,
- * we need the full file loaded to start rendering
- */
-
-static gpointer
-xcf_image_begin_load (GdkPixbufModuleSizeFunc size_func,
-		GdkPixbufModulePreparedFunc prepare_func,
-		GdkPixbufModuleUpdatedFunc update_func,
-		gpointer user_data,
-		GError **error)
-{
-	LOG ("Begin\n");
-	XcfContext *context;
-	gint fd;
-
-	context = g_new (XcfContext, 1);
-	context->size_func = size_func;
-	context->prepare_func = prepare_func;
-	context->update_func = update_func;
-	context->user_data = user_data;
-	context->type = FILETYPE_UNKNOWN;
-	context->bz_stream = NULL;
-#if GIO_2_23
-	context->stream = NULL;
-	context->input = NULL;
-#endif
-
-	fd = g_file_open_tmp ("gdkpixbuf-xcf-tmp.XXXXXX", &context->tempname, NULL);
-
-	if (fd < 0) {
-		g_free (context);
-		return NULL;
-	}
-
-	context->file = fdopen (fd, "w+");
-	if (!context->file) {
-		g_free (context->tempname);
-		g_free (context);
-		return NULL;
-	}
-
-	return context;
-}
-
-static gboolean
-xcf_image_stop_load (gpointer data, GError **error)
-{
-	LOG ("Stop\n");
-	XcfContext *context = (XcfContext*) data;
-	gboolean retval = TRUE;
-
-	g_return_val_if_fail (data, TRUE);
-
-	if (context->type == FILETYPE_XCF ||
-	    context->type == FILETYPE_XCF_BZ2) {
-		fflush (context->file);
-		rewind (context->file);
-		if (context->tempname) {
-			g_unlink (context->tempname);
-			g_free (context->tempname);
-			context->tempname = NULL;
-		}
-		GdkPixbuf *pixbuf = xcf_image_load_real (context->file, context, error);
-		if (!pixbuf)
-			retval = FALSE;
-		else
-			g_object_unref (pixbuf);
-#if GIO_2_23
-	} else if (context->type == FILETYPE_XCF_GZ) {
-		g_object_unref (context->input);
-		context->input = NULL;
-
-		gchar buf [65536];
-		gsize count;
-		GError *err = NULL;
-		while ((count = g_input_stream_read (G_INPUT_STREAM (context->stream),
-						     &buf, sizeof (buf), NULL, error)) > 0) {
-			if (fwrite (buf, sizeof (gchar), count, context->file) != count) {
-				gint save_errno = errno;
-				g_set_error (error,
-					     G_FILE_ERROR,
-					     g_file_error_from_errno (save_errno),
-					     "Failed to write to temporary file when loading Xcf image");
-				retval = FALSE;
-				goto bail;
-			}
-		}
-		if (count == -1) {
-			/* error is already set */
-			retval = FALSE;
-			goto bail;
-		}
-#endif
-	} else {
-		g_assert_not_reached ();
-	}
-
-	fflush (context->file);
-	rewind (context->file);
-	if (context->tempname) {
-		g_unlink (context->tempname);
-		g_free (context->tempname);
-		context->tempname = NULL;
-	}
-	GdkPixbuf *pixbuf = xcf_image_load_real (context->file, context, error);
-	if (!pixbuf)
-		retval = FALSE;
-	else
-		g_object_unref (pixbuf);
-
-bail:
-#if GIO_2_23
-	if (context->stream)
-		g_object_unref (context->stream);
-#endif
-	fclose (context->file);
-	if (context->tempname) {
-		g_unlink (context->tempname);
-		g_free (context->tempname);
-	}
-	g_free (context);
-
-	return retval;
-}
-
-static gboolean
-xcf_image_load_increment (gpointer data,
-		    const guchar *buf,
-		    guint size,
-		    GError **error)
-{
-	LOG ("Increment %d\n", size);
-	g_return_val_if_fail (data, FALSE);
-	XcfContext *context = (XcfContext*) data;
-
-	if (context->type == FILETYPE_STREAMCLOSED) { //end of compressed stream reached
-		g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, "end of compressed stream reached before the end of the file");
-		return FALSE;
-	}
-
-	if (context->type == FILETYPE_UNKNOWN) { // first chunk
-		if (!strncmp (buf, "gimp xcf ", 9))
-			context->type = FILETYPE_XCF;
-		else if (!strncmp (buf, "BZh", 3)) {
-			context->type = FILETYPE_XCF_BZ2;
-
-			//Initialize bzlib
-			context->bz_stream = g_new (bz_stream, 1);
-			context->bz_stream->bzalloc = NULL;
-			context->bz_stream->bzfree = NULL;
-			context->bz_stream->opaque = NULL;
-
-			int ret = BZ2_bzDecompressInit (context->bz_stream, 0, 0); //Verbosity = 0, don't optimize for memory usage
-			if (ret != BZ_OK) {
-				g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, "Failed to initialize bz2 decompressor");
-				g_free(context->bz_stream);
-				context->bz_stream = NULL;
-				return FALSE;
-			}
-#if GIO_2_23
-		} else if (!strncmp (buf, "\x1f\x8b", 2)) {
-			GZlibDecompressor *compressor;
-
-			context->type = FILETYPE_XCF_GZ;
-			compressor = g_zlib_decompressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP);
-
-			context->input = g_memory_input_stream_new ();
-			context->stream = (GInputStream *) g_converter_input_stream_new (context->input, (GConverter *) (compressor));
-			g_object_unref (compressor);
-#endif
-		}
-		LOG ("File type %d\n", context->type);
-	}
-
-	gchar *outbuf;
-	switch (context->type) {
-	case FILETYPE_XCF_BZ2:
-		outbuf = g_new (gchar, 65536);
-		context->bz_stream->next_in = (gchar*)buf;
-		context->bz_stream->avail_in = size;
-		while (context->bz_stream->avail_in > 0) {
-			context->bz_stream->next_out = outbuf;
-			context->bz_stream->avail_out = 65536;
-			int ret = BZ2_bzDecompress (context->bz_stream);
-			switch (ret) {
-			case BZ_OK:
-				break;
-			case BZ_STREAM_END:
-				LOG ("End of bz stream\n");
-				BZ2_bzDecompressEnd (context->bz_stream);
-				context->type = FILETYPE_STREAMCLOSED;
-				break;
-			default:
-				BZ2_bzDecompressEnd (context->bz_stream);
-				context->type = FILETYPE_STREAMCLOSED;
-				g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, "Failed to decompress");
-				g_free(outbuf);
-				context->bz_stream->next_out = NULL;
-				outbuf = NULL;
-				g_free(context->bz_stream);
-				context->bz_stream = NULL;
-				return FALSE;
-			}
-
-			int total_out = 65536 - context->bz_stream->avail_out;
-			LOG ("Wrote %d to file %s\n", total_out, context->tempname);
-			if (fwrite (outbuf, sizeof (guchar), total_out, context->file) != total_out) {
-				gint save_errno = errno;
-				g_set_error (error,
-						     G_FILE_ERROR,
-						     g_file_error_from_errno (save_errno),
-						     "Failed to write to temporary file when loading Xcf image");
-				g_free(outbuf);
-				context->bz_stream->next_out = NULL;
-				outbuf = NULL;
-				g_free(context->bz_stream);
-				context->bz_stream = NULL;
-				return FALSE;
-			}
-		}
-		g_free(outbuf);
-		context->bz_stream->next_out = NULL;
-		outbuf = NULL;
-		if (context->type == FILETYPE_STREAMCLOSED)
-		{
-		   g_free(context->bz_stream);
-		   context->bz_stream = NULL;
-		}
-		break;
-#if GIO_2_23
-	case FILETYPE_XCF_GZ:
-		g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (context->input),
-								       buf, size, NULL);
-		break;
-#endif
-	case FILETYPE_XCF:
-	default:
-		if (fwrite (buf, sizeof (guchar), size, context->file) != size) {
-			gint save_errno = errno;
-			g_set_error (error,
-					     G_FILE_ERROR,
-					     g_file_error_from_errno (save_errno),
-					     "Failed to write to temporary file when loading Xcf image");
-			return FALSE;
-		}
-		break;
-	}
-
-	return TRUE;
-}
-
-
-#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
-MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
-{
-        module->load = xcf_image_load;
-        module->begin_load = xcf_image_begin_load;
-        module->stop_load = xcf_image_stop_load;
-        module->load_increment = xcf_image_load_increment;
-}
-
-MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
-{
-        static GdkPixbufModulePattern signature[] = {
-                { "gimp xcf", NULL, 100 },
-		{ "BZh", NULL, 80 },
-#if GIO_2_23
-		{ "\x1f\x8b", NULL, 80 },
-#endif
-                { NULL, NULL, 0 }
-        };
-	static gchar * mime_types[] = {
-		"image/x-xcf",
-		"image/x-compressed-xcf",
-		NULL
-	};
-	static gchar * extensions[] = {
-		"xcf",
-		"xcf.bz2",
-#if GIO_2_23
-		"xcf.gz",
-#endif
-		NULL
-	};
-
-	info->name = "xcf";
-        info->signature = signature;
-	info->description = "The XCF (The Gimp) image format";
-	info->mime_types = mime_types;
-	info->extensions = extensions;
-	info->flags = 0;
-	info->license = "LGPL";
-}
 
=== modified file 'src/plugin-pixbuf/plugin-pixbuf.h'
--- src/plugin-pixbuf/plugin-pixbuf.h	2010-05-31 14:57:37 +0000
+++ src/plugin-pixbuf/plugin-pixbuf.h	2014-12-26 04:45:12 +0000
@@ -48,12 +48,6 @@
 }
 g_slist_free(suportedFormats);
 
-PluginManager::register_filetype("image/vnd.adobe.photoshop", 1);
-PluginManager::register_filetype("image/x-xcf", 1);
-PluginManager::register_filetype("image/x-compressed-xcf", 1);
-//PluginManager::register_filetype("image/x-icns", 2);
-//PluginManager::register_filetype("image/jpeg", 1); //TODO: do we need this?
-
 #endif
 
 #endif