summaryrefslogtreecommitdiff
path: root/fofi
diff options
context:
space:
mode:
authorOliver Sander <oliver.sander@tu-dresden.de>2018-11-30 18:08:02 +0100
committerAlbert Astals Cid <tsdgeos@yahoo.es>2018-12-06 17:31:41 +0000
commitb7503eb3c2364e7ca7fc37418bb4cc484437ea71 (patch)
tree2b1417517ba4dcfdf2749ee88389069d28a75415 /fofi
parent51bb46766cc5b50d81227cd91e518bc78b0a944b (diff)
Replace Gushort by unsigned short
Diffstat (limited to 'fofi')
-rw-r--r--fofi/FoFiEncodings.cc6
-rw-r--r--fofi/FoFiEncodings.h6
-rw-r--r--fofi/FoFiType1C.cc16
-rw-r--r--fofi/FoFiType1C.h6
4 files changed, 17 insertions, 17 deletions
diff --git a/fofi/FoFiEncodings.cc b/fofi/FoFiEncodings.cc
index 17b93f03..905a3d9c 100644
--- a/fofi/FoFiEncodings.cc
+++ b/fofi/FoFiEncodings.cc
@@ -945,7 +945,7 @@ const char *fofiType1CStdStrings[391] = {
"Semibold"
};
-Gushort fofiType1CISOAdobeCharset[229] = {
+unsigned short fofiType1CISOAdobeCharset[229] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -971,7 +971,7 @@ Gushort fofiType1CISOAdobeCharset[229] = {
220, 221, 222, 223, 224, 225, 226, 227, 228
};
-Gushort fofiType1CExpertCharset[166] = {
+unsigned short fofiType1CExpertCharset[166] = {
0, 1, 229, 230, 231, 232, 233, 234, 235, 236,
237, 238, 13, 14, 15, 99, 239, 240, 241, 242,
243, 244, 245, 246, 247, 248, 27, 28, 249, 250,
@@ -991,7 +991,7 @@ Gushort fofiType1CExpertCharset[166] = {
373, 374, 375, 376, 377, 378
};
-Gushort fofiType1CExpertSubsetCharset[87] = {
+unsigned short fofiType1CExpertSubsetCharset[87] = {
0, 1, 231, 232, 235, 236, 237, 238, 13, 14,
15, 99, 239, 240, 241, 242, 243, 244, 245, 246,
247, 248, 27, 28, 249, 250, 251, 253, 254, 255,
diff --git a/fofi/FoFiEncodings.h b/fofi/FoFiEncodings.h
index c27a370e..bd01a5f9 100644
--- a/fofi/FoFiEncodings.h
+++ b/fofi/FoFiEncodings.h
@@ -37,8 +37,8 @@ extern const char * const fofiType1ExpertEncoding[256];
//------------------------------------------------------------------------
extern const char *fofiType1CStdStrings[391];
-extern Gushort fofiType1CISOAdobeCharset[229];
-extern Gushort fofiType1CExpertCharset[166];
-extern Gushort fofiType1CExpertSubsetCharset[87];
+extern unsigned short fofiType1CISOAdobeCharset[229];
+extern unsigned short fofiType1CExpertCharset[166];
+extern unsigned short fofiType1CExpertSubsetCharset[87];
#endif
diff --git a/fofi/FoFiType1C.cc b/fofi/FoFiType1C.cc
index 39931fa6..5df096ca 100644
--- a/fofi/FoFiType1C.cc
+++ b/fofi/FoFiType1C.cc
@@ -1199,7 +1199,7 @@ void FoFiType1C::cvtGlyph(int offset, int nBytes, GooString *charBuf,
Type1CIndexVal val;
bool ok, dFP;
double d, dx, dy;
- Gushort r2;
+ unsigned short r2;
unsigned char byte;
int pos, subrBias, start, i, k;
@@ -2502,15 +2502,15 @@ bool FoFiType1C::readCharset() {
if (topDict.charsetOffset == 0) {
charset = fofiType1CISOAdobeCharset;
- charsetLength = sizeof(fofiType1CISOAdobeCharset) / sizeof(Gushort);
+ charsetLength = sizeof(fofiType1CISOAdobeCharset) / sizeof(unsigned short);
} else if (topDict.charsetOffset == 1) {
charset = fofiType1CExpertCharset;
- charsetLength = sizeof(fofiType1CExpertCharset) / sizeof(Gushort);
+ charsetLength = sizeof(fofiType1CExpertCharset) / sizeof(unsigned short);
} else if (topDict.charsetOffset == 2) {
charset = fofiType1CExpertSubsetCharset;
- charsetLength = sizeof(fofiType1CExpertSubsetCharset) / sizeof(Gushort);
+ charsetLength = sizeof(fofiType1CExpertSubsetCharset) / sizeof(unsigned short);
} else {
- charset = (Gushort *)gmallocn(nGlyphs, sizeof(Gushort));
+ charset = (unsigned short *)gmallocn(nGlyphs, sizeof(unsigned short));
charsetLength = nGlyphs;
for (i = 0; i < nGlyphs; ++i) {
charset[i] = 0;
@@ -2519,7 +2519,7 @@ bool FoFiType1C::readCharset() {
charsetFormat = getU8(pos++, &parsedOk);
if (charsetFormat == 0) {
for (i = 1; i < nGlyphs; ++i) {
- charset[i] = (Gushort)getU16BE(pos, &parsedOk);
+ charset[i] = (unsigned short)getU16BE(pos, &parsedOk);
pos += 2;
if (!parsedOk) {
break;
@@ -2535,7 +2535,7 @@ bool FoFiType1C::readCharset() {
break;
}
for (j = 0; j <= nLeft && i < nGlyphs; ++j) {
- charset[i++] = (Gushort)c++;
+ charset[i++] = (unsigned short)c++;
}
}
} else if (charsetFormat == 2) {
@@ -2549,7 +2549,7 @@ bool FoFiType1C::readCharset() {
break;
}
for (j = 0; j <= nLeft && i < nGlyphs; ++j) {
- charset[i++] = (Gushort)c++;
+ charset[i++] = (unsigned short)c++;
}
}
}
diff --git a/fofi/FoFiType1C.h b/fofi/FoFiType1C.h
index cc9a622d..3717c15e 100644
--- a/fofi/FoFiType1C.h
+++ b/fofi/FoFiType1C.h
@@ -133,7 +133,7 @@ struct Type1CEexecBuf {
FoFiOutputFunc outputFunc;
void *outputStream;
bool ascii; // ASCII encoding?
- Gushort r1; // eexec encryption key
+ unsigned short r1; // eexec encryption key
int line; // number of eexec chars left on current line
};
@@ -247,8 +247,8 @@ private:
int nGlyphs;
int nFDs;
unsigned char *fdSelect;
- Gushort *charset;
- Gushort charsetLength;
+ unsigned short *charset;
+ unsigned short charsetLength;
int gsubrBias;
bool parsedOk;