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

plug-ins: lots and lots of cleanup in metadata/

This commit is contained in:
Michael Natterer 2017-07-07 23:54:25 +02:00
parent a10b07e398
commit 486e0f3d88
3 changed files with 1962 additions and 1642 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3564
plug-ins/metadata/metadata-editor.c
View File

File diff suppressed because it is too large Load Diff

8
plug-ins/metadata/metadata-tags.h
View File

@ -404,7 +404,6 @@ static const TranslateTag imageSupplierInfoTags[] =
/* Plus and IPTC extension tags */
static const int licensor_items = 8;
static const gchar *licensor_header = "Xmp.plus.Licensor";
static const gchar *licensor[] =
{
@ -419,7 +418,6 @@ static const gchar *licensor[] =
};
#ifdef USE_TAGS
static const int imagesupplier_items = 2;
static const gchar *imagesupplier_header = "Xmp.plus.ImageSupplier";
static const gchar *imagesupplier[] =
{
@ -428,7 +426,6 @@ static const gchar *imagesupplier[] =
};
#endif
static const int imagecreator_items = 2;
static const gchar *imagecreator_header = "Xmp.plus.ImageCreator";
static const gchar *imagecreator[] =
{
@ -436,7 +433,6 @@ static const gchar *imagecreator[] =
"/plus:ImageCreatorID"
};
static const int copyrightowner_items = 2;
static const gchar *copyrightowner_header = "Xmp.plus.CopyrightOwner";
static const gchar *copyrightowner[] =
{
@ -444,7 +440,6 @@ static const gchar *copyrightowner[] =
"/plus:CopyrightOwnerID"
};
static const int registryid_items = 2;
static const gchar *registryid_header = "Xmp.iptcExt.RegistryId";
static const gchar *registryid[] =
{
@ -452,7 +447,6 @@ static const gchar *registryid[] =
"/Iptc4xmpExt:RegItemId"
};
static const int artworkorobject_items = 6;
static const gchar *artworkorobject_header = "Xmp.iptcExt.ArtworkOrObject";
static const gchar *artworkorobject[] =
{
@ -464,7 +458,6 @@ static const gchar *artworkorobject[] =
"/Iptc4xmpExt:AOCreator"
};
static const int locationshown_items = 6;
static const gchar *locationshown_header = "Xmp.iptcExt.LocationShown";
static const gchar *locationshown[] =
{
@ -477,7 +470,6 @@ static const gchar *locationshown[] =
};
#ifdef USE_TAGS
static const int locationcreated_items = 6;
static const gchar *locationcreated_header = "Xmp.iptcExt.LocationCreated";
static const gchar *locationcreated[] =
{

12
plug-ins/metadata/metadata-xml.c
View File

@ -235,7 +235,7 @@ set_tag_ui (metadata_editor *args, int index,
COL_LICENSOR_EMAIL, list_tag_data[row][7],
COL_LICENSOR_WEB, list_tag_data[row][8],
-1);
for (item = 1; item < licensor_items+1; item++)
for (item = 1; item < G_N_ELEMENTS (licensor) + 1; item++)
{
if (list_tag_data[row][item])
{
@ -272,7 +272,7 @@ set_tag_ui (metadata_editor *args, int index,
COL_IMG_CR8_NAME, list_tag_data[row][1],
COL_IMG_CR8_ID, list_tag_data[row][2],
-1);
for (item = 1; item < imagecreator_items+1; item++)
for (item = 1; item < G_N_ELEMENTS (imagecreator) + 1; item++)
{
if (list_tag_data[row][item])
{
@ -307,7 +307,7 @@ set_tag_ui (metadata_editor *args, int index,
COL_AOO_SRC_INV_ID, list_tag_data[row][5],
COL_AOO_CR_NOT, list_tag_data[row][6],
-1);
for (item = 1; item < artworkorobject_items+1; item++)
for (item = 1; item < G_N_ELEMENTS (artworkorobject) + 1; item++)
{
if (list_tag_data[row][item])
{
@ -342,7 +342,7 @@ set_tag_ui (metadata_editor *args, int index,
COL_REGSITRY_ORG_ID, list_tag_data[row][1],
COL_REGSITRY_ITEM_ID, list_tag_data[row][2],
-1);
for (item = 1; item < registryid_items+1; item++)
for (item = 1; item < G_N_ELEMENTS (registryid) + 1; item++)
{
if (list_tag_data[row][item])
{
@ -375,7 +375,7 @@ set_tag_ui (metadata_editor *args, int index,
COL_CR_OWNER_NAME, list_tag_data[row][1],
COL_CR_OWNER_ID, list_tag_data[row][2],
-1);
for (item = 1; item < copyrightowner_items+1; item++)
for (item = 1; item < G_N_ELEMENTS (copyrightowner) + 1; item++)
{
if (list_tag_data[row][item])
{
@ -411,7 +411,7 @@ set_tag_ui (metadata_editor *args, int index,
COL_LOC_SHO_CNTRY_ISO, list_tag_data[row][5],
COL_LOC_SHO_CNTRY_WRLD_REG, list_tag_data[row][6],
-1);
for (item = 1; item < locationshown_items+1; item++)
for (item = 1; item < G_N_ELEMENTS (locationshown) + 1; item++)
{
if (list_tag_data[row][item])
{