1998-07-09 13:31:06 +08:00
|
|
|
/* The GIMP -- an image manipulation program
|
|
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program 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 General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
2000-12-17 05:37:03 +08:00
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef _O_BINARY
|
|
|
|
#define _O_BINARY 0
|
|
|
|
#endif
|
|
|
|
|
2001-08-14 22:53:55 +08:00
|
|
|
#include <glib-object.h>
|
2005-04-16 01:31:04 +08:00
|
|
|
#include <glib/gstdio.h>
|
Jens Lautenbacher <jtl@gimp.org>
2000-12-18 Sven Neumann <sven@gimp.org>
Jens Lautenbacher <jtl@gimp.org>
* app/Makefile.am
* app/gimpbrushlistP.h
* app/gimpbrushpipeP.h
* app/gimpobjectP.h: removed these three files
* app/parasitelistP.h
* app/channels_dialog.c
* app/docindex.c
* app/gimpdrawable.c
* app/gimpdrawableP.h
* app/gimpimage.c
* app/gimpimageP.h
* app/gimplist.[ch]
* app/gimpobject.c
* app/gimpobject.h
* app/gimpsetP.h: changed according to header removal
* app/airbrush.c
* app/brush_select.[ch]
* app/brushes_cmds.c
* app/gimpbrush.[ch]
* app/gimpbrushgenerated.[ch]
* app/gimpbrushlist.[ch]
* app/gimpbrushpipe.[ch]
* app/gimpcontextpreview.c
* app/paint_core.c
* app/paintbrush.c
* app/pencil.c
* tools/pdbgen/pdb/brushes.pdb: Big Brushes Cleanup.
The GimpBrush* object hierarchy and the file formats were broken by
"design". This made it overly difficult to read and write pixmap
brushes and brush pipes, leading to the situation that The GIMP was
not able to read it's very own file formats. Since the GimpBrush
format did support arbitrary color depths, the introduction of a
file format for pixmap brushes was unnecessary.
The GimpBrushPixmap object is dead. GimpBrush has an additional
pixmap temp_buf and handles pixmap brushes transparently. The file
format of pixmap brushes is not any longer a grayscale brush plus
a pattern, but a simple brush with RGBA data. The old brushes can
still be loaded, but the .gpb format is deprecated.
GimpBrushPipe derives from GimpBrush. The fileformat is still a text
header, followed by a number of brushes, but those brushes are stored
in the new GimpBrush format (no pattern anymore). The pipe does not
care about the depth of the contained GimpBrushes, so we get
grayscale BrushPipes for free. Since the brush loader still loads the
old format, old .gih files can also still be loaded.
Since the brushes in the GimpBrushPipe do not any longer contain a
pointer to the pipe object, we do only temporarily switch brushes
in the paint_core routines. This is not very elegant, but the best
we can do without a major redesign.
* app/patterns.[ch]: changed the loader to work with a filedescriptor
instead of a filehandle to make it work with the new brush loading
code.
* plug-ins/common/.cvsignore
* plug-ins/common/Makefile.am
* plug-ins/common/plugin-defs.pl
* plug-ins/common/gih.c: new plug-in that saves GIH files in the
new format (loader will follow soon)
* plug-ins/common/gpb.c: removed since Pixmap Brushes are no longer
supported as a special file format.
* plug-ins/common/gbr.c: load and save brushes in the new brush format
which allows RGBA brushes too.
* plug-ins/common/pat.c: load and save grayscale patterns too
2000-12-18 23:14:08 +08:00
|
|
|
|
2003-10-16 20:24:58 +08:00
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
#ifdef G_OS_WIN32
|
|
|
|
#include "libgimpbase/gimpwin32-io.h"
|
|
|
|
#endif
|
|
|
|
|
2001-05-10 06:34:59 +08:00
|
|
|
#include "core-types.h"
|
Jens Lautenbacher <jtl@gimp.org>
2000-12-18 Sven Neumann <sven@gimp.org>
Jens Lautenbacher <jtl@gimp.org>
* app/Makefile.am
* app/gimpbrushlistP.h
* app/gimpbrushpipeP.h
* app/gimpobjectP.h: removed these three files
* app/parasitelistP.h
* app/channels_dialog.c
* app/docindex.c
* app/gimpdrawable.c
* app/gimpdrawableP.h
* app/gimpimage.c
* app/gimpimageP.h
* app/gimplist.[ch]
* app/gimpobject.c
* app/gimpobject.h
* app/gimpsetP.h: changed according to header removal
* app/airbrush.c
* app/brush_select.[ch]
* app/brushes_cmds.c
* app/gimpbrush.[ch]
* app/gimpbrushgenerated.[ch]
* app/gimpbrushlist.[ch]
* app/gimpbrushpipe.[ch]
* app/gimpcontextpreview.c
* app/paint_core.c
* app/paintbrush.c
* app/pencil.c
* tools/pdbgen/pdb/brushes.pdb: Big Brushes Cleanup.
The GimpBrush* object hierarchy and the file formats were broken by
"design". This made it overly difficult to read and write pixmap
brushes and brush pipes, leading to the situation that The GIMP was
not able to read it's very own file formats. Since the GimpBrush
format did support arbitrary color depths, the introduction of a
file format for pixmap brushes was unnecessary.
The GimpBrushPixmap object is dead. GimpBrush has an additional
pixmap temp_buf and handles pixmap brushes transparently. The file
format of pixmap brushes is not any longer a grayscale brush plus
a pattern, but a simple brush with RGBA data. The old brushes can
still be loaded, but the .gpb format is deprecated.
GimpBrushPipe derives from GimpBrush. The fileformat is still a text
header, followed by a number of brushes, but those brushes are stored
in the new GimpBrush format (no pattern anymore). The pipe does not
care about the depth of the contained GimpBrushes, so we get
grayscale BrushPipes for free. Since the brush loader still loads the
old format, old .gih files can also still be loaded.
Since the brushes in the GimpBrushPipe do not any longer contain a
pointer to the pipe object, we do only temporarily switch brushes
in the paint_core routines. This is not very elegant, but the best
we can do without a major redesign.
* app/patterns.[ch]: changed the loader to work with a filedescriptor
instead of a filehandle to make it work with the new brush loading
code.
* plug-ins/common/.cvsignore
* plug-ins/common/Makefile.am
* plug-ins/common/plugin-defs.pl
* plug-ins/common/gih.c: new plug-in that saves GIH files in the
new format (loader will follow soon)
* plug-ins/common/gpb.c: removed since Pixmap Brushes are no longer
supported as a special file format.
* plug-ins/common/gbr.c: load and save brushes in the new brush format
which allows RGBA brushes too.
* plug-ins/common/pat.c: load and save grayscale patterns too
2000-12-18 23:14:08 +08:00
|
|
|
|
2001-05-15 19:25:25 +08:00
|
|
|
#include "base/temp-buf.h"
|
|
|
|
|
1998-07-09 13:31:06 +08:00
|
|
|
#include "gimpbrush.h"
|
2005-04-16 01:31:04 +08:00
|
|
|
#include "gimpbrush-header.h"
|
2005-04-15 23:56:34 +08:00
|
|
|
#include "gimpbrush-load.h"
|
Jens Lautenbacher <jtl@gimp.org>
2000-12-18 Sven Neumann <sven@gimp.org>
Jens Lautenbacher <jtl@gimp.org>
* app/Makefile.am
* app/gimpbrushlistP.h
* app/gimpbrushpipeP.h
* app/gimpobjectP.h: removed these three files
* app/parasitelistP.h
* app/channels_dialog.c
* app/docindex.c
* app/gimpdrawable.c
* app/gimpdrawableP.h
* app/gimpimage.c
* app/gimpimageP.h
* app/gimplist.[ch]
* app/gimpobject.c
* app/gimpobject.h
* app/gimpsetP.h: changed according to header removal
* app/airbrush.c
* app/brush_select.[ch]
* app/brushes_cmds.c
* app/gimpbrush.[ch]
* app/gimpbrushgenerated.[ch]
* app/gimpbrushlist.[ch]
* app/gimpbrushpipe.[ch]
* app/gimpcontextpreview.c
* app/paint_core.c
* app/paintbrush.c
* app/pencil.c
* tools/pdbgen/pdb/brushes.pdb: Big Brushes Cleanup.
The GimpBrush* object hierarchy and the file formats were broken by
"design". This made it overly difficult to read and write pixmap
brushes and brush pipes, leading to the situation that The GIMP was
not able to read it's very own file formats. Since the GimpBrush
format did support arbitrary color depths, the introduction of a
file format for pixmap brushes was unnecessary.
The GimpBrushPixmap object is dead. GimpBrush has an additional
pixmap temp_buf and handles pixmap brushes transparently. The file
format of pixmap brushes is not any longer a grayscale brush plus
a pattern, but a simple brush with RGBA data. The old brushes can
still be loaded, but the .gpb format is deprecated.
GimpBrushPipe derives from GimpBrush. The fileformat is still a text
header, followed by a number of brushes, but those brushes are stored
in the new GimpBrush format (no pattern anymore). The pipe does not
care about the depth of the contained GimpBrushes, so we get
grayscale BrushPipes for free. Since the brush loader still loads the
old format, old .gih files can also still be loaded.
Since the brushes in the GimpBrushPipe do not any longer contain a
pointer to the pipe object, we do only temporarily switch brushes
in the paint_core routines. This is not very elegant, but the best
we can do without a major redesign.
* app/patterns.[ch]: changed the loader to work with a filedescriptor
instead of a filehandle to make it work with the new brush loading
code.
* plug-ins/common/.cvsignore
* plug-ins/common/Makefile.am
* plug-ins/common/plugin-defs.pl
* plug-ins/common/gih.c: new plug-in that saves GIH files in the
new format (loader will follow soon)
* plug-ins/common/gpb.c: removed since Pixmap Brushes are no longer
supported as a special file format.
* plug-ins/common/gbr.c: load and save brushes in the new brush format
which allows RGBA brushes too.
* plug-ins/common/pat.c: load and save grayscale patterns too
2000-12-18 23:14:08 +08:00
|
|
|
|
2003-03-26 00:38:19 +08:00
|
|
|
#include "gimp-intl.h"
|
1998-11-23 22:47:09 +08:00
|
|
|
|
2001-01-10 08:36:54 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* stuff from abr2gbr Copyright (C) 2001 Marco Lamberto <lm@sunnyspot.org> */
|
|
|
|
/* the above is gpl see http://the.sunnyspot.org/gimp/ */
|
2001-06-30 03:25:03 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
typedef struct _AbrHeader AbrHeader;
|
|
|
|
typedef struct _AbrBrushHeader AbrBrushHeader;
|
|
|
|
typedef struct _AbrSampledBrushHeader AbrSampledBrushHeader;
|
2001-08-11 22:39:19 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
struct _AbrHeader
|
|
|
|
{
|
|
|
|
gint16 version;
|
|
|
|
gint16 count;
|
|
|
|
};
|
2001-08-11 22:39:19 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
struct _AbrBrushHeader
|
|
|
|
{
|
|
|
|
gint16 type;
|
|
|
|
gint32 size;
|
|
|
|
};
|
2002-01-31 00:14:26 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
struct _AbrSampledBrushHeader
|
|
|
|
{
|
|
|
|
gint32 misc;
|
|
|
|
gint16 spacing;
|
|
|
|
gchar antialiasing;
|
|
|
|
gint16 bounds[4];
|
|
|
|
gint32 bounds_long[4];
|
|
|
|
gint16 depth;
|
|
|
|
gboolean wide;
|
|
|
|
};
|
2001-02-05 23:22:20 +08:00
|
|
|
|
Overhaul of pixmap brushes and pipes: No separate pixmap pipe
brush tool any longer. The paintbrush, airbrush and pencil
tools, which already knew how to handle the single-pixmap
brushes now also handle the pipes as well.
* app/pixmapbrush.{h,c}
* app/gimpbrushpixmap.{h,c}: Removed these files.
* app/Makefile.am
* app/makefile.{cygwin,msc}: Remove from here, too.
* app/gimpbrushpipe.{h,c}: Total overhaul.
* app/paint_core.h
* app/apptypes.h: Some more types moved to apptypes.h
* app/context_manager.c
* app/tool_options.c
* app/tools.c
* app/toolsF.h: Remove PIXMAPBRUSH tool.
* app/gimpbrush.h: New method: select_brush. Used to change the
brush in paint_core, for pipe brushes.
* app/gimpbrush.c: Add gimp_brush_select_brush, which is dummy for
the normal brushes (returns the same brush).
* app/paint_core.c: Call the brush's select_brush method to get a
potential new brush before calling the paint_func.
* app/gimpbrushlist.c: Various changes related to the pixmap and
pipe overhaul.
* app/airbrush.c
* app/pencil.c: Reorder code a bit in the tool motion function to
avoid executing unnecessary code in the case of a pixmap brush.
Other changes in the same commit:
* app/install.c: Make quote_spaces extern.
* app/appenv.h: Declare it.
* libgimp/gimpui.def: Add missing entry points.
* libgimp/makefile.{cygwin,msc}: Add missing objects to gimpui.
1999-08-26 08:54:30 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* local function prototypes */
|
2000-02-24 19:39:26 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
static GimpBrush * gimp_brush_load_abr_brush (FILE *file,
|
|
|
|
gint index,
|
|
|
|
const gchar *filename,
|
|
|
|
GError **error);
|
|
|
|
static gchar abr_read_char (FILE *file);
|
|
|
|
static gint16 abr_read_short (FILE *file);
|
|
|
|
static gint32 abr_read_long (FILE *file);
|
2001-06-30 03:25:03 +08:00
|
|
|
|
2001-01-10 08:36:54 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* public functions */
|
1998-07-09 13:31:06 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
GList *
|
|
|
|
gimp_brush_load (const gchar *filename,
|
|
|
|
gboolean stingy_memory_use,
|
|
|
|
GError **error)
|
1998-07-09 13:31:06 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
GimpBrush *brush;
|
|
|
|
gint fd;
|
2000-09-29 20:00:00 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
g_return_val_if_fail (filename != NULL, NULL);
|
|
|
|
g_return_val_if_fail (g_path_is_absolute (filename), NULL);
|
|
|
|
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
1998-07-09 13:31:06 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
fd = g_open (filename, O_RDONLY | _O_BINARY, 0);
|
|
|
|
if (fd == -1)
|
|
|
|
{
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
|
|
|
|
_("Could not open '%s' for reading: %s"),
|
|
|
|
gimp_filename_to_utf8 (filename), g_strerror (errno));
|
|
|
|
return NULL;
|
|
|
|
}
|
2001-02-27 13:21:12 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
brush = gimp_brush_load_brush (fd, filename, error);
|
2001-06-30 03:25:03 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
close (fd);
|
2001-01-10 08:36:54 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (! brush)
|
|
|
|
return NULL;
|
2002-01-31 00:14:26 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* Swap the brush to disk (if we're being stingy with memory) */
|
|
|
|
if (stingy_memory_use)
|
|
|
|
{
|
|
|
|
temp_buf_swap (brush->mask);
|
2001-02-05 23:22:20 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (brush->pixmap)
|
|
|
|
temp_buf_swap (brush->pixmap);
|
|
|
|
}
|
2001-02-14 03:53:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
return g_list_prepend (NULL, brush);
|
1998-07-09 13:31:06 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
GimpBrush *
|
|
|
|
gimp_brush_load_brush (gint fd,
|
|
|
|
const gchar *filename,
|
|
|
|
GError **error)
|
1998-07-09 13:31:06 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
GimpBrush *brush;
|
|
|
|
gint bn_size;
|
|
|
|
BrushHeader header;
|
|
|
|
gchar *name = NULL;
|
|
|
|
guchar *pixmap;
|
|
|
|
guchar *mask;
|
|
|
|
gssize i, size;
|
|
|
|
gboolean success = TRUE;
|
|
|
|
|
|
|
|
g_return_val_if_fail (filename != NULL, NULL);
|
|
|
|
g_return_val_if_fail (fd != -1, NULL);
|
|
|
|
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
|
|
|
|
|
|
|
/* Read in the header size */
|
|
|
|
if (read (fd, &header, sizeof (header)) != sizeof (header))
|
|
|
|
{
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Could not read %d bytes from '%s': %s"),
|
|
|
|
(gint) sizeof (header),
|
|
|
|
gimp_filename_to_utf8 (filename), g_strerror (errno));
|
|
|
|
return NULL;
|
|
|
|
}
|
1998-07-09 13:31:06 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* rearrange the bytes in each unsigned int */
|
|
|
|
header.header_size = g_ntohl (header.header_size);
|
|
|
|
header.version = g_ntohl (header.version);
|
|
|
|
header.width = g_ntohl (header.width);
|
|
|
|
header.height = g_ntohl (header.height);
|
|
|
|
header.bytes = g_ntohl (header.bytes);
|
|
|
|
header.magic_number = g_ntohl (header.magic_number);
|
|
|
|
header.spacing = g_ntohl (header.spacing);
|
1999-08-17 08:59:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* Check for correct file format */
|
|
|
|
|
|
|
|
if (header.width == 0)
|
2001-08-11 22:39:19 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"Width = 0."),
|
|
|
|
gimp_filename_to_utf8 (filename));
|
|
|
|
return NULL;
|
2001-08-11 22:39:19 +08:00
|
|
|
}
|
2001-02-05 23:22:20 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (header.height == 0)
|
2001-08-11 22:39:19 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"Height = 0."),
|
|
|
|
gimp_filename_to_utf8 (filename));
|
|
|
|
return NULL;
|
2001-08-11 22:39:19 +08:00
|
|
|
}
|
2001-04-25 07:06:51 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (header.bytes == 0)
|
2003-02-27 21:59:41 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"Bytes = 0."),
|
|
|
|
gimp_filename_to_utf8 (filename));
|
|
|
|
return NULL;
|
2003-02-27 21:59:41 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
switch (header.version)
|
2001-02-06 23:57:07 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
case 1:
|
|
|
|
/* If this is a version 1 brush, set the fp back 8 bytes */
|
|
|
|
lseek (fd, -8, SEEK_CUR);
|
|
|
|
header.header_size += 8;
|
|
|
|
/* spacing is not defined in version 1 */
|
|
|
|
header.spacing = 25;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 3: /* cinepaint brush */
|
|
|
|
if (header.bytes == 18 /* FLOAT16_GRAY_GIMAGE */)
|
|
|
|
{
|
|
|
|
header.bytes = 2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"Unknown depth %d."),
|
|
|
|
gimp_filename_to_utf8 (filename), header.bytes);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* fallthrough */
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
if (header.magic_number == GBRUSH_MAGIC)
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"Unknown version %d."),
|
|
|
|
gimp_filename_to_utf8 (filename), header.version);
|
|
|
|
return NULL;
|
|
|
|
}
|
2001-02-06 23:57:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* Read in the brush name */
|
|
|
|
if ((bn_size = (header.header_size - sizeof (header))))
|
|
|
|
{
|
|
|
|
gchar *utf8;
|
2004-12-27 02:18:17 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
name = g_new (gchar, bn_size);
|
2001-02-06 23:57:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if ((read (fd, name, bn_size)) < bn_size)
|
2001-02-06 23:57:07 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"File appears truncated."),
|
|
|
|
gimp_filename_to_utf8 (filename));
|
|
|
|
g_free (name);
|
|
|
|
return NULL;
|
2001-02-06 23:57:07 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
utf8 = gimp_any_to_utf8 (name, -1,
|
|
|
|
_("Invalid UTF-8 string in brush file '%s'."),
|
|
|
|
gimp_filename_to_utf8 (filename));
|
|
|
|
g_free (name);
|
|
|
|
name = utf8;
|
2001-02-06 23:57:07 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (!name)
|
|
|
|
name = g_strdup (_("Unnamed"));
|
2001-02-06 23:57:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
brush = g_object_new (GIMP_TYPE_BRUSH,
|
|
|
|
"name", name,
|
|
|
|
NULL);
|
2001-02-06 23:57:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
g_free (name);
|
2001-02-06 23:57:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
brush->mask = temp_buf_new (header.width, header.height, 1, 0, 0, NULL);
|
|
|
|
|
|
|
|
mask = temp_buf_data (brush->mask);
|
|
|
|
size = header.width * header.height * header.bytes;
|
|
|
|
|
|
|
|
switch (header.bytes)
|
2001-02-06 23:57:07 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
case 1:
|
|
|
|
success = (read (fd, mask, size) == size);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: /* cinepaint brush, 16 bit floats */
|
|
|
|
{
|
|
|
|
guchar buf[8 * 1024];
|
|
|
|
|
|
|
|
for (i = 0; success && i < size;)
|
|
|
|
{
|
|
|
|
gssize bytes = MIN (size - i, sizeof (buf));
|
|
|
|
|
|
|
|
success = (read (fd, buf, bytes) == bytes);
|
|
|
|
|
|
|
|
if (success)
|
|
|
|
{
|
|
|
|
guint16 *b = (guint16 *) buf;
|
|
|
|
|
|
|
|
i += bytes;
|
|
|
|
|
|
|
|
for (; bytes > 0; bytes -= 2, mask++, b++)
|
|
|
|
{
|
|
|
|
union
|
|
|
|
{
|
|
|
|
guint16 u[2];
|
|
|
|
gfloat f;
|
|
|
|
} short_float;
|
|
|
|
|
|
|
|
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
|
|
|
short_float.u[0] = 0;
|
|
|
|
short_float.u[1] = GUINT16_FROM_BE (*b);
|
|
|
|
#else
|
|
|
|
short_float.u[0] = GUINT16_FROM_BE (*b);
|
|
|
|
short_float.u[1] = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
*mask = (guchar) (short_float.f * 255.0 + 0.5);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
{
|
|
|
|
guchar buf[8 * 1024];
|
|
|
|
|
|
|
|
brush->pixmap = temp_buf_new (header.width, header.height,
|
|
|
|
3, 0, 0, NULL);
|
|
|
|
pixmap = temp_buf_data (brush->pixmap);
|
|
|
|
|
|
|
|
for (i = 0; success && i < size;)
|
|
|
|
{
|
|
|
|
gssize bytes = MIN (size - i, sizeof (buf));
|
|
|
|
|
|
|
|
success = (read (fd, buf, bytes) == bytes);
|
|
|
|
|
|
|
|
if (success)
|
|
|
|
{
|
|
|
|
guchar *b = buf;
|
|
|
|
|
|
|
|
i += bytes;
|
|
|
|
|
|
|
|
for (; bytes > 0; bytes -= 4, pixmap += 3, mask++, b += 4)
|
|
|
|
{
|
|
|
|
pixmap[0] = b[0];
|
|
|
|
pixmap[1] = b[1];
|
|
|
|
pixmap[2] = b[2];
|
|
|
|
|
|
|
|
mask[0] = b[3];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
g_object_unref (brush);
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"Unsupported brush depth %d\n"
|
|
|
|
"GIMP brushes must be GRAY or RGBA."),
|
|
|
|
gimp_filename_to_utf8 (filename), header.bytes);
|
|
|
|
return NULL;
|
2001-02-06 23:57:07 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (! success)
|
2001-02-06 23:57:07 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
g_object_unref (brush);
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"File appears truncated."),
|
|
|
|
gimp_filename_to_utf8 (filename));
|
|
|
|
return NULL;
|
2001-02-06 23:57:07 +08:00
|
|
|
}
|
2001-02-05 23:22:20 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
brush->spacing = header.spacing;
|
|
|
|
brush->x_axis.x = header.width / 2.0;
|
|
|
|
brush->x_axis.y = 0.0;
|
|
|
|
brush->y_axis.x = 0.0;
|
|
|
|
brush->y_axis.y = header.height / 2.0;
|
|
|
|
|
|
|
|
return brush;
|
1998-07-09 13:31:06 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
GList *
|
|
|
|
gimp_brush_load_abr (const gchar *filename,
|
|
|
|
gboolean stingy_memory_use,
|
|
|
|
GError **error)
|
2003-04-09 00:01:01 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
FILE *file;
|
|
|
|
AbrHeader abr_hdr;
|
|
|
|
GList *brush_list = NULL;
|
2003-04-09 00:01:01 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
g_return_val_if_fail (filename != NULL, NULL);
|
|
|
|
g_return_val_if_fail (g_path_is_absolute (filename), NULL);
|
|
|
|
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
2003-04-09 00:01:01 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
file = g_fopen (filename, "rb");
|
2003-04-09 00:01:01 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (! file)
|
|
|
|
{
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
|
|
|
|
_("Could not open '%s' for reading: %s"),
|
|
|
|
gimp_filename_to_utf8 (filename), g_strerror (errno));
|
|
|
|
return NULL;
|
|
|
|
}
|
2001-02-14 03:53:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
abr_hdr.version = abr_read_short (file);
|
|
|
|
abr_hdr.count = abr_read_short (file);
|
2001-02-14 03:53:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* g_print("version: %d count: %d\n", abr_hdr.version, abr_hdr.count); */
|
2001-02-14 03:53:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (abr_hdr.version > 1)
|
|
|
|
{
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s': "
|
|
|
|
"unable to decode abr format version %d."),
|
|
|
|
gimp_filename_to_utf8 (filename), abr_hdr.version);
|
|
|
|
}
|
|
|
|
else
|
2001-02-14 03:53:07 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
gint i;
|
|
|
|
|
|
|
|
for (i = 0; i < abr_hdr.count; i++)
|
|
|
|
{
|
|
|
|
GimpBrush *brush;
|
2001-02-14 03:53:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
brush = gimp_brush_load_abr_brush (file, i, filename, error);
|
2001-02-14 03:53:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
if (! brush)
|
|
|
|
{
|
|
|
|
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
|
|
|
|
_("Fatal parse error in brush file '%s'"),
|
|
|
|
gimp_filename_to_utf8 (filename));
|
|
|
|
break;
|
|
|
|
}
|
2001-02-14 03:53:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* Swap the brush to disk (if we're being stingy with memory) */
|
|
|
|
if (stingy_memory_use)
|
|
|
|
temp_buf_swap (brush->mask);
|
2001-02-14 03:53:07 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
brush_list = g_list_prepend (brush_list, brush);
|
|
|
|
}
|
|
|
|
}
|
2001-12-02 06:59:48 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
fclose (file);
|
|
|
|
|
|
|
|
return g_list_reverse (brush_list);
|
2001-12-02 06:59:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* private functions */
|
2001-12-02 06:59:48 +08:00
|
|
|
|
Overhaul of pixmap brushes and pipes: No separate pixmap pipe
brush tool any longer. The paintbrush, airbrush and pencil
tools, which already knew how to handle the single-pixmap
brushes now also handle the pipes as well.
* app/pixmapbrush.{h,c}
* app/gimpbrushpixmap.{h,c}: Removed these files.
* app/Makefile.am
* app/makefile.{cygwin,msc}: Remove from here, too.
* app/gimpbrushpipe.{h,c}: Total overhaul.
* app/paint_core.h
* app/apptypes.h: Some more types moved to apptypes.h
* app/context_manager.c
* app/tool_options.c
* app/tools.c
* app/toolsF.h: Remove PIXMAPBRUSH tool.
* app/gimpbrush.h: New method: select_brush. Used to change the
brush in paint_core, for pipe brushes.
* app/gimpbrush.c: Add gimp_brush_select_brush, which is dummy for
the normal brushes (returns the same brush).
* app/paint_core.c: Call the brush's select_brush method to get a
potential new brush before calling the paint_func.
* app/gimpbrushlist.c: Various changes related to the pixmap and
pipe overhaul.
* app/airbrush.c
* app/pencil.c: Reorder code a bit in the tool motion function to
avoid executing unnecessary code in the case of a pixmap brush.
Other changes in the same commit:
* app/install.c: Make quote_spaces extern.
* app/appenv.h: Declare it.
* libgimp/gimpui.def: Add missing entry points.
* libgimp/makefile.{cygwin,msc}: Add missing objects to gimpui.
1999-08-26 08:54:30 +08:00
|
|
|
static GimpBrush *
|
2005-04-16 01:31:04 +08:00
|
|
|
gimp_brush_load_abr_brush (FILE *file,
|
|
|
|
gint index,
|
|
|
|
const gchar *filename,
|
|
|
|
GError **error)
|
Overhaul of pixmap brushes and pipes: No separate pixmap pipe
brush tool any longer. The paintbrush, airbrush and pencil
tools, which already knew how to handle the single-pixmap
brushes now also handle the pipes as well.
* app/pixmapbrush.{h,c}
* app/gimpbrushpixmap.{h,c}: Removed these files.
* app/Makefile.am
* app/makefile.{cygwin,msc}: Remove from here, too.
* app/gimpbrushpipe.{h,c}: Total overhaul.
* app/paint_core.h
* app/apptypes.h: Some more types moved to apptypes.h
* app/context_manager.c
* app/tool_options.c
* app/tools.c
* app/toolsF.h: Remove PIXMAPBRUSH tool.
* app/gimpbrush.h: New method: select_brush. Used to change the
brush in paint_core, for pipe brushes.
* app/gimpbrush.c: Add gimp_brush_select_brush, which is dummy for
the normal brushes (returns the same brush).
* app/paint_core.c: Call the brush's select_brush method to get a
potential new brush before calling the paint_func.
* app/gimpbrushlist.c: Various changes related to the pixmap and
pipe overhaul.
* app/airbrush.c
* app/pencil.c: Reorder code a bit in the tool motion function to
avoid executing unnecessary code in the case of a pixmap brush.
Other changes in the same commit:
* app/install.c: Make quote_spaces extern.
* app/appenv.h: Declare it.
* libgimp/gimpui.def: Add missing entry points.
* libgimp/makefile.{cygwin,msc}: Add missing objects to gimpui.
1999-08-26 08:54:30 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
GimpBrush *brush = NULL;
|
|
|
|
AbrBrushHeader abr_brush_hdr;
|
Overhaul of pixmap brushes and pipes: No separate pixmap pipe
brush tool any longer. The paintbrush, airbrush and pencil
tools, which already knew how to handle the single-pixmap
brushes now also handle the pipes as well.
* app/pixmapbrush.{h,c}
* app/gimpbrushpixmap.{h,c}: Removed these files.
* app/Makefile.am
* app/makefile.{cygwin,msc}: Remove from here, too.
* app/gimpbrushpipe.{h,c}: Total overhaul.
* app/paint_core.h
* app/apptypes.h: Some more types moved to apptypes.h
* app/context_manager.c
* app/tool_options.c
* app/tools.c
* app/toolsF.h: Remove PIXMAPBRUSH tool.
* app/gimpbrush.h: New method: select_brush. Used to change the
brush in paint_core, for pipe brushes.
* app/gimpbrush.c: Add gimp_brush_select_brush, which is dummy for
the normal brushes (returns the same brush).
* app/paint_core.c: Call the brush's select_brush method to get a
potential new brush before calling the paint_func.
* app/gimpbrushlist.c: Various changes related to the pixmap and
pipe overhaul.
* app/airbrush.c
* app/pencil.c: Reorder code a bit in the tool motion function to
avoid executing unnecessary code in the case of a pixmap brush.
Other changes in the same commit:
* app/install.c: Make quote_spaces extern.
* app/appenv.h: Declare it.
* libgimp/gimpui.def: Add missing entry points.
* libgimp/makefile.{cygwin,msc}: Add missing objects to gimpui.
1999-08-26 08:54:30 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
g_return_val_if_fail (filename != NULL, NULL);
|
|
|
|
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
1999-08-31 05:24:13 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
abr_brush_hdr.type = abr_read_short (file);
|
|
|
|
abr_brush_hdr.size = abr_read_long (file);
|
2000-02-24 09:52:31 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
/* g_print(" + BRUSH\n | << type: %i block size: %i bytes\n",
|
|
|
|
* abr_brush_hdr.type, abr_brush_hdr.size);
|
|
|
|
*/
|
1998-07-09 13:31:06 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
switch (abr_brush_hdr.type)
|
|
|
|
{
|
|
|
|
case 1: /* computed brush */
|
|
|
|
/* FIXME: support it!
|
|
|
|
*
|
|
|
|
* We can probabaly feed the info into the generated brush code
|
|
|
|
* and get a useable brush back. It seems to support the same
|
|
|
|
* types -akl
|
|
|
|
*/
|
|
|
|
g_printerr ("WARNING: computed brush unsupported, skipping.\n");
|
|
|
|
fseek (file, abr_brush_hdr.size, SEEK_CUR);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: /* sampled brush */
|
|
|
|
{
|
|
|
|
AbrSampledBrushHeader abr_sampled_brush_hdr;
|
|
|
|
gint width, height;
|
|
|
|
gint bytes;
|
|
|
|
gint size;
|
|
|
|
guchar *mask;
|
|
|
|
gint i;
|
|
|
|
gchar *name;
|
|
|
|
gchar *tmp;
|
|
|
|
gshort compress;
|
|
|
|
|
|
|
|
abr_sampled_brush_hdr.misc = abr_read_long (file);
|
|
|
|
abr_sampled_brush_hdr.spacing = abr_read_short (file);
|
|
|
|
abr_sampled_brush_hdr.antialiasing = abr_read_char (file);
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
abr_sampled_brush_hdr.bounds[i] = abr_read_short (file);
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
abr_sampled_brush_hdr.bounds_long[i] = abr_read_long (file);
|
|
|
|
|
|
|
|
abr_sampled_brush_hdr.depth = abr_read_short (file);
|
|
|
|
|
|
|
|
height = (abr_sampled_brush_hdr.bounds_long[2] -
|
|
|
|
abr_sampled_brush_hdr.bounds_long[0]); /* bottom - top */
|
|
|
|
width = (abr_sampled_brush_hdr.bounds_long[3] -
|
|
|
|
abr_sampled_brush_hdr.bounds_long[1]); /* right - left */
|
|
|
|
bytes = abr_sampled_brush_hdr.depth >> 3;
|
|
|
|
|
|
|
|
/* g_print("width %i height %i\n", width, height); */
|
|
|
|
|
|
|
|
abr_sampled_brush_hdr.wide = height > 16384;
|
|
|
|
|
|
|
|
if (abr_sampled_brush_hdr.wide)
|
|
|
|
{
|
|
|
|
/* FIXME: support wide brushes */
|
|
|
|
|
|
|
|
g_printerr ("WARING: wide brushes not supported\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = g_filename_display_basename (filename);
|
|
|
|
name = g_strdup_printf ("%s-%03d", tmp, index);
|
|
|
|
g_free (tmp);
|
|
|
|
|
|
|
|
brush = g_object_new (GIMP_TYPE_BRUSH,
|
|
|
|
"name", name,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
g_free (name);
|
|
|
|
|
|
|
|
brush->spacing = abr_sampled_brush_hdr.spacing;
|
|
|
|
brush->x_axis.x = width / 2.0;
|
|
|
|
brush->x_axis.y = 0.0;
|
|
|
|
brush->y_axis.x = 0.0;
|
|
|
|
brush->y_axis.y = height / 2.0;
|
|
|
|
brush->mask = temp_buf_new (width, height,
|
|
|
|
1, 0, 0, NULL);
|
|
|
|
|
|
|
|
mask = temp_buf_data (brush->mask);
|
|
|
|
size = width * height * bytes;
|
|
|
|
|
|
|
|
compress = abr_read_char (file);
|
|
|
|
|
|
|
|
/* g_print(" | << size: %dx%d %d bit (%d bytes) %s\n",
|
|
|
|
* width, height, abr_sampled_brush_hdr.depth, size,
|
|
|
|
* comppres ? "compressed" : "raw");
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (! compress)
|
|
|
|
{
|
|
|
|
fread (mask, size, 1, file);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gint16 *cscanline_len;
|
|
|
|
gint32 n;
|
|
|
|
gchar ch;
|
|
|
|
gint i, j, c;
|
|
|
|
|
|
|
|
/* read compressed size foreach scanline */
|
|
|
|
cscanline_len = g_new0 (gshort, height);
|
|
|
|
for (i = 0; i < height; i++)
|
|
|
|
cscanline_len[i] = abr_read_short (file);
|
|
|
|
|
|
|
|
/* unpack each scanline data */
|
|
|
|
for (i = 0; i < height; i++)
|
|
|
|
{
|
|
|
|
for (j = 0; j < cscanline_len[i];)
|
|
|
|
{
|
|
|
|
n = abr_read_char (file);
|
|
|
|
j++;
|
|
|
|
if (n >= 128) /* force sign */
|
|
|
|
n -= 256;
|
|
|
|
|
|
|
|
if (n < 0)
|
|
|
|
{
|
|
|
|
/* copy the following char -n + 1 times */
|
|
|
|
|
|
|
|
if (n == -128) /* it's a nop */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
n = -n + 1;
|
|
|
|
ch = abr_read_char (file);
|
|
|
|
j++;
|
|
|
|
for (c = 0; c < n; c++, mask++)
|
|
|
|
*mask = ch;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* read the following n + 1 chars (no compr) */
|
|
|
|
|
|
|
|
for (c = 0; c < n + 1; c++, j++, mask++)
|
|
|
|
*mask = (guchar) abr_read_char (file);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free (cscanline_len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
g_printerr ("WARNING: unknown brush type, skipping.\n");
|
|
|
|
fseek (file, abr_brush_hdr.size, SEEK_CUR);
|
|
|
|
break;
|
|
|
|
}
|
Jens Lautenbacher <jtl@gimp.org>
2000-12-18 Sven Neumann <sven@gimp.org>
Jens Lautenbacher <jtl@gimp.org>
* app/Makefile.am
* app/gimpbrushlistP.h
* app/gimpbrushpipeP.h
* app/gimpobjectP.h: removed these three files
* app/parasitelistP.h
* app/channels_dialog.c
* app/docindex.c
* app/gimpdrawable.c
* app/gimpdrawableP.h
* app/gimpimage.c
* app/gimpimageP.h
* app/gimplist.[ch]
* app/gimpobject.c
* app/gimpobject.h
* app/gimpsetP.h: changed according to header removal
* app/airbrush.c
* app/brush_select.[ch]
* app/brushes_cmds.c
* app/gimpbrush.[ch]
* app/gimpbrushgenerated.[ch]
* app/gimpbrushlist.[ch]
* app/gimpbrushpipe.[ch]
* app/gimpcontextpreview.c
* app/paint_core.c
* app/paintbrush.c
* app/pencil.c
* tools/pdbgen/pdb/brushes.pdb: Big Brushes Cleanup.
The GimpBrush* object hierarchy and the file formats were broken by
"design". This made it overly difficult to read and write pixmap
brushes and brush pipes, leading to the situation that The GIMP was
not able to read it's very own file formats. Since the GimpBrush
format did support arbitrary color depths, the introduction of a
file format for pixmap brushes was unnecessary.
The GimpBrushPixmap object is dead. GimpBrush has an additional
pixmap temp_buf and handles pixmap brushes transparently. The file
format of pixmap brushes is not any longer a grayscale brush plus
a pattern, but a simple brush with RGBA data. The old brushes can
still be loaded, but the .gpb format is deprecated.
GimpBrushPipe derives from GimpBrush. The fileformat is still a text
header, followed by a number of brushes, but those brushes are stored
in the new GimpBrush format (no pattern anymore). The pipe does not
care about the depth of the contained GimpBrushes, so we get
grayscale BrushPipes for free. Since the brush loader still loads the
old format, old .gih files can also still be loaded.
Since the brushes in the GimpBrushPipe do not any longer contain a
pointer to the pipe object, we do only temporarily switch brushes
in the paint_core routines. This is not very elegant, but the best
we can do without a major redesign.
* app/patterns.[ch]: changed the loader to work with a filedescriptor
instead of a filehandle to make it work with the new brush loading
code.
* plug-ins/common/.cvsignore
* plug-ins/common/Makefile.am
* plug-ins/common/plugin-defs.pl
* plug-ins/common/gih.c: new plug-in that saves GIH files in the
new format (loader will follow soon)
* plug-ins/common/gpb.c: removed since Pixmap Brushes are no longer
supported as a special file format.
* plug-ins/common/gbr.c: load and save brushes in the new brush format
which allows RGBA brushes too.
* plug-ins/common/pat.c: load and save grayscale patterns too
2000-12-18 23:14:08 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
return brush;
|
Jens Lautenbacher <jtl@gimp.org>
2000-12-18 Sven Neumann <sven@gimp.org>
Jens Lautenbacher <jtl@gimp.org>
* app/Makefile.am
* app/gimpbrushlistP.h
* app/gimpbrushpipeP.h
* app/gimpobjectP.h: removed these three files
* app/parasitelistP.h
* app/channels_dialog.c
* app/docindex.c
* app/gimpdrawable.c
* app/gimpdrawableP.h
* app/gimpimage.c
* app/gimpimageP.h
* app/gimplist.[ch]
* app/gimpobject.c
* app/gimpobject.h
* app/gimpsetP.h: changed according to header removal
* app/airbrush.c
* app/brush_select.[ch]
* app/brushes_cmds.c
* app/gimpbrush.[ch]
* app/gimpbrushgenerated.[ch]
* app/gimpbrushlist.[ch]
* app/gimpbrushpipe.[ch]
* app/gimpcontextpreview.c
* app/paint_core.c
* app/paintbrush.c
* app/pencil.c
* tools/pdbgen/pdb/brushes.pdb: Big Brushes Cleanup.
The GimpBrush* object hierarchy and the file formats were broken by
"design". This made it overly difficult to read and write pixmap
brushes and brush pipes, leading to the situation that The GIMP was
not able to read it's very own file formats. Since the GimpBrush
format did support arbitrary color depths, the introduction of a
file format for pixmap brushes was unnecessary.
The GimpBrushPixmap object is dead. GimpBrush has an additional
pixmap temp_buf and handles pixmap brushes transparently. The file
format of pixmap brushes is not any longer a grayscale brush plus
a pattern, but a simple brush with RGBA data. The old brushes can
still be loaded, but the .gpb format is deprecated.
GimpBrushPipe derives from GimpBrush. The fileformat is still a text
header, followed by a number of brushes, but those brushes are stored
in the new GimpBrush format (no pattern anymore). The pipe does not
care about the depth of the contained GimpBrushes, so we get
grayscale BrushPipes for free. Since the brush loader still loads the
old format, old .gih files can also still be loaded.
Since the brushes in the GimpBrushPipe do not any longer contain a
pointer to the pipe object, we do only temporarily switch brushes
in the paint_core routines. This is not very elegant, but the best
we can do without a major redesign.
* app/patterns.[ch]: changed the loader to work with a filedescriptor
instead of a filehandle to make it work with the new brush loading
code.
* plug-ins/common/.cvsignore
* plug-ins/common/Makefile.am
* plug-ins/common/plugin-defs.pl
* plug-ins/common/gih.c: new plug-in that saves GIH files in the
new format (loader will follow soon)
* plug-ins/common/gpb.c: removed since Pixmap Brushes are no longer
supported as a special file format.
* plug-ins/common/gbr.c: load and save brushes in the new brush format
which allows RGBA brushes too.
* plug-ins/common/pat.c: load and save grayscale patterns too
2000-12-18 23:14:08 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
static gchar
|
|
|
|
abr_read_char (FILE *file)
|
1999-04-22 22:34:00 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
return fgetc (file);
|
1999-04-22 22:34:00 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
static gint16
|
|
|
|
abr_read_short (FILE *file)
|
1999-04-22 22:34:00 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
gint16 val;
|
1999-04-22 22:34:00 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
fread (&val, sizeof (val), 1, file);
|
2001-06-30 03:25:03 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
return GINT16_FROM_BE (val);
|
2001-06-30 03:25:03 +08:00
|
|
|
}
|
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
static gint32
|
|
|
|
abr_read_long (FILE *file)
|
2001-06-30 03:25:03 +08:00
|
|
|
{
|
2005-04-16 01:31:04 +08:00
|
|
|
gint32 val;
|
|
|
|
|
|
|
|
fread (&val, sizeof (val), 1, file);
|
2001-06-30 03:25:03 +08:00
|
|
|
|
2005-04-16 01:31:04 +08:00
|
|
|
return GINT32_FROM_BE (val);
|
1999-04-22 22:34:00 +08:00
|
|
|
}
|