Ignore:
Timestamp:
Aug 27, 2010, 11:00:52 AM (11 years ago)
Author:
Silvan Scherrer
Message:

poppler update to 0.14.2

Location:
trunk/poppler/mypoppler/fofi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/mypoppler/fofi/FoFiType1.cc

    r257 r461  
    1616// Copyright (C) 2005, 2008 Albert Astals Cid <aacid@kde.org>
    1717// Copyright (C) 2005 Kristian HÞgsberg <krh@redhat.com>
     18// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net>
    1819//
    1920// To see a description of the changes please see the Changelog file that
     
    193194  char c;
    194195  int n, code, i, j;
     196  char *tokptr;
    195197
    196198  for (i = 1, line = (char *)file;
     
    203205      buf[255] = '\0';
    204206      if ((p = strchr(buf+9, '/')) &&
    205           (p = strtok(p+1, " \t\n\r"))) {
     207          (p = strtok_r(p+1, " \t\n\r", &tokptr))) {
    206208        name = copyString(p);
    207209      }
     
    271273          }
    272274        } else {
    273           if (strtok(buf, " \t") &&
    274               (p = strtok(NULL, " \t\n\r")) && !strcmp(p, "def")) {
     275          if (strtok_r(buf, " \t", &tokptr) &&
     276              (p = strtok_r(NULL, " \t\n\r", &tokptr)) && !strcmp(p, "def")) {
    275277            break;
    276278          }
  • trunk/poppler/mypoppler/fofi/FoFiType1C.cc

    r277 r461  
    1414// under GPL version 2 or later
    1515//
    16 // Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
     16// Copyright (C) 2009, 2010 Albert Astals Cid <aacid@kde.org>
    1717//
    1818// To see a description of the changes please see the Changelog file that
     
    805805    //~ font up by FD; as a kludge we ignore CID 0, which is .notdef
    806806    fd = 0;
    807     for (j = i==0 ? 1 : 0; j < 256 && i+j < nCIDs; ++j) {
    808       if (cidMap[i+j] >= 0) {
    809         fd = fdSelect[cidMap[i+j]];
    810         break;
     807    if (fdSelect != NULL) {
     808      for (j = i==0 ? 1 : 0; j < 256 && i+j < nCIDs; ++j) {
     809        if (cidMap[i+j] >= 0) {
     810          fd = fdSelect[cidMap[i+j]];
     811          break;
     812        }
    811813      }
    812814    }
Note: See TracChangeset for help on using the changeset viewer.