mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-03 09:23:24 +00:00
Merge branch 'lillolollo-master-patch-95315' into 'master'
app/core: replace guint with gint64 for time() function See merge request GNOME/gimp!2110
This commit is contained in:
commit
af464e2755
2 changed files with 5 additions and 5 deletions
|
@ -175,7 +175,7 @@ gimp_undo_class_init (GimpUndoClass *klass)
|
|||
static void
|
||||
gimp_undo_init (GimpUndo *undo)
|
||||
{
|
||||
undo->time = time (NULL);
|
||||
undo->time = (gint64) time (NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -560,10 +560,10 @@ gimp_undo_is_weak (GimpUndo *undo)
|
|||
*
|
||||
* Returns: the time in seconds since this undo item was created
|
||||
*/
|
||||
gint
|
||||
gint64
|
||||
gimp_undo_get_age (GimpUndo *undo)
|
||||
{
|
||||
guint now = time (NULL);
|
||||
gint64 now = (gint64) time (NULL);
|
||||
|
||||
g_return_val_if_fail (GIMP_IS_UNDO (undo), 0);
|
||||
g_return_val_if_fail (now >= undo->time, 0);
|
||||
|
@ -582,7 +582,7 @@ gimp_undo_reset_age (GimpUndo *undo)
|
|||
{
|
||||
g_return_if_fail (GIMP_IS_UNDO (undo));
|
||||
|
||||
undo->time = time (NULL);
|
||||
undo->time = (gint64) time (NULL);
|
||||
|
||||
g_object_notify (G_OBJECT (undo), "time");
|
||||
}
|
||||
|
|
|
@ -54,7 +54,7 @@ struct _GimpUndo
|
|||
GimpViewable parent_instance;
|
||||
|
||||
GimpImage *image; /* the image this undo is part of */
|
||||
guint time; /* time of undo step construction */
|
||||
gint64 time; /* time of undo step construction */
|
||||
|
||||
GimpUndoType undo_type; /* undo type */
|
||||
GimpDirtyMask dirty_mask; /* affected parts of the image */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue