fofi/FoFiTrueType.cc | 2 +- fofi/FoFiTrueType.h | 4 ++-- fofi/FoFiType1C.cc | 8 ++++---- fofi/FoFiType1C.h | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit c9d50037bc860c680ba24877b8727c66c95380da Author: Albert Astals Cid <aa...@kde.org> Date: Wed Jan 15 09:58:22 2020 +0100 fofi: add some const diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc index ae8e3db5..c9c3cc08 100644 --- a/fofi/FoFiTrueType.cc +++ b/fofi/FoFiTrueType.cc @@ -932,7 +932,7 @@ void FoFiTrueType::cvtCharStrings(char **encoding, } void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc, - void *outputStream, GooString *name, + void *outputStream, const GooString *name, bool needVerticalMetrics, int *maxUsedGlyph) const { unsigned char headData[54]; diff --git a/fofi/FoFiTrueType.h b/fofi/FoFiTrueType.h index d3246be2..81b258e3 100644 --- a/fofi/FoFiTrueType.h +++ b/fofi/FoFiTrueType.h @@ -15,7 +15,7 @@ // // Copyright (C) 2006 Takashi Iwai <ti...@suse.de> // Copyright (C) 2007 Koji Otani <s...@bbr.jp> -// Copyright (C) 2011, 2012, 2018, 2019 Albert Astals Cid <aa...@kde.org> +// Copyright (C) 2011, 2012, 2018-2020 Albert Astals Cid <aa...@kde.org> // Copyright (C) 2012 Suzuki Toshiya <mpsuz...@hiroshima-u.ac.jp> // Copyright (C) 2016 William Bader <williamba...@hotmail.com> // Copyright (C) 2018 Adam Reichold <adam.reich...@t-online.de> @@ -173,7 +173,7 @@ private: FoFiOutputFunc outputFunc, void *outputStream) const; void cvtSfnts(FoFiOutputFunc outputFunc, - void *outputStream, GooString *name, + void *outputStream, const GooString *name, bool needVerticalMetrics, int *maxUsedGlyph) const; void dumpString(const unsigned char *s, int length, diff --git a/fofi/FoFiType1C.cc b/fofi/FoFiType1C.cc index 79da746f..9a390635 100644 --- a/fofi/FoFiType1C.cc +++ b/fofi/FoFiType1C.cc @@ -1176,8 +1176,8 @@ void FoFiType1C::convertToType0(const char *psName, const int *codeMap, int nCod void FoFiType1C::eexecCvtGlyph(Type1CEexecBuf *eb, const char *glyphName, int offset, int nBytes, - Type1CIndex *subrIdx, - Type1CPrivateDict *pDict) { + const Type1CIndex *subrIdx, + const Type1CPrivateDict *pDict) { GooString *buf; GooString *charBuf; @@ -1196,7 +1196,7 @@ void FoFiType1C::eexecCvtGlyph(Type1CEexecBuf *eb, const char *glyphName, } void FoFiType1C::cvtGlyph(int offset, int nBytes, GooString *charBuf, - Type1CIndex *subrIdx, Type1CPrivateDict *pDict, + const Type1CIndex *subrIdx, const Type1CPrivateDict *pDict, bool top) { Type1CIndexVal val; bool ok, dFP; @@ -1828,7 +1828,7 @@ void FoFiType1C::cvtGlyph(int offset, int nBytes, GooString *charBuf, } void FoFiType1C::cvtGlyphWidth(bool useOp, GooString *charBuf, - Type1CPrivateDict *pDict) { + const Type1CPrivateDict *pDict) { double w; bool wFP; int i; diff --git a/fofi/FoFiType1C.h b/fofi/FoFiType1C.h index 5449dcd0..067ab99a 100644 --- a/fofi/FoFiType1C.h +++ b/fofi/FoFiType1C.h @@ -15,7 +15,7 @@ // // Copyright (C) 2006 Takashi Iwai <ti...@suse.de> // Copyright (C) 2012 Thomas Freitag <thomas.frei...@alfa.de> -// Copyright (C) 2018, 2019 Albert Astals Cid <aa...@kde.org> +// Copyright (C) 2018-2020 Albert Astals Cid <aa...@kde.org> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -206,13 +206,13 @@ private: FoFiType1C(const char *fileA, int lenA, bool freeFileDataA); void eexecCvtGlyph(Type1CEexecBuf *eb, const char *glyphName, int offset, int nBytes, - Type1CIndex *subrIdx, - Type1CPrivateDict *pDict); + const Type1CIndex *subrIdx, + const Type1CPrivateDict *pDict); void cvtGlyph(int offset, int nBytes, GooString *charBuf, - Type1CIndex *subrIdx, Type1CPrivateDict *pDict, + const Type1CIndex *subrIdx, const Type1CPrivateDict *pDict, bool top); void cvtGlyphWidth(bool useOp, GooString *charBuf, - Type1CPrivateDict *pDict); + const Type1CPrivateDict *pDict); void cvtNum(double x, bool isFP, GooString *charBuf) const; void eexecWrite(Type1CEexecBuf *eb, const char *s) const; void eexecWriteCharstring(Type1CEexecBuf *eb, const unsigned char *s, int n) const; _______________________________________________ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler