Hello community, here is the log from the commit of package libgexiv2 for openSUSE:Factory checked in at 2017-01-25 22:33:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgexiv2 (Old) and /work/SRC/openSUSE:Factory/.libgexiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgexiv2" Changes: -------- --- /work/SRC/openSUSE:Factory/libgexiv2/libgexiv2.changes 2016-08-24 10:07:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgexiv2.new/libgexiv2.changes 2017-01-25 22:33:37.357226422 +0100 @@ -1,0 +2,6 @@ +Thu Jan 19 16:14:43 UTC 2017 - [email protected] + +- Add get_orientation-Fix-abort-on-Minolta-meta-data.patch: Fix + abort on Minolta meta-data (bgo#776233). + +------------------------------------------------------------------- New: ---- get_orientation-Fix-abort-on-Minolta-meta-data.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgexiv2.spec ++++++ --- /var/tmp/diff_new_pack.nqtCJk/_old 2017-01-25 22:33:38.629034004 +0100 +++ /var/tmp/diff_new_pack.nqtCJk/_new 2017-01-25 22:33:38.633033399 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgexiv2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,8 @@ Source: http://ftp.gnome.org/pub/gnome/sources/gexiv2/0.10/%{tarname}-%{version}.tar.xz # PATCH-FIX-UPSTREAM libgexiv2-fix-typelib-vapi-install.patch [email protected] -- Fix install dir of typelib and ensure vapi file is installed. Patch0: libgexiv2-fix-typelib-vapi-install.patch +# PATCH-FIX-UPSTREAM get_orientation-Fix-abort-on-Minolta-meta-data.patch bgo#776233 [email protected] -- Fix abort on Minolta meta-data +Patch1: get_orientation-Fix-abort-on-Minolta-meta-data.patch BuildRequires: gcc-c++ BuildRequires: gobject-introspection BuildRequires: libtool @@ -98,6 +100,7 @@ %prep %setup -q -n %{tarname}-%{version} %patch0 -p1 +%patch1 -p1 %build # Needed for patch0 ++++++ get_orientation-Fix-abort-on-Minolta-meta-data.patch ++++++ From 2860755db106c9484ee7ad5fb4d90a7291e05641 Mon Sep 17 00:00:00 2001 From: Jens Georg <[email protected]> Date: Sun, 18 Dec 2016 17:02:42 +0100 Subject: [PATCH] get_orientation: Fix abort on Minolta meta-data Properly handle rotation value 72 (not rotated) https://bugzilla.redhat.com/show_bug.cgi?id=1401706 Signed-off-by: Jens Georg <[email protected]> https://bugzilla.gnome.org/show_bug.cgi?id=776233 --- gexiv2/gexiv2-metadata.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gexiv2/gexiv2-metadata.cpp b/gexiv2/gexiv2-metadata.cpp index cb89a52..13d685d 100644 --- a/gexiv2/gexiv2-metadata.cpp +++ b/gexiv2/gexiv2-metadata.cpp @@ -399,26 +399,31 @@ GExiv2Orientation gexiv2_metadata_get_orientation (GExiv2Metadata *self) { // Because some camera set a wrong standard exif orientation tag, // We need to check makernote tags first! if (gexiv2_metadata_has_exif_tag(self, "Exif.MinoltaCs7D.Rotation")) { - switch (gexiv2_metadata_get_exif_tag_long(self, "Exif.MinoltaCs7D.Rotation")) { + long orientation = gexiv2_metadata_get_exif_tag_long(self, "Exif.MinoltaCs7D.Rotation"); + switch (orientation) { case 76: return GEXIV2_ORIENTATION_ROT_90; - case 82: return GEXIV2_ORIENTATION_ROT_270; + case 72: + return GEXIV2_ORIENTATION_UNSPECIFIED; default: - g_assert_not_reached(); + g_debug ("Unknown Minolta rotation value %ld, ignoring", orientation); } } - + if (gexiv2_metadata_has_exif_tag(self, "Exif.MinoltaCs5D.Rotation")) { - switch (gexiv2_metadata_get_exif_tag_long(self, "Exif.MinoltaCs5D.Rotation")) { + long orientation = gexiv2_metadata_get_exif_tag_long(self, "Exif.MinoltaCs5D.Rotation"); + switch (orientation) { case 76: return GEXIV2_ORIENTATION_ROT_90; case 82: return GEXIV2_ORIENTATION_ROT_270; + case 72: + return GEXIV2_ORIENTATION_UNSPECIFIED; default: - g_assert_not_reached(); + g_debug ("Unknown Minolta rotation value %ld, ignoring", orientation); } } -- 2.9.3
