From 5f35ff690faf00932d5ab61b38aa7bbc1aca281f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 13 Mar 2011 13:58:22 +0100
Subject: [PATCH] Fixed some direct comparisons of double values

---
 HISTORY       | 1 +
 dvbsubtitle.c | 4 ++--
 remux.c       | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index e880f787..51b7964d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6562,3 +6562,4 @@ Video Disk Recorder Revision History
 - Reduced CPU load when pausing a replay (thanks to Johann Friedrichs).
 - Changed -O2 to -O3 in Make.config.template (reported by Matti Lehtimäki).
 - Added a missing 'default' case in cPixmapMemory::DrawEllipse().
+- Fixed some direct comparisons of double values.
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index c1a0a0c2..ec36d589 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schlüßler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.11 2011/03/12 15:13:03 kls Exp $
+ * $Id: dvbsubtitle.c 2.12 2011/03/13 13:54:05 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -653,7 +653,7 @@ void cDvbSubtitleBitmaps::Draw(cOsd *Osd)
   if (Osd->SetAreas(areas, numAreas) == oeOk) {
      for (int i = 0; i < bitmaps.Size(); i++) {
          cBitmap *b = bitmaps[i];
-         if (osdFactor != 1.0)
+         if (!DoubleEqual(osdFactor, 1.0))
             b = b->Scale(osdFactor, osdFactor);
          Osd->DrawBitmap(int(round(b->X0() * osdFactor)), int(round(b->Y0() * osdFactor)), *b);
          if (b != bitmaps[i])
diff --git a/remux.c b/remux.c
index f7ad86dd..afe9180e 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.51 2011/02/26 15:51:04 kls Exp $
+ * $Id: remux.c 2.52 2011/03/13 13:57:09 kls Exp $
  */
 
 #include "remux.h"
@@ -833,7 +833,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                     return Processed;
                  if (Length < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE)
                     return Processed; // need more data, in case the frame type is not stored in the first TS packet
-                 if (!framesPerSecond) {
+                 if (framesPerSecond <= 0.0) {
                     // frame rate unknown, so collect a sequence of PTS values:
                     if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
                        const uchar *Pes = Data + TsPayloadOffset(Data);
@@ -953,7 +953,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                 pid = 0; // let's just ignore any further data
                        }
                      }
-                 if (!synced && framesPerSecond && independentFrame) {
+                 if (!synced && framesPerSecond > 0.0 && independentFrame) {
                     synced = true;
                     dbgframes("*");
                     Reset();