From a3bf86b11e5a8b0c636576fff14cdb1d511d4f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Tue, 7 Oct 2014 01:00:58 +0200
Subject: [PATCH] 2014-10-07 01:00 UTC+0200 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * contrib/hbhpdf/3rd/libhpdf/hpdfpago.c     *
 pacified warning

  * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
    * rediffed
---
 ChangeLog.txt                          |  7 +++++++
 contrib/hbhpdf/3rd/libhpdf/hpdfpago.c  |  2 +-
 contrib/hbhpdf/3rd/libhpdf/libhpdf.dif | 28 ++++++++++++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b5bc53188b..3b5eb3dc23 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-10-07 01:00 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/hbhpdf/3rd/libhpdf/hpdfpago.c
+    * pacified warning
+
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
+    * rediffed
+
 2014-10-07 00:56 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbtinymt/3rd/tinymt/tinymt32.h
     * pacified warning
diff --git a/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c b/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c
index 2da6883502..af07bf8396 100644
--- a/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c
+++ b/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c
@@ -1155,7 +1155,7 @@ HPDF_Page_SetFontAndSize  (HPDF_Page  page,
         return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT, 0);
 
     if (size <= 0 || size > HPDF_MAX_FONTSIZE)
-        return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT_SIZE, size);
+        return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT_SIZE, (HPDF_STATUS)size);
 
     if (page->mmgr != font->mmgr)
         return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT, 0);
diff --git a/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif b/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
index a980efa24b..cb01ad86bb 100644
--- a/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
+++ b/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
@@ -1,6 +1,6 @@
 diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
---- libhpdf.orig/hpdf.h	2014-02-03 17:57:08.252031640 +0100
-+++ libhpdf/hpdf.h	2014-02-03 17:57:08.252031640 +0100
+--- libhpdf.orig/hpdf.h	2014-10-07 01:00:01.376012911 +0200
++++ libhpdf/hpdf.h	2014-10-07 01:00:01.376012911 +0200
 @@ -17,7 +17,7 @@
  #ifndef _HPDF_H
  #define _HPDF_H
@@ -20,8 +20,8 @@ diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
  								HPDF_Rect      rect,
  								const char     *text,
 diff -urN libhpdf.orig/hpdfimac.c libhpdf/hpdfimac.c
---- libhpdf.orig/hpdfimac.c	2014-02-03 17:57:08.168031638 +0100
-+++ libhpdf/hpdfimac.c	2014-02-03 17:57:08.168031638 +0100
+--- libhpdf.orig/hpdfimac.c	2014-10-07 01:00:01.296012909 +0200
++++ libhpdf/hpdfimac.c	2014-10-07 01:00:01.296012909 +0200
 @@ -78,7 +78,7 @@
  
  #define	Fax3State(tif)		(&(tif)->tif_data->b)
@@ -31,9 +31,21 @@ diff -urN libhpdf.orig/hpdfimac.c libhpdf/hpdfimac.c
  
  /* NB: the uint32 casts are to silence certain ANSI-C compilers */
  #define TIFFhowmany(x, y) ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y)))
+diff -urN libhpdf.orig/hpdfpago.c libhpdf/hpdfpago.c
+--- libhpdf.orig/hpdfpago.c	2014-10-07 01:00:01.332012910 +0200
++++ libhpdf/hpdfpago.c	2014-10-07 01:00:01.332012910 +0200
+@@ -1155,7 +1155,7 @@
+         return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT, 0);
+ 
+     if (size <= 0 || size > HPDF_MAX_FONTSIZE)
+-        return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT_SIZE, size);
++        return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT_SIZE, (HPDF_STATUS)size);
+ 
+     if (page->mmgr != font->mmgr)
+         return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT, 0);
 diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h
---- libhpdf.orig/hpdfutil.h	2014-02-03 17:57:08.288031641 +0100
-+++ libhpdf/hpdfutil.h	2014-02-03 17:57:08.288031641 +0100
+--- libhpdf.orig/hpdfutil.h	2014-10-07 01:00:01.412012912 +0200
++++ libhpdf/hpdfutil.h	2014-10-07 01:00:01.412012912 +0200
 @@ -18,7 +18,7 @@
  #ifndef _HPDF_UTILS_H
  #define _HPDF_UTILS_H
@@ -44,8 +56,8 @@ diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h
  
  #ifdef __cplusplus
 diff -urN libhpdf.orig/t4.h libhpdf/t4.h
---- libhpdf.orig/t4.h	2014-02-03 17:57:08.244031640 +0100
-+++ libhpdf/t4.h	2014-02-03 17:57:08.244031640 +0100
+--- libhpdf.orig/t4.h	2014-10-07 01:00:01.368012911 +0200
++++ libhpdf/t4.h	2014-10-07 01:00:01.368012911 +0200
 @@ -1,4 +1,4 @@
 -/* $Id: t4.h,v 1.20 2007/11/10 18:40:44 drolon Exp $ */
 +/* $Id$ */