[vorbis-tools] 03/03: Added quality-check-first-scale-next.patch to avoid incorrectly complaining about too high quality (Closes: #634855). Patch from Mats Erik Andersson.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository vorbis-tools.

commit 7f46f53a5d297baa965be87c9a70802e130fc08e
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Oct 22 11:40:41 2014 +0200

    Added quality-check-first-scale-next.patch to avoid incorrectly complaining about too high quality (Closes: #634855).  Patch from Mats Erik Andersson.
---
 .../patches/quality-check-first-scale-next.patch   | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/quality-check-first-scale-next.patch b/debian/patches/quality-check-first-scale-next.patch
new file mode 100644
index 0000000..183fff6
--- /dev/null
+++ b/debian/patches/quality-check-first-scale-next.patch
@@ -0,0 +1,33 @@
+Description: Floating point comparison fails.
+ In checking the quality setting, the program `oggenc'
+ performs a floating point comparison after down scaling
+ the given value to a tenth. This causes the inexact
+ internal representation to complain unnecessarily.
+ *
+ It is better to compare first, and normalize later,
+ since quality 10 is top notch!
+Last-Update: 2011-07-10
+Forwarded: no
+Author: Mats Erik Andersson <debian at gisladisker.se>
+Bugs-Debian: https://bugs.debian.org/634855
+
+diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c
+index 9c3e9cd..5c36fea 100644
+--- a/oggenc/oggenc.c
++++ b/oggenc/oggenc.c
+@@ -858,12 +858,12 @@ static void parse_options(int argc, char **argv, oe_options *opt)
+                     break;
+                 }
+                 opt->quality_set=1;
+-                opt->quality *= 0.1;
+-                if(opt->quality > 1.0f)
++                if(opt->quality > 10.0f)
+                 {
+-                    opt->quality = 1.0f;
++                    opt->quality = 10.0f;
+                     fprintf(stderr, _("WARNING: quality setting too high, setting to maximum quality.\n"));
+                 }
++                opt->quality *= 0.1;
+                 break;
+             case 'n':
+                 if(opt->namefmt)
diff --git a/debian/patches/series b/debian/patches/series
index ec4d705..c51f936 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 no_debian_subdir.diff
 dont-corrupt-stdout.patch
+quality-check-first-scale-next.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/vorbis-tools.git