8000 Factor out DEBUG_TRUETYPE checks in ttconv, & removals of unused defs. by anntzer · Pull Request #20527 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Factor out DEBUG_TRUETYPE checks in ttconv, & removals of unused defs. #20527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2021
Merged

Factor out DEBUG_TRUETYPE checks in ttconv, & removals of unused defs. #20527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions extern/ttconv/pprdrv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ class TTException
#define DEBUG_TRUETYPE /* truetype fonts, conversion to Postscript */
#endif

#if DEBUG_TRUETYPE
#define debug(...) printf(__VA_ARGS__)
#else
#define debug(...)
#endif

/* Do not change anything below this line. */

enum font_type_enum
Expand Down
50 changes: 0 additions & 50 deletions extern/ttconv/pprdrv_tt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,7 @@ BYTE *GetTable(struct TTFONT *font, const char *name)
{
BYTE *ptr;
ULONG x;

#ifdef DEBUG_TRUETYPE
debug("GetTable(file,font,\"%s\")",name);
#endif

/* We must search the table directory. */
ptr = font->offset_table + 12;
Expand All @@ -142,9 +139,7 @@ BYTE *GetTable(struct TTFONT *font, const char *name)

try
{
#ifdef DEBUG_TRUETYPE
debug("Loading table \"%s\" from offset %d, %d bytes",name,offset,length);
#endif

if ( fseek( font->file, (long)offset, SEEK_SET ) )
{
Expand Down Expand Up @@ -200,10 +195,7 @@ void Read_name(struct TTFONT *font)
int platform; /* Current platform id */
int nameid; /* name id, */
int offset,length; /* offset and length of string. */

#ifdef DEBUG_TRUETYPE
debug("Read_name()");
#endif

table_ptr = NULL;

Expand Down Expand Up @@ -235,11 +227,8 @@ void Read_name(struct TTFONT *font)
nameid = getUSHORT(ptr2+6);
length = getUSHORT(ptr2+8);
offset = getUSHORT(ptr2+10);

#ifdef DEBUG_TRUETYPE
debug("platform %d, encoding %d, language 0x%x, name %d, offset %d, length %d",
platform,encoding,language,nameid,offset,length);
#endif

/* Copyright notice */
if ( platform == 1 && nameid == 0 )
Expand All @@ -248,10 +237,7 @@ void Read_name(struct TTFONT *font)
strncpy(font->Copyright,(const char*)strings+offset,length);
font->Copyright[length]='\0';
replace_newlines_with_spaces(font->Copyright);

#ifdef DEBUG_TRUETYPE
debug("font->Copyright=\"%s\"",font->Copyright);
#endif
continue;
}

Expand All @@ -264,10 +250,7 @@ void Read_name(struct TTFONT *font)
strncpy(font->FamilyName,(const char*)strings+offset,length);
font->FamilyName[length]='\0';
replace_newlines_with_spaces(font->FamilyName);

#ifdef DEBUG_TRUETYPE
debug("font->FamilyName=\"%s\"",font->FamilyName);
#endif
continue;
}

Expand All @@ -280,10 +263,7 @@ void Read_name(struct TTFONT *font)
strncpy(font->Style,(const char*)strings+offset,length);
font->Style[length]='\0';
replace_newlines_with_spaces(font->Style);

#ifdef DEBUG_TRUETYPE
debug("font->Style=\"%s\"",font->Style);
#endif
continue;
}

Expand All @@ -296,10 +276,7 @@ void Read_name(struct TTFONT *font)
strncpy(font->FullName,(const char*)strings+offset,length);
font->FullName[length]='\0';
replace_newlines_with_spaces(font->FullName);

#ifdef DEBUG_TRUETYPE
debug("font->FullName=\"%s\"",font->FullName);
#endif
continue;
}

Expand All @@ -312,10 +289,7 @@ void Read_name(struct TTFONT *font)
strncpy(font->Version,(const char*)strings+offset,length);
font->Version[length]='\0';
replace_newlines_with_spaces(font->Version);

#ifdef DEBUG_TRUETYPE
debug("font->Version=\"%s\"",font->Version);
#endif
continue;
}

Expand All @@ -328,10 +302,7 @@ void Read_name(struct TTFONT *font)
strncpy(font->PostName,(const char*)strings+offset,length);
font->PostName[length]='\0';
replace_newlines_with_spaces(font->PostName);

#ifdef DEBUG_TRUETYPE
debug("font->PostName=\"%s\"",font->PostName);
#endif
continue;
}

Expand All @@ -343,10 +314,7 @@ void Read_name(struct TTFONT *font)
utf16be_to_ascii(font->PostName, (char *)strings+offset, length);
font->PostName[length/2]='\0';
replace_newlines_with_spaces(font->PostName);

#ifdef DEBUG_TRUETYPE
debug("font->PostName=\"%s\"",font->PostName);
#endif
continue;
}

Expand All @@ -358,10 +326,7 @@ void Read_name(struct TTFONT *font)
strncpy(font->Trademark,(const char*)strings+offset,length);
font->Trademark[length]='\0';
replace_newlines_with_spaces(font->Trademark);

#ifdef DEBUG_TRUETYPE
debug("font->Trademark=\"%s\"",font->Trademark);
#endif
continue;
}
}
Expand Down Expand Up @@ -677,10 +642,7 @@ void sfnts_glyf_table(TTStreamWriter& stream, struct TTFONT *font, ULONG oldoffs
ULONG total=0; /* running total of bytes written to table */
int x;
bool loca_is_local=false;

#ifdef DEBUG_TRUETYPE
debug("sfnts_glyf_table(font,%d)", (int)correct_total_length);
#endif

if (font->loca_table == NULL)
{
Expand Down Expand Up @@ -709,10 +671,7 @@ void sfnts_glyf_table(TTStreamWriter& stream, struct TTFONT *font, ULONG oldoffs
length = getULONG( font->loca_table + ((x+1) * 4) );
length -= off;
}

#ifdef DEBUG_TRUETYPE
debug("glyph length=%d",(int)length);
#endif

/* Start new string if necessary. */
sfnts_new_table( stream, (int)length );
Expand Down Expand Up @@ -847,12 +806,10 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font)
sfnts_pputUSHORT(stream, 3); /* entrySelector */
sfnts_pputUSHORT(stream, 81); /* rangeShift */
}
#ifdef DEBUG_TRUETYPE
else
{
debug("only %d tables selected",count);
}
#endif

/* Now, emmit the table directory. */
for (x=0; x < 9; x++)
Expand Down Expand Up @@ -885,10 +842,7 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font)
{
continue;
}

#ifdef DEBUG_TRUETYPE
debug("emmiting table '%s'",table_names[x]);
#endif

/* 'glyf' table gets special treatment */
if ( strcmp(table_names[x],"glyf")==0 )
Expand Down Expand Up @@ -1278,9 +1232,7 @@ void read_font(const char *filename, font_type_enum target_type, std::vector<int

/* Determine how many directory entries there are. */
font.numTables = getUSHORT( font.offset_table + 4 );
#ifdef DEBUG_TRUETYPE
debug("numTables=%d",(int)font.numTables);
#endif

/* Expand the memory block to hold the whole thing. */
font.offset_table = (BYTE*)realloc( font.offset_table, sizeof(BYTE) * (12 + font.numTables * 16) );
Expand All @@ -1301,9 +1253,7 @@ void read_font(const char *filename, font_type_enum target_type, std::vector<int
font.MfrRevision = getFixed( ptr + 4 ); /* font revision number */
font.unitsPerEm = getUSHORT( ptr + 18 );
font.HUPM = font.unitsPerEm / 2;
#ifdef DEBUG_TRUETYPE
debug("unitsPerEm=%d",(int)font.unitsPerEm);
#endif
font.llx = topost2( getFWord( ptr + 36 ) ); /* bounding box info */
font.lly = topost2( getFWord( ptr + 38 ) );
font.urx = topost2( getFWord( ptr + 40 ) );
Expand Down
6 changes: 0 additions & 6 deletions extern/ttconv/pprdrv_tt2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,6 @@ struct FlaggedPoint
FlaggedPoint(Flag flag_, FWord x_, FWord y_): flag(flag_), x(x_), y(y_) {};
};

double area(FWord *x, FWord *y, int n);
#define sqr(x) ((x)*(x))

#define NOMOREINCTR -1
#define NOMOREOUTCTR -1

/*
** This routine is used to break the character
** procedure up into a number of smaller
Expand Down
12 changes: 0 additions & 12 deletions extern/ttconv/ttutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@
#include <cstdlib>
#include "pprdrv.h"

#if DEBUG_TRUETYPE
void debug(const char *format, ... )
{
va_list arg_list;
va_start(arg_list, format);

printf(format, arg_list);

va_end(arg_list);
}
#endif

#define PRINTF_BUFFER_SIZE 512
void TTStreamWriter::printf(const char* format, ...)
{
Expand Down
0