Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package htmldoc for openSUSE:Factory checked in at 2022-02-11 23:07:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/htmldoc (Old) and /work/SRC/openSUSE:Factory/.htmldoc.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "htmldoc" Fri Feb 11 23:07:15 2022 rev:29 rq:953216 version:1.9.15 Changes: -------- --- /work/SRC/openSUSE:Factory/htmldoc/htmldoc.changes 2022-01-14 23:13:22.198636793 +0100 +++ /work/SRC/openSUSE:Factory/.htmldoc.new.1956/htmldoc.changes 2022-02-11 23:08:27.842781897 +0100 @@ -1,0 +2,13 @@ +Thu Feb 10 11:49:32 UTC 2022 - pgaj...@suse.com + +- version update to 1.9.15 + * Fixed a potential heap overflow bug with GIF images (Issue #461) + * Fixed a potential double-free bug with PNG images (Issue #462) + * Fixed a potential stack overflow bug with GIF images (Issue #463) + * Fixed a potential heap underflow bug with empty attributes (Issue #464) + * Fixed a potential stack overflow bug with BMP images (Issue #466) + * Fixed a potential heap overflow bug with the table-of-contents (Issue #467) + * Fixed a potential heap overflow bug with headings (Issue #468) + * Fixed a potential stack overflow bug with GIF images (Issue #470) + +------------------------------------------------------------------- Old: ---- htmldoc-1.9.14-source.tar.gz New: ---- htmldoc-1.9.15-source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ htmldoc.spec ++++++ --- /var/tmp/diff_new_pack.AhoKzf/_old 2022-02-11 23:08:28.402783517 +0100 +++ /var/tmp/diff_new_pack.AhoKzf/_new 2022-02-11 23:08:28.410783540 +0100 @@ -17,7 +17,7 @@ Name: htmldoc -Version: 1.9.14 +Version: 1.9.15 Release: 0 Summary: HTML Processor that Generates HTML, PostScript, and PDF Files License: LGPL-2.1-or-later ++++++ htmldoc-1.9.14-source.tar.gz -> htmldoc-1.9.15-source.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/CHANGES.md new/htmldoc-1.9.15/CHANGES.md --- old/htmldoc-1.9.14/CHANGES.md 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/CHANGES.md 2022-02-05 18:41:09.000000000 +0100 @@ -1,3 +1,15 @@ +# Changes in HTMLDOC v1.9.15 + +- Fixed a potential heap overflow bug with GIF images (Issue #461) +- Fixed a potential double-free bug with PNG images (Issue #462) +- Fixed a potential stack overflow bug with GIF images (Issue #463) +- Fixed a potential heap underflow bug with empty attributes (Issue #464) +- Fixed a potential stack overflow bug with BMP images (Issue #466) +- Fixed a potential heap overflow bug with the table-of-contents (Issue #467) +- Fixed a potential heap overflow bug with headings (Issue #468) +- Fixed a potential stack overflow bug with GIF images (Issue #470) + + # Changes in HTMLDOC v1.9.14 - BMP image support is now deprecated and will be removed in a future diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/README.md new/htmldoc-1.9.15/README.md --- old/htmldoc-1.9.14/README.md 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/README.md 2022-02-05 18:41:09.000000000 +0100 @@ -120,7 +120,7 @@ Legal Stuff ----------- -HTMLDOC is copyright ?? 1997-2021 by Michael R Sweet. This program is free +HTMLDOC is copyright ?? 1997-2022 by Michael R Sweet. This program is free software. Distribution and use rights are outlined in the file "COPYING". HTMLDOC includes code to encrypt PDF document files using the RC4 algorithm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/config.h.in new/htmldoc-1.9.15/config.h.in --- old/htmldoc-1.9.14/config.h.in 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/config.h.in 2022-02-05 18:41:09.000000000 +0100 @@ -1,7 +1,7 @@ /* * Configuration file for HTMLDOC. * - * Copyright ????2011-2021 by Michael R Sweet. + * Copyright ????2011-2022 by Michael R Sweet. * Copyright ????1997-2010 by Easy Software Products. All rights reserved. * * This program is free software. Distribution and use rights are outlined in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/configure new/htmldoc-1.9.15/configure --- old/htmldoc-1.9.14/configure 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/configure 2022-02-05 18:41:09.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for HTMLDOC 1.9.14. +# Generated by GNU Autoconf 2.71 for HTMLDOC 1.9.15. # # Report bugs to <https://github.com/michaelrsweet/htmldoc/issues>. # @@ -610,8 +610,8 @@ # Identity of this package. PACKAGE_NAME='HTMLDOC' PACKAGE_TARNAME='htmldoc' -PACKAGE_VERSION='1.9.14' -PACKAGE_STRING='HTMLDOC 1.9.14' +PACKAGE_VERSION='1.9.15' +PACKAGE_STRING='HTMLDOC 1.9.15' PACKAGE_BUGREPORT='https://github.com/michaelrsweet/htmldoc/issues' PACKAGE_URL='https://www.msweet.org/htmldoc' @@ -1301,7 +1301,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HTMLDOC 1.9.14 to adapt to many kinds of systems. +\`configure' configures HTMLDOC 1.9.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1367,7 +1367,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HTMLDOC 1.9.14:";; + short | recursive ) echo "Configuration of HTMLDOC 1.9.15:";; esac cat <<\_ACEOF @@ -1469,7 +1469,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HTMLDOC configure 1.9.14 +HTMLDOC configure 1.9.15 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1764,7 +1764,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HTMLDOC $as_me 1.9.14, which was +It was created by HTMLDOC $as_me 1.9.15, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2739,7 +2739,7 @@ -SVERSION="1.9.14" +SVERSION="1.9.15" printf "%s\n" "#define SVERSION \"$SVERSION\"" >>confdefs.h @@ -6960,7 +6960,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HTMLDOC $as_me 1.9.14, which was +This file was extended by HTMLDOC $as_me 1.9.15, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7025,7 +7025,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -HTMLDOC config.status 1.9.14 +HTMLDOC config.status 1.9.15 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/configure.ac new/htmldoc-1.9.15/configure.ac --- old/htmldoc-1.9.14/configure.ac 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/configure.ac 2022-02-05 18:41:09.000000000 +0100 @@ -21,7 +21,7 @@ AC_PREREQ([2.69]) -AC_INIT([HTMLDOC], [1.9.14], [https://github.com/michaelrsweet/htmldoc/issues], [htmldoc], [https://www.msweet.org/htmldoc]) +AC_INIT([HTMLDOC], [1.9.15], [https://github.com/michaelrsweet/htmldoc/issues], [htmldoc], [https://www.msweet.org/htmldoc]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/doc/1-intro.html new/htmldoc-1.9.15/doc/1-intro.html --- old/htmldoc-1.9.14/doc/1-intro.html 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/doc/1-intro.html 2022-02-05 18:41:09.000000000 +0100 @@ -1,8 +1,8 @@ <html> <head> <meta name="author" content="Michael R Sweet"> - <meta name="copyright" content="Copyright © 1997-2021, All Rights Reserved."> - <meta name="docversion" content="htmldoc-1.9.14"> + <meta name="copyright" content="Copyright © 1997-2022, All Rights Reserved."> + <meta name="docversion" content="htmldoc-1.9.15"> <meta name="keywords" content="Software"> <title>HTMLDOC Users Manual</title> </head> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/htmldoc/http-addrlist.c new/htmldoc-1.9.15/htmldoc/http-addrlist.c --- old/htmldoc-1.9.14/htmldoc/http-addrlist.c 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/htmldoc/http-addrlist.c 2022-02-05 18:41:09.000000000 +0100 @@ -491,19 +491,19 @@ /* Global data */ -#ifdef DEBUG - _cups_debug_printf("httpAddrGetList(hostname=\"%s\", family=AF_%s, " - "service=\"%s\")\n", - hostname ? hostname : "(nil)", - family == AF_UNSPEC ? "UNSPEC" : -# ifdef AF_LOCAL - family == AF_LOCAL ? "LOCAL" : -# endif /* AF_LOCAL */ -# ifdef AF_INET6 - family == AF_INET6 ? "INET6" : -# endif /* AF_INET6 */ - family == AF_INET ? "INET" : "???", service); -#endif /* DEBUG */ +//#ifdef DEBUG +// _cups_debug_printf("httpAddrGetList(hostname=\"%s\", family=AF_%s, " +// "service=\"%s\")\n", +// hostname ? hostname : "(nil)", +// family == AF_UNSPEC ? "UNSPEC" : +//# ifdef AF_LOCAL +// family == AF_LOCAL ? "LOCAL" : +//# endif /* AF_LOCAL */ +//# ifdef AF_INET6 +// family == AF_INET6 ? "INET6" : +//# endif /* AF_INET6 */ +// family == AF_INET ? "INET" : "???", service); +//#endif /* DEBUG */ #if 0 #ifdef HAVE_RES_INIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/htmldoc/http-support.c new/htmldoc-1.9.15/htmldoc/http-support.c --- old/htmldoc-1.9.14/htmldoc/http-support.c 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/htmldoc/http-support.c 2022-02-05 18:41:09.000000000 +0100 @@ -1758,7 +1758,7 @@ #endif /* DEBUG */ - DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, resolved_size=" CUPS_LLFMT ", options=0x%x, cb=%p, context=%p)", uri, (void *)resolved_uri, CUPS_LLCAST resolved_size, options, (void *)cb, context)); + DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, resolved_size=" HTMLDOC_LLFMT ", options=0x%x, cb=%p, context=%p)", uri, (void *)resolved_uri, HTMLDOC_LLCAST resolved_size, options, (void *)cb, context)); /* * Get the device URI... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/htmldoc/image.cxx new/htmldoc-1.9.15/htmldoc/image.cxx --- old/htmldoc-1.9.14/htmldoc/image.cxx 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/htmldoc/image.cxx 2022-02-05 18:41:09.000000000 +0100 @@ -1,7 +1,7 @@ /* * Image handling routines for HTMLDOC, a HTML document processing program. * - * Copyright ????2011-2021 by Michael R Sweet. + * Copyright ????2011-2022 by Michael R Sweet. * Copyright ????1997-2010 by Easy Software Products. All rights reserved. * * This program is free software. Distribution and use rights are outlined in @@ -225,8 +225,7 @@ if (done) { - progress_error(HD_ERROR_READ_ERROR, - "Not enough data left to read GIF compression code."); + progress_error(HD_ERROR_READ_ERROR, "Not enough data left to read GIF compression code."); return (-1); /* Sorry, no more... */ } @@ -250,7 +249,7 @@ * Read in another buffer... */ - if ((count = gif_get_block (fp, buf + last_byte)) <= 0) + if ((count = gif_get_block(fp, buf + last_byte)) <= 0) { /* * Whoops, no more data! @@ -264,7 +263,7 @@ * Update buffer state... */ - curbit = (curbit - lastbit) + 8 * last_byte; + curbit = curbit + 8 * last_byte - lastbit; last_byte += (unsigned)count; lastbit = last_byte * 8; } @@ -306,6 +305,12 @@ pass = 0; code_size = (uchar)getc(fp); + if (code_size > 12) + { + progress_error(HD_ERROR_READ_ERROR, "Bad GIF file \"%s\" - invalid code size %d.", img->filename, code_size); + return (-1); + } + if (gif_read_lzw(fp, 1, code_size) < 0) return (-1); @@ -433,7 +438,7 @@ if (sp > stack) return (*--sp); - while ((code = gif_get_code (fp, code_size, 0)) >= 0) + while ((code = gif_get_code(fp, code_size, 0)) >= 0) { if (code == clear_code) { @@ -460,7 +465,6 @@ { uchar buf[260]; - if (!gif_eof) while (gif_get_block(fp, buf) > 0); @@ -477,17 +481,23 @@ while (code >= clear_code) { + if (sp >= (stack + sizeof(stack))) + return (255); + *sp++ = table[1][code]; + if (code == table[0][code]) return (255); code = table[0][code]; } + if (sp >= (stack + sizeof(stack))) + return (255); + *sp++ = firstcode = table[1][code]; - code = max_code; - if (code < 4096) + if ((code = max_code) < 4096) { table[0][code] = oldcode; table[1][code] = firstcode; @@ -1187,7 +1197,7 @@ */ if (color < 0) - temp = getc(fp); + temp = getc(fp) & 255; else temp = color; @@ -1312,6 +1322,13 @@ return (-1); } + img->width = (buf[5] << 8) | buf[4]; + img->height = (buf[7] << 8) | buf[6]; + img->depth = gray ? 1 : 3; + + if (img->width <= 0 || img->width > 32767 || img->height <= 0 || img->height > 32767) + return (-1); + if (transparent >= 0) { /* @@ -1343,13 +1360,6 @@ image_need_mask(img); } - img->width = (buf[5] << 8) | buf[4]; - img->height = (buf[7] << 8) | buf[6]; - img->depth = gray ? 1 : 3; - - if (img->width <= 0 || img->width > 32767 || img->height <= 0 || img->height > 32767) - return (-1); - if (!load_data) return (0); @@ -1478,7 +1488,7 @@ png_structp pp; /* PNG read pointer */ png_infop info; /* PNG info pointers */ int depth; /* Input image depth */ - png_bytep *rows; /* PNG row pointers */ + png_bytep *rows = NULL; /* PNG row pointers */ uchar *inptr, /* Input pixels */ *outptr; /* Output pixels */ int color_type, /* PNG color mode */ @@ -1508,19 +1518,20 @@ return (-1); } - rows = NULL; - if (setjmp(png_jmpbuf(pp))) { progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!"); png_destroy_read_struct(&pp, &info, NULL); - if (img != NULL && img->pixels != NULL) + if (img != NULL) + { free(img->pixels); + img->pixels = NULL; + } - if (rows != NULL) - free(rows); + free(rows); + rows = NULL; return (-1); } @@ -1617,7 +1628,7 @@ return (0); } - img->pixels = (uchar *)calloc(1,(size_t)(img->width * img->height * depth)); + img->pixels = (uchar *)calloc(1, (size_t)(img->width * img->height * depth)); /* * Allocate pointers... @@ -1709,11 +1720,11 @@ * Free memory and return... */ - free(rows); - png_read_end(pp, info); png_destroy_read_struct(&pp, &info, NULL); + free(rows); + return (0); } #endif // HAVE_LIBPNG @@ -1784,7 +1795,7 @@ if (img == NULL || img->mask == NULL || x < 0 || x >= img->width || - y < 0 || y > img->height) + y < 0 || y >= img->height) return; if (img->maskscale == 8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/htmldoc/license.cxx new/htmldoc-1.9.15/htmldoc/license.cxx --- old/htmldoc-1.9.14/htmldoc/license.cxx 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/htmldoc/license.cxx 2022-02-05 18:41:09.000000000 +0100 @@ -59,7 +59,7 @@ group->labelsize(18); box = new Fl_Box(20, 45, 600, 110, - "Copyright ?? 2011-2020 by Michael R Sweet.\n\n" + "Copyright ?? 2011-2022 by Michael R Sweet.\n\n" "HTMLDOC is provided under the terms of the GNU General Public License and " "comes with absolutely no warranty. Please report problems on the Github " "issues page at:\n\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/htmldoc/mmd.c new/htmldoc-1.9.15/htmldoc/mmd.c --- old/htmldoc-1.9.14/htmldoc/mmd.c 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/htmldoc/mmd.c 2022-02-05 18:41:09.000000000 +0100 @@ -13,7 +13,9 @@ * Define DEBUG to get debug printf messages to stderr. */ -#define DEBUG 0 +#ifndef DEBUG +# define DEBUG 0 +#endif // !DEBUG #if DEBUG > 0 # define DEBUG_printf(...) fprintf(stderr, __VA_ARGS__) # define DEBUG_puts(s) fputs(s, stderr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/htmldoc/ps-pdf.cxx new/htmldoc-1.9.15/htmldoc/ps-pdf.cxx --- old/htmldoc-1.9.14/htmldoc/ps-pdf.cxx 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/htmldoc/ps-pdf.cxx 2022-02-05 18:41:09.000000000 +0100 @@ -6,7 +6,7 @@ * broken into more manageable pieces once we make all of the output * "drivers" into classes... * - * Copyright ?? 2011-2021 by Michael R Sweet. + * Copyright ?? 2011-2022 by Michael R Sweet. * Copyright ?? 1997-2010 by Easy Software Products. All rights reserved. * * This program is free software. Distribution and use rights are outlined in @@ -68,7 +68,7 @@ #define HTMLDOC_ASCII85 //#define HTMLDOC_INTERPOLATION -#define HTMLDOC_PRODUCER "htmldoc " SVERSION " Copyright 2011-2021 by Michael R Sweet" +#define HTMLDOC_PRODUCER "htmldoc " SVERSION " Copyright 2011-2022 by Michael R Sweet" /* @@ -2838,6 +2838,9 @@ * This is for the Table of Contents page... */ + if (chapter_starts[0] < 0 || chapter_starts[0] >= (int)num_pages) + return; + thisobj = pdf_start_object(out); fprintf(out, "/Parent %d 0 R", parent); @@ -2979,15 +2982,17 @@ free(text); } - i = heading_pages[*heading]; - x = 0.0f; - y = heading_tops[*heading] + pages[i].bottom; - pspdf_transform_coords(pages + i, x, y); + if (*heading < (int)num_headings) + { + i = heading_pages[*heading]; + x = 0.0f; + y = heading_tops[*heading] + pages[i].bottom; + pspdf_transform_coords(pages + i, x, y); - fprintf(out, "/Dest[%d 0 R/XYZ %.0f %.0f 0]", - pages_object + 2 * pages[i].outpage + 1, x, y); + fprintf(out, "/Dest[%d 0 R/XYZ %.0f %.0f 0]", pages_object + 2 * pages[i].outpage + 1, x, y); - (*heading) ++; + (*heading) ++; + } } if (prev > 0) @@ -3909,7 +3914,7 @@ { pages[*page].chapter = htmlGetText(t->child->child); - for (int i = *page + 1; i < num_pages; i ++) + for (int i = *page + 1; i < (int)num_pages; i ++) pages[i].chapter = pages[*page].chapter; } @@ -3917,7 +3922,7 @@ { pages[*page].heading = htmlGetText(t->child->child); - for (int i = *page + 1; i < num_pages; i ++) + for (int i = *page + 1; i < (int)num_pages; i ++) pages[i].heading = pages[*page].heading; } @@ -4608,7 +4613,7 @@ { pages[*page].chapter = htmlGetText(current_heading); - for (int i = *page + 1; i < num_pages; i ++) + for (int i = *page + 1; i < (int)num_pages; i ++) pages[i].chapter = pages[*page].chapter; } @@ -4619,7 +4624,7 @@ pages[*page].heading = htmlGetText(current_heading); pages[*page].headnode = current_heading; - for (int i = *page + 1; i < num_pages; i ++) + for (int i = *page + 1; i < (int)num_pages; i ++) { pages[i].heading = pages[*page].heading; pages[i].headnode = current_heading; @@ -5507,9 +5512,7 @@ if (flat->height > height) height = flat->height; - if (flat->markup == MARKUP_BR || - (flat->markup == MARKUP_NONE && flat->data && - flat->data[strlen((char *)flat->data) - 1] == '\n')) + if (flat->markup == MARKUP_BR || (flat->markup == MARKUP_NONE && flat->data && flat->data[0] && flat->data[strlen((char *)flat->data) - 1] == '\n')) break; } @@ -5953,7 +5956,7 @@ break; } - if (height_var != NULL) + if (height_var != NULL && *height_var) { // Hardcode the row height... if (height_var[strlen((char *)height_var) - 1] == '%') @@ -6395,7 +6398,7 @@ cells = NULL; - if ((var = htmlGetVariable(t, (uchar *)"WIDTH")) != NULL) + if ((var = htmlGetVariable(t, (uchar *)"WIDTH")) != NULL && *var) { if (var[strlen((char *)var) - 1] == '%') table_width = (float)(atof((char *)var) * (right - left) / 100.0f); @@ -6408,7 +6411,7 @@ else table_width = right - left; - if ((var = htmlGetVariable(t, (uchar *)"HEIGHT")) != NULL) + if ((var = htmlGetVariable(t, (uchar *)"HEIGHT")) != NULL && *var) { if (var[strlen((char *)var) - 1] == '%') table.height = (float)(atof((char *)var) * (top - bottom) / 100.0f); @@ -6614,7 +6617,7 @@ // Compute the cell size... col_width = get_cell_size(tempcol, 0.0f, table_width, &col_min, &col_pref, &col_height); - if ((var = htmlGetVariable(tempcol, (uchar *)"WIDTH")) != NULL) + if ((var = htmlGetVariable(tempcol, (uchar *)"WIDTH")) != NULL && *var) { if (var[strlen((char *)var) - 1] == '%') { @@ -6724,7 +6727,7 @@ * Now figure out the width of the table... */ - if ((var = htmlGetVariable(t, (uchar *)"WIDTH")) != NULL) + if ((var = htmlGetVariable(t, (uchar *)"WIDTH")) != NULL && *var) { if (var[strlen((char *)var) - 1] == '%') width = (float)(atof((char *)var) * (right - left) / 100.0f); @@ -7070,7 +7073,7 @@ if (height_var != NULL && row == header_row) header_height_var = height_var; - if (cells[row][0] != NULL && height_var != NULL) + if (cells[row][0] != NULL && height_var != NULL && *height_var) { // Row height specified; make sure it'll fit... if (height_var[strlen((char *)height_var) - 1] == '%') @@ -9056,8 +9059,7 @@ (void *)t, left, right, (void *)minwidth, (void *)prefwidth, (void *)minheight)); // First see if the width has been specified for this cell... - if ((var = htmlGetVariable(t, (uchar *)"WIDTH")) != NULL && - (var[strlen((char *)var) - 1] != '%' || (right - left) > 0.0f)) + if ((var = htmlGetVariable(t, (uchar *)"WIDTH")) != NULL && *var && (var[strlen((char *)var) - 1] != '%' || (right - left) > 0.0f)) { // Yes, use it! if (var[strlen((char *)var) - 1] == '%') @@ -9075,7 +9077,7 @@ prefw = 0.0f; // Then the height... - if ((var = htmlGetVariable(t, (uchar *)"HEIGHT")) != NULL) + if ((var = htmlGetVariable(t, (uchar *)"HEIGHT")) != NULL && *var) { // Yes, use it! if (var[strlen((char *)var) - 1] == '%') @@ -9164,8 +9166,7 @@ minw = temp->width; } - if (temp->preformatted && temp->data != NULL && - temp->data[strlen((char *)temp->data) - 1] == '\n') + if (temp->preformatted && temp->data != NULL && temp->data[0] && temp->data[strlen((char *)temp->data) - 1] == '\n') { // End of a line - check preferred width... frag_pref += temp->width + 1; @@ -9195,8 +9196,7 @@ else frag_pref += temp->width; - if (temp->preformatted && temp->data != NULL && - temp->data[strlen((char *)temp->data) - 1] == '\n') + if (temp->preformatted && temp->data != NULL && temp->data[0] && temp->data[strlen((char *)temp->data) - 1] == '\n') { // Check required width... frag_width += temp->width + 1; @@ -9210,9 +9210,7 @@ frag_width = 0.0f; } - else if (!temp->preformatted && temp->data != NULL && - (isspace(temp->data[0]) || - (temp->data[0] && isspace(temp->data[strlen((char *)temp->data) - 1])))) + else if (!temp->preformatted && temp->data != NULL && temp->data[0] && (isspace(temp->data[0]) || (temp->data[0] && isspace(temp->data[strlen((char *)temp->data) - 1])))) { // Check required width... if (isspace(temp->data[0])) @@ -9387,8 +9385,7 @@ (void *)t, left, right, (void *)minwidth, (void *)prefwidth, (void *)minheight)); // First see if the width has been specified for this table... - if ((var = htmlGetVariable(t, (uchar *)"WIDTH")) != NULL && - (var[strlen((char *)var) - 1] != '%' || (right - left) > 0.0f)) + if ((var = htmlGetVariable(t, (uchar *)"WIDTH")) != NULL && *var && (var[strlen((char *)var) - 1] != '%' || (right - left) > 0.0f)) { // Yes, use it! if (var[strlen((char *)var) - 1] == '%') @@ -9403,7 +9400,7 @@ prefw = 0.0f; // Then the height... - if ((var = htmlGetVariable(t, (uchar *)"HEIGHT")) != NULL) + if ((var = htmlGetVariable(t, (uchar *)"HEIGHT")) != NULL && *var) { // Yes, use it! if (var[strlen((char *)var) - 1] == '%') @@ -9689,7 +9686,7 @@ width = htmlGetVariable(t, (uchar *)"WIDTH"); height = htmlGetVariable(t, (uchar *)"HEIGHT"); - if (width != NULL && height != NULL) + if (width != NULL && *width && height != NULL && *height) { if (width[strlen((char *)width) - 1] == '%') t->width = (float)(atof((char *)width) * PagePrintWidth / 100.0f); @@ -9709,7 +9706,7 @@ if (img == NULL) return; - if (width != NULL) + if (width != NULL && *width) { if (width[strlen((char *)width) - 1] == '%') t->width = (float)(atof((char *)width) * PagePrintWidth / 100.0f); @@ -9718,7 +9715,7 @@ t->height = t->width * img->height / img->width; } - else if (height != NULL) + else if (height != NULL && *height) { if (height[strlen((char *)height) - 1] == '%') t->height = (float)(atof((char *)height) * PagePrintWidth / 100.0f); @@ -10302,8 +10299,13 @@ indwidth = 0; if (!img->pixels && !img->obj) + { image_load(img->filename, !OutputColor, 1); + if (!img->pixels) + return; + } + // Note: Acrobat 6 tries to decrypt the colormap of indexed in-line images twice, which // is 1) not consistent with prior Acrobat releases and 2) in violation of their // PDF spec. The "img->use > 1 || !Encryption" test prevents the use of indexed @@ -12482,7 +12484,7 @@ while (fgets(line, sizeof(line), fp) != NULL) fputs(line, out); - if (line[strlen(line) - 1] != '\n') + if (line[0] && line[strlen(line) - 1] != '\n') fputs("\n", out); fputs("%%EndResource\n", out); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/htmldoc/tls-darwin.c new/htmldoc-1.9.15/htmldoc/tls-darwin.c --- old/htmldoc-1.9.14/htmldoc/tls-darwin.c 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/htmldoc/tls-darwin.c 2022-02-05 18:41:09.000000000 +0100 @@ -449,7 +449,7 @@ SecCertificateRef secCert; /* Certificate reference */ - DEBUG_printf(("httpCredentialsString(credentials=%p, buffer=%p, bufsize=" CUPS_LLFMT ")", (void *)credentials, (void *)buffer, CUPS_LLCAST bufsize)); + DEBUG_printf(("httpCredentialsString(credentials=%p, buffer=%p, bufsize=" HTMLDOC_LLFMT ")", (void *)credentials, (void *)buffer, HTMLDOC_LLCAST bufsize)); if (!buffer) return (0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/htmldoc/zipc.c new/htmldoc-1.9.15/htmldoc/zipc.c --- old/htmldoc-1.9.14/htmldoc/zipc.c 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/htmldoc/zipc.c 2022-02-05 18:41:09.000000000 +0100 @@ -624,8 +624,8 @@ if (zc->readptr && zc->readptr < zc->readend) { rbytes = zc->readend - zc->readptr; - if (rbytes > bytes) - rbytes = bytes; + if (rbytes > (ssize_t)bytes) + rbytes = (ssize_t)bytes; memcpy(data, zc->readptr, rbytes); zc->readptr += rbytes; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/snap/snapcraft.yaml new/htmldoc-1.9.15/snap/snapcraft.yaml --- old/htmldoc-1.9.14/snap/snapcraft.yaml 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/snap/snapcraft.yaml 2022-02-05 18:41:09.000000000 +0100 @@ -1,6 +1,6 @@ name: htmldoc base: core20 -version: 1.9.14 +version: 1.9.15 summary: HTML and Markdown conversion utility description: | HTMLDOC is a program that reads HTML and Markdown source files or web pages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/vcnet/config.h new/htmldoc-1.9.15/vcnet/config.h --- old/htmldoc-1.9.14/vcnet/config.h 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/vcnet/config.h 2022-02-05 18:41:09.000000000 +0100 @@ -1,7 +1,7 @@ /* * Configuration file for HTMLDOC. * - * Copyright ????2011-2021 by Michael R Sweet. + * Copyright ????2011-2022 by Michael R Sweet. * Copyright ????1997-2010 by Easy Software Products. All rights reserved. * * This program is free software. Distribution and use rights are outlined in @@ -88,7 +88,7 @@ * What is the version number for this software? */ -#define SVERSION "1.9.14" +#define SVERSION "1.9.15" /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/vcnet/htmldoc-installer.aip new/htmldoc-1.9.15/vcnet/htmldoc-installer.aip --- old/htmldoc-1.9.14/vcnet/htmldoc-installer.aip 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/vcnet/htmldoc-installer.aip 2022-02-05 18:41:09.000000000 +0100 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<DOCUMENT Type="Advanced Installer" CreateVersion="15.3" version="19.0" Modules="simple" RootPath="." Language="en" Id="{8101414C-E32A-4865-B7D9-ABB4FFFB336F}"> +<DOCUMENT Type="Advanced Installer" CreateVersion="15.3" version="19.1" Modules="simple" RootPath="." Language="en" Id="{8101414C-E32A-4865-B7D9-ABB4FFFB336F}"> <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent"> <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/> - <ROW Property="AI_CURRENT_YEAR" Value="2021" ValueLocId="-"/> + <ROW Property="AI_CURRENT_YEAR" Value="2022" ValueLocId="-"/> <ROW Property="AI_PROPPATH_DIR_PERBUILD_ghtmldoc.exe" Value="x64\Release\ghtmldoc"/> <ROW Property="AI_PROPPATH_DIR_PERBUILD_htmldoc.exe" Value="x64\Release"/> <ROW Property="AI_PROPPATH_FILENAME_PERBUILD_ghtmldoc.exe" Value="ghtmldoc.exe"/> @@ -14,10 +14,10 @@ <ROW Property="ARPPRODUCTICON" Value="htmldoc.exe" Type="8"/> <ROW Property="ARPURLINFOABOUT" Value="https://www.msweet.org/htmldoc"/> <ROW Property="Manufacturer" Value="Michael R Sweet"/> - <ROW Property="ProductCode" Value="1033:{A8FCA8C4-2144-44E8-A4B9-871611CFAA60} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{20C49885-ABD0-4F20-B13A-3ED4D0888BF8} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="HTMLDOC"/> - <ROW Property="ProductVersion" Value="1.9.14.0" Type="32"/> + <ROW Property="ProductVersion" Value="1.9.15.0" Type="32"/> <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/> <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/> <ROW Property="UpgradeCode" Value="{4016A37E-404B-4785-B768-D4FF161DE6E9}"/> @@ -166,6 +166,7 @@ <ROW Fragment="SequenceDialogs.aip" Path="<AI_THEMES>classic\fragments\SequenceDialogs.aip"/> <ROW Fragment="Sequences.aip" Path="<AI_FRAGS>Sequences.aip"/> <ROW Fragment="StaticUIStrings.aip" Path="<AI_FRAGS>StaticUIStrings.aip"/> + <ROW Fragment="Themes.aip" Path="<AI_FRAGS>Themes.aip"/> <ROW Fragment="UI.aip" Path="<AI_THEMES>classic\fragments\UI.aip"/> <ROW Fragment="Validation.aip" Path="<AI_FRAGS>Validation.aip"/> <ROW Fragment="VerifyRemoveDlg.aip" Path="<AI_THEMES>classic\fragments\VerifyRemoveDlg.aip"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/xcode/config.h new/htmldoc-1.9.15/xcode/config.h --- old/htmldoc-1.9.14/xcode/config.h 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/xcode/config.h 2022-02-05 18:41:09.000000000 +0100 @@ -1,7 +1,7 @@ /* * Configuration file for HTMLDOC. * - * Copyright ????2011-2021 by Michael R Sweet. + * Copyright ????2011-2022 by Michael R Sweet. * Copyright ????1997-2010 by Easy Software Products. All rights reserved. * * This program is free software. Distribution and use rights are outlined in @@ -12,7 +12,7 @@ * What is the version number for this software? */ -#define SVERSION "1.9.14" +#define SVERSION "1.9.15" /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/htmldoc-1.9.14/xcode/htmldoc.xcodeproj/project.pbxproj new/htmldoc-1.9.15/xcode/htmldoc.xcodeproj/project.pbxproj --- old/htmldoc-1.9.14/xcode/htmldoc.xcodeproj/project.pbxproj 2021-12-23 01:55:23.000000000 +0100 +++ new/htmldoc-1.9.15/xcode/htmldoc.xcodeproj/project.pbxproj 2022-02-05 18:41:09.000000000 +0100 @@ -32,9 +32,6 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 27422F1110E7311E0095C134 /* jaricom.c in Sources */ = {isa = PBXBuildFile; fileRef = 27422F0E10E7311E0095C134 /* jaricom.c */; }; - 27422F1210E7311E0095C134 /* jcarith.c in Sources */ = {isa = PBXBuildFile; fileRef = 27422F0F10E7311E0095C134 /* jcarith.c */; }; - 27422F1310E7311E0095C134 /* jdarith.c in Sources */ = {isa = PBXBuildFile; fileRef = 27422F1010E7311E0095C134 /* jdarith.c */; }; 2788A4CF1EAEF234007ED0E1 /* epub.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2788A4C81EAEF234007ED0E1 /* epub.cxx */; }; 2788A4D01EAEF234007ED0E1 /* markdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2788A4C91EAEF234007ED0E1 /* markdown.cxx */; }; 2788A4D11EAEF234007ED0E1 /* mmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 2788A4CB1EAEF234007ED0E1 /* mmd.c */; }; @@ -51,9 +48,17 @@ 27A9F6F118D527AC00804DE9 /* rc4.c in Sources */ = {isa = PBXBuildFile; fileRef = 27A9F6E718D527AC00804DE9 /* rc4.c */; }; 27A9F6F318D527D300804DE9 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A9F6F218D527D300804DE9 /* Security.framework */; }; 27A9F6F518D527D900804DE9 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A9F6F418D527D900804DE9 /* CoreFoundation.framework */; }; - 27A9F6F718D527E400804DE9 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A9F6F618D527E400804DE9 /* libresolv.dylib */; }; - 27A9F6FB18D528C200804DE9 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A9F6FA18D528C200804DE9 /* libz.dylib */; }; 27A9F6FE18D5450C00804DE9 /* htmldoc.man in CopyFiles */ = {isa = PBXBuildFile; fileRef = 27A9F6FD18D5294000804DE9 /* htmldoc.man */; }; + 27CACC3E2794ED5A00BC4A11 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 27CACC3D2794ED5A00BC4A11 /* libz.tbd */; }; + 27CACC402794ED6200BC4A11 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 27CACC3F2794ED6200BC4A11 /* libresolv.tbd */; }; + 27CACC412794EDA200BC4A11 /* libpng16.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D3E1822794DC0D0034494A /* libpng16.a */; }; + 27CACC442794F22500BC4A11 /* libfltk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27CACC422794F22500BC4A11 /* libfltk.a */; }; + 27CACC452794F22500BC4A11 /* libfltk_images.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27CACC432794F22500BC4A11 /* libfltk_images.a */; }; + 27CACC472794F23000BC4A11 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27CACC462794F23000BC4A11 /* CoreGraphics.framework */; }; + 27CACC492794F23C00BC4A11 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27CACC482794F23C00BC4A11 /* CoreText.framework */; }; + 27CACC4D2794F25500BC4A11 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27CACC4C2794F25500BC4A11 /* Cocoa.framework */; }; + 27CACC502794F2CF00BC4A11 /* gui.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27CACC4E2794F2CF00BC4A11 /* gui.cxx */; }; + 27D3E1852794DC0D0034494A /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D3E1832794DC0D0034494A /* libjpeg.a */; }; 27D5714A1C3863E200D93F41 /* tls.c in Sources */ = {isa = PBXBuildFile; fileRef = 27D571461C3863E200D93F41 /* tls.c */; }; 27D5714E1C386EFF00D93F41 /* array.c in Sources */ = {isa = PBXBuildFile; fileRef = 27D5714C1C386EFF00D93F41 /* array.c */; }; 27DD25520EC01A3300B76D4E /* html.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27DD252F0EC01A3300B76D4E /* html.cxx */; }; @@ -64,77 +69,6 @@ 27DD255F0EC01A3300B76D4E /* ps-pdf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25440EC01A3300B76D4E /* ps-pdf.cxx */; }; 27DD25660EC01A3300B76D4E /* toc.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27DD254D0EC01A3300B76D4E /* toc.cxx */; }; 27DD25670EC01A3300B76D4E /* util.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27DD254F0EC01A3300B76D4E /* util.cxx */; }; - 27DD25D30EC01D1200B76D4E /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD259A0EC01D1200B76D4E /* jcapimin.c */; }; - 27DD25D40EC01D1200B76D4E /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD259B0EC01D1200B76D4E /* jcapistd.c */; }; - 27DD25D50EC01D1200B76D4E /* jccoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD259C0EC01D1200B76D4E /* jccoefct.c */; }; - 27DD25D60EC01D1200B76D4E /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD259D0EC01D1200B76D4E /* jccolor.c */; }; - 27DD25D70EC01D1200B76D4E /* jcdctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD259E0EC01D1200B76D4E /* jcdctmgr.c */; }; - 27DD25D80EC01D1200B76D4E /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD259F0EC01D1200B76D4E /* jchuff.c */; }; - 27DD25DA0EC01D1200B76D4E /* jcinit.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25A10EC01D1200B76D4E /* jcinit.c */; }; - 27DD25DB0EC01D1200B76D4E /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25A20EC01D1200B76D4E /* jcmainct.c */; }; - 27DD25DC0EC01D1200B76D4E /* jcmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25A30EC01D1200B76D4E /* jcmarker.c */; }; - 27DD25DD0EC01D1200B76D4E /* jcmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25A40EC01D1200B76D4E /* jcmaster.c */; }; - 27DD25DE0EC01D1200B76D4E /* jcomapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25A50EC01D1200B76D4E /* jcomapi.c */; }; - 27DD25DF0EC01D1200B76D4E /* jconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25A60EC01D1200B76D4E /* jconfig.h */; }; - 27DD25E00EC01D1200B76D4E /* jcparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25A70EC01D1200B76D4E /* jcparam.c */; }; - 27DD25E20EC01D1200B76D4E /* jcprepct.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25A90EC01D1200B76D4E /* jcprepct.c */; }; - 27DD25E30EC01D1200B76D4E /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25AA0EC01D1200B76D4E /* jcsample.c */; }; - 27DD25E40EC01D1200B76D4E /* jctrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25AB0EC01D1200B76D4E /* jctrans.c */; }; - 27DD25E50EC01D1200B76D4E /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25AC0EC01D1200B76D4E /* jdapimin.c */; }; - 27DD25E60EC01D1200B76D4E /* jdapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25AD0EC01D1200B76D4E /* jdapistd.c */; }; - 27DD25E70EC01D1200B76D4E /* jdatadst.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25AE0EC01D1200B76D4E /* jdatadst.c */; }; - 27DD25E80EC01D1200B76D4E /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25AF0EC01D1200B76D4E /* jdatasrc.c */; }; - 27DD25E90EC01D1200B76D4E /* jdcoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25B00EC01D1200B76D4E /* jdcoefct.c */; }; - 27DD25EA0EC01D1200B76D4E /* jdcolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25B10EC01D1200B76D4E /* jdcolor.c */; }; - 27DD25EB0EC01D1200B76D4E /* jdct.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25B20EC01D1200B76D4E /* jdct.h */; }; - 27DD25EC0EC01D1200B76D4E /* jddctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25B30EC01D1200B76D4E /* jddctmgr.c */; }; - 27DD25ED0EC01D1200B76D4E /* jdhuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25B40EC01D1200B76D4E /* jdhuff.c */; }; - 27DD25EF0EC01D1200B76D4E /* jdinput.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25B60EC01D1200B76D4E /* jdinput.c */; }; - 27DD25F00EC01D1200B76D4E /* jdmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25B70EC01D1200B76D4E /* jdmainct.c */; }; - 27DD25F10EC01D1200B76D4E /* jdmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25B80EC01D1200B76D4E /* jdmarker.c */; }; - 27DD25F20EC01D1200B76D4E /* jdmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25B90EC01D1200B76D4E /* jdmaster.c */; }; - 27DD25F30EC01D1200B76D4E /* jdmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25BA0EC01D1200B76D4E /* jdmerge.c */; }; - 27DD25F50EC01D1200B76D4E /* jdpostct.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25BC0EC01D1200B76D4E /* jdpostct.c */; }; - 27DD25F60EC01D1200B76D4E /* jdsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25BD0EC01D1200B76D4E /* jdsample.c */; }; - 27DD25F70EC01D1200B76D4E /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25BE0EC01D1200B76D4E /* jdtrans.c */; }; - 27DD25F80EC01D1200B76D4E /* jerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25BF0EC01D1200B76D4E /* jerror.c */; }; - 27DD25F90EC01D1200B76D4E /* jerror.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25C00EC01D1200B76D4E /* jerror.h */; }; - 27DD25FA0EC01D1200B76D4E /* jfdctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25C10EC01D1200B76D4E /* jfdctflt.c */; }; - 27DD25FB0EC01D1200B76D4E /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25C20EC01D1200B76D4E /* jfdctfst.c */; }; - 27DD25FC0EC01D1200B76D4E /* jfdctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25C30EC01D1200B76D4E /* jfdctint.c */; }; - 27DD25FD0EC01D1200B76D4E /* jidctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25C40EC01D1200B76D4E /* jidctflt.c */; }; - 27DD25FE0EC01D1200B76D4E /* jidctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25C50EC01D1200B76D4E /* jidctfst.c */; }; - 27DD25FF0EC01D1200B76D4E /* jidctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25C60EC01D1200B76D4E /* jidctint.c */; }; - 27DD26010EC01D1200B76D4E /* jinclude.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25C80EC01D1200B76D4E /* jinclude.h */; }; - 27DD26020EC01D1200B76D4E /* jmemmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25C90EC01D1200B76D4E /* jmemmgr.c */; }; - 27DD26030EC01D1200B76D4E /* jmemnobs.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25CA0EC01D1200B76D4E /* jmemnobs.c */; }; - 27DD26040EC01D1200B76D4E /* jmemsys.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25CB0EC01D1200B76D4E /* jmemsys.h */; }; - 27DD26050EC01D1200B76D4E /* jmorecfg.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25CC0EC01D1200B76D4E /* jmorecfg.h */; }; - 27DD26060EC01D1200B76D4E /* jpegint.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25CD0EC01D1200B76D4E /* jpegint.h */; }; - 27DD26070EC01D1200B76D4E /* jpeglib.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25CE0EC01D1200B76D4E /* jpeglib.h */; }; - 27DD26080EC01D1200B76D4E /* jquant1.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25CF0EC01D1200B76D4E /* jquant1.c */; }; - 27DD26090EC01D1200B76D4E /* jquant2.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25D00EC01D1200B76D4E /* jquant2.c */; }; - 27DD260A0EC01D1200B76D4E /* jutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD25D10EC01D1200B76D4E /* jutils.c */; }; - 27DD260B0EC01D1200B76D4E /* jversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD25D20EC01D1200B76D4E /* jversion.h */; }; - 27DD261D0EC01D5800B76D4E /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD260C0EC01D5700B76D4E /* png.c */; }; - 27DD261E0EC01D5800B76D4E /* png.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD260D0EC01D5700B76D4E /* png.h */; }; - 27DD261F0EC01D5800B76D4E /* pngconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DD260E0EC01D5700B76D4E /* pngconf.h */; }; - 27DD26200EC01D5800B76D4E /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD260F0EC01D5700B76D4E /* pngerror.c */; }; - 27DD26210EC01D5800B76D4E /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26100EC01D5700B76D4E /* pngget.c */; }; - 27DD26220EC01D5800B76D4E /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26110EC01D5700B76D4E /* pngmem.c */; }; - 27DD26230EC01D5800B76D4E /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26120EC01D5700B76D4E /* pngpread.c */; }; - 27DD26240EC01D5800B76D4E /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26130EC01D5700B76D4E /* pngread.c */; }; - 27DD26250EC01D5800B76D4E /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26140EC01D5700B76D4E /* pngrio.c */; }; - 27DD26260EC01D5800B76D4E /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26150EC01D5700B76D4E /* pngrtran.c */; }; - 27DD26270EC01D5800B76D4E /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26160EC01D5700B76D4E /* pngrutil.c */; }; - 27DD26280EC01D5800B76D4E /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26170EC01D5700B76D4E /* pngset.c */; }; - 27DD26290EC01D5800B76D4E /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26180EC01D5700B76D4E /* pngtrans.c */; }; - 27DD262A0EC01D5800B76D4E /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26190EC01D5700B76D4E /* pngwio.c */; }; - 27DD262B0EC01D5800B76D4E /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD261A0EC01D5700B76D4E /* pngwrite.c */; }; - 27DD262C0EC01D5800B76D4E /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD261B0EC01D5700B76D4E /* pngwtran.c */; }; - 27DD262D0EC01D5800B76D4E /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD261C0EC01D5700B76D4E /* pngwutil.c */; }; - 27DD262E0EC0228D00B76D4E /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27DD25950EC01C4E00B76D4E /* libpng.a */; }; - 27DD262F0EC0229A00B76D4E /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27DD258C0EC01C4200B76D4E /* libjpeg.a */; }; 27DD26460EC024FA00B76D4E /* string.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DD26450EC024FA00B76D4E /* string.c */; }; 27DD26930EC028AC00B76D4E /* Courier-Bold.afm in CopyFiles */ = {isa = PBXBuildFile; fileRef = 27DD265B0EC028AC00B76D4E /* Courier-Bold.afm */; }; 27DD26940EC028AC00B76D4E /* Courier-Bold.pfa in CopyFiles */ = {isa = PBXBuildFile; fileRef = 27DD265C0EC028AC00B76D4E /* Courier-Bold.pfa */; }; @@ -215,20 +149,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 27DD26370EC0244100B76D4E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 27DD258B0EC01C4200B76D4E; - remoteInfo = jpeg; - }; - 27DD26390EC0244300B76D4E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 27DD25940EC01C4E00B76D4E; - remoteInfo = png; - }; 27DD270B0EC029FD00B76D4E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; @@ -353,9 +273,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 27422F0E10E7311E0095C134 /* jaricom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jaricom.c; path = ../jpeg/jaricom.c; sourceTree = SOURCE_ROOT; }; - 27422F0F10E7311E0095C134 /* jcarith.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcarith.c; path = ../jpeg/jcarith.c; sourceTree = SOURCE_ROOT; }; - 27422F1010E7311E0095C134 /* jdarith.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdarith.c; path = ../jpeg/jdarith.c; sourceTree = SOURCE_ROOT; }; 2788A4C71EAEF1B4007ED0E1 /* htmldoc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = htmldoc; sourceTree = BUILT_PRODUCTS_DIR; }; 2788A4C81EAEF234007ED0E1 /* epub.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = epub.cxx; path = ../htmldoc/epub.cxx; sourceTree = "<group>"; }; 2788A4C91EAEF234007ED0E1 /* markdown.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = markdown.cxx; path = ../htmldoc/markdown.cxx; sourceTree = "<group>"; }; @@ -379,9 +296,19 @@ 27A9F6E718D527AC00804DE9 /* rc4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rc4.c; path = ../htmldoc/rc4.c; sourceTree = "<group>"; }; 27A9F6F218D527D300804DE9 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 27A9F6F418D527D900804DE9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - 27A9F6F618D527E400804DE9 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; }; - 27A9F6FA18D528C200804DE9 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 27A9F6FD18D5294000804DE9 /* htmldoc.man */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = htmldoc.man; path = ../doc/htmldoc.man; sourceTree = "<group>"; }; + 27CACC3D2794ED5A00BC4A11 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 27CACC3F2794ED6200BC4A11 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; + 27CACC422794F22500BC4A11 /* libfltk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfltk.a; path = ../../../../../usr/local/lib/libfltk.a; sourceTree = "<group>"; }; + 27CACC432794F22500BC4A11 /* libfltk_images.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfltk_images.a; path = ../../../../../usr/local/lib/libfltk_images.a; sourceTree = "<group>"; }; + 27CACC462794F23000BC4A11 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 27CACC482794F23C00BC4A11 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; + 27CACC4A2794F24700BC4A11 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; + 27CACC4C2794F25500BC4A11 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + 27CACC4E2794F2CF00BC4A11 /* gui.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gui.cxx; path = ../htmldoc/gui.cxx; sourceTree = "<group>"; }; + 27CACC4F2794F2CF00BC4A11 /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gui.h; path = ../htmldoc/gui.h; sourceTree = "<group>"; }; + 27D3E1822794DC0D0034494A /* libpng16.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng16.a; path = ../../../../../usr/local/lib/libpng16.a; sourceTree = "<group>"; }; + 27D3E1832794DC0D0034494A /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../../usr/local/lib/libjpeg.a; sourceTree = "<group>"; }; 27D571431C3863E200D93F41 /* tls-darwin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "tls-darwin.c"; path = "../htmldoc/tls-darwin.c"; sourceTree = "<group>"; }; 27D571441C3863E200D93F41 /* tls-gnutls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "tls-gnutls.c"; path = "../htmldoc/tls-gnutls.c"; sourceTree = "<group>"; }; 27D571451C3863E200D93F41 /* tls-sspi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "tls-sspi.c"; path = "../htmldoc/tls-sspi.c"; sourceTree = "<group>"; }; @@ -408,77 +335,6 @@ 27DD254D0EC01A3300B76D4E /* toc.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = toc.cxx; path = ../htmldoc/toc.cxx; sourceTree = SOURCE_ROOT; }; 27DD254E0EC01A3300B76D4E /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = types.h; path = ../htmldoc/types.h; sourceTree = SOURCE_ROOT; }; 27DD254F0EC01A3300B76D4E /* util.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = util.cxx; path = ../htmldoc/util.cxx; sourceTree = SOURCE_ROOT; }; - 27DD258C0EC01C4200B76D4E /* libjpeg.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjpeg.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 27DD25950EC01C4E00B76D4E /* libpng.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpng.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 27DD259A0EC01D1200B76D4E /* jcapimin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../jpeg/jcapimin.c; sourceTree = SOURCE_ROOT; }; - 27DD259B0EC01D1200B76D4E /* jcapistd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcapistd.c; path = ../jpeg/jcapistd.c; sourceTree = SOURCE_ROOT; }; - 27DD259C0EC01D1200B76D4E /* jccoefct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jccoefct.c; path = ../jpeg/jccoefct.c; sourceTree = SOURCE_ROOT; }; - 27DD259D0EC01D1200B76D4E /* jccolor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jccolor.c; path = ../jpeg/jccolor.c; sourceTree = SOURCE_ROOT; }; - 27DD259E0EC01D1200B76D4E /* jcdctmgr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcdctmgr.c; path = ../jpeg/jcdctmgr.c; sourceTree = SOURCE_ROOT; }; - 27DD259F0EC01D1200B76D4E /* jchuff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jchuff.c; path = ../jpeg/jchuff.c; sourceTree = SOURCE_ROOT; }; - 27DD25A10EC01D1200B76D4E /* jcinit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcinit.c; path = ../jpeg/jcinit.c; sourceTree = SOURCE_ROOT; }; - 27DD25A20EC01D1200B76D4E /* jcmainct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcmainct.c; path = ../jpeg/jcmainct.c; sourceTree = SOURCE_ROOT; }; - 27DD25A30EC01D1200B76D4E /* jcmarker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcmarker.c; path = ../jpeg/jcmarker.c; sourceTree = SOURCE_ROOT; }; - 27DD25A40EC01D1200B76D4E /* jcmaster.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcmaster.c; path = ../jpeg/jcmaster.c; sourceTree = SOURCE_ROOT; }; - 27DD25A50EC01D1200B76D4E /* jcomapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcomapi.c; path = ../jpeg/jcomapi.c; sourceTree = SOURCE_ROOT; }; - 27DD25A60EC01D1200B76D4E /* jconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jconfig.h; path = ../jpeg/jconfig.h; sourceTree = SOURCE_ROOT; }; - 27DD25A70EC01D1200B76D4E /* jcparam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcparam.c; path = ../jpeg/jcparam.c; sourceTree = SOURCE_ROOT; }; - 27DD25A90EC01D1200B76D4E /* jcprepct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcprepct.c; path = ../jpeg/jcprepct.c; sourceTree = SOURCE_ROOT; }; - 27DD25AA0EC01D1200B76D4E /* jcsample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcsample.c; path = ../jpeg/jcsample.c; sourceTree = SOURCE_ROOT; }; - 27DD25AB0EC01D1200B76D4E /* jctrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jctrans.c; path = ../jpeg/jctrans.c; sourceTree = SOURCE_ROOT; }; - 27DD25AC0EC01D1200B76D4E /* jdapimin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdapimin.c; path = ../jpeg/jdapimin.c; sourceTree = SOURCE_ROOT; }; - 27DD25AD0EC01D1200B76D4E /* jdapistd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../jpeg/jdapistd.c; sourceTree = SOURCE_ROOT; }; - 27DD25AE0EC01D1200B76D4E /* jdatadst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdatadst.c; path = ../jpeg/jdatadst.c; sourceTree = SOURCE_ROOT; }; - 27DD25AF0EC01D1200B76D4E /* jdatasrc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdatasrc.c; path = ../jpeg/jdatasrc.c; sourceTree = SOURCE_ROOT; }; - 27DD25B00EC01D1200B76D4E /* jdcoefct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdcoefct.c; path = ../jpeg/jdcoefct.c; sourceTree = SOURCE_ROOT; }; - 27DD25B10EC01D1200B76D4E /* jdcolor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdcolor.c; path = ../jpeg/jdcolor.c; sourceTree = SOURCE_ROOT; }; - 27DD25B20EC01D1200B76D4E /* jdct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jdct.h; path = ../jpeg/jdct.h; sourceTree = SOURCE_ROOT; }; - 27DD25B30EC01D1200B76D4E /* jddctmgr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jddctmgr.c; path = ../jpeg/jddctmgr.c; sourceTree = SOURCE_ROOT; }; - 27DD25B40EC01D1200B76D4E /* jdhuff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../jpeg/jdhuff.c; sourceTree = SOURCE_ROOT; }; - 27DD25B60EC01D1200B76D4E /* jdinput.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdinput.c; path = ../jpeg/jdinput.c; sourceTree = SOURCE_ROOT; }; - 27DD25B70EC01D1200B76D4E /* jdmainct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdmainct.c; path = ../jpeg/jdmainct.c; sourceTree = SOURCE_ROOT; }; - 27DD25B80EC01D1200B76D4E /* jdmarker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdmarker.c; path = ../jpeg/jdmarker.c; sourceTree = SOURCE_ROOT; }; - 27DD25B90EC01D1200B76D4E /* jdmaster.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdmaster.c; path = ../jpeg/jdmaster.c; sourceTree = SOURCE_ROOT; }; - 27DD25BA0EC01D1200B76D4E /* jdmerge.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdmerge.c; path = ../jpeg/jdmerge.c; sourceTree = SOURCE_ROOT; }; - 27DD25BC0EC01D1200B76D4E /* jdpostct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdpostct.c; path = ../jpeg/jdpostct.c; sourceTree = SOURCE_ROOT; }; - 27DD25BD0EC01D1200B76D4E /* jdsample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdsample.c; path = ../jpeg/jdsample.c; sourceTree = SOURCE_ROOT; }; - 27DD25BE0EC01D1200B76D4E /* jdtrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jdtrans.c; path = ../jpeg/jdtrans.c; sourceTree = SOURCE_ROOT; }; - 27DD25BF0EC01D1200B76D4E /* jerror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jerror.c; path = ../jpeg/jerror.c; sourceTree = SOURCE_ROOT; }; - 27DD25C00EC01D1200B76D4E /* jerror.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jerror.h; path = ../jpeg/jerror.h; sourceTree = SOURCE_ROOT; }; - 27DD25C10EC01D1200B76D4E /* jfdctflt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfdctflt.c; path = ../jpeg/jfdctflt.c; sourceTree = SOURCE_ROOT; }; - 27DD25C20EC01D1200B76D4E /* jfdctfst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfdctfst.c; path = ../jpeg/jfdctfst.c; sourceTree = SOURCE_ROOT; }; - 27DD25C30EC01D1200B76D4E /* jfdctint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfdctint.c; path = ../jpeg/jfdctint.c; sourceTree = SOURCE_ROOT; }; - 27DD25C40EC01D1200B76D4E /* jidctflt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../jpeg/jidctflt.c; sourceTree = SOURCE_ROOT; }; - 27DD25C50EC01D1200B76D4E /* jidctfst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jidctfst.c; path = ../jpeg/jidctfst.c; sourceTree = SOURCE_ROOT; }; - 27DD25C60EC01D1200B76D4E /* jidctint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../jpeg/jidctint.c; sourceTree = SOURCE_ROOT; }; - 27DD25C80EC01D1200B76D4E /* jinclude.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jinclude.h; path = ../jpeg/jinclude.h; sourceTree = SOURCE_ROOT; }; - 27DD25C90EC01D1200B76D4E /* jmemmgr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jmemmgr.c; path = ../jpeg/jmemmgr.c; sourceTree = SOURCE_ROOT; }; - 27DD25CA0EC01D1200B76D4E /* jmemnobs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jmemnobs.c; path = ../jpeg/jmemnobs.c; sourceTree = SOURCE_ROOT; }; - 27DD25CB0EC01D1200B76D4E /* jmemsys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jmemsys.h; path = ../jpeg/jmemsys.h; sourceTree = SOURCE_ROOT; }; - 27DD25CC0EC01D1200B76D4E /* jmorecfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jmorecfg.h; path = ../jpeg/jmorecfg.h; sourceTree = SOURCE_ROOT; }; - 27DD25CD0EC01D1200B76D4E /* jpegint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jpegint.h; path = ../jpeg/jpegint.h; sourceTree = SOURCE_ROOT; }; - 27DD25CE0EC01D1200B76D4E /* jpeglib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jpeglib.h; path = ../jpeg/jpeglib.h; sourceTree = SOURCE_ROOT; }; - 27DD25CF0EC01D1200B76D4E /* jquant1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../jpeg/jquant1.c; sourceTree = SOURCE_ROOT; }; - 27DD25D00EC01D1200B76D4E /* jquant2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jquant2.c; path = ../jpeg/jquant2.c; sourceTree = SOURCE_ROOT; }; - 27DD25D10EC01D1200B76D4E /* jutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jutils.c; path = ../jpeg/jutils.c; sourceTree = SOURCE_ROOT; }; - 27DD25D20EC01D1200B76D4E /* jversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jversion.h; path = ../jpeg/jversion.h; sourceTree = SOURCE_ROOT; }; - 27DD260C0EC01D5700B76D4E /* png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../png/png.c; sourceTree = SOURCE_ROOT; }; - 27DD260D0EC01D5700B76D4E /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = png.h; path = ../png/png.h; sourceTree = SOURCE_ROOT; }; - 27DD260E0EC01D5700B76D4E /* pngconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngconf.h; path = ../png/pngconf.h; sourceTree = SOURCE_ROOT; }; - 27DD260F0EC01D5700B76D4E /* pngerror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngerror.c; path = ../png/pngerror.c; sourceTree = SOURCE_ROOT; }; - 27DD26100EC01D5700B76D4E /* pngget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = ../png/pngget.c; sourceTree = SOURCE_ROOT; }; - 27DD26110EC01D5700B76D4E /* pngmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngmem.c; path = ../png/pngmem.c; sourceTree = SOURCE_ROOT; }; - 27DD26120EC01D5700B76D4E /* pngpread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../png/pngpread.c; sourceTree = SOURCE_ROOT; }; - 27DD26130EC01D5700B76D4E /* pngread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngread.c; path = ../png/pngread.c; sourceTree = SOURCE_ROOT; }; - 27DD26140EC01D5700B76D4E /* pngrio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngrio.c; path = ../png/pngrio.c; sourceTree = SOURCE_ROOT; }; - 27DD26150EC01D5700B76D4E /* pngrtran.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../png/pngrtran.c; sourceTree = SOURCE_ROOT; }; - 27DD26160EC01D5700B76D4E /* pngrutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../png/pngrutil.c; sourceTree = SOURCE_ROOT; }; - 27DD26170EC01D5700B76D4E /* pngset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngset.c; path = ../png/pngset.c; sourceTree = SOURCE_ROOT; }; - 27DD26180EC01D5700B76D4E /* pngtrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../png/pngtrans.c; sourceTree = SOURCE_ROOT; }; - 27DD26190EC01D5700B76D4E /* pngwio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngwio.c; path = ../png/pngwio.c; sourceTree = SOURCE_ROOT; }; - 27DD261A0EC01D5700B76D4E /* pngwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = ../png/pngwrite.c; sourceTree = SOURCE_ROOT; }; - 27DD261B0EC01D5700B76D4E /* pngwtran.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngwtran.c; path = ../png/pngwtran.c; sourceTree = SOURCE_ROOT; }; - 27DD261C0EC01D5700B76D4E /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = ../png/pngwutil.c; sourceTree = SOURCE_ROOT; }; 27DD26450EC024FA00B76D4E /* string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = string.c; path = ../htmldoc/string.c; sourceTree = SOURCE_ROOT; }; 27DD265B0EC028AC00B76D4E /* Courier-Bold.afm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "Courier-Bold.afm"; path = "../fonts/Courier-Bold.afm"; sourceTree = SOURCE_ROOT; }; 27DD265C0EC028AC00B76D4E /* Courier-Bold.pfa */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "Courier-Bold.pfa"; path = "../fonts/Courier-Bold.pfa"; sourceTree = SOURCE_ROOT; }; @@ -559,30 +415,21 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 27DD258A0EC01C4200B76D4E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 27DD25930EC01C4E00B76D4E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 8DD76F660486A84900D96B5E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 27A9F6FB18D528C200804DE9 /* libz.dylib in Frameworks */, - 27A9F6F718D527E400804DE9 /* libresolv.dylib in Frameworks */, + 27CACC4D2794F25500BC4A11 /* Cocoa.framework in Frameworks */, + 27CACC492794F23C00BC4A11 /* CoreText.framework in Frameworks */, + 27CACC472794F23000BC4A11 /* CoreGraphics.framework in Frameworks */, + 27CACC442794F22500BC4A11 /* libfltk.a in Frameworks */, + 27CACC452794F22500BC4A11 /* libfltk_images.a in Frameworks */, + 27CACC412794EDA200BC4A11 /* libpng16.a in Frameworks */, + 27CACC402794ED6200BC4A11 /* libresolv.tbd in Frameworks */, + 27CACC3E2794ED5A00BC4A11 /* libz.tbd in Frameworks */, + 27D3E1852794DC0D0034494A /* libjpeg.a in Frameworks */, 27A9F6F518D527D900804DE9 /* CoreFoundation.framework in Frameworks */, 27A9F6F318D527D300804DE9 /* Security.framework in Frameworks */, - 27DD262E0EC0228D00B76D4E /* libpng.a in Frameworks */, - 27DD262F0EC0229A00B76D4E /* libjpeg.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -593,13 +440,9 @@ isa = PBXGroup; children = ( 08FB7795FE84155DC02AAC07 /* htmldoc */, - 1AB674ADFE9D54B511CA2CBB /* libjpeg */, - C6859E8C029090F304C91782 /* libpng */, 27DD26CB0EC028FD00B76D4E /* Data Files */, 27DD25790EC01C0F00B76D4E /* Fonts */, 275491F61E7DF17C002398B4 /* Products */, - 27DD25950EC01C4E00B76D4E /* libpng.a */, - 27DD258C0EC01C4200B76D4E /* libjpeg.a */, 27A9F6FC18D528CB00804DE9 /* Frameworks */, ); name = htmldoc; @@ -616,6 +459,8 @@ 2788A4C81EAEF234007ED0E1 /* epub.cxx */, 27A9F6DB18D527AC00804DE9 /* file.c */, 27DD252D0EC01A3300B76D4E /* file.h */, + 27CACC4E2794F2CF00BC4A11 /* gui.cxx */, + 27CACC4F2794F2CF00BC4A11 /* gui.h */, 27DD252E0EC01A3300B76D4E /* hdstring.h */, 27DD252F0EC01A3300B76D4E /* html.cxx */, 27DD25300EC01A3300B76D4E /* html.h */, @@ -660,68 +505,6 @@ name = htmldoc; sourceTree = "<group>"; }; - 1AB674ADFE9D54B511CA2CBB /* libjpeg */ = { - isa = PBXGroup; - children = ( - 27422F0E10E7311E0095C134 /* jaricom.c */, - 27422F0F10E7311E0095C134 /* jcarith.c */, - 27422F1010E7311E0095C134 /* jdarith.c */, - 27DD259A0EC01D1200B76D4E /* jcapimin.c */, - 27DD259B0EC01D1200B76D4E /* jcapistd.c */, - 27DD259C0EC01D1200B76D4E /* jccoefct.c */, - 27DD259D0EC01D1200B76D4E /* jccolor.c */, - 27DD259E0EC01D1200B76D4E /* jcdctmgr.c */, - 27DD259F0EC01D1200B76D4E /* jchuff.c */, - 27DD25A10EC01D1200B76D4E /* jcinit.c */, - 27DD25A20EC01D1200B76D4E /* jcmainct.c */, - 27DD25A30EC01D1200B76D4E /* jcmarker.c */, - 27DD25A40EC01D1200B76D4E /* jcmaster.c */, - 27DD25A50EC01D1200B76D4E /* jcomapi.c */, - 27DD25A60EC01D1200B76D4E /* jconfig.h */, - 27DD25A70EC01D1200B76D4E /* jcparam.c */, - 27DD25A90EC01D1200B76D4E /* jcprepct.c */, - 27DD25AA0EC01D1200B76D4E /* jcsample.c */, - 27DD25AB0EC01D1200B76D4E /* jctrans.c */, - 27DD25AC0EC01D1200B76D4E /* jdapimin.c */, - 27DD25AD0EC01D1200B76D4E /* jdapistd.c */, - 27DD25AE0EC01D1200B76D4E /* jdatadst.c */, - 27DD25AF0EC01D1200B76D4E /* jdatasrc.c */, - 27DD25B00EC01D1200B76D4E /* jdcoefct.c */, - 27DD25B10EC01D1200B76D4E /* jdcolor.c */, - 27DD25B20EC01D1200B76D4E /* jdct.h */, - 27DD25B30EC01D1200B76D4E /* jddctmgr.c */, - 27DD25B40EC01D1200B76D4E /* jdhuff.c */, - 27DD25B60EC01D1200B76D4E /* jdinput.c */, - 27DD25B70EC01D1200B76D4E /* jdmainct.c */, - 27DD25B80EC01D1200B76D4E /* jdmarker.c */, - 27DD25B90EC01D1200B76D4E /* jdmaster.c */, - 27DD25BA0EC01D1200B76D4E /* jdmerge.c */, - 27DD25BC0EC01D1200B76D4E /* jdpostct.c */, - 27DD25BD0EC01D1200B76D4E /* jdsample.c */, - 27DD25BE0EC01D1200B76D4E /* jdtrans.c */, - 27DD25BF0EC01D1200B76D4E /* jerror.c */, - 27DD25C00EC01D1200B76D4E /* jerror.h */, - 27DD25C10EC01D1200B76D4E /* jfdctflt.c */, - 27DD25C20EC01D1200B76D4E /* jfdctfst.c */, - 27DD25C30EC01D1200B76D4E /* jfdctint.c */, - 27DD25C40EC01D1200B76D4E /* jidctflt.c */, - 27DD25C50EC01D1200B76D4E /* jidctfst.c */, - 27DD25C60EC01D1200B76D4E /* jidctint.c */, - 27DD25C80EC01D1200B76D4E /* jinclude.h */, - 27DD25C90EC01D1200B76D4E /* jmemmgr.c */, - 27DD25CA0EC01D1200B76D4E /* jmemnobs.c */, - 27DD25CB0EC01D1200B76D4E /* jmemsys.h */, - 27DD25CC0EC01D1200B76D4E /* jmorecfg.h */, - 27DD25CD0EC01D1200B76D4E /* jpegint.h */, - 27DD25CE0EC01D1200B76D4E /* jpeglib.h */, - 27DD25CF0EC01D1200B76D4E /* jquant1.c */, - 27DD25D00EC01D1200B76D4E /* jquant2.c */, - 27DD25D10EC01D1200B76D4E /* jutils.c */, - 27DD25D20EC01D1200B76D4E /* jversion.h */, - ); - name = libjpeg; - sourceTree = "<group>"; - }; 275491F61E7DF17C002398B4 /* Products */ = { isa = PBXGroup; children = ( @@ -732,8 +515,16 @@ 27A9F6FC18D528CB00804DE9 /* Frameworks */ = { isa = PBXGroup; children = ( - 27A9F6FA18D528C200804DE9 /* libz.dylib */, - 27A9F6F618D527E400804DE9 /* libresolv.dylib */, + 27CACC4C2794F25500BC4A11 /* Cocoa.framework */, + 27CACC4A2794F24700BC4A11 /* ApplicationServices.framework */, + 27CACC482794F23C00BC4A11 /* CoreText.framework */, + 27CACC462794F23000BC4A11 /* CoreGraphics.framework */, + 27CACC432794F22500BC4A11 /* libfltk_images.a */, + 27CACC422794F22500BC4A11 /* libfltk.a */, + 27CACC3F2794ED6200BC4A11 /* libresolv.tbd */, + 27CACC3D2794ED5A00BC4A11 /* libz.tbd */, + 27D3E1832794DC0D0034494A /* libjpeg.a */, + 27D3E1822794DC0D0034494A /* libpng16.a */, 27A9F6F418D527D900804DE9 /* CoreFoundation.framework */, 27A9F6F218D527D300804DE9 /* Security.framework */, ); @@ -831,95 +622,9 @@ name = "Data Files"; sourceTree = "<group>"; }; - C6859E8C029090F304C91782 /* libpng */ = { - isa = PBXGroup; - children = ( - 27DD260C0EC01D5700B76D4E /* png.c */, - 27DD260D0EC01D5700B76D4E /* png.h */, - 27DD260E0EC01D5700B76D4E /* pngconf.h */, - 27DD260F0EC01D5700B76D4E /* pngerror.c */, - 27DD26100EC01D5700B76D4E /* pngget.c */, - 27DD26110EC01D5700B76D4E /* pngmem.c */, - 27DD26120EC01D5700B76D4E /* pngpread.c */, - 27DD26130EC01D5700B76D4E /* pngread.c */, - 27DD26140EC01D5700B76D4E /* pngrio.c */, - 27DD26150EC01D5700B76D4E /* pngrtran.c */, - 27DD26160EC01D5700B76D4E /* pngrutil.c */, - 27DD26170EC01D5700B76D4E /* pngset.c */, - 27DD26180EC01D5700B76D4E /* pngtrans.c */, - 27DD26190EC01D5700B76D4E /* pngwio.c */, - 27DD261A0EC01D5700B76D4E /* pngwrite.c */, - 27DD261B0EC01D5700B76D4E /* pngwtran.c */, - 27DD261C0EC01D5700B76D4E /* pngwutil.c */, - ); - name = libpng; - sourceTree = "<group>"; - }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - 27DD25880EC01C4200B76D4E /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 27DD25DF0EC01D1200B76D4E /* jconfig.h in Headers */, - 27DD25EB0EC01D1200B76D4E /* jdct.h in Headers */, - 27DD25F90EC01D1200B76D4E /* jerror.h in Headers */, - 27DD26010EC01D1200B76D4E /* jinclude.h in Headers */, - 27DD26040EC01D1200B76D4E /* jmemsys.h in Headers */, - 27DD26050EC01D1200B76D4E /* jmorecfg.h in Headers */, - 27DD26060EC01D1200B76D4E /* jpegint.h in Headers */, - 27DD26070EC01D1200B76D4E /* jpeglib.h in Headers */, - 27DD260B0EC01D1200B76D4E /* jversion.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 27DD25910EC01C4E00B76D4E /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 27DD261E0EC01D5800B76D4E /* png.h in Headers */, - 27DD261F0EC01D5800B76D4E /* pngconf.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ - 27DD258B0EC01C4200B76D4E /* jpeg */ = { - isa = PBXNativeTarget; - buildConfigurationList = 27DD25980EC01C6C00B76D4E /* Build configuration list for PBXNativeTarget "jpeg" */; - buildPhases = ( - 27DD25880EC01C4200B76D4E /* Headers */, - 27DD25890EC01C4200B76D4E /* Sources */, - 27DD258A0EC01C4200B76D4E /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = jpeg; - productName = jpeg; - productReference = 27DD258C0EC01C4200B76D4E /* libjpeg.a */; - productType = "com.apple.product-type.library.static"; - }; - 27DD25940EC01C4E00B76D4E /* png */ = { - isa = PBXNativeTarget; - buildConfigurationList = 27DD25990EC01C6C00B76D4E /* Build configuration list for PBXNativeTarget "png" */; - buildPhases = ( - 27DD25910EC01C4E00B76D4E /* Headers */, - 27DD25920EC01C4E00B76D4E /* Sources */, - 27DD25930EC01C4E00B76D4E /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = png; - productName = png; - productReference = 27DD25950EC01C4E00B76D4E /* libpng.a */; - productType = "com.apple.product-type.library.static"; - }; 8DD76F620486A84900D96B5E /* htmldoc */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "htmldoc" */; @@ -931,8 +636,6 @@ buildRules = ( ); dependencies = ( - 27DD26380EC0244100B76D4E /* PBXTargetDependency */, - 27DD263A0EC0244300B76D4E /* PBXTargetDependency */, 27DD270C0EC029FD00B76D4E /* PBXTargetDependency */, 27DD270E0EC02A0100B76D4E /* PBXTargetDependency */, ); @@ -948,7 +651,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1100; + LastUpgradeCheck = 1320; TargetAttributes = { 8DD76F620486A84900D96B5E = { DevelopmentTeam = RU58A2256H; @@ -970,8 +673,6 @@ projectRoot = ""; targets = ( 8DD76F620486A84900D96B5E /* htmldoc */, - 27DD258B0EC01C4200B76D4E /* jpeg */, - 27DD25940EC01C4E00B76D4E /* png */, 27DD26570EC0285300B76D4E /* fonts */, 27DD26CF0EC0294500B76D4E /* data files */, ); @@ -979,86 +680,12 @@ /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 27DD25890EC01C4200B76D4E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 27DD25D30EC01D1200B76D4E /* jcapimin.c in Sources */, - 27DD25D40EC01D1200B76D4E /* jcapistd.c in Sources */, - 27DD25D50EC01D1200B76D4E /* jccoefct.c in Sources */, - 27DD25D60EC01D1200B76D4E /* jccolor.c in Sources */, - 27DD25D70EC01D1200B76D4E /* jcdctmgr.c in Sources */, - 27DD25D80EC01D1200B76D4E /* jchuff.c in Sources */, - 27DD25DA0EC01D1200B76D4E /* jcinit.c in Sources */, - 27DD25DB0EC01D1200B76D4E /* jcmainct.c in Sources */, - 27DD25DC0EC01D1200B76D4E /* jcmarker.c in Sources */, - 27DD25DD0EC01D1200B76D4E /* jcmaster.c in Sources */, - 27DD25DE0EC01D1200B76D4E /* jcomapi.c in Sources */, - 27DD25E00EC01D1200B76D4E /* jcparam.c in Sources */, - 27DD25E20EC01D1200B76D4E /* jcprepct.c in Sources */, - 27DD25E30EC01D1200B76D4E /* jcsample.c in Sources */, - 27DD25E40EC01D1200B76D4E /* jctrans.c in Sources */, - 27DD25E50EC01D1200B76D4E /* jdapimin.c in Sources */, - 27DD25E60EC01D1200B76D4E /* jdapistd.c in Sources */, - 27DD25E70EC01D1200B76D4E /* jdatadst.c in Sources */, - 27DD25E80EC01D1200B76D4E /* jdatasrc.c in Sources */, - 27DD25E90EC01D1200B76D4E /* jdcoefct.c in Sources */, - 27DD25EA0EC01D1200B76D4E /* jdcolor.c in Sources */, - 27DD25EC0EC01D1200B76D4E /* jddctmgr.c in Sources */, - 27DD25ED0EC01D1200B76D4E /* jdhuff.c in Sources */, - 27DD25EF0EC01D1200B76D4E /* jdinput.c in Sources */, - 27DD25F00EC01D1200B76D4E /* jdmainct.c in Sources */, - 27DD25F10EC01D1200B76D4E /* jdmarker.c in Sources */, - 27DD25F20EC01D1200B76D4E /* jdmaster.c in Sources */, - 27DD25F30EC01D1200B76D4E /* jdmerge.c in Sources */, - 27DD25F50EC01D1200B76D4E /* jdpostct.c in Sources */, - 27DD25F60EC01D1200B76D4E /* jdsample.c in Sources */, - 27DD25F70EC01D1200B76D4E /* jdtrans.c in Sources */, - 27DD25F80EC01D1200B76D4E /* jerror.c in Sources */, - 27DD25FA0EC01D1200B76D4E /* jfdctflt.c in Sources */, - 27DD25FB0EC01D1200B76D4E /* jfdctfst.c in Sources */, - 27DD25FC0EC01D1200B76D4E /* jfdctint.c in Sources */, - 27DD25FD0EC01D1200B76D4E /* jidctflt.c in Sources */, - 27DD25FE0EC01D1200B76D4E /* jidctfst.c in Sources */, - 27DD25FF0EC01D1200B76D4E /* jidctint.c in Sources */, - 27DD26020EC01D1200B76D4E /* jmemmgr.c in Sources */, - 27DD26030EC01D1200B76D4E /* jmemnobs.c in Sources */, - 27DD26080EC01D1200B76D4E /* jquant1.c in Sources */, - 27DD26090EC01D1200B76D4E /* jquant2.c in Sources */, - 27DD260A0EC01D1200B76D4E /* jutils.c in Sources */, - 27422F1110E7311E0095C134 /* jaricom.c in Sources */, - 27422F1210E7311E0095C134 /* jcarith.c in Sources */, - 27422F1310E7311E0095C134 /* jdarith.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 27DD25920EC01C4E00B76D4E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 27DD261D0EC01D5800B76D4E /* png.c in Sources */, - 27DD26200EC01D5800B76D4E /* pngerror.c in Sources */, - 27DD26210EC01D5800B76D4E /* pngget.c in Sources */, - 27DD26220EC01D5800B76D4E /* pngmem.c in Sources */, - 27DD26230EC01D5800B76D4E /* pngpread.c in Sources */, - 27DD26240EC01D5800B76D4E /* pngread.c in Sources */, - 27DD26250EC01D5800B76D4E /* pngrio.c in Sources */, - 27DD26260EC01D5800B76D4E /* pngrtran.c in Sources */, - 27DD26270EC01D5800B76D4E /* pngrutil.c in Sources */, - 27DD26280EC01D5800B76D4E /* pngset.c in Sources */, - 27DD26290EC01D5800B76D4E /* pngtrans.c in Sources */, - 27DD262A0EC01D5800B76D4E /* pngwio.c in Sources */, - 27DD262B0EC01D5800B76D4E /* pngwrite.c in Sources */, - 27DD262C0EC01D5800B76D4E /* pngwtran.c in Sources */, - 27DD262D0EC01D5800B76D4E /* pngwutil.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 8DD76F640486A84900D96B5E /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( 27DD25520EC01A3300B76D4E /* html.cxx in Sources */, + 27CACC502794F2CF00BC4A11 /* gui.cxx in Sources */, 27DD25530EC01A3300B76D4E /* htmldoc.cxx in Sources */, 27DD25540EC01A3300B76D4E /* htmllib.cxx in Sources */, 27DD255A0EC01A3300B76D4E /* image.cxx in Sources */, @@ -1089,16 +716,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 27DD26380EC0244100B76D4E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 27DD258B0EC01C4200B76D4E /* jpeg */; - targetProxy = 27DD26370EC0244100B76D4E /* PBXContainerItemProxy */; - }; - 27DD263A0EC0244300B76D4E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 27DD25940EC01C4E00B76D4E /* png */; - targetProxy = 27DD26390EC0244300B76D4E /* PBXContainerItemProxy */; - }; 27DD270C0EC029FD00B76D4E /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 27DD26570EC0285300B76D4E /* fonts */; @@ -1164,6 +781,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -1196,10 +814,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( ., - ../jpeg, - ../png, + /usr/local/include, ); - MACOSX_DEPLOYMENT_TARGET = 10.13; + LIBRARY_SEARCH_PATHS = /usr/local/lib; + MACOSX_DEPLOYMENT_TARGET = 10.14; ONLY_ACTIVE_ARCH = YES; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; @@ -1226,6 +844,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -1257,10 +876,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( ., - ../jpeg, - ../png, + /usr/local/include, ); - MACOSX_DEPLOYMENT_TARGET = 10.13; + LIBRARY_SEARCH_PATHS = /usr/local/lib; + MACOSX_DEPLOYMENT_TARGET = 10.14; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; USE_HEADERMAP = NO; @@ -1268,74 +887,6 @@ }; name = Release; }; - 27DD258D0EC01C4200B76D4E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_CONSTANT_CONVERSION = NO; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - GCC_WARN_PEDANTIC = NO; - INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = jpeg; - RUN_CLANG_STATIC_ANALYZER = NO; - ZERO_LINK = YES; - }; - name = Debug; - }; - 27DD258E0EC01C4200B76D4E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_CONSTANT_CONVERSION = NO; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_MODEL_TUNING = G5; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - GCC_WARN_PEDANTIC = NO; - INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = jpeg; - RUN_CLANG_STATIC_ANALYZER = NO; - ZERO_LINK = NO; - }; - name = Release; - }; - 27DD25960EC01C4E00B76D4E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = png; - ZERO_LINK = YES; - }; - name = Debug; - }; - 27DD25970EC01C4E00B76D4E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_MODEL_TUNING = G5; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = png; - ZERO_LINK = NO; - }; - name = Release; - }; 27DD26580EC0285300B76D4E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1408,24 +959,6 @@ ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; - }; - 27DD25980EC01C6C00B76D4E /* Build configuration list for PBXNativeTarget "jpeg" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 27DD258D0EC01C4200B76D4E /* Debug */, - 27DD258E0EC01C4200B76D4E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 27DD25990EC01C6C00B76D4E /* Build configuration list for PBXNativeTarget "png" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 27DD25960EC01C4E00B76D4E /* Debug */, - 27DD25970EC01C4E00B76D4E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; }; 27DD265A0EC0287100B76D4E /* Build configuration list for PBXAggregateTarget "fonts" */ = { isa = XCConfigurationList;
