dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp: un-deprecate and fix gexiv2 usage.

This commit is contained in:
Simon Budig 2023-05-20 01:59:36 +02:00
parent 604045fc0f
commit 27af306a8a
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/core/gimpimage-rotate.c
View File

@ -269,11 +269,12 @@ gimp_image_import_rotation_metadata (GimpImage *image,
if (policy == GIMP_METADATA_ROTATION_POLICY_ROTATE)
gimp_image_metadata_rotate (image, context,
gexiv2_metadata_get_orientation (GEXIV2_METADATA (metadata)),
gexiv2_metadata_try_get_orientation (GEXIV2_METADATA (metadata), NULL),
progress);
gexiv2_metadata_set_orientation (GEXIV2_METADATA (metadata),
GEXIV2_ORIENTATION_NORMAL);
gexiv2_metadata_try_set_orientation (GEXIV2_METADATA (metadata),
GEXIV2_ORIENTATION_NORMAL,
NULL);
}
}

2
app/dialogs/metadata-rotation-import-dialog.c
View File

@ -64,7 +64,7 @@ metadata_rotation_import_dialog_run (GimpImage *image,
GExiv2Orientation orientation;
metadata = gimp_image_get_metadata (image);
orientation = gexiv2_metadata_get_orientation (GEXIV2_METADATA (metadata));
orientation = gexiv2_metadata_try_get_orientation (GEXIV2_METADATA (metadata), NULL);
if (orientation <= GEXIV2_ORIENTATION_NORMAL ||
orientation > GEXIV2_ORIENTATION_MAX)

7
libgimp/gimpimagemetadata.c
View File

@ -210,8 +210,9 @@ gimp_image_metadata_load_finish (GimpImage *image,
if (! (flags & GIMP_METADATA_LOAD_ORIENTATION))
{
gexiv2_metadata_set_orientation (GEXIV2_METADATA (metadata),
GEXIV2_ORIENTATION_UNSPECIFIED);
gexiv2_metadata_try_set_orientation (GEXIV2_METADATA (metadata),
GEXIV2_ORIENTATION_NORMAL,
NULL);
}
if (flags & GIMP_METADATA_LOAD_COLORSPACE)
@ -313,7 +314,7 @@ gimp_image_metadata_load_thumbnail (GFile *file,
gimp_image_insert_layer (image, layer, NULL, 0);
gimp_image_metadata_rotate (image,
gexiv2_metadata_get_orientation (GEXIV2_METADATA (metadata)));
gexiv2_metadata_try_get_orientation (GEXIV2_METADATA (metadata), NULL));
}
g_object_unref (metadata);