From 96d2120c2bb0b29e1849098198f5fbef81939cdd Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Wed, 29 Jun 2011 09:59:05 -0300
Subject: [PATCH] tag: xmp: Remove extra chars from end of xmp packet

Windows picture viewer is unhappy with extra trailing chars at the
end of the xmppacket footer. So remove them as they aren't needed.
---
 gst-libs/gst/tag/gstxmptag.c | 6 +++---
 tests/check/libs/tag.c       | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gst-libs/gst/tag/gstxmptag.c b/gst-libs/gst/tag/gstxmptag.c
index dd20fd3..6ae5d99 100644
--- a/gst-libs/gst/tag/gstxmptag.c
+++ b/gst-libs/gst/tag/gstxmptag.c
@@ -1317,7 +1317,7 @@ gst_tag_list_from_xmp_buffer (const GstBuffer * buffer)
   if (*xp1 != '>')
     goto missing_header;
 
-  max_ft_len = 1 + strlen ("<?xpacket end=\".\"?>\n");
+  max_ft_len = 1 + strlen ("<?xpacket end=\".\"?>");
   if (len < max_ft_len)
     goto missing_footer;
 
@@ -1848,11 +1848,11 @@ gst_tag_list_to_xmp_buffer_full (const GstTagList * list, gboolean read_only,
           "                " "                " "\n");
     }
   }
-  g_string_append_printf (data, "<?xpacket end=\"%c\"?>\n",
+  g_string_append_printf (data, "<?xpacket end=\"%c\"?>",
       (read_only ? 'r' : 'w'));
 
   buffer = gst_buffer_new ();
-  GST_BUFFER_SIZE (buffer) = data->len + 1;
+  GST_BUFFER_SIZE (buffer) = data->len;
   GST_BUFFER_DATA (buffer) = (guint8 *) g_string_free (data, FALSE);
   GST_BUFFER_MALLOCDATA (buffer) = GST_BUFFER_DATA (buffer);
 
diff --git a/tests/check/libs/tag.c b/tests/check/libs/tag.c
index 555cdb8..a65cdf1 100644
--- a/tests/check/libs/tag.c
+++ b/tests/check/libs/tag.c
@@ -793,8 +793,7 @@ GST_START_TEST (test_xmp_parsing)
       "<?xpacket begin=\"\xEF\xBB\xBF\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>"
       "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"GStreamer\">"
       "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\">";
-  const gchar *xmp_footer =
-      "</rdf:RDF>" "</x:xmpmeta>" "<?xpacket end=\"r\"?>\n";
+  const gchar *xmp_footer = "</rdf:RDF>" "</x:xmpmeta>" "<?xpacket end=\"r\"?>";
   struct
   {
     const gchar *xmp_data;
-- 
2.7.4