← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gimp/karmic-security

« back to all changes in this revision

Viewing changes to app/core/gimpdrawablemodundo.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-10-06 13:30:41 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20081006133041-axco233xt49jobn7
Tags: 2.6.0-1ubuntu1
https://launchpad.net/bugs/276839
* Sync on debian and new version (lp: #276839)
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch:
  - updated some strings for ubuntu
* debian/rules:
  - updated translation templates

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/core/gimpdrawablemodundo.c
85
85
 
86
86
  drawable = GIMP_DRAWABLE (GIMP_ITEM_UNDO (object)->item);
87
87
 
88
 
  drawable_mod_undo->tiles    = tile_manager_ref (drawable->tiles);
 
88
  drawable_mod_undo->tiles    = tile_manager_ref (gimp_drawable_get_tiles (drawable));
89
89
  drawable_mod_undo->type     = drawable->type;
90
90
  drawable_mod_undo->offset_x = GIMP_ITEM (drawable)->offset_x;
91
91
  drawable_mod_undo->offset_y = GIMP_ITEM (drawable)->offset_y;
100
100
  GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (object);
101
101
  gint64               memsize           = 0;
102
102
 
103
 
  if (drawable_mod_undo->tiles)
104
 
    memsize += tile_manager_get_memsize (drawable_mod_undo->tiles, FALSE);
 
103
  memsize += tile_manager_get_memsize (drawable_mod_undo->tiles, FALSE);
105
104
 
106
105
  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
107
106
                                                                  gui_size);
125
124
  offset_x = drawable_mod_undo->offset_x;
126
125
  offset_y = drawable_mod_undo->offset_y;
127
126
 
128
 
  drawable_mod_undo->tiles    = tile_manager_ref (drawable->tiles);
 
127
  drawable_mod_undo->tiles    = tile_manager_ref (gimp_drawable_get_tiles (drawable));
129
128
  drawable_mod_undo->type     = drawable->type;
130
129
  drawable_mod_undo->offset_x = GIMP_ITEM (drawable)->offset_x;
131
130
  drawable_mod_undo->offset_y = GIMP_ITEM (drawable)->offset_y;