From ad55da4ef95044f68cc337a4b0265b984467cc6f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 22 Nov 2020 13:32:05 +0100
Subject: Fixed possible compilation errors with libjpeg

---
 CONTRIBUTORS |  3 +++
 HISTORY      |  3 ++-
 tools.c      | 12 ++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3138239e..29a91c90 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3651,3 +3651,6 @@ Stefan Verse <Verse@amotronics.de>
 
 Jens Schleusener <Jens.Schleusener@fossies.org>
  for reporting several typos
+
+Bernd Kuhls <bernd.kuhls@t-online.de>
+ for fixing possible compilation errors with libjpeg
diff --git a/HISTORY b/HISTORY
index 6d98bc2b..1bf64191 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9536,7 +9536,7 @@ Video Disk Recorder Revision History
   cDvbTuner::GetSignalStats() to avoid problems with drivers that don't do this
   (thanks to Helmut Binder).
 
-2020-11-20:
+2020-11-22:
 
 - Fixed multiple recording entries in case a recording is started during the initial
   reading of the video directory (reported by Claus Muus).
@@ -9545,3 +9545,4 @@ Video Disk Recorder Revision History
 - Fixed a crash in case an error occurs when setting a remote timer.
 - Fixed allocating memory for cImage (reported by Christoph Haubrich).
 - Fixed parsing the '-l' command line option (reported by Harald Milz).
+- Fixed possible compilation errors with libjpeg (thanks to Bernd Kuhls).
diff --git a/tools.c b/tools.c
index 67136221..3a3a1143 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 4.12 2020/06/10 20:52:10 kls Exp $
+ * $Id: tools.c 4.13 2020/11/22 13:32:05 kls Exp $
  */
 
 #include "tools.h"
@@ -1272,15 +1272,15 @@ static boolean JpegCompressEmptyOutputBuffer(j_compress_ptr cinfo)
         }
      else {
         esyslog("ERROR: out of memory");
-        return false;
+        return FALSE;
         }
      if (jcd->mem) {
         cinfo->dest->next_output_byte = jcd->mem + Used;
         cinfo->dest->free_in_buffer = jcd->size - Used;
-        return true;
+        return TRUE;
         }
      }
-  return false;
+  return FALSE;
 }
 
 static void JpegCompressTermDestination(j_compress_ptr cinfo)
@@ -1325,8 +1325,8 @@ uchar *RgbToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality)
   cinfo.in_color_space = JCS_RGB;
 
   jpeg_set_defaults(&cinfo);
-  jpeg_set_quality(&cinfo, Quality, true);
-  jpeg_start_compress(&cinfo, true);
+  jpeg_set_quality(&cinfo, Quality, TRUE);
+  jpeg_start_compress(&cinfo, TRUE);
 
   int rs = Width * 3;
   JSAMPROW rp[Height];
-- 
cgit v1.2.3