AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix includes. (gdk_pixbuf_get_from_drawable): Implemented the zillion

Browse Source 
1999-12-08  Federico Mena Quintero  <federico@redhat.com>

	* gdk-pixbuf/gdk-pixbuf-drawable.c: Fix includes.
	(gdk_pixbuf_get_from_drawable): Implemented the zillion sanity
	checks and API definition.  The body needs filling in and it needs
	to do the Right Thing(tm) for pixmaps plus the given colormap and
	windows and their own colormaps.

	* gdk-pixbuf/gdk-pixbuf.h: Added prototype for
	gdk_pixbuf_get_from_drawable().  Killed gdk-pixbuf-drawable.h.

	* gdk-pixbuf/Makefile.am: Re-added the gdk-pixbuf-drawable sources.

	* doc/tmpl/from-drawables.sgml: Populated.

	* doc/gdk-pixbuf.sgml: Added the from-drawables section.

	* doc/Makefile.am (tmpl_sources): Added tmpl/from-drawables.sgml.

	* doc/gdk-pixbuf-sections.txt: Added a section for getting pixbufs
	from drawables.
This commit is contained in:
Federico Mena Quintero 1999-12-08 21:17:53 +00:00 committed by Arturo Espinosa
parent a70843bab2
commit c6f25c2de8
11 changed files with 444 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gdk-pixbuf/Makefile.am
View File

@ -19,6 +19,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
tmpl_sources = \ tmpl_sources = \
tmpl/creating.sgml \ tmpl/creating.sgml \
tmpl/file-loading.sgml \ tmpl/file-loading.sgml \
tmpl/from-drawables.sgml \
tmpl/gdk-pixbuf-loader.sgml \ tmpl/gdk-pixbuf-loader.sgml \
tmpl/gdk-pixbuf-unused.sgml \ tmpl/gdk-pixbuf-unused.sgml \
tmpl/gdk-pixbuf.sgml \ tmpl/gdk-pixbuf.sgml \

5
docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
View File

@ -40,6 +40,11 @@ gdk_pixbuf_render_to_drawable
gdk_pixbuf_render_threshold_alpha gdk_pixbuf_render_threshold_alpha
</SECTION> </SECTION>
<SECTION>
<FILE>from-drawables</FILE>
gdk_pixbuf_get_from_drawable
</SECTION>
<SECTION> <SECTION>
<FILE>util</FILE> <FILE>util</FILE>
gdk_pixbuf_add_alpha gdk_pixbuf_add_alpha

2
docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
View File

@ -4,6 +4,7 @@
<!entity gdk-pixbuf-file-loading SYSTEM "sgml/file-loading.sgml"> <!entity gdk-pixbuf-file-loading SYSTEM "sgml/file-loading.sgml">
<!entity gdk-pixbuf-creating SYSTEM "sgml/creating.sgml"> <!entity gdk-pixbuf-creating SYSTEM "sgml/creating.sgml">
<!entity gdk-pixbuf-rendering SYSTEM "sgml/rendering.sgml"> <!entity gdk-pixbuf-rendering SYSTEM "sgml/rendering.sgml">
<!entity gdk-pixbuf-from-drawables SYSTEM "sgml/from-drawables.sgml">
<!entity gdk-pixbuf-util SYSTEM "sgml/util.sgml"> <!entity gdk-pixbuf-util SYSTEM "sgml/util.sgml">
<!entity GnomeCanvasPixbuf SYSTEM "sgml/gnome-canvas-pixbuf.sgml"> <!entity GnomeCanvasPixbuf SYSTEM "sgml/gnome-canvas-pixbuf.sgml">
<!entity GdkPixbufLoader SYSTEM "sgml/gdk-pixbuf-loader.sgml"> <!entity GdkPixbufLoader SYSTEM "sgml/gdk-pixbuf-loader.sgml">
@ -47,6 +48,7 @@
&gdk-pixbuf-file-loading; &gdk-pixbuf-file-loading;
&gdk-pixbuf-creating; &gdk-pixbuf-creating;
&gdk-pixbuf-rendering; &gdk-pixbuf-rendering;
&gdk-pixbuf-from-drawables;
&gdk-pixbuf-util; &gdk-pixbuf-util;
&GnomeCanvasPixbuf; &GnomeCanvasPixbuf;
&GdkPixbufLoader; &GdkPixbufLoader;

45
docs/reference/gdk-pixbuf/tmpl/from-drawables.sgml Normal file
View File

@ -0,0 +1,45 @@
<!-- ##### SECTION Title ##### -->
Drawables to Pixbufs
<!-- ##### SECTION Short_Description ##### -->
Getting parts of a drawable's image data into a pixbuf.
<!-- ##### SECTION Long_Description ##### -->
<para>
The functions in this section allow you to take the image data
from a GDK drawable and dump it into a #GdkPixbuf. This can be
used for screenshots and other special effects. Note that these
operations can be expensive, since the image data has to be
transferred from the X server to the client program and converted.
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
#GdkPixbuf, gdk_image_get()
</para>
<!-- ##### FUNCTION gdk_pixbuf_get_from_drawable ##### -->
<para>
</para>
@dest:
@src:
@cmap:
@src_x:
@src_y:
@dest_x:
@dest_y:
@width:
@height:
@Returns:
<!--
Local variables:
mode: sgml
sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
End:
-->

5
docs/reference/gdk-pixbuf/tmpl/rendering.sgml
View File

@ -2,7 +2,7 @@
Rendering Rendering
<!-- ##### SECTION Short_Description ##### --> <!-- ##### SECTION Short_Description ##### -->
Rendering a Pixbuf to a GDK Drawable. Rendering a pixbuf to a GDK drawable.
<!-- ##### SECTION Long_Description ##### --> <!-- ##### SECTION Long_Description ##### -->
<para> <para>
@ -96,8 +96,7 @@ In the future it will do full alpha compositing.
@dest_y: @dest_y:
@width: @width:
@height: @height:
@alpha_threshold: @alpha_threshold:
<!-- <!--
Local variables: Local variables:
mode: sgml mode: sgml

3
docs/reference/gdk-pixbuf/tmpl/util.sgml
View File

@ -29,10 +29,11 @@ Utility and miscellaneous convenience functions.
@b: @b:
@Returns: @Returns:
<!-- <!--
Local variables: Local variables:
mode: sgml mode: sgml
sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "") sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
End: End:
--> -->

54
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,25 @@
1999-12-08 Federico Mena Quintero <federico@redhat.com>
* gdk-pixbuf/gdk-pixbuf-drawable.c: Fix includes.
(gdk_pixbuf_get_from_drawable): Implemented the zillion sanity
checks and API definition. The body needs filling in and it needs
to do the Right Thing(tm) for pixmaps plus the given colormap and
windows and their own colormaps.
* gdk-pixbuf/gdk-pixbuf.h: Added prototype for
gdk_pixbuf_get_from_drawable(). Killed gdk-pixbuf-drawable.h.
* gdk-pixbuf/Makefile.am: Re-added the gdk-pixbuf-drawable sources.
* doc/tmpl/from-drawables.sgml: Populated.
* doc/gdk-pixbuf.sgml: Added the from-drawables section.
* doc/Makefile.am (tmpl_sources): Added tmpl/from-drawables.sgml.
* doc/gdk-pixbuf-sections.txt: Added a section for getting pixbufs
from drawables.
1999-12-07 Federico Mena Quintero <federico@redhat.com> 1999-12-07 Federico Mena Quintero <federico@redhat.com>
* doc/tmpl/gnome-canvas-pixbuf.sgml: Added clarification about * doc/tmpl/gnome-canvas-pixbuf.sgml: Added clarification about
@ -31,24 +53,24 @@
1999-12-05 Jaka Mocnik <jaka.mocnik@kiss.uni-lj.si> 1999-12-05 Jaka Mocnik <jaka.mocnik@kiss.uni-lj.si>
* gdk-pixbuf/Makefile.am: removed GNOME_LIBS from testpixbuf_LDADD. * gdk-pixbuf/Makefile.am: removed GNOME_LIBS from testpixbuf_LDADD.
1999-12-05 Arjan van de Ven <arjan@fenrus.demon.nl> 1999-12-05 Arjan van de Ven <arjan@fenrus.demon.nl>
* gdk-pixbuf/io-ico.c: Bug in palet-size * gdk-pixbuf/io-ico.c: Bug in palet-size
calculation fixed calculation fixed
1999-12-04 Arjan van de Ven <arjan@fenrus.demon.nl> 1999-12-04 Arjan van de Ven <arjan@fenrus.demon.nl>
* gdk-pixbuf/io-bmp.c: Major cleanup, added support for * gdk-pixbuf/io-bmp.c: Major cleanup, added support for
32 bpp and 4 bpp (uncompressed) images, fixed 1bpp. 32 bpp and 4 bpp (uncompressed) images, fixed 1bpp.
* gdk-pixbuf/io-ras.c: Minor cleanup, ran through lclint * gdk-pixbuf/io-ras.c: Minor cleanup, ran through lclint
* gdk-pixbuf/io-ico.c: Minor cleanup, fixed 1bpp icons, * gdk-pixbuf/io-ico.c: Minor cleanup, fixed 1bpp icons,
ran through lclint. ran through lclint.
* gdk-pixbuf/gdk-pixbuf-io.c: Added detection of .CUR files * gdk-pixbuf/gdk-pixbuf-io.c: Added detection of .CUR files
(Windows Cursor files). These are identical to .ICO files, (Windows Cursor files). These are identical to .ICO files,
except for the signature and 2 extra fields for the hotspot. except for the signature and 2 extra fields for the hotspot.
1999-12-03 Federico Mena Quintero <federico@redhat.com> 1999-12-03 Federico Mena Quintero <federico@redhat.com>
@ -151,7 +173,7 @@
* configure.in: Add AM_CONDITIONAL for inside gnome-libs * configure.in: Add AM_CONDITIONAL for inside gnome-libs
* src/Makefile.am: conditionalize GnomeCanvasPixbuf * src/Makefile.am: conditionalize GnomeCanvasPixbuf
1999-11-29 Federico Mena Quintero <federico@redhat.com> 1999-11-29 Federico Mena Quintero <federico@redhat.com>
* src/Makefile.am: Uncomment the GnomeCanvasPixbuf sources. This * src/Makefile.am: Uncomment the GnomeCanvasPixbuf sources. This
@ -236,7 +258,7 @@
* src/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_bounds): * src/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_bounds):
implement the bounds method correctly. implement the bounds method correctly.
(compute_viewport_affine): compute the affine need to fit the (compute_viewport_affine): compute the affine need to fit the
image within the viewport given by the args. image within the viewport given by the args.
(compute_render_affine): call compute_viewport_affine. (compute_render_affine): call compute_viewport_affine.
@ -283,7 +305,7 @@ Mon Nov 15 17:18:28 1999 George Lebl <jirka@5z.com>
files. files.
* src/testpixbuf.c: Added final queued draw when done loading image. * src/testpixbuf.c: Added final queued draw when done loading image.
1999-11-10 Jonathan Blandford <jrb@redhat.com> 1999-11-10 Jonathan Blandford <jrb@redhat.com>
* src/gdk-pixbuf-io.c (gdk_pixbuf_load_module): removed spurious * src/gdk-pixbuf-io.c (gdk_pixbuf_load_module): removed spurious
@ -305,12 +327,12 @@ Mon Nov 15 17:18:28 1999 George Lebl <jirka@5z.com>
* src/testpixbuf.c: Fixed it to use timeout to read from file * src/testpixbuf.c: Fixed it to use timeout to read from file
for progressive loading. Set TBF_KBPS=n, where n is the number of for progressive loading. Set TBF_KBPS=n, where n is the number of
kilobytes/second to simulate in downloading. n has to be an integer. kilobytes/second to simulate in downloading. n has to be an integer.
* src/io-jpeg.c: Slight cosmetic cleanup. * src/io-jpeg.c: Slight cosmetic cleanup.
* src/io-pnm.c: Fixed raw PNM loading bug. Also discovered that ASCII * src/io-pnm.c: Fixed raw PNM loading bug. Also discovered that ASCII
PBM loading has a similar problem and will address tomorrow. PBM loading has a similar problem and will address tomorrow.
1999-11-09 Havoc Pennington <hp@pobox.com> 1999-11-09 Havoc Pennington <hp@pobox.com>
* src/Makefile.am (libgdk_pixbuf_la_SOURCES): build the * src/Makefile.am (libgdk_pixbuf_la_SOURCES): build the
@ -332,7 +354,7 @@ Mon Nov 15 17:18:28 1999 George Lebl <jirka@5z.com>
implement later. implement later.
With these changes all JPEG formats appear to load properly for me. With these changes all JPEG formats appear to load properly for me.
1999-11-08 Jonathan Blandford <jrb@redhat.com> 1999-11-08 Jonathan Blandford <jrb@redhat.com>
* src/io-ras.c (image_load_increment): Final patch from Arjan. * src/io-ras.c (image_load_increment): Final patch from Arjan.
@ -343,7 +365,7 @@ Mon Nov 15 17:18:28 1999 George Lebl <jirka@5z.com>
* src/io-pnm.c image_load (): Fixed so we do not create a separate * src/io-pnm.c image_load (): Fixed so we do not create a separate
pixel buffer when reading in image - we reuse the pixel data in pixel buffer when reading in image - we reuse the pixel data in
the GdkPixbuf structure instead. the GdkPixbuf structure instead.
1999-11-08 Michael Fulbright <drmike@redhat.com> 1999-11-08 Michael Fulbright <drmike@redhat.com>
* src/io-pnm.c pnm_read_ascii_scanline (): Added support for * src/io-pnm.c pnm_read_ascii_scanline (): Added support for
@ -357,7 +379,7 @@ Mon Nov 15 17:18:28 1999 George Lebl <jirka@5z.com>
of the width, height, x, and y setting and pixels arguments. of the width, height, x, and y setting and pixels arguments.
1999-11-05 Jonathan Blandford <jrb@redhat.com> 1999-11-05 Jonathan Blandford <jrb@redhat.com>
* src/io-ras.c (image_load): third patch. Now it seems to load. * src/io-ras.c (image_load): third patch. Now it seems to load.
* src/gdk-pixbuf-io.c: second patch Arjan van de Ven * src/gdk-pixbuf-io.c: second patch Arjan van de Ven
@ -402,7 +424,7 @@ Mon Nov 15 17:18:28 1999 George Lebl <jirka@5z.com>
* src/gdk-pixbuf-render.c (gdk_pixbuf_render_to_drawable): In * src/gdk-pixbuf-render.c (gdk_pixbuf_render_to_drawable): In
docs, explain what a dither offset is for. docs, explain what a dither offset is for.
(gdk_pixbuf_render_to_drawable_alpha): Explain why you would use (gdk_pixbuf_render_to_drawable_alpha): Explain why you would use
this function vs. gdk_pixbuf_render_to_drawable(). this function vs. gdk_pixbuf_render_to_drawable().
1999-11-04 Havoc Pennington <hp@pobox.com> 1999-11-04 Havoc Pennington <hp@pobox.com>
@ -415,8 +437,8 @@ Mon Nov 15 17:18:28 1999 George Lebl <jirka@5z.com>
library list. library list.
Patch untested in the inside-gnome-libs case, I need to commit Patch untested in the inside-gnome-libs case, I need to commit
then check out to the gnome-libs I'm using. then check out to the gnome-libs I'm using.
1999-11-04 Michael Fulbright <drmike@redhat.com> 1999-11-04 Michael Fulbright <drmike@redhat.com>
* src/io-jpeg.c (image_begin_load): Add update_func callback. * src/io-jpeg.c (image_begin_load): Add update_func callback.

10
gdk-pixbuf/Makefile.am
View File

@ -41,7 +41,6 @@ libexec_LTLIBRARIES = \
#noinst_PROGRAMS = testpixbuf testpixbuf-drawable #noinst_PROGRAMS = testpixbuf testpixbuf-drawable
noinst_PROGRAMS = testpixbuf noinst_PROGRAMS = testpixbuf
DEPS = libgdk_pixbuf.la DEPS = libgdk_pixbuf.la
INCLUDES = -I$(top_builddir)/gdk-pixbuf $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS) INCLUDES = -I$(top_builddir)/gdk-pixbuf $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS)
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
@ -50,11 +49,11 @@ LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
if INSIDE_GNOME_LIBS if INSIDE_GNOME_LIBS
testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) -lgmodule testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) -lgmodule
#testpixbuf_drawable_LDADD = $(LDADDS)
else else
testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule
endif
#testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS) #testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
endif
GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS) GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
@ -74,14 +73,13 @@ libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
libgdk_pixbuf_la_SOURCES = \ libgdk_pixbuf_la_SOURCES = \
gdk-pixbuf.c \ gdk-pixbuf.c \
gdk-pixbuf-data.c \ gdk-pixbuf-data.c \
gdk-pixbuf-drawable.c \
gdk-pixbuf-io.c \ gdk-pixbuf-io.c \
gdk-pixbuf-loader.c \ gdk-pixbuf-loader.c \
gdk-pixbuf-render.c \ gdk-pixbuf-render.c \
gdk-pixbuf-util.c \ gdk-pixbuf-util.c \
$(CANVAS_SOURCEFILES) $(CANVAS_SOURCEFILES)
# gdk-pixbuf-drawable.c \
libgdk_pixbuf_la_LDFLAGS = -version-info 1:0:0 libgdk_pixbuf_la_LDFLAGS = -version-info 1:0:0
libgdk_pixbufinclude_HEADERS = \ libgdk_pixbufinclude_HEADERS = \
@ -89,8 +87,6 @@ libgdk_pixbufinclude_HEADERS = \
gdk-pixbuf-loader.h \ gdk-pixbuf-loader.h \
$(CANVAS_HEADERFILES) $(CANVAS_HEADERFILES)
# gdk-pixbuf-drawable.h \
noinst_HEADERS = \ noinst_HEADERS = \
gdk-pixbuf-io.h gdk-pixbuf-io.h

10
gdk-pixbuf/gdk-pixbuf-drawable.h
View File

@ -1,10 +0,0 @@
#ifndef _GDK_PIXBUF_DRAWABLE_H_
#define _GDK_PIXBUF_DRAWABLE_H_
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
GdkPixbuf *gdk_pixbuf_rgb_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);
GdkPixbuf *gdk_pixbuf_rgba_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);
#endif /* _GDK_PIXBUF_DRAWABLE_H_ */

13
gdk-pixbuf/gdk-pixbuf.h
View File

@ -118,6 +118,19 @@ void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf, GdkDrawable *drawab
GdkRgbDither dither, GdkRgbDither dither,
int x_dither, int y_dither); int x_dither, int y_dither);
#if 0
/* Fetching a region from a drawable */
GdkPixbuf *gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
GdkDrawable *src, GdkColormap *cmap,
int src_x, int src_y,
int dest_x, int dest_y,
int width, int height);
#endif
#ifdef __cplusplus #ifdef __cplusplus

508
gdk/gdkpixbuf-drawable.c
View File

@ -1,28 +1,38 @@
/* /* GdkPixbuf library - convert X drawable information to RGB
* Creates an GdkPixbuf from a Drawable
* *
* Authors: * Copyright (C) 1999 Michael Zucchi
* Cody Russell <bratsche@dfw.net>
* Michael Zucchi <zucchi@zedzone.mmc.com.au>
* *
* This is licensed software, see the file COPYING for * Authors: Michael Zucchi <zucchi@zedzone.mmc.com.au>
* details. * Cody Russell <bratsche@dfw.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library 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.
*/ */
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <glib.h>
#include <gmodule.h>
#include "gdk-pixbuf.h" #include "gdk-pixbuf.h"
#include "gdk-pixbuf-drawable.h"
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN) #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
#define LITTLE #define LITTLE
#endif #endif
#define d(x) #define d(x)
static unsigned long mask_table[] = { static unsigned long mask_table[] = {
0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x00000000, 0x00000001, 0x00000003, 0x00000007,
0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f, 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f,
@ -35,11 +45,14 @@ static unsigned long mask_table[] = {
0xffffffff 0xffffffff
}; };
/* /*
convert 1 bits-pixel data convert 1 bits-pixel data
no alpha no alpha
*/ */
static void rgb1(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb1 (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -48,7 +61,7 @@ static void rgb1(GdkImage *image, art_u8 *pixels, int rowstride)
register unsigned char data; register unsigned char data;
unsigned char *o; unsigned char *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
GdkColormap *colormap; GdkColormap *colormap;
d (printf ("1 bits/pixel\n")); d (printf ("1 bits/pixel\n"));
@ -58,15 +71,15 @@ static void rgb1(GdkImage *image, art_u8 *pixels, int rowstride)
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
colormap = gdk_rgb_get_cmap (); colormap = gdk_rgb_get_cmap ();
for (yy = 0; yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow; s = srow;
o = orow; o = orow;
for (xx = 0; xx < width; xx ++) { for (xx = 0; xx < width; xx ++) {
data = srow[xx>>3] >> (7 - (xx & 7)) & 1; data = srow[xx >> 3] >> (7 - (xx & 7)) & 1;
*o++ = colormap->colors[data].red; *o++ = colormap->colors[data].red;
*o++ = colormap->colors[data].green; *o++ = colormap->colors[data].green;
*o++ = colormap->colors[data].blue; *o++ = colormap->colors[data].blue;
@ -80,7 +93,8 @@ static void rgb1(GdkImage *image, art_u8 *pixels, int rowstride)
convert 1 bits/pixel data convert 1 bits/pixel data
with alpha with alpha
*/ */
static void rgb1a(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb1a (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -90,7 +104,7 @@ static void rgb1a(GdkImage *image, art_u8 *pixels, int rowstride)
unsigned char *o; unsigned char *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
unsigned long remap[2]; unsigned long remap[2];
GdkColormap *colormap; GdkColormap *colormap;
d (printf ("1 bits/pixel\n")); d (printf ("1 bits/pixel\n"));
@ -100,29 +114,29 @@ static void rgb1a(GdkImage *image, art_u8 *pixels, int rowstride)
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
colormap = gdk_rgb_get_cmap (); colormap = gdk_rgb_get_cmap ();
for (xx=0;xx<2;xx++) { for (xx = 0; xx < 2; xx++) {
#ifdef LITTLE #ifdef LITTLE
remap[xx] = 0xff000000 remap[xx] = 0xff000000
| colormap->colors[xx].blue<<16 | colormap->colors[xx].blue << 16
| colormap->colors[xx].green<<8 | colormap->colors[xx].green << 8
| colormap->colors[xx].red; | colormap->colors[xx].red;
#else #else
remap[xx] = 0xff remap[xx] = 0xff
| colormap->colors[xx].red<<24 | colormap->colors[xx].red << 24
| colormap->colors[xx].green<<16 | colormap->colors[xx].green << 16
| colormap->colors[xx].red<<8; | colormap->colors[xx].red << 8;
#endif #endif
} }
for (yy = 0; yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow; s = srow;
o = orow; o = orow;
for (xx = 0; xx < width; xx ++) { for (xx = 0; xx < width; xx ++) {
data = srow[xx>>3] >> (7 - (xx & 7)) & 1; data = srow[xx >> 3] >> (7 - (xx & 7)) & 1;
*o++ = remap[data]; *o++ = remap[data];
} }
srow += bpl; srow += bpl;
@ -134,7 +148,8 @@ static void rgb1a(GdkImage *image, art_u8 *pixels, int rowstride)
convert 8 bits/pixel data convert 8 bits/pixel data
no alpha no alpha
*/ */
static void rgb8(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb8 (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -144,18 +159,18 @@ static void rgb8(GdkImage *image, art_u8 *pixels, int rowstride)
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
register unsigned char *s; register unsigned char *s;
register unsigned char *o; register unsigned char *o;
GdkColormap *colormap; GdkColormap *colormap;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
d(printf("8 bit, no alpha output\n")); d (printf ("8 bit, no alpha output\n"));
colormap = gdk_rgb_get_cmap (); colormap = gdk_rgb_get_cmap ();
mask = mask_table[image->depth]; mask = mask_table[image->depth];
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow; s = srow;
o = orow; o = orow;
for (xx = 0; xx < width; xx++) { for (xx = 0; xx < width; xx++) {
@ -173,7 +188,8 @@ static void rgb8(GdkImage *image, art_u8 *pixels, int rowstride)
convert 8 bits/pixel data convert 8 bits/pixel data
with alpha with alpha
*/ */
static void rgb8a(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb8a (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -181,37 +197,37 @@ static void rgb8a(GdkImage *image, art_u8 *pixels, int rowstride)
unsigned long mask; unsigned long mask;
register unsigned long data; register unsigned long data;
GdkColormap *colormap; GdkColormap *colormap;
unsigned long remap[256]; unsigned long remap[256];
register unsigned char *s; /* read 2 pixels at once */ register unsigned char *s; /* read 2 pixels at once */
register unsigned long *o; register unsigned long *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
d(printf("8 bit, with alpha output\n")); d (printf ("8 bit, with alpha output\n"));
colormap = gdk_rgb_get_cmap (); colormap = gdk_rgb_get_cmap ();
mask = mask_table[image->depth]; mask = mask_table[image->depth];
for (xx=0;xx<colormap->size;xx++) { for (xx = 0; xx < colormap->size; xx++) {
#ifdef LITTLE #ifdef LITTLE
remap[xx] = 0xff000000 remap[xx] = 0xff000000
| colormap->colors[xx].blue<<16 | colormap->colors[xx].blue << 16
| colormap->colors[xx].green<<8 | colormap->colors[xx].green << 8
| colormap->colors[xx].red; | colormap->colors[xx].red;
#else #else
remap[xx] = 0xff remap[xx] = 0xff
| colormap->colors[xx].red<<24 | colormap->colors[xx].red << 24
| colormap->colors[xx].green<<16 | colormap->colors[xx].green << 16
| colormap->colors[xx].red<<8; | colormap->colors[xx].red << 8;
#endif #endif
} }
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow; s = srow;
o = (unsigned long *)orow; o = (unsigned long *) orow;
for (xx = 0; xx < width; xx ++) { for (xx = 0; xx < width; xx ++) {
data = *s++ & mask; data = *s++ & mask;
*o++ = remap[data]; *o++ = remap[data];
@ -226,12 +242,13 @@ static void rgb8a(GdkImage *image, art_u8 *pixels, int rowstride)
no alpha no alpha
data in lsb format data in lsb format
*/ */
static void rgb565lsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb565lsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
int bpl; int bpl;
#ifdef LITTLE #ifdef LITTLE
register unsigned long *s; /* read 2 pixels at once */ register unsigned long *s; /* read 2 pixels at once */
#else #else
@ -239,18 +256,18 @@ static void rgb565lsb(GdkImage *image, art_u8 *pixels, int rowstride)
#endif #endif
register unsigned short *o; register unsigned short *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
#ifdef LITTLE #ifdef LITTLE
s = (unsigned long *)srow; s = (unsigned long *) srow;
#else #else
s = (unsigned char *)srow; s = (unsigned char *) srow;
#endif #endif
o = (unsigned short *)orow; o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) { for (xx = 1; xx < width; xx += 2) {
register unsigned long data; register unsigned long data;
#ifdef LITTLE #ifdef LITTLE
@ -260,8 +277,8 @@ static void rgb565lsb(GdkImage *image, art_u8 *pixels, int rowstride)
*o++ = ((data & 0x7e00000) >> 19) | (data & 0x1f0000) >> 5; *o++ = ((data & 0x7e00000) >> 19) | (data & 0x1f0000) >> 5;
#else #else
/* swap endianness first */ /* swap endianness first */
data = s[0] | s[1]<<8 | s[2]<<16 | s[3]<<24; data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24;
s+=4; s += 4;
*o++ = (data & 0xf800) | (data & 0x7e0) >> 3; *o++ = (data & 0xf800) | (data & 0x7e0) >> 3;
*o++ = (data & 0x1f) << 11 | (data & 0xf8000000) >> 24; *o++ = (data & 0x1f) << 11 | (data & 0xf8000000) >> 24;
*o++ = ((data & 0x7e00000) >> 11) | (data & 0x1f0000) >> 13; *o++ = ((data & 0x7e00000) >> 11) | (data & 0x1f0000) >> 13;
@ -290,12 +307,13 @@ static void rgb565lsb(GdkImage *image, art_u8 *pixels, int rowstride)
no alpha no alpha
data in msb format data in msb format
*/ */
static void rgb565msb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb565msb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
int bpl; int bpl;
#ifdef LITTLE #ifdef LITTLE
register unsigned char *s; /* need to swap data order */ register unsigned char *s; /* need to swap data order */
#else #else
@ -303,24 +321,24 @@ static void rgb565msb(GdkImage *image, art_u8 *pixels, int rowstride)
#endif #endif
register unsigned short *o; register unsigned short *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
#ifdef LITTLE #ifdef LITTLE
s = srow; s = srow;
#else #else
s = (unsigned long *)srow; s = (unsigned long *) srow;
#endif #endif
o = (unsigned short *)orow; o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) { for (xx = 1; xx < width; xx += 2) {
register unsigned long data; register unsigned long data;
#ifdef LITTLE #ifdef LITTLE
/* swap endianness first */ /* swap endianness first */
data = s[0] | s[1]<<8 | s[2]<<16 | s[3]<<24; data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24;
s+=4; s += 4;
*o++ = (data & 0xf800) >> 8 | (data & 0x7e0) << 5; *o++ = (data & 0xf800) >> 8 | (data & 0x7e0) << 5;
*o++ = (data & 0x1f) << 3 | (data & 0xf8000000) >> 16; *o++ = (data & 0x1f) << 3 | (data & 0xf8000000) >> 16;
*o++ = ((data & 0x7e00000) >> 19) | (data & 0x1f0000) >> 5; *o++ = ((data & 0x7e00000) >> 19) | (data & 0x1f0000) >> 5;
@ -354,7 +372,8 @@ static void rgb565msb(GdkImage *image, art_u8 *pixels, int rowstride)
with alpha with alpha
data in lsb format data in lsb format
*/ */
static void rgb565alsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb565alsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -366,32 +385,32 @@ static void rgb565alsb(GdkImage *image, art_u8 *pixels, int rowstride)
register unsigned char *s; register unsigned char *s;
#endif #endif
register unsigned long *o; register unsigned long *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
#ifdef LITTLE #ifdef LITTLE
s = (unsigned short *)srow; s = (unsigned short *) srow;
#else #else
s = (unsigned char *)srow; s = (unsigned char *) srow;
#endif #endif
o = (unsigned long *)orow; o = (unsigned long *) orow;
for (xx = 0; xx < width; xx ++) { for (xx = 0; xx < width; xx ++) {
register unsigned long data; register unsigned long data;
/* rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */ /* rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */
/* little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */ /* little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */
#ifdef LITTLE #ifdef LITTLE
data = *s++; data = *s++;
*o++ = (data & 0xf800) >>8 | (data & 0x7e0) << 5 *o++ = (data & 0xf800) >> 8 | (data & 0x7e0) << 5
| (data & 0x1f) << 19 | 0xff000000; | (data & 0x1f) << 19 | 0xff000000;
#else #else
/* swap endianness first */ /* swap endianness first */
data = s[0] | s[1]<<8; data = s[0] | s[1] << 8;
s+=2; s += 2;
*o++ = (data & 0xf800) << 16 | (data & 0x7e0) << 13 *o++ = (data & 0xf800) << 16 | (data & 0x7e0) << 13
| (data & 0x1f) << 11 | 0xff; | (data & 0x1f) << 11 | 0xff;
#endif #endif
@ -406,7 +425,8 @@ static void rgb565alsb(GdkImage *image, art_u8 *pixels, int rowstride)
with alpha with alpha
data in msb format data in msb format
*/ */
static void rgb565amsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb565amsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -418,25 +438,25 @@ static void rgb565amsb(GdkImage *image, art_u8 *pixels, int rowstride)
register unsigned short *s; /* read 1 pixels at once */ register unsigned short *s; /* read 1 pixels at once */
#endif #endif
register unsigned long *o; register unsigned long *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow; s = srow;
o = (unsigned long *)orow; o = (unsigned long *) orow;
for (xx = 0; xx < width; xx ++) { for (xx = 0; xx < width; xx ++) {
register unsigned long data; register unsigned long data;
/* rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */ /* rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */
/* little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */ /* little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */
#ifdef LITTLE #ifdef LITTLE
/* swap endianness first */ /* swap endianness first */
data = s[0] | s[1]<<8; data = s[0] | s[1] << 8;
s+=2; s += 2;
*o++ = (data & 0xf800) >>8 | (data & 0x7e0) << 5 *o++ = (data & 0xf800) >> 8 | (data & 0x7e0) << 5
| (data & 0x1f) << 19 | 0xff000000; | (data & 0x1f) << 19 | 0xff000000;
#else #else
data = *s++; data = *s++;
@ -454,12 +474,13 @@ static void rgb565amsb(GdkImage *image, art_u8 *pixels, int rowstride)
no alpha no alpha
data in lsb format data in lsb format
*/ */
static void rgb555lsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb555lsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
int bpl; int bpl;
#ifdef LITTLE #ifdef LITTLE
register unsigned long *s; /* read 2 pixels at once */ register unsigned long *s; /* read 2 pixels at once */
#else #else
@ -467,18 +488,18 @@ static void rgb555lsb(GdkImage *image, art_u8 *pixels, int rowstride)
#endif #endif
register unsigned short *o; register unsigned short *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
#ifdef LITTLE #ifdef LITTLE
s = (unsigned long *)srow; s = (unsigned long *) srow;
#else #else
s = srow; s = srow;
#endif #endif
o = (unsigned short *)orow; o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) { for (xx = 1; xx < width; xx += 2) {
register unsigned long data; register unsigned long data;
#ifdef LITTLE #ifdef LITTLE
@ -488,8 +509,8 @@ static void rgb555lsb(GdkImage *image, art_u8 *pixels, int rowstride)
*o++ = ((data & 0x3e00000) >> 18) | (data & 0x1f0000) >> 5; *o++ = ((data & 0x3e00000) >> 18) | (data & 0x1f0000) >> 5;
#else #else
/* swap endianness first */ /* swap endianness first */
data = s[0] | s[1]<<8 | s[2]<<16 | s[3]<<24; data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24;
s+=4; s += 4;
*o++ = (data & 0x7c00) << 1 | (data & 0x3e0) >> 2; *o++ = (data & 0x7c00) << 1 | (data & 0x3e0) >> 2;
*o++ = (data & 0x1f) << 11 | (data & 0x7c000000) >> 23; *o++ = (data & 0x1f) << 11 | (data & 0x7c000000) >> 23;
*o++ = ((data & 0x3e00000) >> 10) | (data & 0x1f0000) >> 13; *o++ = ((data & 0x3e00000) >> 10) | (data & 0x1f0000) >> 13;
@ -518,12 +539,13 @@ static void rgb555lsb(GdkImage *image, art_u8 *pixels, int rowstride)
no alpha no alpha
data in msb format data in msb format
*/ */
static void rgb555msb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb555msb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
int bpl; int bpl;
#ifdef LITTLE #ifdef LITTLE
register unsigned char *s; /* read 2 pixels at once */ register unsigned char *s; /* read 2 pixels at once */
#else #else
@ -531,20 +553,20 @@ static void rgb555msb(GdkImage *image, art_u8 *pixels, int rowstride)
#endif #endif
register unsigned short *o; register unsigned short *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow; s = srow;
o = (unsigned short *)orow; o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) { for (xx = 1; xx < width; xx += 2) {
register unsigned long data; register unsigned long data;
#ifdef LITTLE #ifdef LITTLE
/* swap endianness first */ /* swap endianness first */
data = s[0] | s[1]<<8 | s[2]<<16 | s[3]<<24; data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24;
s+=4; s += 4;
*o++ = (data & 0x7c00) >> 7 | (data & 0x3e0) << 6; *o++ = (data & 0x7c00) >> 7 | (data & 0x3e0) << 6;
*o++ = (data & 0x1f) << 3 | (data & 0x7c000000) >> 15; *o++ = (data & 0x1f) << 3 | (data & 0x7c000000) >> 15;
*o++ = ((data & 0x3e00000) >> 18) | (data & 0x1f0000) >> 5; *o++ = ((data & 0x3e00000) >> 18) | (data & 0x1f0000) >> 5;
@ -578,7 +600,8 @@ static void rgb555msb(GdkImage *image, art_u8 *pixels, int rowstride)
with alpha with alpha
data in lsb format data in lsb format
*/ */
static void rgb555alsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb555alsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -590,32 +613,32 @@ static void rgb555alsb(GdkImage *image, art_u8 *pixels, int rowstride)
register unsigned char *s; register unsigned char *s;
#endif #endif
register unsigned long *o; register unsigned long *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
#ifdef LITTLE #ifdef LITTLE
s = (unsigned short *)srow; s = (unsigned short *) srow;
#else #else
s = srow; s = srow;
#endif #endif
o = (unsigned long *)orow; o = (unsigned long *) orow;
for (xx = 0; xx < width; xx++) { for (xx = 0; xx < width; xx++) {
register unsigned long data; register unsigned long data;
/* rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */ /* rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */
/* little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */ /* little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */
#ifdef LITTLE #ifdef LITTLE
data = *s++; data = *s++;
*o++ = (data & 0x7c00) >>7 | (data & 0x3e0) << 6 *o++ = (data & 0x7c00) >> 7 | (data & 0x3e0) << 6
| (data & 0x1f) << 19 | 0xff000000; | (data & 0x1f) << 19 | 0xff000000;
#else #else
/* swap endianness first */ /* swap endianness first */
data = s[0] | s[1]<<8; data = s[0] | s[1] << 8;
s+=2; s += 2;
*o++ = (data & 0x7c00) << 17 | (data & 0x3e0) << 14 *o++ = (data & 0x7c00) << 17 | (data & 0x3e0) << 14
| (data & 0x1f) << 11 | 0xff; | (data & 0x1f) << 11 | 0xff;
#endif #endif
@ -630,7 +653,8 @@ static void rgb555alsb(GdkImage *image, art_u8 *pixels, int rowstride)
with alpha with alpha
data in msb format data in msb format
*/ */
static void rgb555amsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb555amsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -642,28 +666,28 @@ static void rgb555amsb(GdkImage *image, art_u8 *pixels, int rowstride)
register unsigned char *s; register unsigned char *s;
#endif #endif
register unsigned long *o; register unsigned long *o;
unsigned char *srow = image->mem, *orow = pixels; unsigned char *srow = image->mem, *orow = pixels;
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
for (yy = 0;yy < height; yy++) { for (yy = 0; yy < height; yy++) {
#ifdef LITTLE #ifdef LITTLE
s = (unsigned short *)srow; s = (unsigned short *) srow;
#else #else
s = srow; s = srow;
#endif #endif
o = (unsigned long *)orow; o = (unsigned long *) orow;
for (xx = 0; xx < width; xx++) { for (xx = 0; xx < width; xx++) {
register unsigned long data; register unsigned long data;
/* rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */ /* rrrrrggg gggbbbbb -> rrrrr000 gggggg00 bbbbb000 aaaaaaaa */
/* little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */ /* little endian: aaaaaaaa bbbbb000 gggggg00 rrrrr000 */
#ifdef LITTLE #ifdef LITTLE
/* swap endianness first */ /* swap endianness first */
data = s[0] | s[1]<<8; data = s[0] | s[1] << 8;
s+=2; s += 2;
*o++ = (data & 0x7c00) >>7 | (data & 0x3e0) << 6 *o++ = (data & 0x7c00) >>7 | (data & 0x3e0) << 6
| (data & 0x1f) << 19 | 0xff000000; | (data & 0x1f) << 19 | 0xff000000;
#else #else
@ -678,7 +702,8 @@ static void rgb555amsb(GdkImage *image, art_u8 *pixels, int rowstride)
} }
static void rgb888alsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb888alsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -691,9 +716,9 @@ static void rgb888alsb(GdkImage *image, art_u8 *pixels, int rowstride)
width = image->width; width = image->width;
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
d(printf ("32 bits/pixel with alpha\n")); d (printf ("32 bits/pixel with alpha\n"));
/* lsb data */ /* lsb data */
for (yy = 0; yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow; s = srow;
@ -710,7 +735,8 @@ static void rgb888alsb(GdkImage *image, art_u8 *pixels, int rowstride)
} }
} }
static void rgb888lsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb888lsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -723,7 +749,7 @@ static void rgb888lsb(GdkImage *image, art_u8 *pixels, int rowstride)
height = image->height; height = image->height;
bpl = image->bpl; bpl = image->bpl;
d(printf("32 bit, lsb, no alpha\n")); d (printf ("32 bit, lsb, no alpha\n"));
for (yy = 0; yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow; s = srow;
@ -739,7 +765,8 @@ static void rgb888lsb(GdkImage *image, art_u8 *pixels, int rowstride)
} }
} }
static void rgb888amsb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb888amsb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -754,7 +781,7 @@ static void rgb888amsb(GdkImage *image, art_u8 *pixels, int rowstride)
unsigned char *o; unsigned char *o;
#endif #endif
d(printf("32 bit, msb, with alpha\n")); d (printf ("32 bit, msb, with alpha\n"));
width = image->width; width = image->width;
height = image->height; height = image->height;
@ -763,8 +790,8 @@ static void rgb888amsb(GdkImage *image, art_u8 *pixels, int rowstride)
/* msb data */ /* msb data */
for (yy = 0; yy < height; yy++) { for (yy = 0; yy < height; yy++) {
#ifdef LITTLE #ifdef LITTLE
s = (unsigned long *)srow; s = (unsigned long *) srow;
o = (unsigned long *)orow; o = (unsigned long *) orow;
#else #else
s = srow; s = srow;
o = orow; o = orow;
@ -777,7 +804,7 @@ static void rgb888amsb(GdkImage *image, art_u8 *pixels, int rowstride)
*o++ = 0xff; *o++ = 0xff;
s += 4; s += 4;
#else #else
*o++ = (*s <<8 ) | 0xff; /* untested */ *o++ = (*s << 8) | 0xff; /* untested */
s++; s++;
#endif #endif
} }
@ -786,7 +813,8 @@ static void rgb888amsb(GdkImage *image, art_u8 *pixels, int rowstride)
} }
} }
static void rgb888msb(GdkImage *image, art_u8 *pixels, int rowstride) static void
rgb888msb (GdkImage *image, art_u8 *pixels, int rowstride)
{ {
int xx, yy; int xx, yy;
int width, height; int width, height;
@ -796,7 +824,7 @@ static void rgb888msb(GdkImage *image, art_u8 *pixels, int rowstride)
unsigned char *s; unsigned char *s;
unsigned char *o; unsigned char *o;
d(printf("32 bit, msb, no alpha\n")); d (printf ("32 bit, msb, no alpha\n"));
width = image->width; width = image->width;
height = image->height; height = image->height;
@ -816,7 +844,7 @@ static void rgb888msb(GdkImage *image, art_u8 *pixels, int rowstride)
} }
} }
typedef void (*cfunc) (GdkImage *image, art_u8 *pixels, int rowstride); typedef void (* cfunc) (GdkImage *image, art_u8 *pixels, int rowstride);
static cfunc convert_map[] = { static cfunc convert_map[] = {
rgb1,rgb1,rgb1a,rgb1a, rgb1,rgb1,rgb1a,rgb1a,
@ -829,22 +857,37 @@ static cfunc convert_map[] = {
/* /*
perform actual conversion perform actual conversion
*/ */
static void rgbconvert(GdkImage *image, art_u8 *pixels, int rowstride, int alpha) static void
rgbconvert (GdkImage *image, art_u8 *pixels, int rowstride, int alpha)
{ {
int index = (image->byte_order == GDK_MSB_FIRST) int index = (image->byte_order == GDK_MSB_FIRST) | (alpha != 0) << 1;
| (alpha!=0) << 1;
int bank=0; int bank=0;
switch (image->depth) { switch (image->depth) {
case 1: bank = 0; break; case 1:
case 8: bank = 1; break; bank = 0;
case 15: bank = 2; break; break;
case 16: bank = 3; break;
case 8:
bank = 1;
break;
case 15:
bank = 2;
break;
case 16:
bank = 3;
break;
case 24: case 24:
case 32: bank = 4; break; case 32:
bank = 4;
break;
} }
index |= bank<<2;
convert_map[index](image, pixels, rowstride); index |= bank << 2;
(* convert_map[index]) (image, pixels, rowstride);
} }
static GdkPixbuf * static GdkPixbuf *
@ -860,15 +903,15 @@ gdk_pixbuf_from_drawable_core (GdkPixmap * window, gint x, gint y, gint width,
gint screen_width, screen_height; gint screen_width, screen_height;
gint window_width, window_height, window_x, window_y; gint window_width, window_height, window_x, window_y;
int bpl; int bpl;
g_return_val_if_fail (window != NULL, NULL); g_return_val_if_fail (window != NULL, NULL);
/* always returns image in ZPixmap format ... */ /* always returns image in ZPixmap format ... */
image = gdk_image_get (window, x, y, width, height); image = gdk_image_get (window, x, y, width, height);
fatness = with_alpha ? 4 : 3; fatness = with_alpha ? 4 : 3;
rowstride = width * fatness; rowstride = width * fatness;
buff = art_alloc (rowstride * height); buff = art_alloc (rowstride * height);
pixels = buff; pixels = buff;
@ -878,38 +921,153 @@ gdk_pixbuf_from_drawable_core (GdkPixmap * window, gint x, gint y, gint width,
printf ("byte order = %d\n", image->byte_order); printf ("byte order = %d\n", image->byte_order);
printf ("bytes/line = %d\n", image->bpl); printf ("bytes/line = %d\n", image->bpl);
#endif #endif
bpl = image->bpl; bpl = image->bpl;
rgbconvert(image, pixels, rowstride, with_alpha); rgbconvert (image, pixels, rowstride, with_alpha);
gdk_image_destroy (image); gdk_image_destroy (image);
if (with_alpha) if (with_alpha)
art_pixbuf = art_pixbuf_new_rgba (buff, width, height, rowstride); art_pixbuf = art_pixbuf_new_rgba (buff, width, height, rowstride);
else else
art_pixbuf = art_pixbuf_new_rgb (buff, width, height, rowstride); art_pixbuf = art_pixbuf_new_rgb (buff, width, height, rowstride);
return gdk_pixbuf_new_from_art_pixbuf (art_pixbuf); return gdk_pixbuf_new_from_art_pixbuf (art_pixbuf);
} }
/* Public functions */
GdkPixbuf *
gdk_pixbuf_rgb_from_drawable (GdkWindow * window, gint x, gint y, gint width,
gint height)
{
return gdk_pixbuf_from_drawable_core (window, x, y, width, height, 0);
}
GdkPixbuf * /* Exported functions */
gdk_pixbuf_rgba_from_drawable (GdkWindow * window, gint x, gint y, gint width,
gint height)
{
return gdk_pixbuf_from_drawable_core (window, x, y, width, height, 1);
}
/* /**
* Local variables: * gdk_pixbuf_get_from_drawable:
* c-basic-offset: 8 * @dest: Destination pixbuf, or NULL if a new pixbuf should be created.
* End: * @src: Source drawable.
*/ * @cmap: A colormap if @src is a pixmap. If it is a window, this argument will
* be ignored.
* @src_x: Source X coordinate within drawable.
* @src_y: Source Y coordinate within drawable.
* @dest_x: Destination X coordinate in pixbuf, or 0 if @dest is NULL.
* @dest_y: Destination Y coordinate in pixbuf, or 0 if @dest is NULL.
* @width: Width in pixels of region to get.
* @height: Height in pixels of region to get.
*
* Transfers image data from a Gdk drawable and converts it to an RGB(A)
* representation inside a GdkPixbuf.
*
* If the drawable @src is a pixmap, then a suitable colormap must be specified,
* since pixmaps are just blocks of pixel data without an associated colormap.
* If the drawable is a window, the @cmap argument will be ignored and the
* window's own colormap will be used instead.
*
* If the specified destination pixbuf @dest is #NULL, then this function will
* create an RGB pixbuf with 8 bits per channel and no alpha, with the same size
* specified by the @width and @height arguments. In this case, the @dest_x and
* @dest_y arguments must be specified as 0, otherwise the function will return
* #NULL. If the specified destination pixbuf is not NULL and it contains alpha
* information, then the filled pixels will be set to full opacity.
*
* If the specified drawable is a pixmap, then the requested source rectangle
* must be completely contained within the pixmap, otherwise the function will
* return #NULL.
*
* If the specified drawable is a window, then it must be viewable, i.e. all of
* its ancestors up to the root window must be mapped. Also, the specified
* source rectangle must be completely contained within the window and within
* the screen. If regions of the window are obscured by noninferior windows, the
* contents of those regions are undefined. The contents of regions obscured by
* inferior windows of a different depth than that of the source window will also
* be undefined.
*
* Return value: The same pixbuf as @dest if it was non-NULL, or a newly-created
* pixbuf with a reference count of 1 if no destination pixbuf was specified.
**/
GdkPixbuf *
gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
GdkDrawable *src, GdkColormap *cmap,
int src_x, int src_y,
int dest_x, int dest_y,
int width, int height)
{
GdkWindowType window_type;
gint src_width, src_height;
ArtPixBuf *apb;
/* General sanity checks */
g_return_val_if_fail (src != NULL, NULL);
window_type = gdk_window_get_type (src);
if (window_type == GDK_WINDOW_PIXMAP)
g_return_val_if_fail (cmap != NULL, NULL);
else
/* FIXME: this is not perfect, since is_viewable() only tests
* recursively up the Gdk parent window tree, but stops at
* foreign windows or Gdk toplevels. I.e. if a window manager
* unmapped one of its own windows, this won't work.
*/
g_return_val_if_fail (gdk_window_is_viewable (src), NULL);
if (!dest)
g_return_val_if_fail (dest_x == 0 && dest_y == 0, NULL);
else {
apb = dest->art_pixbuf;
g_return_val_if_fail (apb->format == ART_PIX_RGB, NULL);
g_return_val_if_fail (apb->n_channels == 3 || apb->n_channels == 4, NULL);
g_return_val_if_fail (apb->bits_per_sample == 8, NULL);
}
/* Coordinate sanity checks */
gdk_window_get_size (src, &src_width, &src_height);
g_return_val_if_fail (src_x >= 0 && src_y >= 0, NULL);
g_return_val_if_fail (src_x + width <= src_width && src_y + height <= src_height, NULL);
if (dest) {
g_return_val_if_fail (dest_x >= 0 && dest_y >= 0, NULL);
g_return_val_if_fail (dest_x + width <= apb->width, NULL);
g_return_val_if_fail (dest_y + height <= apb->height, NULL);
}
if (window_type != GDK_WINDOW_PIXMAP) {
int ret;
gint src_xorigin, src_yorigin;
int screen_width, screen_height;
int screen_srcx, screen_srcy;
ret = gdk_window_get_origin (src, &src_xorigin, &src_yorigin);
g_return_val_if_fail (ret != FALSE, NULL);
screen_width = gdk_screen_width ();
screen_height = gdk_screen_height ();
screen_srcx = src_xorigin + src_x;
screen_srcy = src_yorigin + src_y;
g_return_val_if_fail (screen_srcx >= 0 && screen_srcy >= 0, NULL);
g_return_val_if_fail (screen_srcx + width <= screen_width, NULL);
g_return_val_if_fail (screen_srcy + height <= screen_height, NULL);
}
/* Create the pixbuf if needed */
if (!dest) {
dest = gdk_pixbuf_new (ART_PIX_RGB, FALSE, 8, width, height);
if (!dest)
return NULL;
apb = dest->art_pixbuf;
}
/* Get the colormap if needed */
if (window_type != GDK_WINDOW_PIXMAP)
cmap = gdk_window_get_colormap (src);
/* FIXME: fill in the body here */
return dest;
}