Version 1.1

Added distanceRangeMiddle metric
Minor warning fixes
2024-06-30 17:26:56 +02:00 · 2024-05-01 22:59:09 +02:00 · 2023-03-06 01:21:22 +01:00 · 2022-12-04 22:00:53 +01:00
5 changed files with 34 additions and 32 deletions
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020 Viktor Chlumsky
+Copyright (c) 2020 - 2024 Viktor Chlumsky

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/artery-font/artery-font.h
+++ b/artery-font/artery-font.h
@ -6,5 +6,5 @@
 #include "structures.h"
 #include "serialization.h"

-// ARTERY ENGINE ATLAS FONT FORMAT LIBRARY v1.0.1
-// Author: Viktor Chlumsky (c) 2020 - 2022
+// ARTERY ENGINE ATLAS FONT FORMAT LIBRARY v1.1
+// Author: Viktor Chlumsky (c) 2020 - 2024
--- a/artery-font/serialization.hpp
+++ b/artery-font/serialization.hpp
@ -97,7 +97,7 @@ inline uint32 paddedLength(uint32 len) {

 template <class STRING>
 uint32 paddedStringLength(const STRING &str) {
-    uint32 len = str.length();
+    uint32 len = (uint32) str.length();
    return paddedLength(len+(len > 0));
 }

@ -115,8 +115,8 @@ bool decode(ArteryFont<REAL, LIST, BYTE_ARRAY, STRING> &font, void *userData) {
        if (READ((target), (len), userData) != int(len)) \
            return false; \
        totalLength += (len); \
-        for (int i = 0; i < int(len); ++i) \
-            checksum = crc32Update(checksum, reinterpret_cast<const byte *>(target)[i]); \
+        for (int _i = 0; _i < int(len); ++_i) \
+            checksum = crc32Update(checksum, reinterpret_cast<const byte *>(target)[_i]); \
    }
    #define ARTERY_FONT_DECODE_REALIGN() { \
        if (totalLength&0x03u) { \
@ -250,19 +250,19 @@ bool encode(const ArteryFont<REAL, LIST, BYTE_ARRAY, STRING> &font, void *userDa
        if (WRITE((data), (len), userData) != int(len)) \
            return false; \
        totalLength += (len); \
-        for (int i = 0; i < int(len); ++i) \
-            checksum = crc32Update(checksum, reinterpret_cast<const byte *>(data)[i]); \
+        for (int _i = 0; _i < int(len); ++_i) \
+            checksum = crc32Update(checksum, reinterpret_cast<const byte *>(data)[_i]); \
    }
    #define ARTERY_FONT_ENCODE_REALIGN() { \
        if (totalLength&0x03u) { \
-            uint32 len = 0x04u-(totalLength&0x03u); \
-            ARTERY_FONT_ENCODE_WRITE(padding, len); \
+            uint32 _len = 0x04u-(totalLength&0x03u); \
+            ARTERY_FONT_ENCODE_WRITE(padding, _len); \
        } \
    }
    #define ARTERY_FONT_ENCODE_WRITE_STRING(str) { \
-        uint32 len = (str).length(); \
-        if ((len) > 0) { \
-            ARTERY_FONT_ENCODE_WRITE((const char *) (str), (len)); \
+        uint32 len = (uint32) (str).length(); \
+        if (len > 0) { \
+            ARTERY_FONT_ENCODE_WRITE((const char *) (str), len); \
            ARTERY_FONT_ENCODE_WRITE(padding, 1) \
            ARTERY_FONT_ENCODE_REALIGN(); \
        } \
@ -280,12 +280,12 @@ bool encode(const ArteryFont<REAL, LIST, BYTE_ARRAY, STRING> &font, void *userDa
        header.realType = internal::realTypeCode<REAL>();
        memset(header.reserved, 0, sizeof(header.reserved));
        header.metadataFormat = (uint32) font.metadataFormat;
-        header.metadataLength = font.metadata.length();
-        header.variantCount = variantCount = font.variants.length();
+        header.metadataLength = (uint32) font.metadata.length();
+        header.variantCount = variantCount = (int) font.variants.length();
        header.variantsLength = 0;
-        header.imageCount = imageCount = font.images.length();
+        header.imageCount = imageCount = (int) font.images.length();
        header.imagesLength = 0;
-        header.appendixCount = appendixCount = font.appendices.length();
+        header.appendixCount = appendixCount = (int) font.appendices.length();
        header.appendicesLength = 0;
        memset(header.reserved2, 0, sizeof(header.reserved2));
        for (int i = 0; i < variantCount; ++i) {
@ -293,20 +293,20 @@ bool encode(const ArteryFont<REAL, LIST, BYTE_ARRAY, STRING> &font, void *userDa
            header.variantsLength += sizeof(internal::FontVariantHeader<REAL>);
            header.variantsLength += internal::paddedStringLength(variant.name);
            header.variantsLength += internal::paddedStringLength(variant.metadata);
-            header.variantsLength += variant.glyphs.length()*sizeof(Glyph<REAL>);
-            header.variantsLength += variant.kernPairs.length()*sizeof(KernPair<REAL>);
+            header.variantsLength += (uint32) (variant.glyphs.length()*sizeof(Glyph<REAL>));
+            header.variantsLength += (uint32) (variant.kernPairs.length()*sizeof(KernPair<REAL>));
        }
        for (int i = 0; i < imageCount; ++i) {
            const FontImage<BYTE_ARRAY, STRING> &image = font.images[i];
            header.imagesLength += sizeof(internal::ImageHeader);
            header.imagesLength += internal::paddedStringLength(image.metadata);
-            header.imagesLength += internal::paddedLength(image.data.length());
+            header.imagesLength += internal::paddedLength((uint32) image.data.length());
        }
        for (int i = 0; i < appendixCount; ++i) {
            const FontAppendix<BYTE_ARRAY, STRING> &appendix = font.appendices[i];
            header.appendicesLength += sizeof(internal::AppendixHeader);
            header.appendicesLength += internal::paddedStringLength(appendix.metadata);
-            header.appendicesLength += internal::paddedLength(appendix.data.length());
+            header.appendicesLength += internal::paddedLength((uint32) appendix.data.length());
        }
        ARTERY_FONT_ENCODE_WRITE(&header, sizeof(header));
        ARTERY_FONT_ENCODE_WRITE_STRING(font.metadata);
@ -323,10 +323,10 @@ bool encode(const ArteryFont<REAL, LIST, BYTE_ARRAY, STRING> &font, void *userDa
        header.fallbackGlyph = variant.fallbackGlyph;
        memset(header.reserved, 0, sizeof(header.reserved));
        memcpy(header.metrics, &variant.metrics, sizeof(header.metrics));
-        header.nameLength = variant.name.length();
-        header.metadataLength = variant.metadata.length();
-        header.glyphCount = variant.glyphs.length();
-        header.kernPairCount = variant.kernPairs.length();
+        header.nameLength = (uint32) variant.name.length();
+        header.metadataLength = (uint32) variant.metadata.length();
+        header.glyphCount = (uint32) variant.glyphs.length();
+        header.kernPairCount = (uint32) variant.kernPairs.length();
        ARTERY_FONT_ENCODE_WRITE(&header, sizeof(header));
        ARTERY_FONT_ENCODE_WRITE_STRING(variant.name);
        ARTERY_FONT_ENCODE_WRITE_STRING(variant.metadata);
@ -349,8 +349,8 @@ bool encode(const ArteryFont<REAL, LIST, BYTE_ARRAY, STRING> &font, void *userDa
        header.childImages = image.childImages;
        header.textureFlags = image.textureFlags;
        memset(header.reserved, 0, sizeof(header.reserved));
-        header.metadataLength = image.metadata.length();
-        header.dataLength = image.data.length();
+        header.metadataLength = (uint32) image.metadata.length();
+        header.dataLength = (uint32) image.data.length();
        ARTERY_FONT_ENCODE_WRITE(&header, sizeof(header));
        ARTERY_FONT_ENCODE_WRITE_STRING(image.metadata);
        ARTERY_FONT_ENCODE_WRITE((const unsigned char *) image.data, header.dataLength);
@ -360,8 +360,8 @@ bool encode(const ArteryFont<REAL, LIST, BYTE_ARRAY, STRING> &font, void *userDa
    for (int i = 0; i < appendixCount; ++i) {
        const FontAppendix<BYTE_ARRAY, STRING> &appendix = font.appendices[i];
        internal::AppendixHeader header;
-        header.metadataLength = appendix.metadata.length();
-        header.dataLength = appendix.data.length();
+        header.metadataLength = (uint32) appendix.metadata.length();
+        header.dataLength = (uint32) appendix.data.length();
        ARTERY_FONT_ENCODE_WRITE(&header, sizeof(header));
        ARTERY_FONT_ENCODE_WRITE_STRING(appendix.metadata);
        ARTERY_FONT_ENCODE_WRITE((const unsigned char *) appendix.data, header.dataLength);
--- a/artery-font/std-artery-font.h
+++ b/artery-font/std-artery-font.h
@ -16,8 +16,8 @@ public:
    inline int length() const { return (int) std::vector<T>::size(); }
    inline explicit operator T *() { return std::vector<T>::data(); }
    inline explicit operator const T *() const { return std::vector<T>::data(); }
-    inline T & operator[](int index) { return std::vector<T>::operator[](index); }
-    inline const T & operator[](int index) const { return std::vector<T>::operator[](index); }
+    inline T &operator[](int index) { return std::vector<T>::operator[](index); }
+    inline const T &operator[](int index) const { return std::vector<T>::operator[](index); }

 };

--- a/artery-font/structures.h
+++ b/artery-font/structures.h
@ -43,7 +43,9 @@ struct FontVariant {
        REAL ascender, descender;
        REAL lineHeight;
        REAL underlineY, underlineThickness;
-        REAL reserved[24];
+        // In pixels:
+        REAL distanceRangeMiddle;
+        REAL reserved[23];
    } metrics;
    STRING name;
    STRING metadata;
Author	SHA1	Message	Date
Chlumsky	af79386abe	Version 1.1	2024-06-30 17:26:56 +02:00
Chlumsky	8886742202	Added distanceRangeMiddle metric	2024-05-01 22:59:09 +02:00
Chlumsky	34134bde3c	Minor warning fixes	2023-03-06 01:21:22 +01:00
Chlumsky	a3dcadb9df	Changed whitespace formatting of function return type	2022-12-04 22:00:53 +01:00