Newer
Older
Import / applications / MakePDF / 3rdParty / libharu / pr-patches / 0001-hpdf_doc-compare-against-the-first-enum-value.patch
From bad0a1c4514f3abc41351f4afed873fe37faa65f Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 11 Jan 2019 13:14:58 -0500
Subject: [PATCH] hpdf_doc: compare against the first enum value

This avoids a warning on Apple Clang about a tautological comparison.
---
 src/hpdf_doc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hpdf_doc.c b/src/hpdf_doc.c
index f294322..d90aa9e 100644
--- a/src/hpdf_doc.c
+++ b/src/hpdf_doc.c
@@ -1785,7 +1785,7 @@ HPDF_SetPageLayout  (HPDF_Doc          pdf,
     if (!HPDF_HasDoc (pdf))
         return HPDF_INVALID_DOCUMENT;
 
-    if (layout < 0 || layout >= HPDF_PAGE_LAYOUT_EOF)
+    if (layout < HPDF_PAGE_LAYOUT_SINGLE || layout >= HPDF_PAGE_LAYOUT_EOF)
         return HPDF_RaiseError (&pdf->error, HPDF_PAGE_LAYOUT_OUT_OF_RANGE,
                 (HPDF_STATUS)layout);
 
@@ -1822,7 +1822,7 @@ HPDF_SetPageMode  (HPDF_Doc        pdf,
     if (!HPDF_HasDoc (pdf))
         return HPDF_INVALID_DOCUMENT;
 
-    if (mode < 0 || mode >= HPDF_PAGE_MODE_EOF)
+    if (mode < HPDF_PAGE_MODE_USE_NONE || mode >= HPDF_PAGE_MODE_EOF)
         return HPDF_RaiseError (&pdf->error, HPDF_PAGE_MODE_OUT_OF_RANGE,
                 (HPDF_STATUS)mode);
 
@@ -1909,7 +1909,7 @@ HPDF_AddPageLabel  (HPDF_Doc             pdf,
     if (!page_label)
         return HPDF_CheckError (&pdf->error);
 
-    if (style < 0 || style >= HPDF_PAGE_NUM_STYLE_EOF)
+    if (style < HPDF_PAGE_NUM_STYLE_DECIMAL || style >= HPDF_PAGE_NUM_STYLE_EOF)
         return HPDF_RaiseError (&pdf->error, HPDF_PAGE_NUM_STYLE_OUT_OF_RANGE,
                     (HPDF_STATUS)style);
 
-- 
2.21.1 (Apple Git-122.3)