vcl/inc/sft.hxx | 4 ++--
vcl/source/fontsubset/sft.cxx | 25 ++++++++++++-------------
2 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 244adb53b0308f121ede4dfafd2a7953914e55a6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Mar 22 11:27:31 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Mar 22 16:16:08 2021 +0100
convert calloc/free into std::vector
Change-Id: Iecbbc58b52d393840b9e68764de276594a86aa4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112882
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index aabdfdb7368f..05b97dc8273b 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -722,10 +722,10 @@ class VCL_DLLPUBLIC AbstractTrueTypeFont
{
char* m_pFileName;
sal_uInt32 m_nGlyphs;
- sal_uInt32* m_pGlyphOffsets;
sal_uInt32 m_nHorzMetrics;
sal_uInt32 m_nVertMetrics; /* if not 0 => font has vertical metrics
information */
sal_uInt32 m_nUnitsPerEm;
+ std::vector<sal_uInt32> m_aGlyphOffsets;
FontCharMapRef m_xCharMap;
protected:
@@ -737,7 +737,7 @@ public:
const char* fileName() const { return m_pFileName; }
sal_uInt32 glyphCount() const { return m_nGlyphs; }
- sal_uInt32 glyphOffset(sal_uInt32 glyphID) const { return
m_pGlyphOffsets[glyphID]; }
+ sal_uInt32 glyphOffset(sal_uInt32 glyphID) const;
sal_uInt32 horzMetricCount() const { return m_nHorzMetrics; }
sal_uInt32 vertMetricCount() const { return m_nVertMetrics; }
sal_uInt32 unitsPerEm() const { return m_nUnitsPerEm; }
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index bc4db89582d0..61ff497cbde4 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1116,7 +1116,6 @@ bool withinBounds(sal_uInt32 tdoffset, sal_uInt32
moreoffset, sal_uInt32 len, sa
AbstractTrueTypeFont::AbstractTrueTypeFont(const char* pFileName, const
FontCharMapRef xCharMap)
: m_pFileName(nullptr)
, m_nGlyphs(0xFFFFFFFF)
- , m_pGlyphOffsets(nullptr)
, m_nHorzMetrics(0)
, m_nVertMetrics(0)
, m_nUnitsPerEm(0)
@@ -1129,7 +1128,6 @@ AbstractTrueTypeFont::AbstractTrueTypeFont(const char*
pFileName, const FontChar
AbstractTrueTypeFont::~AbstractTrueTypeFont()
{
free(m_pFileName);
- free(m_pGlyphOffsets);
}
TrueTypeFont::TrueTypeFont(const char* pFileName, const FontCharMapRef
xCharMap)
@@ -1160,6 +1158,11 @@ TrueTypeFont::~TrueTypeFont()
void CloseTTFont(TrueTypeFont* ttf) { delete ttf; }
+sal_uInt32 AbstractTrueTypeFont::glyphOffset(sal_uInt32 glyphID) const
+{
+ return m_aGlyphOffsets[glyphID];
+}
+
SFErrCodes AbstractTrueTypeFont::indexGlyphData()
{
if (!(hasTable(O_maxp) && hasTable(O_head) && hasTable(O_name) &&
hasTable(O_cmap)))
@@ -1185,12 +1188,10 @@ SFErrCodes AbstractTrueTypeFont::indexGlyphData()
if (k < static_cast<int>(m_nGlyphs)) /* Hack for broken Chinese
fonts */
m_nGlyphs = k;
- free(m_pGlyphOffsets);
- m_pGlyphOffsets = static_cast<sal_uInt32 *>(calloc(m_nGlyphs + 1,
sizeof(sal_uInt32)));
- assert(m_pGlyphOffsets != nullptr);
-
+ m_aGlyphOffsets.clear();
+ m_aGlyphOffsets.reserve(m_nGlyphs + 1);
for (int i = 0; i <= static_cast<int>(m_nGlyphs); ++i)
- m_pGlyphOffsets[i] = indexfmt ? GetUInt32(table, i << 2) :
static_cast<sal_uInt32>(GetUInt16(table, i << 1)) << 1;
+ m_aGlyphOffsets.push_back(indexfmt ? GetUInt32(table, i << 2) :
static_cast<sal_uInt32>(GetUInt16(table, i << 1)) << 1);
}
else if (this->table(O_CFF, table_size)) /* PS-OpenType */
{
@@ -1198,17 +1199,15 @@ SFErrCodes AbstractTrueTypeFont::indexGlyphData()
if (k < static_cast<int>(m_nGlyphs))
m_nGlyphs = k;
- free(m_pGlyphOffsets);
- m_pGlyphOffsets = static_cast<sal_uInt32 *>(calloc(m_nGlyphs + 1,
sizeof(sal_uInt32)));
+ m_aGlyphOffsets.clear();
+ m_aGlyphOffsets.resize(m_nGlyphs + 1, 0);
/* TODO: implement to get subsetting */
- assert(m_pGlyphOffsets != nullptr);
}
else {
// Bitmap font, accept for now.
- free(m_pGlyphOffsets);
- m_pGlyphOffsets = static_cast<sal_uInt32 *>(calloc(m_nGlyphs + 1,
sizeof(sal_uInt32)));
+ m_aGlyphOffsets.clear();
+ m_aGlyphOffsets.resize(m_nGlyphs + 1, 0);
/* TODO: implement to get subsetting */
- assert(m_pGlyphOffsets != nullptr);
}
table = this->table(O_hhea, table_size);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
