summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng/sfd.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-09 23:09:19 +0000
committerKarl Berry <karl@freefriends.org>2008-05-09 23:09:19 +0000
commitfc0d5bd5d823bb4ad11757609ea705390e975479 (patch)
tree87164107acc12ecd361a1eae24c9dfc69f95c59e /Build/source/texk/dvipng/sfd.c
parenteeb60f2336ed350f714dbbfc58bc224afe8ad333 (diff)
dvipng 1.10 (but reverting configure.ac to ours) from savannah.nongnu.org
git-svn-id: svn://tug.org/texlive/trunk@7995 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng/sfd.c')
-rw-r--r--Build/source/texk/dvipng/sfd.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/Build/source/texk/dvipng/sfd.c b/Build/source/texk/dvipng/sfd.c
index f69d7f4ed73..ea9f2fe456d 100644
--- a/Build/source/texk/dvipng/sfd.c
+++ b/Build/source/texk/dvipng/sfd.c
@@ -4,22 +4,21 @@
Part of the dvipng distribution
- 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 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 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
- General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- 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.
+ 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/>.
- Copyright (C) 2006 Jan-Åke Larsson
+ Copyright (C) 2002-2008 Jan-Åke Larsson
************************************************************************/
@@ -42,8 +41,8 @@ struct subfont* ReadSubfont(char* sfdname, char *infix)
}
DEBUG_PRINT((DEBUG_FT|DEBUG_ENC),("\n OPEN SUBFONT:\t'%s'", sfdfile));
if (MmapFile(sfdfile,&fmmap)) return(NULL);
- pos=fmmap.dp_mmap;
- max=fmmap.dp_mmap+fmmap.size;
+ pos=fmmap.data;
+ max=fmmap.data+fmmap.size;
while(pos<max && (*pos==' ' || *pos=='\n' || *pos=='\t')) pos++;
while (pos<max && *pos=='#') {
while(pos<max && *pos!='\n') pos++;