head 1.3; access; symbols pkgsrc-2019Q3:1.2.0.72 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.70 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.68 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.66 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.64 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.62 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.60 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.58 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.56 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.52 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.50 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.48 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.46 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.44 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.42 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.40 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.38 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.36 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.34 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.32 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.30 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.28 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.26 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.24 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.22 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.20 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.18 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.16 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.14 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.12 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.10 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.8 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.6 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.2 pkgsrc-2011Q1-base:1.2; locks; strict; comment @# @; 1.3 date 2019.10.18.11.02.13; author micha; state dead; branches; next 1.2; commitid J2z969OiF2TZ3lHB; 1.2 date 2011.01.24.16.33.19; author wiz; state Exp; branches; next 1.1; 1.1 date 2011.01.16.13.02.38; author wiz; state Exp; branches; next ; desc @@ 1.3 log @www/htmldoc: Update to version 1.9.7 - patch-ab/patch-ac/patch-ad/patch-ae/patch-htmldoc_htmlsep.cxx removed Already merged upstream - INSTALL_MAKE_FLAGS removed from Makefile No longer required (autotools do the right things) - OpenSSL option removed OpenSSL support was dropped in version 1.8.29 Always use GnuTLS for "ssl" option ====================== # Changes in HTMLDOC v1.9.7 - Refactored the PRE rendering code to work around compiler optimization bugs (Issue #349) - Added support for links with targets (Issue #351) - Fixed a table rowspan + valign bug (Issue #360) # Changes in HTMLDOC v1.9.6 - Added support for data URIs (Issue #340) - HTMLDOC no longer includes a PDF table of contents when converting a single web page (Issue #344) - Updated the markdown support with external links, additional inline markup, and hard line breaks. - Links in markdown text no longer render with a leading space as part of the link (Issue #346) - Fixed a buffer underflow bug discovered by AddressSanitizer. - Fixed a bug in UTF-8 support (Issue #348) - PDF output now includes the base language of the input document(s) (Issue #350) - Optimized the loading of font widths (Issue #354) - Optimized PDF page resources (Issue #356) - Optimized the base memory used for font widths (Issue #357) - Added proper `­` support (Issue #361) - Title files can now be markdown. # Changes in HTMLDOC v1.9.5 - The GUI did not support EPUB output. - Empty markdown table cells were not rendered in PDF or PostScript output. - The automatically-generated title page now supports both "docnumber" and "version" metadata. - Added support for dc:subject and dc:language metadata in EPUB output from the HTML keywords and lang values. - Added support for the subject and language metadata in markdown input. - Fixed a buffer underflow bug (Issue #338) - `htmldoc --help` now reports whether HTTPS URLs are supported (Issue #339) - Fixed an issue with HTML title pages and EPUB output. # Changes in HTMLDOC v1.9.4 - Inline fixed-width text is no longer reduced in size automatically (Issue #309) - Optimized initialization of font width data (Issue #334) # Changes in HTMLDOC v1.9.3 - Fixed formatting bugs with aligned images (Issue #322, Issue #324) - Fixed support for three digit "#RGB" color values (Issue #323) - Fixed character set support for markdown metadata. - Updated libpng to v1.6.34 (Issue #326) - The makefiles did not use the CPPFLAGS value (Issue #328) # Changes in HTMLDOC v1.9.2 - Added Markdown table support. - Fixed parsing of TBODY, TFOOT, and THEAD elements in HTML files. # Changes in HTMLDOC v1.9.1 - Fixed monospace font size issue (Issue #309) - Added support for reproducible builds (Issue #310) - Added limited support for the HTML 4.0 SPAN element (Issue #311) - Added (extremely limited) UTF-8 support for input files (Issue #314) - Fixed buffer underflow for (invalid) short HTML comments (Issue #316) - Now indent PRE text, by popular request. - EPUB output now makes sure that `` is written as ``. - Now support both NAME and ID for table-of-contents targets. # Changes in HTMLDOC v1.9 - Added support for repeating a single header row for tables that span multiple pages (Issue #16) - Added support for embedding the current filename/URL in the header or footer (Issue #50) - Added EPUB support (Issue #301) - Added Markdown support (Issue #302) - Fixed a regression in header/footer image scaling (Issue #303) - Documentation updates (Issue #305) - Compiler fixes (Issue #304, Issue #306) - Fixed a bug when running HTMLDOC as a macOS application. - Updated the bundled libpng to v1.6.29. # Changes in HTMLDOC v1.8.30 - Updated documentation to reflect new project page on Github. - Dropped old CDE and IRIX desktop integration files. - Cleaned up the GUI and adopted new default text editors for Linux and macOS. - PAGE BREAK comments at the end of a file in web page mode would lose the first page (Issue #251) - Fixed the scaling of header/footer images to limit them to the height of the header or footer (Issue #273) - Fixed an issue with the top-level makefile not exiting with an error as needed (Issue #282) - Fixed a URL referencing bug when the same hostname but a different port was used (Issue #290) - Fixed build issue on macOS (Issue #291) - Fixed handling of indexed+alpha PNG images (Issue #295) # Changes in HTMLDOC v1.8.29 - Updated local PNG library to version 1.6.20. - Updated local JPEG library to version 9b. - Dropped support for OpenSSL. - Added configure script support for libjpeg-turbo. - Updated HTTP code to latest CUPS/ippsample sources. - Duplex PDF output incorrectly forced an even number of pages - The table of contents showed the wrong page numbers after headings containing the "_HD_OMIT_TOC" attribute. - Fixed reported build issues - The configure script's --enable-local* options did not work. # Changes in HTMLDOC v1.8.28 - Updated local zlib to version 1.2.8. - Updated local PNG library to version 1.6.8. - Updated local JPEG library to version 9. - Updated default PDF version to 1.4. - SECURITY: Fixed three buffer overflow issues when reading AFM files and parsing page sizes. - Fixed incompatibility with Fortify's version of strcpy, which does not work properly with variable-length arrays - Fixed compilation against PNG library 1.5 or later - Fixed documentation errors - Marked Zapf-Dingbats as a standard font - Fixed GPL license text in GUI - Fixed a table formatting problem when a column has multiple colspan values - Fixed parsing of HTML comments - Fixed potential out-of-bounds read in table-of-contents rendering code - Fixed handling of image URLs with ampersands in them - Fixed top/bottom margins for logo and header/footer images - Fixed image alignment bug - Fixed X11 build problem @ text @$NetBSD: patch-ae,v 1.2 2011/01/24 16:33:19 wiz Exp $ Fix build with png-1.5. http://www.htmldoc.org/str.php?L243+P0+S-2+C0+I0+E0+M10+Q --- htmldoc/image.cxx.orig 2006-05-31 19:00:02.000000000 +0000 +++ htmldoc/image.cxx @@@@ -1472,6 +1472,9 @@@@ image_load_png(image_t *img, /* I - Imag png_bytep *rows; /* PNG row pointers */ uchar *inptr, /* Input pixels */ *outptr; /* Output pixels */ + png_bytep trans_alpha; + int num_trans; + png_color_16p trans_color; /* @@@@ -1499,7 +1502,7 @@@@ image_load_png(image_t *img, /* I - Imag rows = NULL; - if (setjmp(pp->jmpbuf)) + if (setjmp(png_jmpbuf(pp))) { progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!"); @@@@ -1526,7 +1529,7 @@@@ image_load_png(image_t *img, /* I - Imag png_read_info(pp, info); - if (info->color_type & PNG_COLOR_MASK_PALETTE) + if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) { png_set_expand(pp); @@@@ -1535,15 +1538,15 @@@@ image_load_png(image_t *img, /* I - Imag if (Encryption) img->use ++; } - else if (info->bit_depth < 8) + else if (png_get_bit_depth(pp, info) < 8) { png_set_packing(pp); png_set_expand(pp); } - else if (info->bit_depth == 16) + else if (png_get_bit_depth(pp, info) == 16) png_set_strip_16(pp); - if (info->color_type & PNG_COLOR_MASK_COLOR) + if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) { depth = 3; img->depth = gray ? 1 : 3; @@@@ -1554,10 +1557,11 @@@@ image_load_png(image_t *img, /* I - Imag img->depth = 1; } - img->width = info->width; - img->height = info->height; + img->width = png_get_image_width(pp, info); + img->height = png_get_image_height(pp, info); - if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) + png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color); + if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) { if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3) image_need_mask(img, 8); @@@@ -1571,14 +1575,14 @@@@ image_load_png(image_t *img, /* I - Imag #ifdef DEBUG printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d, img->depth=%d\n", - info->color_type, depth, img->width, img->height, img->depth); - if (info->color_type & PNG_COLOR_MASK_COLOR) + png_get_color_type(pp, info), depth, img->width, img->height, img->depth); + if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) puts(" COLOR"); else puts(" GRAYSCALE"); - if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) + if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) puts(" ALPHA"); - if (info->color_type & PNG_COLOR_MASK_PALETTE) + if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) puts(" PALETTE"); #endif // DEBUG @@@@ -1594,9 +1598,9 @@@@ image_load_png(image_t *img, /* I - Imag * Allocate pointers... */ - rows = (png_bytep *)calloc(info->height, sizeof(png_bytep)); + rows = (png_bytep *)calloc(png_get_image_height(pp, info), sizeof(png_bytep)); - for (i = 0; i < (int)info->height; i ++) + for (i = 0; i < (int)png_get_image_height(pp, info); i ++) rows[i] = img->pixels + i * img->width * depth; /* @@@@ -1610,7 +1614,7 @@@@ image_load_png(image_t *img, /* I - Imag * Generate the alpha mask as necessary... */ - if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) + if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) { #ifdef DEBUG for (inptr = img->pixels, i = 0; i < img->height; i ++) @@@@ -1639,7 +1643,7 @@@@ image_load_png(image_t *img, /* I - Imag * Reformat the data as necessary for the reader... */ - if (gray && info->color_type & PNG_COLOR_MASK_COLOR) + if (gray && png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) { /* * Greyscale output needed... @ 1.2 log @Add upstream bug report URL. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2011/01/16 13:02:38 wiz Exp $ @ 1.1 log @Fix build with png-1.5. Breakage reported by Stefano Marinelli. @ text @d1 1 a1 1 $NetBSD$ d4 1 @