From 328d1df46c080daccb16dabe4d8ed4e6569d7ab0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 6 Dec 2010 18:59:24 +0000 Subject: [PATCH] 2010-12-06 19:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbhpdf/3rd/libhpdf/hpdfcons.h * contrib/hbhpdf/3rd/libhpdf/hpdfcata.c * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif * contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp * contrib/hbhpdf/3rd/libhpdf/hpdf.h * contrib/hbhpdf/3rd/libhpdf/hpdfvers.h * Updated to 2.2.1 (from 2.2.0) ; Patch by Tamas. * ChangeLog ! Fixed previous entry header. --- harbour/ChangeLog | 16 ++++++++++++++- harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h | 6 ++++++ harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c | 11 ++++++++++ harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h | 1 + harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c | 2 ++ harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h | 6 +++--- .../contrib/hbhpdf/3rd/libhpdf/libhpdf.dif | 20 +++++++++---------- .../contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp | 4 ++-- 8 files changed, 50 insertions(+), 16 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0ebc02cf1d..934476fcbd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,7 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ -2010-12-06 18:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) +2010-12-06 19:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbhpdf/3rd/libhpdf/hpdfcons.h + * contrib/hbhpdf/3rd/libhpdf/hpdfcata.c + * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif + * contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c + * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp + * contrib/hbhpdf/3rd/libhpdf/hpdf.h + * contrib/hbhpdf/3rd/libhpdf/hpdfvers.h + * Updated to 2.2.1 (from 2.2.0) + ; Patch by Tamas. + + * ChangeLog + ! Fixed previous entry header. + +2010-12-06 18:05 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbrun/hbrun.prg + Readded -I option. (partial revert of 2010-11-23 19:05 UTC+0100) diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h index 25f12ed4de..a9e0ab15eb 100644 --- a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h +++ b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h @@ -66,6 +66,12 @@ typedef HPDF_HANDLE HPDF_Annotation; typedef HPDF_HANDLE HPDF_ExtGState; typedef HPDF_HANDLE HPDF_FontDef; typedef HPDF_HANDLE HPDF_U3D; +typedef HPDF_HANDLE HPDF_Error; +typedef HPDF_HANDLE HPDF_MMgr; +typedef HPDF_HANDLE HPDF_Dict; +typedef HPDF_HANDLE HPDF_EmbeddedFile; +typedef HPDF_HANDLE HPDF_OutputIntent; +typedef HPDF_HANDLE HPDF_Xref; #else diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c index d577823c68..d12e9e10b2 100644 --- a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c +++ b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c @@ -314,6 +314,17 @@ HPDF_Catalog_SetViewerPreference (HPDF_Catalog catalog, return ret; } + if (value & HPDF_PRINT_SCALING_NONE) { + if ((ret = HPDF_Dict_AddName (preferences, "PrintScaling", + "None")) != HPDF_OK) + return ret; + } else { + if ((ret = HPDF_Dict_RemoveElement (preferences, "PrintScaling")) != + HPDF_OK) + if (ret != HPDF_DICT_ITEM_NOT_FOUND) + return ret; + } + return HPDF_OK; } diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h index a474dfa70e..3ff2ce5282 100644 --- a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h +++ b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h @@ -100,6 +100,7 @@ #define HPDF_HIDE_WINDOW_UI 4 #define HPDF_FIT_WINDOW 8 #define HPDF_CENTER_WINDOW 16 +#define HPDF_PRINT_SCALING_NONE 32 /*---------------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c index 82a5ae2937..65d6675cc3 100644 --- a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c +++ b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c @@ -1874,6 +1874,8 @@ HPDF_SetViewerPreference (HPDF_Doc pdf, if (ret != HPDF_OK) return HPDF_CheckError (&pdf->error); + pdf->pdf_version = HPDF_VER_16; + return HPDF_OK; } diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h index f1743c3c99..2ec5b2f40f 100644 --- a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h +++ b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define HPDF_MAJOR_VERSION 2 #define HPDF_MINOR_VERSION 2 -#define HPDF_BUGFIX_VERSION 0 +#define HPDF_BUGFIX_VERSION 1 #define HPDF_EXTRA_VERSION "" -#define HPDF_VERSION_TEXT "2.2.0" -#define HPDF_VERSION_ID 20200 +#define HPDF_VERSION_TEXT "2.2.1" +#define HPDF_VERSION_ID 20201 diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif index 9da167d0fe..7d5d6fa220 100644 --- a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif +++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif @@ -1,6 +1,6 @@ -diff -urN libhpdf.orig\hpdf.h libhpdf\hpdf.h ---- libhpdf.orig\hpdf.h Tue Nov 09 01:34:54 2010 -+++ libhpdf\hpdf.h Tue Nov 09 01:34:54 2010 +diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h +--- libhpdf.orig/hpdf.h 2010-12-06 19:37:33.537341371 +0100 ++++ libhpdf/hpdf.h 2010-12-06 19:37:34.047343524 +0100 @@ -17,7 +17,7 @@ #ifndef _HPDF_H #define _HPDF_H @@ -10,7 +10,7 @@ diff -urN libhpdf.orig\hpdf.h libhpdf\hpdf.h #include "hpdfvers.h" #ifdef HPDF_DLL_MAKE -@@ -472,7 +472,7 @@ +@@ -478,7 +478,7 @@ const char *uri); @@ -19,9 +19,9 @@ diff -urN libhpdf.orig\hpdf.h libhpdf\hpdf.h HPDF_Page_CreateTextMarkupAnnot (HPDF_Page page, HPDF_Rect rect, const char *text, -diff -urN libhpdf.orig\hpdfpdfa.c libhpdf\hpdfpdfa.c ---- libhpdf.orig\hpdfpdfa.c Tue Nov 09 01:34:53 2010 -+++ libhpdf\hpdfpdfa.c Tue Nov 09 01:34:53 2010 +diff -urN libhpdf.orig/hpdfpdfa.c libhpdf/hpdfpdfa.c +--- libhpdf.orig/hpdfpdfa.c 2010-12-06 19:37:32.597342286 +0100 ++++ libhpdf/hpdfpdfa.c 2010-12-06 19:37:34.047343524 +0100 @@ -116,12 +116,12 @@ HPDF_BYTE *currentTime; HPDF_BYTE idkey[HPDF_MD5_KEY_LEN]; @@ -36,9 +36,9 @@ diff -urN libhpdf.orig\hpdfpdfa.c libhpdf\hpdfpdfa.c id = HPDF_Dict_GetItem(pdf->trailer, "ID", HPDF_OCLASS_ARRAY); if (!id) { id = HPDF_Array_New(pdf->mmgr); -diff -urN libhpdf.orig\hpdfutil.h libhpdf\hpdfutil.h ---- libhpdf.orig\hpdfutil.h Tue Nov 09 01:34:55 2010 -+++ libhpdf\hpdfutil.h Tue Nov 09 01:34:55 2010 +diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h +--- libhpdf.orig/hpdfutil.h 2010-12-06 19:37:34.037342732 +0100 ++++ libhpdf/hpdfutil.h 2010-12-06 19:37:34.047343524 +0100 @@ -18,7 +18,7 @@ #ifndef _HPDF_UTILS_H #define _HPDF_UTILS_H diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp index d5f592993d..7f5b7d4c5e 100644 --- a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp +++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp @@ -89,8 +89,8 @@ hpdfutil.c hpdfxref.c # ORIGIN http://libharu.org/ -# VER 2.2.0 -# URL http://libharu.org/files/libharu-2.2.0.tar.gz +# VER 2.2.1 +# URL http://libharu.org/files/libharu-2.2.1.tar.gz # DIFF libhpdf.dif # # MAP README