aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2022-07-17 18:10:39 +0200
committerMattias Andrée <maandree@kth.se>2022-07-17 18:10:39 +0200
commit45f0261cfa26628fbde3458f5b0f513a6192a4f0 (patch)
tree18c8573801eca8cdb191add68f7a81fab8e12f47
parentClearify that output parameters are not updated if no glyph is found (diff)
downloadlibparsepsf-45f0261cfa26628fbde3458f5b0f513a6192a4f0.tar.gz
libparsepsf-45f0261cfa26628fbde3458f5b0f513a6192a4f0.tar.bz2
libparsepsf-45f0261cfa26628fbde3458f5b0f513a6192a4f0.tar.xz
Fix value of *unrecognised_versionp
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--libparsepsf.c2
-rw-r--r--libparsepsf.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/libparsepsf.c b/libparsepsf.c
index a3be5f3..67e7158 100644
--- a/libparsepsf.c
+++ b/libparsepsf.c
@@ -326,7 +326,7 @@ libparsepsf_parse_font(const void *data, size_t size, struct libparsepsf_font *f
if (header.psf2.height * ((header.psf2.width + 7) / 8) != header.psf2.charsize)
goto ebfont;
if (header.psf2.version > PSF2_MAXVERSION)
- *unrecognised_versionp = 1;
+ *unrecognised_versionp = header.psf2.version;
fontp->num_glyphs = (size_t)header.psf2.num_glyphs;
fontp->height = (size_t)header.psf2.height;
fontp->width = (size_t)header.psf2.width;
diff --git a/libparsepsf.h b/libparsepsf.h
index 5a0b219..74b229b 100644
--- a/libparsepsf.h
+++ b/libparsepsf.h
@@ -88,8 +88,8 @@ void libparsepsf_destroy_font(struct libparsepsf_font *font);
* @param fontp Output parameter for the font, should be deallocated
* using `libparsepsf_destroy_font` when no longer
* needed (only allocated on success completion)
- * @param unrecognised_versionp Normally set to 0; set to 1 if the minor version in
- * the font file is unrecognised (backwards-compatibility
+ * @param unrecognised_versionp Normally set to 0; set to the minor version in the
+ * font file if it is unrecognised (backwards-compatibility
* is assumed, so it will still be parsed as a supported
* font file)
* @return 0 on successful completion, -1 on failure