* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- *
+ *
* Derived from:
- *
+ *
* GdkPixbuf library - PSD image loader
*
* Copyright (C) 2008 Jan Dudek
#include "image-load.h"
#include "image-load-psd.h"
-typedef struct _ImageLoaderPSD ImageLoaderPSD;
-struct _ImageLoaderPSD {
+struct ImageLoaderPSD {
ImageLoaderBackendCbAreaUpdated area_updated_cb;
ImageLoaderBackendCbSize size_cb;
ImageLoaderBackendCbAreaPrepared area_prepared_cb;
gboolean abort;
};
-typedef struct
+struct PsdHeader
{
guchar signature[4]; /* file ID, always "8BPS" */
guint16 version; /* version number, always 1 */
guint32 columns; /* width of image in pixels (1-30000) */
guint16 depth; /* number of bits per channel (1, 8, 16 or 32) */
guint16 color_mode; /* color mode as defined below */
-} PsdHeader;
+};
#define PSD_HEADER_SIZE 26
-typedef enum
+enum PsdColorMode
{
PSD_MODE_MONO = 0,
PSD_MODE_GRAYSCALE = 1,
PSD_MODE_MULTICHANNEL = 7,
PSD_MODE_DUOTONE = 8,
PSD_MODE_LAB = 9,
-} PsdColorMode;
+};
-typedef enum
+enum PsdCompressionType
{
PSD_COMPRESSION_NONE = 0,
PSD_COMPRESSION_RLE = 1
-} PsdCompressionType;
+};
-typedef enum
+enum PsdReadState
{
PSD_STATE_HEADER,
PSD_STATE_COLOR_MODE_BLOCK,
PSD_STATE_LINES_LENGTHS,
PSD_STATE_CHANNEL_DATA,
PSD_STATE_DONE
-} PsdReadState;
+};
-typedef struct
+struct PsdContext
{
PsdReadState state;
-
+
GdkPixbuf* pixbuf;
gpointer user_data;
guint pos;
guint16* lines_lengths;
gboolean finalized;
-} PsdContext;
+};
static guint16
-read_uint16 (guchar* buf)
+read_uint16 (const guchar* buf)
{
return (buf[0] << 8) | buf[1];
}
static guint32
-read_uint32 (guchar* buf)
+read_uint32 (const guchar* buf)
{
return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
}
psd_parse_header (guchar* str)
{
PsdHeader hd;
-
+
memcpy(hd.signature, str, 4);
hd.version = read_uint16(str + 4);
hd.channels = read_uint16(str + 12);
return FALSE;
}
}
- if (*size < context->bytes_to_skip) {
+
+ if (*size < context->bytes_to_skip)
+ {
*data += *size;
context->bytes_to_skip -= *size;
*size = 0;
return FALSE;
- } else {
- *size -= context->bytes_to_skip;
- *data += context->bytes_to_skip;
- return TRUE;
- }
+ }
+
+ *size -= context->bytes_to_skip;
+ *data += context->bytes_to_skip;
+ return TRUE;
}
/*
{
guint16 bytes_read = 0;
int k;
- while (bytes_read < line_length) {
+ while (bytes_read < line_length)
+ {
gchar byte = src[bytes_read];
++bytes_read;
-
- if (byte == -128) {
+
+ if (byte == -128)
+ {
continue;
- } else if (byte > -1) {
+ }
+
+ if (byte > -1)
+ {
gint count = byte + 1;
-
+
/* copy next count bytes */
- for (k = 0; k < count; ++k) {
+ for (k = 0; k < count; ++k)
+ {
*dest = src[bytes_read];
++dest;
++bytes_read;
+ }
}
- } else {
+ else
+ {
gint count = -byte + 1;
-
+
/* copy next byte count times */
guchar next_byte = src[bytes_read];
- ++bytes_read;
- for (k = 0; k < count; ++k) {
+ ++bytes_read;
+ for (k = 0; k < count; ++k)
+ {
*dest = next_byte;
++dest;
+ }
}
}
- }
}
static void
g_free(ctx);
}
-static gboolean image_loader_psd_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
+static gboolean image_loader_psd_load(gpointer loader, const guchar *buf, gsize count, GError **)
{
- ImageLoaderPSD *ld = (ImageLoaderPSD *) loader;
- PsdContext* ctx = g_new0(PsdContext, 1);
+ auto ld = static_cast<ImageLoaderPSD *>(loader);
+ auto ctx = g_new0(PsdContext, 1);
guint i;
guint32 j;
guint size = count;
ctx->buffer = static_cast<guchar *>(g_malloc(PSD_HEADER_SIZE));
reset_context_buffer(ctx);
- ctx->ch_bufs = NULL;
+ ctx->ch_bufs = nullptr;
ctx->curr_ch = 0;
ctx->curr_row = 0;
ctx->pos = 0;
- ctx->lines_lengths = NULL;
+ ctx->lines_lengths = nullptr;
ctx->finalized = FALSE;
while (size > 0) {
ctx->channels = hd.channels;
ctx->depth = hd.depth;
ctx->depth_bytes = (ctx->depth/8 > 0 ? ctx->depth/8 : 1);
- ctx->color_mode = hd.color_mode;
-
+ ctx->color_mode = static_cast<PsdColorMode>(hd.color_mode);
+
if (ctx->color_mode != PSD_MODE_RGB
&& ctx->color_mode != PSD_MODE_GRAYSCALE
&& ctx->color_mode != PSD_MODE_CMYK
free_context(ctx);
return FALSE;
}
-
+
if (ctx->depth != 8 && ctx->depth != 16) {
log_printf("warning: psd - Unsupported color depth\n");
free_context(ctx);
/* we need buffer that can contain one channel data for one
row in RLE compressed format. 2*width should be enough */
g_free(ctx->buffer);
- ctx->buffer = g_malloc(ctx->width * 2 * ctx->depth_bytes);
-
+ ctx->buffer = static_cast<guchar *>(g_malloc(ctx->width * 2 * ctx->depth_bytes));
+
/* this will be needed for RLE decompression */
ctx->lines_lengths =
- g_malloc(2 * ctx->channels * ctx->height);
-
+ static_cast<guint16 *>(g_malloc(2 * ctx->channels * ctx->height));
+
ctx->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
FALSE, 8, ctx->width, ctx->height);
- if (ctx->lines_lengths == NULL || ctx->buffer == NULL ||
- ctx->pixbuf == NULL)
+ if (ctx->lines_lengths == nullptr || ctx->buffer == nullptr ||
+ ctx->pixbuf == nullptr)
{
log_printf("warning: Insufficient memory to load PSD image file\n");
free_context(ctx);
return FALSE;
}
-
+
/* create separate buffers for each channel */
- ctx->ch_bufs = g_malloc(sizeof(guchar*) * ctx->channels);
+ ctx->ch_bufs = static_cast<guchar **>(g_malloc(sizeof(guchar*) * ctx->channels));
for (i = 0; i < ctx->channels; i++) {
ctx->ch_bufs[i] =
- g_malloc(ctx->width*ctx->height*ctx->depth_bytes);
+ static_cast<guchar *>(g_malloc(ctx->width*ctx->height*ctx->depth_bytes));
- if (ctx->ch_bufs[i] == NULL) {
+ if (ctx->ch_bufs[i] == nullptr) {
log_printf("warning: Insufficient memory to load PSD image file\n");
free_context(ctx);
return FALSE;
- }
+ }
}
ctx->state = PSD_STATE_COLOR_MODE_BLOCK;
case PSD_STATE_COMPRESSION:
if (feed_buffer(ctx->buffer, &ctx->bytes_read, &buf, &size, 2))
{
- ctx->compression = read_uint16(ctx->buffer);
+ ctx->compression = static_cast<PsdCompressionType>(read_uint16(ctx->buffer));
if (ctx->compression == PSD_COMPRESSION_RLE) {
ctx->state = PSD_STATE_LINES_LENGTHS;
break;
case PSD_STATE_LINES_LENGTHS:
if (feed_buffer(
- (guchar*) ctx->lines_lengths, &ctx->bytes_read, &buf,
+ reinterpret_cast<guchar*>(ctx->lines_lengths), &ctx->bytes_read, &buf,
&size, 2 * ctx->height * ctx->channels))
{
/* convert from different endianness */
for (i = 0; i < ctx->height * ctx->channels; i++) {
ctx->lines_lengths[i] = read_uint16(
- (guchar*) &ctx->lines_lengths[i]);
+ reinterpret_cast<guchar*>(&ctx->lines_lengths[i]));
}
ctx->state = PSD_STATE_CHANNEL_DATA;
reset_context_buffer(ctx);
line_length = ctx->lines_lengths[
ctx->curr_ch * ctx->height + ctx->curr_row];
}
-
+
if (feed_buffer(ctx->buffer, &ctx->bytes_read, &buf, &size,
line_length))
{
memcpy(ctx->ch_bufs[ctx->curr_ch] + ctx->pos,
ctx->buffer, line_length);
}
-
+
ctx->pos += ctx->width * ctx->depth_bytes;
++ctx->curr_row;
-
+
if (ctx->curr_row >= ctx->height) {
++ctx->curr_ch;
ctx->curr_row = 0;
ctx->state = PSD_STATE_DONE;
}
}
-
+
reset_context_buffer(ctx);
}
}
break;
}
}
-
+
if (ctx->state == PSD_STATE_DONE && !ctx->finalized) {
/* convert or copy channel buffers to our GdkPixbuf */
guchar* pixels = gdk_pixbuf_get_pixels(ctx->pixbuf);
} else if (ctx->color_mode == PSD_MODE_CMYK) {
/* unfortunately, this doesn't work 100% correctly...
CMYK-RGB conversion distorts colors significantly */
-
+
guchar* pixels = gdk_pixbuf_get_pixels(ctx->pixbuf);
for (i = 0; i < ctx->height; i++) {
for (j = 0; j < ctx->width; j++) {
double c = 1.0 -
- (double) ctx->ch_bufs[0][ctx->width*i + j] / 255.0;
+ static_cast<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;
+ static_cast<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;
+ static_cast<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;
-
+ static_cast<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;
static gpointer image_loader_psd_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
{
- ImageLoaderPSD *loader = g_new0(ImageLoaderPSD, 1);
+ auto loader = g_new0(ImageLoaderPSD, 1);
loader->area_updated_cb = area_updated_cb;
loader->size_cb = size_cb;
loader->area_prepared_cb = area_prepared_cb;
loader->data = data;
- return (gpointer) loader;
+ return loader;
}
static void image_loader_psd_set_size(gpointer loader, int width, int height)
{
- ImageLoaderPSD *ld = (ImageLoaderPSD *) loader;
+ auto ld = static_cast<ImageLoaderPSD *>(loader);
ld->requested_width = width;
ld->requested_height = height;
}
static GdkPixbuf* image_loader_psd_get_pixbuf(gpointer loader)
{
- ImageLoaderPSD *ld = (ImageLoaderPSD *) loader;
+ auto ld = static_cast<ImageLoaderPSD *>(loader);
return ld->pixbuf;
}
-static gchar* image_loader_psd_get_format_name(gpointer UNUSED(loader))
+static gchar* image_loader_psd_get_format_name(gpointer)
{
return g_strdup("psd");
}
-static gchar** image_loader_psd_get_format_mime_types(gpointer UNUSED(loader))
+static gchar** image_loader_psd_get_format_mime_types(gpointer)
{
- static gchar *mime[] = {"application/psd", NULL};
- return g_strdupv(mime);
+ static const gchar *mime[] = {"application/psd", nullptr};
+ return g_strdupv(const_cast<gchar **>(mime));
}
-static gboolean image_loader_psd_close(gpointer UNUSED(loader), GError **UNUSED(error))
+static gboolean image_loader_psd_close(gpointer, GError **)
{
return TRUE;
}
static void image_loader_psd_abort(gpointer loader)
{
- ImageLoaderPSD *ld = (ImageLoaderPSD *) loader;
+ auto ld = static_cast<ImageLoaderPSD *>(loader);
ld->abort = TRUE;
}
static void image_loader_psd_free(gpointer loader)
{
- ImageLoaderPSD *ld = (ImageLoaderPSD *) loader;
+ auto ld = static_cast<ImageLoaderPSD *>(loader);
if (ld->pixbuf) g_object_unref(ld->pixbuf);
g_free(ld);
}
funcs->loader_new = image_loader_psd_new;
funcs->set_size = image_loader_psd_set_size;
funcs->load = image_loader_psd_load;
- funcs->write = NULL;
+ funcs->write = nullptr;
funcs->get_pixbuf = image_loader_psd_get_pixbuf;
funcs->close = image_loader_psd_close;
funcs->abort = image_loader_psd_abort;