FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

exiftag: reflow the code

Browse Source 
Move the warning on unsupported units to the swicth-case. Move fetching the
pending tags down to where we use them.
This commit is contained in:
Stefan Kost 2011-05-25 14:12:50 +03:00
parent 8ffe4445f6
commit 5e3f448afb
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gst-libs/gst/tag/gstexiftag.c
View File

@ -2565,14 +2565,6 @@ deserialize_resolution (GstExifReader * exif_reader,
unit = GST_READ_UINT16_BE (tagdata->offset_as_data); unit = GST_READ_UINT16_BE (tagdata->offset_as_data);
} }
if (unit != 2 && unit != 3) {
GST_WARNING ("Invalid resolution unit, ignoring PPI tags");
return 0;
}
xres = gst_exif_reader_get_pending_tag (exif_reader, EXIF_TAG_XRESOLUTION);
yres = gst_exif_reader_get_pending_tag (exif_reader, EXIF_TAG_YRESOLUTION);
switch (unit) { switch (unit) {
case 2: /* inch */ case 2: /* inch */
multiplier = 1; multiplier = 1;
@ -2581,15 +2573,16 @@ deserialize_resolution (GstExifReader * exif_reader,
multiplier = 1 / 2.54; multiplier = 1 / 2.54;
break; break;
default: default:
multiplier = 1; GST_WARNING ("Invalid resolution unit, ignoring PPI tags");
g_assert_not_reached (); return 0;
break;
} }
xres = gst_exif_reader_get_pending_tag (exif_reader, EXIF_TAG_XRESOLUTION);
if (xres) { if (xres) {
parse_exif_rational_tag (exif_reader, GST_TAG_IMAGE_HORIZONTAL_PPI, parse_exif_rational_tag (exif_reader, GST_TAG_IMAGE_HORIZONTAL_PPI,
xres->count, xres->offset, multiplier, FALSE); xres->count, xres->offset, multiplier, FALSE);
} }
yres = gst_exif_reader_get_pending_tag (exif_reader, EXIF_TAG_YRESOLUTION);
if (yres) { if (yres) {
parse_exif_rational_tag (exif_reader, GST_TAG_IMAGE_VERTICAL_PPI, parse_exif_rational_tag (exif_reader, GST_TAG_IMAGE_VERTICAL_PPI,
yres->count, yres->offset, multiplier, FALSE); yres->count, yres->offset, multiplier, FALSE);