summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-08-10 11:29:22 -0300
committerThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-08-10 11:30:04 -0300
commit1547c2b9ce1f5045e384b0dff1a819ae644042f3 (patch)
tree19b30b67903b0cae845e4bd6b242d3b76485a71b
parent70d5b562260efe5258664ebca300ab0d6edd1356 (diff)
tag: exif: Fix bug on image-orientation parsing
Do not skip one extra tag when parsing image-orientation tags.
-rw-r--r--gst-libs/gst/tag/gstexiftag.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gst-libs/gst/tag/gstexiftag.c b/gst-libs/gst/tag/gstexiftag.c
index f6198d6eb..5158238e9 100644
--- a/gst-libs/gst/tag/gstexiftag.c
+++ b/gst-libs/gst/tag/gstexiftag.c
@@ -1176,7 +1176,6 @@ deserialize_orientation (GstExifReader * exif_reader,
GstByteReader * reader, const GstExifTagMatch * exiftag,
GstExifTagData * tagdata)
{
- gint ret = 1;
const gchar *str = NULL;
gint value;
@@ -1186,7 +1185,7 @@ deserialize_orientation (GstExifReader * exif_reader,
/* validate tag */
if (tagdata->tag_type != EXIF_TYPE_SHORT || tagdata->count != 1) {
GST_WARNING ("Orientation tag has unexpected type/count");
- return ret;
+ return 0;
}
if (exif_reader->byte_order == G_LITTLE_ENDIAN) {
@@ -1198,12 +1197,12 @@ deserialize_orientation (GstExifReader * exif_reader,
str = gst_tag_image_orientation_from_exif_value (value);
if (str == NULL) {
GST_WARNING ("Invalid value for exif orientation tag: %d", value);
- return ret;
+ return 0;
}
gst_tag_list_add (exif_reader->taglist, GST_TAG_MERGE_REPLACE,
exiftag->gst_tag, str, NULL);
- return ret;
+ return 0;
}
static void