Update docos.

Fix static library build commands - remove archive before building it fresh.
Fix some Clang warnings.
2025-04-30 12:26:46 +02:00 · 2024-01-24 11:03:58 -05:00 · 2024-01-24 10:58:11 -05:00 · 2024-01-24 10:53:53 -05:00
14 changed files with 35 additions and 29 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -2,8 +2,8 @@ Changes in PDFio
 ================


-v1.2.0 (Month DD, YYYY)
-----------------------
+v1.2.0 (January 24, 2024)
+-------------------------

 - Now use autoconf to configure the PDFio sources (Issue #54)
 - Added `pdfioFileCreateNumberObj` and `pdfioFileCreateStringObj` functions
--- a/Makefile.in
+++ b/Makefile.in
@ -172,6 +172,7 @@ valgrind:	testpdfio
 # pdfio library
 libpdfio.a:		$(LIBOBJS)
 	echo Archiving $@...
+	$(RM) $@
 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
 	$(RANLIB) $@

@ -226,7 +227,7 @@ ttf.o:			ttf.h
 # Make documentation using Codedoc <https://www.msweet.org/codedoc>
 DOCFLAGS	=	\
 			--author "Michael R Sweet" \
-			--copyright "Copyright (c) 2021-2023 by Michael R Sweet" \
+			--copyright "Copyright (c) 2021-2024 by Michael R Sweet" \
 			--docversion $(PDFIO_VERSION)

 .PHONY: doc
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 PDFio - PDF Read/Write Library

-Copyright © 2021-2023 by Michael R Sweet.
+Copyright © 2021-2024 by Michael R Sweet.

 (Optional) Exceptions to the Apache 2.0 License:
 ================================================
--- a/README.md
+++ b/README.md
@ -89,7 +89,7 @@ generates a static library that will be installed under "/usr/local" with:
 Legal Stuff
 -----------

-PDFio is Copyright © 2021-2023 by Michael R Sweet.
+PDFio is Copyright © 2021-2024 by Michael R Sweet.

 This software is licensed under the Apache License Version 2.0 with an
 (optional) exception to allow linking against GPL2/LGPL2 software.  See the
--- a/SECURITY.md
+++ b/SECURITY.md
@ -54,7 +54,7 @@ starting at 0.  A feature release has a "PATCH" value of 0, for example:
    1.1.0
    2.0.0

-Beta releases and release candidates are *not* prodution releases and use
+Beta releases and release candidates are *not* production releases and use
 semantic version numbers of the form:

    MAJOR.MINORbNUMBER
--- a/configure.ac
+++ b/configure.ac
@ -1,7 +1,7 @@
 dnl
 dnl Configuration script for PDFio
 dnl
-dnl Copyright © 2023 by Michael R Sweet
+dnl Copyright © 2023-2024 by Michael R Sweet
 dnl
 dnl Licensed under Apache License v2.0.  See the file "LICENSE" for more
 dnl information.
@ -105,8 +105,8 @@ dnl ZLIB
 AC_MSG_CHECKING([for zlib via pkg-config])
 AS_IF([$PKGCONFIG --exists zlib], [
    AC_MSG_RESULT([yes])
-    LIBS="$($PKGCONFIG --libs zlib) $LIBS"
    CPPFLAGS="$($PKGCONFIG --cflags zlib) $CPPFLAGS"
+    LIBS="$($PKGCONFIG --libs zlib) $LIBS"
 ],[
    AC_MSG_RESULT([no])
    AC_CHECK_HEADER([zlib.h])
@ -116,6 +116,7 @@ AS_IF([$PKGCONFIG --exists zlib], [
 	AC_MSG_ERROR([Sorry, this software requires zlib 1.1 or higher.])
    ])

+    PKGCONFIG_REQUIRES=""
    PKGCONFIG_LIBS_PRIVATE="-lz $PKGCONFIG_LIBS_PRIVATE"
 ])

--- a/doc/pdfio.3
+++ b/doc/pdfio.3
@ -1,4 +1,4 @@
-.TH pdfio 3 "pdf read/write library" "2023-12-05" "pdf read/write library"
+.TH pdfio 3 "pdf read/write library" "2024-01-24" "pdf read/write library"
 .SH NAME
 pdfio \- pdf read/write library
 .SH Introduction
@ -34,7 +34,7 @@ PDFio is
 .I not
 concerned with rendering or viewing a PDF file, although a PDF RIP or viewer could be written using it.
 .PP
-PDFio is Copyright \[co] 2021\-2023 by Michael R Sweet and is licensed under the Apache License Version 2.0 with an (optional) exception to allow linking against GPL2/LGPL2 software. See the files "LICENSE" and "NOTICE" for more information.
+PDFio is Copyright \[co] 2021\-2024 by Michael R Sweet and is licensed under the Apache License Version 2.0 with an (optional) exception to allow linking against GPL2/LGPL2 software. See the files "LICENSE" and "NOTICE" for more information.
 .SS Requirements
 .PP
 PDFio requires the following to build the software:
@ -3087,4 +3087,4 @@ typedef enum pdfio_valtype_e pdfio_valtype_t;
 Michael R Sweet
 .SH COPYRIGHT
 .PP
-Copyright (c) 2021-2023 by Michael R Sweet
+Copyright (c) 2021-2024 by Michael R Sweet
--- a/doc/pdfio.html
+++ b/doc/pdfio.html
@ -6,7 +6,7 @@
 <meta name="generator" content="codedoc v3.7">
 <meta name="author" content="Michael R Sweet">
 <meta name="language" content="en-US">
-<meta name="copyright" content="Copyright © 2021-2023 by Michael R Sweet">
+<meta name="copyright" content="Copyright © 2021-2024 by Michael R Sweet">
 <meta name="version" content="1.2.0">
 <style type="text/css"><!--
 body {
@ -247,7 +247,7 @@ span.string {
 <p><img class="title" src="pdfio-512.png"></p>
 <h1 class="title">PDFio Programming Manual v1.2.0</h1>
 <p>Michael R Sweet</p>
-<p>Copyright © 2021-2023 by Michael R Sweet</p>
+<p>Copyright © 2021-2024 by Michael R Sweet</p>
 </div>
 <div class="contents">
 <h2 class="title">Contents</h2>
@ -501,7 +501,7 @@ span.string {
 </li>
 </ul>
 <p>PDFio is <em>not</em> concerned with rendering or viewing a PDF file, although a PDF RIP or viewer could be written using it.</p>
-<p>PDFio is Copyright © 2021-2023 by Michael R Sweet and is licensed under the Apache License Version 2.0 with an (optional) exception to allow linking against GPL2/LGPL2 software. See the files &quot;LICENSE&quot; and &quot;NOTICE&quot; for more information.</p>
+<p>PDFio is Copyright © 2021-2024 by Michael R Sweet and is licensed under the Apache License Version 2.0 with an (optional) exception to allow linking against GPL2/LGPL2 software. See the files &quot;LICENSE&quot; and &quot;NOTICE&quot; for more information.</p>
 <h3 class="title" id="requirements">Requirements</h3>
 <p>PDFio requires the following to build the software:</p>
 <ul>
--- a/doc/pdfio.md
+++ b/doc/pdfio.md
@ -15,7 +15,7 @@ goals of pdfio are:
 PDFio is *not* concerned with rendering or viewing a PDF file, although a PDF
 RIP or viewer could be written using it.

-PDFio is Copyright © 2021-2023 by Michael R Sweet and is licensed under the
+PDFio is Copyright © 2021-2024 by Michael R Sweet and is licensed under the
 Apache License Version 2.0 with an (optional) exception to allow linking against
 GPL2/LGPL2 software.  See the files "LICENSE" and "NOTICE" for more information.

--- a/pdfio-content.c
+++ b/pdfio-content.c
@ -1131,20 +1131,20 @@ pdfioContentTextMeasure(
      if (ch < 128)
      {
        // ASCII
-	*tempptr++ = ch;
+	*tempptr++ = (char)ch;
      }
      else if (ch < 2048)
      {
        // 2-byte UTF-8
-        *tempptr++ = 0xc0 | ((ch >> 6) & 0x1f);
-        *tempptr++ = 0x80 | (ch & 0x3f);
+        *tempptr++ = (char)(0xc0 | ((ch >> 6) & 0x1f));
+        *tempptr++ = (char)(0x80 | (ch & 0x3f));
      }
      else
      {
        // 3-byte UTF-8
-        *tempptr++ = 0xe0 | ((ch >> 12) & 0x0f);
-        *tempptr++ = 0x80 | ((ch >> 6) & 0x3f);
-        *tempptr++ = 0x80 | (ch & 0x3f);
+        *tempptr++ = (char)(0xe0 | ((ch >> 12) & 0x0f));
+        *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f));
+        *tempptr++ = (char)(0x80 | (ch & 0x3f));
      }
    }

@ -1152,7 +1152,7 @@ pdfioContentTextMeasure(
    s        = temp;
  }

-  ttfGetExtents(ttf, size, s, &extents);
+  ttfGetExtents(ttf, (float)size, s, &extents);

  return (extents.right - extents.left);
 }
@ -1642,7 +1642,7 @@ pdfioFileCreateFontObjFromFile(
        *bufptr++ = (unsigned char)(cmap[i] >> 8);
        *bufptr++ = (unsigned char)(cmap[i] & 255);

-        glyphs[cmap[i]] = i;
+        glyphs[cmap[i]] = (unsigned short)i;
        if (cmap[i] < min_glyph)
          min_glyph = cmap[i];
        if (cmap[i] > max_glyph)
@ -1727,9 +1727,9 @@ pdfioFileCreateFontObjFromFile(
    if ((w_array = pdfioArrayCreate(pdf)) == NULL)
      goto done;

-    for (start = 0, w0 = ttfGetWidth(font, 0), i = 1; i < 65536; start = i, w0 = w1, i ++)
+    for (start = 0, w0 = ttfGetWidth(font, 0), w1 = 0, i = 1; i < 65536; start = i, w0 = w1, i ++)
    {
-      while (i < 65536 && (w1 = ttfGetWidth(font, i)) == w0)
+      while (i < 65536 && (w1 = ttfGetWidth(font, (int)i)) == w0)
        i ++;

      if ((i - start) > 1)
@ -1750,7 +1750,7 @@ pdfioFileCreateFontObjFromFile(
        pdfioArrayAppendNumber(temp_array, w0);
        for (w0 = w1, i ++; i < 65536; w0 = w1, i ++)
        {
-          if ((w1 = ttfGetWidth(font, i)) == w0 && i < 65535)
+          if ((w1 = ttfGetWidth(font, (int)i)) == w0 && i < 65535)
            break;

 	  pdfioArrayAppendNumber(temp_array, w0);
--- a/pdfio-value.c
+++ b/pdfio-value.c
@ -138,6 +138,10 @@ _pdfioValueDecrypt(pdfio_file_t   *pdf,	// I - PDF file

  switch (v->type)
  {
+    default :
+        // Do nothing
+        break;
+
    case PDFIO_VALTYPE_ARRAY :
        return (_pdfioArrayDecrypt(pdf, obj, v->value.array, depth + 1));
        break;
--- a/pdfio_native.nuspec
+++ b/pdfio_native.nuspec
@ -13,7 +13,7 @@
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
        <description>PDFio Library for VS2019+</description>
        <summary>PDFio is a simple C library for reading and writing PDF files. PDFio is licensed under the Apache License Version 2.0 with an (optional) exception to allow linking against GNU GPL2-only software.</summary>
-        <copyright>Copyright © 2019-2023 by Michael R Sweet</copyright>
+        <copyright>Copyright © 2019-2024 by Michael R Sweet</copyright>
        <tags>pdf file native</tags>
 	<dependencies>
 	    <dependency id="pdfio_native.redist" version="1.2.0" />
--- a/pdfio_native.redist.nuspec
+++ b/pdfio_native.redist.nuspec
@ -13,7 +13,7 @@
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
        <description>PDFio Library for VS2019+</description>
        <summary>PDFio is a simple C library for reading and writing PDF files. This package provides the redistributable content for the PDFio library. PDFio is licensed under the Apache License Version 2.0 with an (optional) exception to allow linking against GNU GPL2-only software.</summary>
-        <copyright>Copyright © 2019-2023 by Michael R Sweet</copyright>
+        <copyright>Copyright © 2019-2024 by Michael R Sweet</copyright>
        <tags>pdf file native</tags>
 	<dependencies>
 	    <dependency id="zlib_native.redist" version="1.2.11" />
--- a/ttf.c
+++ b/ttf.c
@ -1307,7 +1307,7 @@ read_cmap(ttf_t *font)			// I - Font
              {
                // Use an "obscure indexing trick" (words from the spec, not
                // mine) to look up the glyph index...
-                temp = segment->idRangeOffset / 2 - segCount + (ch - segment->startCode) + (segment - segments);
+                temp = (int)(segment->idRangeOffset / 2 - segCount + (ch - segment->startCode) + (segment - segments));

                TTF_DEBUG("read_cmap: ch=%d, temp=%d\n", ch, temp);
                if (temp < 0 || temp >= numGlyphIdArray)
Author	SHA1	Message	Date
Michael R Sweet	cd1406e158	Update docos. Fix static library build commands - remove archive before building it fresh.	2024-01-24 11:03:58 -05:00
Michael R Sweet	59deee020a	Fix some Clang warnings.	2024-01-24 10:58:11 -05:00
Michael R Sweet	476013706e	Prep for 1.2.0 release, bump copyright.	2024-01-24 10:53:53 -05:00