mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-20 11:37:14 +00:00
app: add gimp_gegl_buffer_get_tile_manager()
and ust it in some get_memsize() functions instead of having a FIXME. So many files changed because they need to inlcude <gegl.h> now.
This commit is contained in:
parent
c4f88e5166
commit
5a7b7d9a4b
|
@ -23,7 +23,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
#include "libgimpmath/gimpmath.h"
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "libgimpmath/gimpmath.h"
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#endif
|
||||
|
||||
#include <cairo.h>
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
#include <gobject/gvaluecollector.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
@ -266,6 +266,22 @@ gimp_g_param_spec_get_memsize (GParamSpec *pspec)
|
|||
return memsize + gimp_g_type_instance_get_memsize ((GTypeInstance *) pspec);
|
||||
}
|
||||
|
||||
gint64
|
||||
gimp_gegl_buffer_get_memsize (GeglBuffer *buffer)
|
||||
{
|
||||
if (buffer)
|
||||
{
|
||||
const Babl *format = gegl_buffer_get_format (buffer);
|
||||
|
||||
return (babl_format_get_bytes_per_pixel (format) *
|
||||
gegl_buffer_get_width (buffer) *
|
||||
gegl_buffer_get_height (buffer) +
|
||||
gimp_g_object_get_memsize (G_OBJECT (buffer)));
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
gint64
|
||||
gimp_string_get_memsize (const gchar *string)
|
||||
{
|
||||
|
|
|
@ -52,6 +52,8 @@ gint64 gimp_g_list_get_memsize_foreach (GList *slist,
|
|||
gint64 gimp_g_value_get_memsize (GValue *value);
|
||||
gint64 gimp_g_param_spec_get_memsize (GParamSpec *pspec);
|
||||
|
||||
gint64 gimp_gegl_buffer_get_memsize (GeglBuffer *buffer);
|
||||
|
||||
gint64 gimp_string_get_memsize (const gchar *string);
|
||||
gint64 gimp_parasite_get_memsize (GimpParasite *parasite,
|
||||
gint64 *gui_size);
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include "gegl/gimp-gegl-utils.h"
|
||||
|
||||
#include "gimp-utils.h"
|
||||
#include "gimpbuffer.h"
|
||||
#include "gimpimage.h"
|
||||
|
||||
|
@ -108,7 +109,7 @@ gimp_buffer_get_memsize (GimpObject *object,
|
|||
GimpBuffer *buffer = GIMP_BUFFER (object);
|
||||
gint64 memsize = 0;
|
||||
|
||||
/* FIXME memsize += tile_manager_get_memsize (buffer->tiles, FALSE); */
|
||||
memsize += gimp_gegl_buffer_get_memsize (buffer->buffer);
|
||||
|
||||
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
|
||||
gui_size);
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "libgimpconfig/gimpconfig.h"
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include "gegl/gimp-gegl-utils.h"
|
||||
|
||||
#include "gimp-utils.h"
|
||||
#include "gimpimage.h"
|
||||
#include "gimpdrawable.h"
|
||||
#include "gimpdrawablemodundo.h"
|
||||
|
@ -169,7 +170,7 @@ gimp_drawable_mod_undo_get_memsize (GimpObject *object,
|
|||
GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (object);
|
||||
gint64 memsize = 0;
|
||||
|
||||
/* FIXME memsize += gimp_gegl_buffer_get_memsize (drawable_mod_undo->buffer, FALSE); */
|
||||
memsize += gimp_gegl_buffer_get_memsize (drawable_mod_undo->buffer);
|
||||
|
||||
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
|
||||
gui_size);
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "core-types.h"
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include "gegl/gimp-gegl-utils.h"
|
||||
|
||||
#include "gimp-utils.h"
|
||||
#include "gimpchannel.h"
|
||||
#include "gimpmaskundo.h"
|
||||
|
||||
|
@ -87,7 +88,7 @@ gimp_mask_undo_constructed (GObject *object)
|
|||
|
||||
gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
|
||||
GIMP_GEGL_RECT (x1, y1, x2 - x1, y2 - y1),
|
||||
mask_undo->buffer,
|
||||
mask_undo->buffer,
|
||||
GIMP_GEGL_RECT (0, 0, 0, 0));
|
||||
|
||||
mask_undo->x = x1;
|
||||
|
@ -102,7 +103,7 @@ gimp_mask_undo_get_memsize (GimpObject *object,
|
|||
GimpMaskUndo *mask_undo = GIMP_MASK_UNDO (object);
|
||||
gint64 memsize = 0;
|
||||
|
||||
/* FIXME memsize += tile_manager_get_memsize (mask_undo->tiles, FALSE); */
|
||||
memsize += gimp_gegl_buffer_get_memsize (mask_undo->buffer);
|
||||
|
||||
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
|
||||
gui_size);
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#include <cairo.h>
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
#include "libgimpcolor/gimpcolor.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <io.h>
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
#include "libgimpmath/gimpmath.h"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "libgimpmath/gimpmath.h"
|
||||
#include "libgimpconfig/gimpconfig.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
#include <gobject/gvaluecollector.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "plug-in-types.h"
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
#include "libgimpconfig/gimpconfig.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#include <cairo.h>
|
||||
#include <gegl.h>
|
||||
#include <pango/pango.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gegl.h>
|
||||
|
||||
#include "vectors-types.h"
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <gegl.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <gegl.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <libgimpmath/gimpmath.h>
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <gegl.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue