From bc46769b267540ff5c07c274ffaae9f0d3217ff4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 4 Apr 2012 20:30:44 +0000 Subject: [PATCH] 2012-04-04 22:29 UTC+0200 Viktor Szakats (harbour syenar.net) * hbhpdf/hbhpdf.hbp * hbhpdf/hbhpdf.hbx + hbhpdf/misc.prg * hbhpdf/core.c + added HB_HPDF_VERSION( @nMajor, @nMinor, @nBugfix ) -> NIL + added HB_HPDF_ISVERSION( nMajor, nMinor, nBugfix ) -> lLogical ; these use the built-time version --- harbour/ChangeLog | 9 +++++ harbour/contrib/hbhpdf/core.c | 7 ++++ harbour/contrib/hbhpdf/hbhpdf.hbp | 2 + harbour/contrib/hbhpdf/hbhpdf.hbx | 2 + harbour/contrib/hbhpdf/misc.prg | 61 +++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 harbour/contrib/hbhpdf/misc.prg diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 136b440d4a..b453a58847 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-04 22:29 UTC+0200 Viktor Szakats (harbour syenar.net) + * hbhpdf/hbhpdf.hbp + * hbhpdf/hbhpdf.hbx + + hbhpdf/misc.prg + * hbhpdf/core.c + + added HB_HPDF_VERSION( @nMajor, @nMinor, @nBugfix ) -> NIL + + added HB_HPDF_ISVERSION( nMajor, nMinor, nBugfix ) -> lLogical + ; these use the built-time version + 2012-04-04 20:06 UTC+0200 Viktor Szakats (harbour syenar.net) * examples/guestbk/testcgi.prg * examples/hscript/multiply.hs diff --git a/harbour/contrib/hbhpdf/core.c b/harbour/contrib/hbhpdf/core.c index de762124ea..5f68b187cb 100644 --- a/harbour/contrib/hbhpdf/core.c +++ b/harbour/contrib/hbhpdf/core.c @@ -1699,3 +1699,10 @@ HB_FUNC( HPDF_USEUTFENCODINGS ) hb_retnl( -1 ); #endif } + +HB_FUNC( HB_HPDF_VERSION ) +{ + hb_storni( HPDF_MAJOR_VERSION, 1 ); + hb_storni( HPDF_MINOR_VERSION, 2 ); + hb_storni( HPDF_BUGFIX_VERSION, 3 ); +} diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbp b/harbour/contrib/hbhpdf/hbhpdf.hbp index cc698273ce..35d2be74f9 100644 --- a/harbour/contrib/hbhpdf/hbhpdf.hbp +++ b/harbour/contrib/hbhpdf/hbhpdf.hbp @@ -38,4 +38,6 @@ fontkr.c image.c pdfa.c +misc.prg + 3rd/libhpdf/libhpdf.hbc{HBMK_HAS_LIBHARU_LOCAL} diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbx b/harbour/contrib/hbhpdf/hbhpdf.hbx index 1456b876a8..b8aceeedcf 100644 --- a/harbour/contrib/hbhpdf/hbhpdf.hbx +++ b/harbour/contrib/hbhpdf/hbhpdf.hbx @@ -25,6 +25,8 @@ #command DYNAMIC => EXTERNAL #endif +DYNAMIC HB_HPDF_ISVERSION +DYNAMIC HB_HPDF_VERSION DYNAMIC HPDF_ADDPAGE DYNAMIC HPDF_ADDPAGELABEL DYNAMIC HPDF_ANNOTATION_SETBORDERSTYLE diff --git a/harbour/contrib/hbhpdf/misc.prg b/harbour/contrib/hbhpdf/misc.prg new file mode 100644 index 0000000000..9dd1d3dd53 --- /dev/null +++ b/harbour/contrib/hbhpdf/misc.prg @@ -0,0 +1,61 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * libharu supplementary functions + * + * Copyright 2012 Viktor Szakats (harbour syenar.net) + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +FUNCTION hb_HPDF_IsVersion( ma, mi, mu ) + LOCAL HPDF_MAJOR_VERSION, HPDF_MINOR_VERSION, HPDF_BUGFIX_VERSION + + hb_HPDF_Version( @HPDF_MAJOR_VERSION, @HPDF_MINOR_VERSION, @HPDF_BUGFIX_VERSION ) + + RETURN HPDF_MAJOR_VERSION > ma .OR. ; + ( HPDF_MAJOR_VERSION == ma .AND. ; + ( HPDF_MINOR_VERSION > mi .OR. ; + ( HPDF_MINOR_VERSION == mi .AND. HPDF_BUGFIX_VERSION >= mu ) ) )