cvs: /php3/functions cpdf.c pdf.c php3_cpdf.h php3_pdf.h

kk Mon Feb 14 02:09:21 2000 EDT Modified files: /php3/functions cpdf.c pdf.c php3_cpdf.h php3_pdf.h Log: These LIBGD13 defines seem to be outdated and need to be updated. Index: php3/functions/cpdf.c diff -u php3/functions/cpdf.c:1.22 php3/functions/cpdf.c:1.23 --- php3/functions/cpdf.c:1.22 Fri Dec 31 20:31:14 1999 +++ php3/functions/cpdf.c Mon Feb 14 02:09:20 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.22 2000/01/01 04:31:14 sas Exp $ */ +/* $Id: cpdf.c,v 1.23 2000/02/14 10:09:20 kk Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -40,7 +40,7 @@ #include "head.h" #include <math.h> #include "php3_cpdf.h" -#if HAVE_LIBGD13 +#if HAVE_LIBGD #include <gd.h> #endif @@ -125,7 +125,7 @@ {"cpdf_output_buffer", php3_cpdf_output_buffer, NULL}, {"cpdf_save_to_file", php3_cpdf_save_to_file, NULL}, {"cpdf_import_jpeg", php3_cpdf_import_jpeg, NULL}, -#if HAVE_LIBGD13 +#if HAVE_LIBGD {"cpdf_place_inline_image", php3_cpdf_place_inline_image, NULL}, #endif {"cpdf_add_annotation", php3_cpdf_add_annotation, NULL}, @@ -2294,7 +2294,7 @@ } /* }}} */ -#if HAVE_LIBGD13 +#if HAVE_LIBGD /* {{{ proto void cpdf_place_inline_image(int pdfdoc, int gdimage, double x, double y, double angle, fload width, float height, int gsave [, int mode]) Includes image */ void php3_cpdf_place_inline_image(INTERNAL_FUNCTION_PARAMETERS) { Index: php3/functions/pdf.c diff -u php3/functions/pdf.c:1.57 php3/functions/pdf.c:1.58 --- php3/functions/pdf.c:1.57 Fri Dec 31 20:31:16 1999 +++ php3/functions/pdf.c Mon Feb 14 02:09:20 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.57 2000/01/01 04:31:16 sas Exp $ */ +/* $Id: pdf.c,v 1.58 2000/02/14 10:09:20 kk Exp $ */ /* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -40,7 +40,7 @@ #include "head.h" #include <math.h> #include "php3_pdf.h" -#if HAVE_LIBGD13 +#if HAVE_LIBGD #include <gd.h> #endif @@ -126,7 +126,7 @@ PHP_FE(pdf_set_transition, NULL) PHP_FE(pdf_set_duration, NULL) PHP_FE(pdf_open_jpeg, NULL) -#if HAVE_LIBGD13 && HAVE_PDFLIB2 +#if HAVE_LIBGD && HAVE_PDFLIB2 PHP_FE(pdf_open_memory_image, NULL) #endif PHP_FE(pdf_open_gif, NULL) @@ -2200,7 +2200,7 @@ } /* }}} */ -#if HAVE_LIBGD13 +#if HAVE_LIBGD #if HAVE_PDFLIB2 /* {{{ proto int pdf_open_memory_image(int pdf, int image) Takes an gd image and returns an image for placement in a pdf document */ @@ -2266,7 +2266,7 @@ } /* }}} */ #endif /* HAVE_PDFLIB2 */ -#endif /* HAVE_LIBGD13 */ +#endif /* HAVE_LIBGD */ /* {{{ proto void pdf_close_image(int pdfimage) Closes the pdf image */ Index: php3/functions/php3_cpdf.h diff -u php3/functions/php3_cpdf.h:1.10 php3/functions/php3_cpdf.h:1.11 --- php3/functions/php3_cpdf.h:1.10 Fri Dec 31 20:44:09 1999 +++ php3/functions/php3_cpdf.h Mon Feb 14 02:09:20 2000 @@ -26,7 +26,7 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php3_cpdf.h,v 1.10 2000/01/01 04:44:09 sas Exp $ */ +/* $Id: php3_cpdf.h,v 1.11 2000/02/14 10:09:20 kk Exp $ */ #ifndef _PHP3_CPDF_H #define _PHP3_CPDF_H @@ -111,7 +111,7 @@ extern void php3_cpdf_save_to_file(INTERNAL_FUNCTION_PARAMETERS); extern void php3_cpdf_add_annotation(INTERNAL_FUNCTION_PARAMETERS); extern void php3_cpdf_import_jpeg(INTERNAL_FUNCTION_PARAMETERS); -#if HAVE_LIBGD13 +#if HAVE_LIBGD extern void php3_cpdf_place_inline_image(INTERNAL_FUNCTION_PARAMETERS); #endif extern void php3_cpdf_set_action_url(INTERNAL_FUNCTION_PARAMETERS); Index: php3/functions/php3_pdf.h diff -u php3/functions/php3_pdf.h:1.14 php3/functions/php3_pdf.h:1.15 --- php3/functions/php3_pdf.h:1.14 Fri Dec 31 20:44:09 1999 +++ php3/functions/php3_pdf.h Mon Feb 14 02:09:20 2000 @@ -26,7 +26,7 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php3_pdf.h,v 1.14 2000/01/01 04:44:09 sas Exp $ */ +/* $Id: php3_pdf.h,v 1.15 2000/02/14 10:09:20 kk Exp $ */ #ifndef _PHP3_PDF_H #define _PHP3_PDF_H @@ -108,7 +108,7 @@ PHP_FUNCTION(pdf_set_transition); PHP_FUNCTION(pdf_set_duration); PHP_FUNCTION(pdf_open_jpeg); -#if HAVE_LIBGD13 && HAVE_PDFLIB2 +#if HAVE_LIBGD && HAVE_PDFLIB2 PHP_FUNCTION(pdf_open_memory_image); #endif PHP_FUNCTION(pdf_open_gif);