Commit Graph

151 Commits

Author SHA1 Message Date
Michael Zucchi
757fc193c4 Should now handle all formats, slow routine used where optimised
ones can't be.

1999-12-09  Michael Zucchi  <zucchi@zedzone.mmc.com.au>

        * gdk-pixbuf/gdk-pixbuf-drawable.c
        (convert_real_slow): New function - should convert ANY visual/data
        format properly, but it aint fast.  Used as a fallback when an
        optimised routine wont match.
        (rgbconvert): Do very specific tests on the data format to verify
        properly if the optimised version will do, otherwise use the
        fallback function for all other data formats.
1999-12-09 01:50:18 +00:00
Michael Zucchi
6b23587aef Filled in body of function. (rgbconvert): Added GdkColormap parameter, and
1999-12-09  Michael Zucchi  <zucchi@zedzone.mmc.com.au>

	* gdk-pixbuf/gdk-pixbuf-drawable.c (gdk_pixbuf_get_from_drawable):
	Filled in body of function.
	(rgbconvert): Added GdkColormap parameter, and to all conversion
	functions also.

	* gdk-pixbuf/Makefile.am: Re-enabled building of
	textpixbuf-drawable.

	* gdk-pixbuf/testpixbuf-drawable.c (main): Changed to use
	gdk_pixbuf_get_from_drawable().
1999-12-09 00:43:53 +00:00
Arjan van de Ven
880f5ade6b Fixed the red/green/red bug on two occasions. Changed from the custom
1999-12-08  Arjan van de Ven
<arjan@fenrus.demon.nl>

* gdk-pixbuf/gdk-pixbuf-drawable.c : Fixed
  the red/green/red bug on two occasions.
* gdk-pixbuf/io-ras.c: Changed from the custom
  be32_to_cpu function to the generic glib one.
1999-12-08 21:37:17 +00:00
Federico Mena Quintero
c6f25c2de8 Fix includes. (gdk_pixbuf_get_from_drawable): Implemented the zillion
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-08 21:17:53 +00:00
Federico Mena Quintero
a56ec79881 Added clarification about reference counting for GdkPixbuf structures.
1999-12-07  Federico Mena Quintero  <federico@redhat.com>

	* doc/tmpl/gnome-canvas-pixbuf.sgml: Added clarification about
	reference counting for GdkPixbuf structures.
1999-12-08 05:18:41 +00:00
Martin Baulig
4460746adc Conditionally include $(GNOME_LIBS) here.
1999-12-07  Martin Baulig  <martin@home-of-linux.org>

	* gdk-pixbuf/Makefile.am (testpixbuf_LDADD): Conditionally
	include $(GNOME_LIBS) here.
1999-12-07 18:56:46 +00:00
Arjan van de Ven
f2b649691a Added missing "include <string.h>" to: gdk-pixbuf/io-ras.c
1999-12-05  Arjan van de Ven
<arjan@fenrus.demon.nl>

Added missing "include <string.h>" to:
* gdk-pixbuf/io-ras.c
* gdk-pixbuf/io-bmp.c
* gdk-pixbuf/io-ico.c
1999-12-07 18:17:01 +00:00
Federico Mena Quintero
e506cf37cb Patch from Arjan to fix an initializer.
1999-12-06  Federico Mena Quintero  <federico@redhat.com>

	* gdk-pixbuf/gdk-pixbuf-io.c (file_formats): Patch from Arjan to
	fix an initializer.
1999-12-06 18:57:03 +00:00
Federico Mena Quintero
8a02827e39 Add back $(GNOME_LIBS). This must compile outside of gnome-libs. If you
1999-12-05  Federico Mena Quintero  <federico@redhat.com>

	* gdk-pixbuf/Makefile.am (testpixbuf_LDADD): Add back
	$(GNOME_LIBS).  This must compile outside of gnome-libs.  If you
	want, send me a patch to do the conditional stuff properly.
	Otherwise, please read the GNOME Programming Guidelines,
	especially the "CVS policies" section.
1999-12-06 00:22:29 +00:00
Jaka Mocnik
3f00a28b6c removed GNOME_LIBS from testpixbuf_LDADD.
1999-12-05  Jaka Mocnik  <jaka.mocnik@kiss.uni-lj.si>

	* gdk-pixbuf/Makefile.am: removed GNOME_LIBS from testpixbuf_LDADD.
1999-12-05 21:48:35 +00:00
Arjan van de Ven
a03ac28c6e Bug in palet-size calculation fixed
1999-12-05  Arjan van de Ven
     <arjan@fenrus.demon.nl>

* gdk-pixbuf/io-ico.c: Bug in palet-size
   calculation fixed
1999-12-05 13:47:26 +00:00
Arjan van de Ven
631f507f58 Major cleanup, added support for 32 bpp and 4 bpp (uncompressed) images,
1999-12-04  Arjan van de Ven <arjan@fenrus.demon.nl>

	* gdk-pixbuf/io-bmp.c: Major cleanup, added support for
	32 bpp and 4 bpp (uncompressed) images, fixed 1bpp.

	* gdk-pixbuf/io-ras.c: Minor cleanup, ran through lclint

	* gdk-pixbuf/io-ico.c: Minor cleanup, fixed 1bpp icons,
 	ran through lclint.

	* gdk-pixbuf/gdk-pixbuf-io.c: Added detection of .CUR files
	(Windows Cursor files). These are identical to .ICO files,
	except for the signature and 2 extra fields for the hotspot.
1999-12-04 18:17:52 +00:00
Jonathan Blandford
d8b35eab3e added a comment to explain this function better.
1999-12-03  Jonathan Blandford  <jrb@redhat.com>

	* gdk-pixbuf/io-gif.c (gif_fill_in_lines): added a comment to
	explain this function better.
1999-12-03 21:57:07 +00:00
Federico Mena Quintero
72868800d7 Source files moved from src/ to gdk-pixbuf/, to be consistent with other
1999-12-02  Federico Mena Quintero  <federico@redhat.com>

	Source files moved from src/ to gdk-pixbuf/, to be consistent with
	other libraries.

	* doc/Makefile.am: Modified for the new source directory.

	* configure.in: Likewise.

	* Makefile.am: Likewise.

	* autogen.sh: Likewise.

	* gdk-pixbuf/Makefile.am: Likewise.
1999-12-02 23:02:56 +00:00
Federico Mena Quintero
25a8142429 #include <config.h>, and fix includes.
1999-12-02  Federico Mena Quintero  <federico@redhat.com>

	* src/testpixbuf.c: #include <config.h>, and fix includes.

	* src/testpixbuf-drawable.c: #include <config.h>, and fix includes.

	* src/io-xpm.c: Fix includes.

	* src/io-tiff.c: Fix includes.

	* src/io-ras.c: Fix includes, and do not include more stuff than needed.

	* src/io-pnm.c: Fix inlcudes, and do not include more stuff than needed.

	* src/io-png.c: Fix includes.

	* src/io-ico.c: Fix includes, and do not include more stuff than needed.

	* src/io-gif.c: Fix includes, and do not include more stuff than needed.

	* src/io-bmp.c: Fix includes, and do not include more stuff than needed.

	* src/gnome-canvas-pixbuf.c: Fix includes.

	* src/gdk-pixbuf.c: Fix includes.

	* src/gdk-pixbuf-util.c: Fix includes.

	* src/gdk-pixbuf-render.c: Fix includes.

	* src/gdk-pixbuf-io.h: Fix includes.

	* src/gdk-pixbuf-drawable.c: Fix includes.

	* src/gdk-pixbuf-drawable.h: Use angle brackets for the gdk-pixbuf
	include files.

	* src/gdk-pixbuf-data.c: Fix includes.

	* src/gdk-pixbuf-loader.c: #include <config.h>

	* src/gdk-pixbuf-loader.h: Use angle brackets for the gdk-pixbuf
	include files.

	* src/Makefile.am: Commented out the gdk-pixbuf-drawable stuff,
	since it is not finished.
1999-12-02 20:44:43 +00:00
Federico Mena Quintero
21f0dff4cd Removed unused transformation prototypes.
1999-12-02  Federico Mena Quintero  <federico@redhat.com>

	* src/gdk-pixbuf.h: Removed unused transformation prototypes.
1999-12-02 20:10:22 +00:00
Federico Mena Quintero
e026570571 New file with utility and convenience functions for pixbufs.
1999-12-02  Federico Mena Quintero  <federico@redhat.com>

	* src/gdk-pixbuf-util.c: New file with utility and convenience
	functions for pixbufs.

	* src/Makefile.am (libgdk_pixbuf_la_SOURCES): Added gdk-pixbuf-util.c.

	* doc/gdk-pixbuf-sections.txt: Added section for utility functions.

	* doc/Makefile.am (tmpl_sources): Added tmpl/util.sgml.

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

	* doc/tmpl/util.sgml: Documentation for the utility functions.
1999-12-02 17:45:47 +00:00
Owen Taylor
bfa345c338 Keep the mask around until after we draw ... since the GC changes aren't
1999-11-29  Owen Taylor  <otaylor@redhat.com>

	* src/gdk-pixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha):
	Keep the mask around until after we draw ... since
	the GC changes aren't flushed to the X server until we
	draw, destroying it before that may result in BadPixmap
	errors.
1999-11-30 17:56:02 +00:00
Havoc Pennington
1284c3fc42 Add AM_CONDITIONAL for inside gnome-libs
1999-11-30  Havoc Pennington  <hp@pobox.com>

* configure.in: Add AM_CONDITIONAL for inside gnome-libs

* src/Makefile.am: conditionalize GnomeCanvasPixbuf
1999-11-30 17:53:02 +00:00
Federico Mena Quintero
f5b3df2956 Uncomment the GnomeCanvasPixbuf sources. This should be made conditional,
1999-11-29  Federico Mena Quintero  <federico@redhat.com>

	* src/Makefile.am: Uncomment the GnomeCanvasPixbuf sources.  This
	should be made conditional, not blindly commented out.
1999-11-29 20:36:55 +00:00
Jonathan Blandford
4aae90b5b1 Added another loader from Arjan to handle .ico files. Cool.
1999-11-29  Jonathan Blandford  <jrb@redhat.com>

        * src/Makefile.am (ICO_LIB): Added another loader from Arjan to
	handle .ico files.  Cool.
1999-11-29 16:49:39 +00:00
Jonathan Blandford
119a9f33ca new patch from Arjan to handle compressed bmps.
1999-11-24  Jonathan Blandford  <jrb@redhat.com>

	* src/io-bmp.c (OneLine24): new patch from Arjan to handle
	compressed bmps.
1999-11-24 21:12:24 +00:00
James Henstridge
104c12d28e libart must be built before gdk-pixbuf.
1999-11-24  James Henstridge  <james@daa.com.au>

	* Makefile.am (SUBDIRS): libart must be built before gdk-pixbuf.

[ in gdk-pixbuf ]
1999-11-24  James Henstridge  <james@daa.com.au>

	* configure.in (AC_OUTPUT): altered hack to place the symlink in the
	top builddir rather than src.  This still builds fine, and does not
	get gtk-doc into an infinite loop when trying to find all the source
	files.
1999-11-24 14:32:49 +00:00
Federico Mena Quintero
b990b30723 Create the temporary buffer to the size of the interesction of the
1999-11-22  Federico Mena Quintero  <federico@redhat.com>

	* src/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_draw): Create the
	temporary buffer to the size of the interesction of the bounding
	box and the expose area, not the whole expose area.  This speeds
	up things a lot.

	* src/gdk-pixbuf-render.c (gdk_pixbuf_render_threshold_alpha): Do
	not paint black on the mask, since we already cleared it in a
	single gdk_draw_rectangle() operation.
1999-11-24 08:19:58 +00:00
Jonathan Blandford
43bbf78a29 Removed #PRAGMA } from headers. Also, make compile if you don't have it
1999-11-23  Jonathan Blandford  <jrb@redhat.com>

	* Removed #PRAGMA } from headers.  Also, make compile if you don't
	have it installed, already.
1999-11-23 16:04:13 +00:00
Raja R Harinath
68f5479eb0 Fix for srcdir != builddir.
* configure.in (GDK_PIXBUF_DIR): Fix for srcdir != builddir.
1999-11-22 23:59:49 +00:00
Havoc Pennington
1bfdff1dcb Patch from Paul Fisher <pnfisher@redhat.com> adds all -lgdk-pixbuf and all
1999-11-22  Havoc Pennington  <hp@pobox.com>

* src/Makefile.am (GDK_PIXBUF_LIBS): Patch from Paul Fisher
<pnfisher@redhat.com> adds all -lgdk-pixbuf and all other
dependencies to LIBADD variables for loadable modules. Necessary
for a Java dynamic loading thing to be able to figure it out.
1999-11-22 23:11:05 +00:00
Havoc Pennington
4cbca90747 Call the update_area callback depending on the number of rows loaded in
1999-11-22  Havoc Pennington  <hp@pobox.com>

* src/io-png.c (image_load_increment): Call the update_area
callback depending on the number of rows loaded in this increment.

* src/testpixbuf.c (main): slow down the progressive load demo
1999-11-22 23:04:52 +00:00
Jonathan Blandford
14237d13e2 make the symlink. Does not work for srcdir != buildir != . Beats me why; I
1999-11-22  Jonathan Blandford  <jrb@redhat.com>

	* configure.in (GDK_PIXBUF_DIR): make the symlink.  Does not work
	for srcdir != buildir != .  Beats me why; I can't figure it out.
	AC_OUTPUT_COMMANDS doesn't seem to let me substitute it correctly.
1999-11-22 20:43:58 +00:00
Jonathan Blandford
0652653292 added io-bmp from Arjan <arjan@fenrus.demon.nl>
1999-11-21  Jonathan Blandford  <jrb@redhat.com>

        * src/gdk-pixbuf-io.c: added io-bmp from Arjan
        <arjan@fenrus.demon.nl>
1999-11-21 21:28:28 +00:00
Michael Zucchi
7b4d53a529 Rework/reorder of the code. Each case has been separated into another
1999-11-20  Michael Zucchi  <zucchi@zedzone.mmc.com.au>

        * src/gdk-pixbuf-drawable.c (gdk_pixbuf_from_drawable_core):
        Rework/reorder of the code.  Each case has been separated into
        another function; its big but it should be quick.
        gdk_pixbuf_rgba_from_drawable() will now return a pixbuf with
        opaque alpha information.  Not all depths/formats have been
        tested, but 8, 15/16 and 24 (alinged 32) should work ok.
1999-11-20 05:39:54 +00:00
Larry Ewing
36a27c6759 implement the bounds method correctly. (compute_viewport_affine): compute
1999-11-17  Larry Ewing  <lewing@gimp.org>

	* src/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_bounds):
	implement the bounds method correctly.
	(compute_viewport_affine): compute the affine need to fit the
	image within the viewport given by the args.
	(compute_render_affine): call compute_viewport_affine.
1999-11-17 23:21:34 +00:00
Havoc Pennington
3a330a3d6b Use includes from the current directory, not the system directory.
1999-11-16  Havoc Pennington  <hp@pobox.com>

* src/gdk-pixbuf-drawable.h: Use includes from the current
directory, not the system directory.
1999-11-16 23:30:51 +00:00
George Lebl
705168dab0 use includes from the current directory rather then from the system
Mon Nov 15 17:18:28 1999  George Lebl <jirka@5z.com>

	* src/testpixbuf-drawable.c: use includes from the current directory
	  rather then from the system include directory as gdk-pixbuf
	  includes are not yet installed when this is compiled.
1999-11-16 01:18:53 +00:00
Cody Russell
e4df9fa95b Added testpixbuf-drawable test program 1999-11-13 17:28:11 +00:00
Federico Mena Quintero
cfb0266518 Populated.
1999-11-10  Federico Mena Quintero  <federico@redhat.com>

	* doc/tmpl/gdk-pixbuf-loader.sgml: Populated.

	* doc/gdk-pixbuf.signals: Put in the real names of signal
	arguments.

	* src/gdk-pixbuf-loader.c: Improved documentation comments.
1999-11-10 22:48:46 +00:00
Jonathan Blandford
19b42c342f emit the closed signal.
1999-11-10  Jonathan Blandford  <jrb@redhat.com>

	* src/gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): emit the
	closed signal.
1999-11-10 21:06:40 +00:00
Jonathan Blandford
d23b21018c Now can handle indexing correctly. Patch from Arjan to do so.
1999-11-10  Jonathan Blandford  <jrb@redhat.com>

	* src/io-ras.c (OneLineMapped_file): Now can handle indexing
	correctly.  Patch from Arjan to do so.
1999-11-10 18:47:39 +00:00
Michael Fulbright
d2bfbdb99e Fixed loading of ASCII PNM files.
1999-11-10  Michael Fulbright  <drmike@redhat.com>

        * src/io-pnm.c (pnm_ascii_read_scanline): Fixed loading of ASCII PNM
	files.

	* src/testpixbuf.c: Added final queued draw when done loading image.
1999-11-10 17:43:49 +00:00
Jonathan Blandford
12474a79ae removed spurious print statements.
1999-11-10  Jonathan Blandford  <jrb@redhat.com>

	* src/gdk-pixbuf-io.c (gdk_pixbuf_load_module): removed spurious
	print statements.
1999-11-10 17:30:13 +00:00
Arturo Espinosa
a3a4606eab Warning fixes - Federico 1999-11-10 15:45:24 +00:00
Federico Mena Quintero
b835084dfa Added documentation.
1999-11-10  Federico Mena Quintero  <federico@redhat.com>

	* src/gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Added
	documentation.
1999-11-10 06:40:12 +00:00
Michael Fulbright
78141c328f Fixed up testpixbuf.c to simulate downloading at certain speed, set
env var TBF_KBPS=n to get n kBytes/sec.

Dr Mike
1999-11-09 23:51:35 +00:00
Michael Fulbright
c9a347c8e9 Slight cosmetic cleanup.
1999-11-09  Michael Fulbright  <drmike@redhat.com>

	* src/io-jpeg.c: Slight cosmetic cleanup.

	* src/io-pnm.c: Fixed raw PNM loading bug. Also discovered that ASCII
        PBM loading has a similar problem and will address tomorrow.
1999-11-09 23:21:08 +00:00
Havoc Pennington
9495faccfc build the gdk-pixbuf-drawable stuff.
1999-11-09  Havoc Pennington  <hp@pobox.com>

* src/Makefile.am (libgdk_pixbuf_la_SOURCES): build the
gdk-pixbuf-drawable stuff.
1999-11-09 22:23:35 +00:00
Arturo Espinosa
f9615262f2 0.4 - Federico 1999-11-09 21:38:26 +00:00
Michael Fulbright
5de53804a1 Figured out problem with loading Progressive JPEG's progressively (say
1999-11-09  Michael Fulbright  <drmike@redhat.com>

* src/io-jpeg.c (image_load_increment): Figured out problem with
loading Progressive JPEG's progressively (say that 10 times fast).
Currently for Progressive JPEG's the entire image is loaded before
it is displayed. libjpeg supports a fancier mechanism which I may
implement later.

With these changes all JPEG formats appear to load properly for me.
1999-11-09 17:24:15 +00:00
Michael Fulbright
665096fcdf Finished progressive PNM loading code. Should handle all types of PNM
1999-11-09  Michael Fulbright  <drmike@redhat.com>

	* src/io-pnm.c : Finished progressive PNM loading code. Should handle
	all types of PNM files now.
1999-11-09 16:38:31 +00:00
Jonathan Blandford
cd02981bf2 Final patch from Arjan. Seems to do progressive loading.
1999-11-08  Jonathan Blandford  <jrb@redhat.com>

	* src/io-ras.c (image_load_increment): Final patch from Arjan.
	Seems to do progressive loading.
1999-11-08 19:37:45 +00:00
Michael Fulbright
ce83490d75 Fixed so we do not create a separate pixel buffer when reading in image -
1999-11-08  Michael Fulbright  <drmike@redhat.com>

	* 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
	the GdkPixbuf structure instead.
1999-11-08 19:02:58 +00:00