summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng/font.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvipng/font.c')
-rw-r--r--Build/source/texk/dvipng/font.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/Build/source/texk/dvipng/font.c b/Build/source/texk/dvipng/font.c
index b4fb9d82978..194e156453d 100644
--- a/Build/source/texk/dvipng/font.c
+++ b/Build/source/texk/dvipng/font.c
@@ -4,21 +4,22 @@
Part of the dvipng distribution
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this program. If not, see
- <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
- Copyright (C) 2002-2008 Jan-Åke Larsson
+ Copyright (C) 2002-2005 Jan-Åke Larsson
************************************************************************/
@@ -193,7 +194,7 @@ char* kpse_find_t1_or_tt(char* filename)
{
char* filepath = kpse_find_file(filename, kpse_type1_format, false);
#ifdef HAVE_FT2
- if ((option_flags & USE_FREETYPE) && filepath==NULL)
+ if ((flags & USE_FREETYPE) && filepath==NULL)
filepath = kpse_find_file(filename, kpse_truetype_format, false);
#endif
return(filepath);
@@ -215,7 +216,7 @@ void FontFind(struct font_entry * tfontptr)
InitVF(tfontptr);
}
#ifdef HAVE_FT2_OR_LIBT1
- if ((option_flags & (USE_FREETYPE | USE_LIBT1)) && name==NULL) {
+ if ((flags & (USE_FREETYPE | USE_LIBT1)) && name==NULL) {
tfontptr->psfontmap = FindPSFontMap(tfontptr->n);
if (tfontptr->psfontmap!=NULL) {
TEMPSTR(name,kpse_find_t1_or_tt(tfontptr->psfontmap->psfile));
@@ -230,10 +231,10 @@ void FontFind(struct font_entry * tfontptr)
name=NULL;
} else
#ifdef HAVE_FT2
- if ((option_flags & USE_FREETYPE)==0 || !InitFT(tfontptr)) {
+ if ((flags & USE_FREETYPE)==0 || !InitFT(tfontptr)) {
#endif
#ifdef HAVE_LIBT1
- if ((option_flags & USE_LIBT1)==0 || !InitT1(tfontptr)) {
+ if ((flags & USE_LIBT1)==0 || !InitT1(tfontptr)) {
#endif
/* if Freetype or T1 loading fails for some reason, fall
back to PK font */
@@ -253,18 +254,18 @@ void FontFind(struct font_entry * tfontptr)
if (name!=NULL) {
strcpy (tfontptr->name, name);
if (!FILESTRCASEEQ (tfontptr->n, font_ret.name)) {
- page_flags |= PAGE_GAVE_WARN;
+ flags |= PAGE_GAVE_WARN;
Warning("font %s not found, using %s at %d dpi instead",
tfontptr->n, font_ret.name, font_ret.dpi);
tfontptr->c = 0; /* no checksum warning */
} else if (!kpse_bitmap_tolerance ((double)font_ret.dpi, (double) tfontptr->dpi)) {
- page_flags |= PAGE_GAVE_WARN;
+ flags |= PAGE_GAVE_WARN;
Warning("font %s at %d dpi not found, using %d dpi instead",
tfontptr->name, tfontptr->dpi, font_ret.dpi);
}
InitPK(tfontptr);
} else {
- page_flags |= PAGE_GAVE_WARN;
+ flags |= PAGE_GAVE_WARN;
Warning("font %s at %d dpi not found, characters will be left blank",
tfontptr->n, tfontptr->dpi);
strcpy (tfontptr->name, "None");