1999-11-21 21:28:28 +00:00
|
|
|
|
/* GdkPixbuf library - Windows Bitmap image loader
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1999 The Free Software Foundation
|
1999-07-08 16:04:16 +00:00
|
|
|
|
*
|
1999-11-21 21:28:28 +00:00
|
|
|
|
* Authors: Arjan van de Ven <arjan@fenrus.demon.nl>
|
|
|
|
|
* Federico Mena-Quintero <federico@gimp.org>
|
|
|
|
|
*
|
|
|
|
|
* Based on io-ras.c
|
1999-07-08 16:04:16 +00:00
|
|
|
|
*
|
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:33:08 +00:00
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1999-07-08 16:04:16 +00:00
|
|
|
|
* 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
|
2000-07-26 11:33:08 +00:00
|
|
|
|
* Lesser General Public License for more details.
|
1999-07-08 16:04:16 +00:00
|
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1999-11-21 21:28:28 +00:00
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
* Boston, MA 02111-1307, USA.
|
1999-07-08 16:04:16 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
2000-08-01 21:43:56 +00:00
|
|
|
|
#ifdef HAVE_UNISTD_H
|
1999-11-21 21:28:28 +00:00
|
|
|
|
#include <unistd.h>
|
2000-08-01 21:43:56 +00:00
|
|
|
|
#endif
|
1999-12-07 18:17:01 +00:00
|
|
|
|
#include <string.h>
|
2000-04-11 07:03:25 +00:00
|
|
|
|
#include "gdk-pixbuf-private.h"
|
|
|
|
|
#include "gdk-pixbuf-io.h"
|
1999-12-04 18:17:52 +00:00
|
|
|
|
|
2000-04-11 07:03:25 +00:00
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
1999-11-24 21:12:24 +00:00
|
|
|
|
/*
|
|
|
|
|
|
|
|
|
|
These structures are actually dummies. These are according to
|
1999-12-04 18:17:52 +00:00
|
|
|
|
the "Windows API reference guide volume II" as written by
|
|
|
|
|
Borland International, but GCC fiddles with the alignment of
|
|
|
|
|
the internal members, so these aren't actually usable.
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
struct BitmapFileHeader {
|
1999-11-24 21:12:24 +00:00
|
|
|
|
gushort bfType;
|
|
|
|
|
guint bfSize;
|
|
|
|
|
guint reserverd;
|
|
|
|
|
guint bfOffbits;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct BitmapInfoHeader {
|
1999-11-24 21:12:24 +00:00
|
|
|
|
guint biSize;
|
|
|
|
|
guint biWidth;
|
|
|
|
|
guint biHeight;
|
|
|
|
|
gushort biPlanes;
|
|
|
|
|
gushort biBitCount;
|
|
|
|
|
guint biCompression;
|
|
|
|
|
guint biSizeImage;
|
|
|
|
|
guint biXPelsPerMeter;
|
|
|
|
|
guint biYPelsPerMeter;
|
|
|
|
|
guint biClrUsed;
|
|
|
|
|
guint biClrImportant;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
/* biCompression values */
|
|
|
|
|
|
|
|
|
|
#define BI_RGB 0
|
|
|
|
|
#define BI_RLE8 1
|
|
|
|
|
#define BI_RLE4 2
|
|
|
|
|
#define BI_BITFIELDS 3
|
|
|
|
|
#define BI_JPEG 4
|
|
|
|
|
#define BI_PNG 5
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
/*
|
|
|
|
|
|
|
|
|
|
DumpBIH printf's the values in a BitmapInfoHeader to the screen, for
|
|
|
|
|
debugging purposes.
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
#if DUMPBIH
|
1999-11-24 21:12:24 +00:00
|
|
|
|
static void DumpBIH(unsigned char *BIH)
|
2000-03-06 08:53:57 +00:00
|
|
|
|
{
|
1999-11-24 21:12:24 +00:00
|
|
|
|
printf("biSize = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[3] << 24) + (BIH[2] << 16) + (BIH[1] << 8) +
|
|
|
|
|
(BIH[0]));
|
1999-11-24 21:12:24 +00:00
|
|
|
|
printf("biWidth = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[7] << 24) + (BIH[6] << 16) + (BIH[5] << 8) +
|
|
|
|
|
(BIH[4]));
|
1999-11-24 21:12:24 +00:00
|
|
|
|
printf("biHeight = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[11] << 24) + (BIH[10] << 16) + (BIH[9] << 8) +
|
1999-11-24 21:12:24 +00:00
|
|
|
|
(BIH[8]));
|
1999-12-04 18:17:52 +00:00
|
|
|
|
printf("biPlanes = %i \n", (int) (BIH[13] << 8) + (BIH[12]));
|
|
|
|
|
printf("biBitCount = %i \n", (int) (BIH[15] << 8) + (BIH[14]));
|
1999-11-24 21:12:24 +00:00
|
|
|
|
printf("biCompress = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[19] << 24) + (BIH[18] << 16) + (BIH[17] << 8) +
|
1999-11-24 21:12:24 +00:00
|
|
|
|
(BIH[16]));
|
|
|
|
|
printf("biSizeImage = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[23] << 24) + (BIH[22] << 16) + (BIH[21] << 8) +
|
1999-11-24 21:12:24 +00:00
|
|
|
|
(BIH[20]));
|
|
|
|
|
printf("biXPels = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[27] << 24) + (BIH[26] << 16) + (BIH[25] << 8) +
|
1999-11-24 21:12:24 +00:00
|
|
|
|
(BIH[24]));
|
|
|
|
|
printf("biYPels = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[31] << 24) + (BIH[30] << 16) + (BIH[29] << 8) +
|
1999-11-24 21:12:24 +00:00
|
|
|
|
(BIH[28]));
|
|
|
|
|
printf("biClrUsed = %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[35] << 24) + (BIH[34] << 16) + (BIH[33] << 8) +
|
1999-11-24 21:12:24 +00:00
|
|
|
|
(BIH[32]));
|
|
|
|
|
printf("biClrImprtnt= %i \n",
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(int) (BIH[39] << 24) + (BIH[38] << 16) + (BIH[37] << 8) +
|
1999-11-24 21:12:24 +00:00
|
|
|
|
(BIH[36]));
|
|
|
|
|
}
|
1999-12-04 18:17:52 +00:00
|
|
|
|
#endif
|
|
|
|
|
/* struct headerpair contains the decoded width/height/depth info for
|
|
|
|
|
the current bitmap */
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
struct headerpair {
|
2001-05-28 18:28:16 +00:00
|
|
|
|
guint32 size;
|
|
|
|
|
gint32 width;
|
|
|
|
|
gint32 height;
|
1999-12-04 18:17:52 +00:00
|
|
|
|
guint depth;
|
|
|
|
|
guint Negative; /* Negative = 1 -> top down BMP,
|
|
|
|
|
Negative = 0 -> bottom up BMP */
|
|
|
|
|
};
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
1999-11-24 21:12:24 +00:00
|
|
|
|
/* Data needed for the "state" during decompression */
|
|
|
|
|
struct bmp_compression_state {
|
2001-05-28 18:28:16 +00:00
|
|
|
|
gint phase;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
gint RunCount;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
|
|
|
|
|
guchar *linebuff;
|
|
|
|
|
gint linebuffsize; /* these two counts in nibbles */
|
|
|
|
|
gint linebuffdone;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
};
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
/* Progressive loading */
|
|
|
|
|
|
|
|
|
|
struct bmp_progressive_state {
|
|
|
|
|
ModulePreparedNotifyFunc prepared_func;
|
|
|
|
|
ModuleUpdatedNotifyFunc updated_func;
|
|
|
|
|
gpointer user_data;
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
guint LineWidth;
|
|
|
|
|
guint Lines; /* # of finished lines */
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
guchar *buff;
|
|
|
|
|
gint BufferSize;
|
|
|
|
|
gint BufferDone;
|
|
|
|
|
|
|
|
|
|
guchar (*Colormap)[3];
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
gint Type; /*
|
1999-12-04 18:17:52 +00:00
|
|
|
|
32 = RGB + alpha
|
1999-11-21 21:28:28 +00:00
|
|
|
|
24 = RGB
|
2001-05-28 18:28:16 +00:00
|
|
|
|
16 = RGB
|
1999-12-04 18:17:52 +00:00
|
|
|
|
4 = 4 bpp colormapped
|
|
|
|
|
8 = 8 bpp colormapped
|
1999-11-21 21:28:28 +00:00
|
|
|
|
1 = 1 bit bitonal
|
|
|
|
|
*/
|
1999-11-24 21:12:24 +00:00
|
|
|
|
gint Compressed;
|
|
|
|
|
struct bmp_compression_state compr;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct headerpair Header; /* Decoded (BE->CPU) header */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
GdkPixbuf *pixbuf; /* Our "target" */
|
|
|
|
|
};
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gpointer
|
2000-02-22 00:29:00 +00:00
|
|
|
|
gdk_pixbuf__bmp_image_begin_load(ModulePreparedNotifyFunc prepared_func,
|
|
|
|
|
ModuleUpdatedNotifyFunc updated_func,
|
2001-05-07 15:58:47 +00:00
|
|
|
|
gpointer user_data,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
GError **error);
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gboolean gdk_pixbuf__bmp_image_stop_load(gpointer data, GError **error);
|
|
|
|
|
static gboolean gdk_pixbuf__bmp_image_load_increment(gpointer data,
|
|
|
|
|
const guchar * buf,
|
|
|
|
|
guint size,
|
|
|
|
|
GError **error);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
1999-07-08 16:04:16 +00:00
|
|
|
|
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
/* Shared library entry point --> This should be removed when
|
|
|
|
|
generic_image_load enters gdk-pixbuf-io. */
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static GdkPixbuf *gdk_pixbuf__bmp_image_load(FILE * f, GError **error)
|
1999-07-08 16:04:16 +00:00
|
|
|
|
{
|
2000-07-28 00:09:36 +00:00
|
|
|
|
guchar membuf[4096];
|
1999-11-21 21:28:28 +00:00
|
|
|
|
size_t length;
|
|
|
|
|
struct bmp_progressive_state *State;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
GdkPixbuf *pb;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
2000-03-06 08:53:57 +00:00
|
|
|
|
State =
|
2001-05-07 15:58:47 +00:00
|
|
|
|
gdk_pixbuf__bmp_image_begin_load(NULL, NULL, NULL,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
error);
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
2000-10-18 18:42:54 +00:00
|
|
|
|
if (State == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
while (feof(f) == 0) {
|
|
|
|
|
length = fread(membuf, 1, 4096, f);
|
1999-11-24 21:12:24 +00:00
|
|
|
|
if (length > 0)
|
2000-10-18 18:42:54 +00:00
|
|
|
|
if (!gdk_pixbuf__bmp_image_load_increment(State,
|
|
|
|
|
membuf,
|
|
|
|
|
length,
|
|
|
|
|
error)) {
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
gdk_pixbuf__bmp_image_stop_load (State, NULL);
|
2000-10-18 18:42:54 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
|
|
|
|
}
|
1999-11-21 21:28:28 +00:00
|
|
|
|
if (State->pixbuf != NULL)
|
|
|
|
|
gdk_pixbuf_ref(State->pixbuf);
|
|
|
|
|
|
|
|
|
|
pb = State->pixbuf;
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
gdk_pixbuf__bmp_image_stop_load(State, NULL);
|
1999-12-04 18:17:52 +00:00
|
|
|
|
return pb;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gboolean DecodeHeader(unsigned char *BFH, unsigned char *BIH,
|
|
|
|
|
struct bmp_progressive_state *State,
|
|
|
|
|
GError **error)
|
1999-11-21 21:28:28 +00:00
|
|
|
|
{
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
/* FIXME this is totally unrobust against bogus image data. */
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (State->BufferSize < GUINT32_FROM_LE (* (guint32 *) &BIH[0]) + 14) {
|
|
|
|
|
State->BufferSize = GUINT32_FROM_LE (* (guint32 *) &BIH[0]) + 14;
|
|
|
|
|
State->buff = g_realloc (State->buff, State->BufferSize);
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
#if DUMPBIH
|
|
|
|
|
DumpBIH(BIH);
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
State->Header.size = GUINT32_FROM_LE (* (guint32 *) &BIH[0]);
|
|
|
|
|
if (State->Header.size == 40) {
|
|
|
|
|
State->Header.width = GINT32_FROM_LE (* (gint32 *) &BIH[4]);
|
|
|
|
|
State->Header.height = GINT32_FROM_LE (* (gint32 *) &BIH[8]);
|
|
|
|
|
State->Header.depth = GUINT16_FROM_LE (* (guint16 *) &BIH[14]);
|
|
|
|
|
State->Compressed = GUINT32_FROM_LE (* (guint32 *) &BIH[16]);
|
|
|
|
|
} else if (State->Header.size == 12) {
|
|
|
|
|
State->Header.width = GUINT16_FROM_LE (* (guint16 *) &BIH[4]);
|
|
|
|
|
State->Header.height = GUINT16_FROM_LE (* (guint16 *) &BIH[6]);
|
|
|
|
|
State->Header.depth = GUINT16_FROM_LE (* (guint16 *) &BIH[10]);
|
|
|
|
|
State->Compressed = 0;
|
|
|
|
|
} else {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("BMP image has unsupported header size"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
State->Type = State->Header.depth; /* This may be less trivial someday */
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
/* Negative heights indicates bottom-down pixelorder */
|
1999-11-24 21:12:24 +00:00
|
|
|
|
if (State->Header.height < 0) {
|
|
|
|
|
State->Header.height = -State->Header.height;
|
|
|
|
|
State->Header.Negative = 1;
|
|
|
|
|
}
|
|
|
|
|
if (State->Header.width < 0) {
|
|
|
|
|
State->Header.width = -State->Header.width;
|
|
|
|
|
State->Header.Negative = 0;
|
|
|
|
|
}
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (State->Header.width == 0 || State->Header.height == 0 ||
|
|
|
|
|
(State->Compressed == BI_RLE4 && State->Type != 4) ||
|
|
|
|
|
(State->Compressed == BI_RLE8 && State->Type != 8) ||
|
|
|
|
|
State->Compressed > BI_RLE4) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("BMP image has bogus header data"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
if (State->Type == 32)
|
|
|
|
|
State->LineWidth = State->Header.width * 4;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
else if (State->Type == 24)
|
1999-11-21 21:28:28 +00:00
|
|
|
|
State->LineWidth = State->Header.width * 3;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
else if (State->Type == 16)
|
|
|
|
|
State->LineWidth = State->Header.width * 2;
|
|
|
|
|
else if (State->Type == 8)
|
1999-11-21 21:28:28 +00:00
|
|
|
|
State->LineWidth = State->Header.width * 1;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
else if (State->Type == 4)
|
1999-12-04 18:17:52 +00:00
|
|
|
|
State->LineWidth = (State->Header.width + 1) / 2;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
else if (State->Type == 1) {
|
1999-11-21 21:28:28 +00:00
|
|
|
|
State->LineWidth = State->Header.width / 8;
|
|
|
|
|
if ((State->Header.width & 7) != 0)
|
|
|
|
|
State->LineWidth++;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
} else {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
|
|
|
|
_("BMP image has bogus header data"));
|
|
|
|
|
return FALSE;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
}
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
/* Pad to a 32 bit boundary */
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (((State->LineWidth % 4) > 0) && (State->Compressed == BI_RGB))
|
1999-11-24 21:12:24 +00:00
|
|
|
|
State->LineWidth = (State->LineWidth / 4) * 4 + 4;
|
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
if (State->pixbuf == NULL) {
|
1999-12-04 18:17:52 +00:00
|
|
|
|
if (State->Type == 32)
|
|
|
|
|
State->pixbuf =
|
2000-04-11 07:03:25 +00:00
|
|
|
|
gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(gint) State->Header.width,
|
|
|
|
|
(gint) State->Header.height);
|
|
|
|
|
else
|
|
|
|
|
State->pixbuf =
|
2000-04-11 07:03:25 +00:00
|
|
|
|
gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
|
1999-12-04 18:17:52 +00:00
|
|
|
|
(gint) State->Header.width,
|
|
|
|
|
(gint) State->Header.height);
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
if (State->pixbuf == NULL) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
GDK_PIXBUF_ERROR,
|
|
|
|
|
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
|
|
|
|
|
_("Not enough memory to load bitmap image"));
|
2001-05-28 18:28:16 +00:00
|
|
|
|
return FALSE;
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
if (State->prepared_func != NULL)
|
|
|
|
|
/* Notify the client that we are ready to go */
|
2001-05-07 15:58:47 +00:00
|
|
|
|
(*State->prepared_func) (State->pixbuf, NULL, State->user_data);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
}
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (State->Compressed != BI_RGB) {
|
|
|
|
|
State->compr.linebuffdone = 0;
|
|
|
|
|
State->compr.linebuffsize = State->Header.width;
|
|
|
|
|
if (State->Type == 8)
|
|
|
|
|
State->compr.linebuffsize *= 2;
|
|
|
|
|
State->compr.linebuff = g_malloc ((State->compr.linebuffsize + 1) / 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
State->BufferDone = 0;
|
|
|
|
|
if (State->Type <= 8)
|
|
|
|
|
State->BufferSize = GUINT32_FROM_LE (* (guint32 *) &BFH[10]) - 14 - State->Header.size;
|
|
|
|
|
else if (State->Compressed != BI_RGB)
|
|
|
|
|
State->BufferSize = 2;
|
|
|
|
|
else
|
|
|
|
|
State->BufferSize = State->LineWidth;
|
|
|
|
|
State->buff = g_realloc (State->buff, State->BufferSize);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void DecodeColormap (guchar *buff,
|
|
|
|
|
struct bmp_progressive_state *State,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
|
|
State->Colormap = g_malloc ((1 << State->Header.depth) * sizeof (*State->Colormap));
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < (1 << State->Header.depth); i++)
|
|
|
|
|
{
|
|
|
|
|
State->Colormap[i][0] = buff[i * (State->Header.size == 12 ? 3 : 4)];
|
|
|
|
|
State->Colormap[i][1] = buff[i * (State->Header.size == 12 ? 3 : 4) + 1];
|
|
|
|
|
State->Colormap[i][2] = buff[i * (State->Header.size == 12 ? 3 : 4) + 2];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
State->BufferDone = 0;
|
|
|
|
|
if (State->Compressed != BI_RGB)
|
|
|
|
|
State->BufferSize = 2;
|
|
|
|
|
else
|
|
|
|
|
State->BufferSize = State->LineWidth;
|
|
|
|
|
State->buff = g_realloc (State->buff, State->BufferSize);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* func - called when we have pixmap created (but no image data)
|
|
|
|
|
* user_data - passed as arg 1 to func
|
|
|
|
|
* return context (opaque to user)
|
|
|
|
|
*/
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gpointer
|
2000-02-22 00:29:00 +00:00
|
|
|
|
gdk_pixbuf__bmp_image_begin_load(ModulePreparedNotifyFunc prepared_func,
|
|
|
|
|
ModuleUpdatedNotifyFunc updated_func,
|
2001-05-07 15:58:47 +00:00
|
|
|
|
gpointer user_data,
|
2000-10-18 18:42:54 +00:00
|
|
|
|
GError **error)
|
1999-11-21 21:28:28 +00:00
|
|
|
|
{
|
|
|
|
|
struct bmp_progressive_state *context;
|
|
|
|
|
|
|
|
|
|
context = g_new0(struct bmp_progressive_state, 1);
|
|
|
|
|
context->prepared_func = prepared_func;
|
|
|
|
|
context->updated_func = updated_func;
|
|
|
|
|
context->user_data = user_data;
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->BufferSize = 26;
|
|
|
|
|
context->buff = g_malloc(26);
|
|
|
|
|
context->BufferDone = 0;
|
|
|
|
|
/* 14 for the BitmapFileHeader, 12 for the BitmapImageHeader */
|
1999-12-04 18:17:52 +00:00
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap = NULL;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
context->Lines = 0;
|
|
|
|
|
|
|
|
|
|
context->Type = 0;
|
|
|
|
|
|
|
|
|
|
memset(&context->Header, 0, sizeof(struct headerpair));
|
1999-11-24 21:12:24 +00:00
|
|
|
|
memset(&context->compr, 0, sizeof(struct bmp_compression_state));
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
context->pixbuf = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (gpointer) context;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* context - returned from image_begin_load
|
|
|
|
|
*
|
|
|
|
|
* free context, unref gdk_pixbuf
|
|
|
|
|
*/
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gboolean gdk_pixbuf__bmp_image_stop_load(gpointer data, GError **error)
|
1999-11-21 21:28:28 +00:00
|
|
|
|
{
|
|
|
|
|
struct bmp_progressive_state *context =
|
|
|
|
|
(struct bmp_progressive_state *) data;
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
/* FIXME this thing needs to report errors if
|
|
|
|
|
* we have unused image data
|
|
|
|
|
*/
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
g_return_val_if_fail(context != NULL, TRUE);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (context->compr.linebuff != NULL)
|
|
|
|
|
g_free(context->compr.linebuff);
|
1999-12-04 18:17:52 +00:00
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (context->Colormap != NULL)
|
|
|
|
|
g_free(context->Colormap);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
if (context->pixbuf)
|
|
|
|
|
gdk_pixbuf_unref(context->pixbuf);
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
g_free(context->buff);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
g_free(context);
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
|
|
|
|
|
return TRUE;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
/*
|
|
|
|
|
The OneLineXX functions are called when 1 line worth of data is present.
|
|
|
|
|
OneLine24 is the 24 bpp-version.
|
|
|
|
|
*/
|
|
|
|
|
static void OneLine32(struct bmp_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-12-04 18:17:52 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-12-04 18:17:52 +00:00
|
|
|
|
while (X < context->Header.width) {
|
2001-05-28 18:28:16 +00:00
|
|
|
|
Pixels[X * 4 + 0] = context->buff[X * 4 + 2];
|
|
|
|
|
Pixels[X * 4 + 1] = context->buff[X * 4 + 1];
|
|
|
|
|
Pixels[X * 4 + 2] = context->buff[X * 4 + 0];
|
|
|
|
|
Pixels[X * 4 + 3] = context->buff[X * 4 + 3];
|
1999-12-04 18:17:52 +00:00
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
static void OneLine24(struct bmp_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-11-24 21:12:24 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
while (X < context->Header.width) {
|
2001-05-28 18:28:16 +00:00
|
|
|
|
Pixels[X * 3 + 0] = context->buff[X * 3 + 2];
|
|
|
|
|
Pixels[X * 3 + 1] = context->buff[X * 3 + 1];
|
|
|
|
|
Pixels[X * 3 + 2] = context->buff[X * 3 + 0];
|
1999-11-21 21:28:28 +00:00
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
static void OneLine16(struct bmp_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
|
|
|
|
else
|
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
Pixels[X * 3 + 0] = (GUINT16_FROM_LE (* (guint16 *) &context->buff[X * 2]) & 0x7C00) >> 7;
|
|
|
|
|
Pixels[X * 3 + 1] = (GUINT16_FROM_LE (* (guint16 *) &context->buff[X * 2]) & 0x03E0) >> 2;
|
|
|
|
|
Pixels[X * 3 + 2] = (GUINT16_FROM_LE (* (guint16 *) &context->buff[X * 2]) & 0x001F) << 3;
|
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
static void OneLine8(struct bmp_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-11-24 21:12:24 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
Pixels[X * 3 + 0] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[context->buff[X]][2];
|
1999-11-21 21:28:28 +00:00
|
|
|
|
Pixels[X * 3 + 1] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[context->buff[X]][1];
|
1999-11-21 21:28:28 +00:00
|
|
|
|
Pixels[X * 3 + 2] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[context->buff[X]][0];
|
1999-11-21 21:28:28 +00:00
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
static void OneLine4(struct bmp_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-12-04 18:17:52 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-12-04 18:17:52 +00:00
|
|
|
|
|
|
|
|
|
while (X < context->Header.width) {
|
|
|
|
|
guchar Pix;
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
Pix = context->buff[X / 2];
|
1999-12-04 18:17:52 +00:00
|
|
|
|
|
|
|
|
|
Pixels[X * 3 + 0] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[Pix >> 4][2];
|
1999-12-04 18:17:52 +00:00
|
|
|
|
Pixels[X * 3 + 1] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[Pix >> 4][1];
|
1999-12-04 18:17:52 +00:00
|
|
|
|
Pixels[X * 3 + 2] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[Pix >> 4][0];
|
1999-12-04 18:17:52 +00:00
|
|
|
|
X++;
|
|
|
|
|
if (X < context->Header.width) {
|
|
|
|
|
/* Handle the other 4 bit pixel only when there is one */
|
|
|
|
|
Pixels[X * 3 + 0] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[Pix & 15][2];
|
1999-12-04 18:17:52 +00:00
|
|
|
|
Pixels[X * 3 + 1] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[Pix & 15][1];
|
1999-12-04 18:17:52 +00:00
|
|
|
|
Pixels[X * 3 + 2] =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->Colormap[Pix & 15][0];
|
1999-12-04 18:17:52 +00:00
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
static void OneLine1(struct bmp_progressive_state *context)
|
|
|
|
|
{
|
|
|
|
|
gint X;
|
|
|
|
|
guchar *Pixels;
|
|
|
|
|
|
|
|
|
|
X = 0;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
if (context->Header.Negative == 0)
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
(context->Header.height - context->Lines - 1));
|
1999-11-24 21:12:24 +00:00
|
|
|
|
else
|
2000-04-11 07:03:25 +00:00
|
|
|
|
Pixels = (context->pixbuf->pixels +
|
|
|
|
|
context->pixbuf->rowstride *
|
|
|
|
|
context->Lines);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
while (X < context->Header.width) {
|
1999-12-04 18:17:52 +00:00
|
|
|
|
gint Bit;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
Bit = (context->buff[X / 8]) >> (7 - (X & 7));
|
1999-11-21 21:28:28 +00:00
|
|
|
|
Bit = Bit & 1;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
Pixels[X * 3 + 0] = context->Colormap[Bit][2];
|
|
|
|
|
Pixels[X * 3 + 1] = context->Colormap[Bit][1];
|
|
|
|
|
Pixels[X * 3 + 2] = context->Colormap[Bit][0];
|
1999-11-21 21:28:28 +00:00
|
|
|
|
X++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void OneLine(struct bmp_progressive_state *context)
|
|
|
|
|
{
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->BufferDone = 0;
|
1999-11-24 21:12:24 +00:00
|
|
|
|
if (context->Lines >= context->Header.height)
|
|
|
|
|
return;
|
|
|
|
|
|
1999-12-04 18:17:52 +00:00
|
|
|
|
if (context->Type == 32)
|
|
|
|
|
OneLine32(context);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
if (context->Type == 24)
|
|
|
|
|
OneLine24(context);
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (context->Type == 16)
|
|
|
|
|
OneLine16(context);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
if (context->Type == 8)
|
|
|
|
|
OneLine8(context);
|
1999-12-04 18:17:52 +00:00
|
|
|
|
if (context->Type == 4)
|
|
|
|
|
OneLine4(context);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
if (context->Type == 1)
|
|
|
|
|
OneLine1(context);
|
|
|
|
|
|
|
|
|
|
context->Lines++;
|
|
|
|
|
|
|
|
|
|
if (context->updated_func != NULL) {
|
|
|
|
|
(*context->updated_func) (context->pixbuf,
|
|
|
|
|
0,
|
|
|
|
|
context->Lines,
|
|
|
|
|
context->Header.width,
|
2000-01-05 23:06:13 +00:00
|
|
|
|
context->Header.height,
|
|
|
|
|
context->user_data);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static void
|
2001-05-28 18:28:16 +00:00
|
|
|
|
DoCompressed(struct bmp_progressive_state *context)
|
1999-12-04 18:17:52 +00:00
|
|
|
|
{
|
2001-05-28 18:28:16 +00:00
|
|
|
|
gint count, pos;
|
1999-12-04 18:17:52 +00:00
|
|
|
|
switch (context->compr.phase) {
|
|
|
|
|
case 0: /* Neutral state */
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (context->buff[0] != 0) { /* run count */
|
|
|
|
|
context->compr.RunCount = context->buff[0];
|
|
|
|
|
if (context->Type == 8)
|
|
|
|
|
context->compr.RunCount *= 2;
|
|
|
|
|
while (context->compr.RunCount > 0) {
|
|
|
|
|
if (context->compr.linebuffdone & 1) {
|
|
|
|
|
guchar *ptr = context->compr.linebuff +
|
|
|
|
|
context->compr.linebuffdone / 2;
|
|
|
|
|
|
|
|
|
|
*ptr = (*ptr & 0xF0) | (context->buff[1] >> 4);
|
|
|
|
|
context->buff[1] = (context->buff[1] << 4) |
|
|
|
|
|
(context->buff[1] >> 4);
|
|
|
|
|
context->compr.linebuffdone++;
|
|
|
|
|
context->compr.RunCount--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (context->compr.RunCount) {
|
|
|
|
|
count = context->compr.linebuffsize -
|
|
|
|
|
context->compr.linebuffdone;
|
|
|
|
|
if (count > context->compr.RunCount)
|
|
|
|
|
count = context->compr.RunCount;
|
|
|
|
|
|
|
|
|
|
memset (context->compr.linebuff +
|
|
|
|
|
context->compr.linebuffdone / 2,
|
|
|
|
|
context->buff[1],
|
|
|
|
|
(count + 1) / 2);
|
|
|
|
|
context->compr.RunCount -= count;
|
|
|
|
|
context->compr.linebuffdone += count;
|
|
|
|
|
}
|
|
|
|
|
if (context->compr.linebuffdone == context->compr.linebuffsize) {
|
|
|
|
|
guchar *tmp = context->buff;
|
|
|
|
|
context->buff = context->compr.linebuff;
|
|
|
|
|
OneLine (context);
|
|
|
|
|
context->buff = tmp;
|
|
|
|
|
|
|
|
|
|
if (context->compr.linebuffdone & 1)
|
|
|
|
|
context->buff[1] = (context->buff[1] << 4) |
|
|
|
|
|
(context->buff[1] >> 4);
|
|
|
|
|
context->compr.linebuffdone = 0;
|
|
|
|
|
}
|
1999-12-04 18:17:52 +00:00
|
|
|
|
}
|
2001-05-28 18:28:16 +00:00
|
|
|
|
} else { /* Escape */
|
|
|
|
|
if (context->buff[1] == 0) { /* End of line */
|
|
|
|
|
if (context->compr.linebuffdone) {
|
|
|
|
|
guchar *tmp = context->buff;
|
|
|
|
|
context->buff = context->compr.linebuff;
|
|
|
|
|
OneLine (context);
|
|
|
|
|
context->buff = tmp;
|
|
|
|
|
|
|
|
|
|
context->compr.linebuffdone = 0;
|
|
|
|
|
}
|
|
|
|
|
} else if (context->buff[1] == 1) { /* End of image */
|
|
|
|
|
if (context->compr.linebuffdone) {
|
|
|
|
|
guchar *tmp = context->buff;
|
|
|
|
|
context->buff = context->compr.linebuff;
|
|
|
|
|
OneLine (context);
|
|
|
|
|
context->buff = tmp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
context->compr.phase = 2;
|
|
|
|
|
} else if (context->buff[1] == 2) /* Cursor displacement */
|
|
|
|
|
; /* not implemented */
|
|
|
|
|
else {
|
|
|
|
|
context->compr.phase = 1;
|
|
|
|
|
context->compr.RunCount = context->buff[1];
|
|
|
|
|
if (context->Type == 8)
|
|
|
|
|
context->compr.RunCount *= 2;
|
|
|
|
|
context->BufferSize = (context->compr.RunCount + 3) / 4 * 2;
|
|
|
|
|
context->buff = g_realloc (context->buff, context->BufferSize);
|
1999-12-04 18:17:52 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->BufferDone = 0;
|
1999-12-04 18:17:52 +00:00
|
|
|
|
break;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
case 1:
|
|
|
|
|
pos = 0;
|
|
|
|
|
while (pos < context->compr.RunCount) {
|
|
|
|
|
count = context->compr.linebuffsize - context->compr.linebuffdone;
|
|
|
|
|
if (count > context->compr.RunCount)
|
|
|
|
|
count = context->compr.RunCount;
|
|
|
|
|
|
|
|
|
|
if ((context->compr.linebuffdone & 1) || (pos & 1)) {
|
|
|
|
|
gint i, newval;
|
|
|
|
|
guchar *ptr;
|
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
|
ptr = context->compr.linebuff + (i +
|
|
|
|
|
context->compr.linebuffdone) / 2;
|
|
|
|
|
newval = *(context->buff + (pos + i) / 2) & (0xf0 >> (((pos + i) % 2) * 4));
|
|
|
|
|
if (((pos + i) % 2) ^ ((context->compr.linebuffdone + i) % 2)) {
|
|
|
|
|
if ((pos + i) % 2)
|
|
|
|
|
newval <<= 4;
|
|
|
|
|
else
|
|
|
|
|
newval >>= 4;
|
|
|
|
|
}
|
|
|
|
|
*ptr = (*ptr & (0xf << (((i + context->compr.linebuffdone) % 2) * 4))) | newval;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
memmove (context->compr.linebuff +
|
|
|
|
|
context->compr.linebuffdone / 2,
|
|
|
|
|
context->buff + pos / 2,
|
|
|
|
|
(count + 1) / 2);
|
1999-12-04 18:17:52 +00:00
|
|
|
|
}
|
2001-05-28 18:28:16 +00:00
|
|
|
|
pos += count;
|
|
|
|
|
context->compr.linebuffdone += count;
|
|
|
|
|
if (context->compr.linebuffdone == context->compr.linebuffsize) {
|
|
|
|
|
guchar *tmp = context->buff;
|
|
|
|
|
context->buff = context->compr.linebuff;
|
|
|
|
|
OneLine (context);
|
|
|
|
|
context->buff = tmp;
|
|
|
|
|
|
|
|
|
|
context->compr.linebuffdone = 0;
|
2000-03-06 08:53:57 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
context->compr.phase = 0;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->BufferSize = 2;
|
|
|
|
|
context->buff = g_realloc (context->buff, context->BufferSize);
|
|
|
|
|
context->BufferDone = 0;
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
context->BufferDone = 0;
|
2000-03-06 08:53:57 +00:00
|
|
|
|
break;
|
1999-12-04 18:17:52 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
/*
|
|
|
|
|
* context - from image_begin_load
|
|
|
|
|
* buf - new image data
|
|
|
|
|
* size - length of new image data
|
|
|
|
|
*
|
|
|
|
|
* append image data onto inrecrementally built output image
|
|
|
|
|
*/
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
static gboolean
|
|
|
|
|
gdk_pixbuf__bmp_image_load_increment(gpointer data,
|
|
|
|
|
const guchar * buf,
|
|
|
|
|
guint size,
|
|
|
|
|
GError **error)
|
1999-11-21 21:28:28 +00:00
|
|
|
|
{
|
|
|
|
|
struct bmp_progressive_state *context =
|
|
|
|
|
(struct bmp_progressive_state *) data;
|
|
|
|
|
|
|
|
|
|
gint BytesToCopy;
|
|
|
|
|
|
|
|
|
|
while (size > 0) {
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (context->BufferDone < context->BufferSize) { /* We still
|
1999-11-21 21:28:28 +00:00
|
|
|
|
have headerbytes to do */
|
|
|
|
|
BytesToCopy =
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->BufferSize - context->BufferDone;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
if (BytesToCopy > size)
|
|
|
|
|
BytesToCopy = size;
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
memmove(context->buff + context->BufferDone,
|
2000-03-06 08:53:57 +00:00
|
|
|
|
buf, BytesToCopy);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
|
|
|
|
size -= BytesToCopy;
|
|
|
|
|
buf += BytesToCopy;
|
2001-05-28 18:28:16 +00:00
|
|
|
|
context->BufferDone += BytesToCopy;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (context->BufferDone != context->BufferSize)
|
|
|
|
|
break;
|
1999-11-21 21:28:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-05-28 18:28:16 +00:00
|
|
|
|
if (!context->Header.size) {
|
|
|
|
|
if (!DecodeHeader (context->buff,
|
|
|
|
|
context->buff + 14, context,
|
|
|
|
|
error))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
else if (context->Type <= 8 && context->Colormap == NULL)
|
|
|
|
|
DecodeColormap (context->buff, context, error);
|
|
|
|
|
else if (context->Compressed != BI_RGB)
|
|
|
|
|
DoCompressed(context);
|
|
|
|
|
else
|
|
|
|
|
/* Uncompressed pixeldata */
|
|
|
|
|
OneLine(context);
|
1999-11-21 21:28:28 +00:00
|
|
|
|
}
|
1999-07-08 16:04:16 +00:00
|
|
|
|
|
1999-11-21 21:28:28 +00:00
|
|
|
|
return TRUE;
|
1999-07-08 16:04:16 +00:00
|
|
|
|
}
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdk_pixbuf__bmp_fill_vtable (GdkPixbufModule *module)
|
|
|
|
|
{
|
|
|
|
|
module->load = gdk_pixbuf__bmp_image_load;
|
|
|
|
|
module->begin_load = gdk_pixbuf__bmp_image_begin_load;
|
|
|
|
|
module->stop_load = gdk_pixbuf__bmp_image_stop_load;
|
|
|
|
|
module->load_increment = gdk_pixbuf__bmp_image_load_increment;
|
|
|
|
|
}
|