← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xpdf/lucid-updates

« back to all changes in this revision

Viewing changes to splash/SplashFTFontFile.cc

  • Committer: Bazaar Package Importer
  • Author(s): Andy Price
  • Date: 2007-05-17 22:04:33 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517220433-gzcx2lrvllkbl7mr
Tags: 3.02-1ubuntu1
https://launchpad.net/bugs/113365
* Merge from Debian unstable (LP: #113365), remaining changes:
  - Added back 09_xpdfrc_manpage.dpatch (LP #71753)
  - Set Ubuntu maintainer

Show diffs side-by-side

added added

removed removed

Lines of Context:
splash/SplashFTFontFile.cc
43
43
  }
44
44
 
45
45
  return new SplashFTFontFile(engineA, idA, fileNameA, deleteFileA,
46
 
                              faceA, codeToGIDA, 256);
 
46
                              faceA, codeToGIDA, 256, gFalse);
47
47
}
48
48
 
49
49
SplashFontFile *SplashFTFontFile::loadCIDFont(SplashFTFontEngine *engineA,
59
59
  }
60
60
 
61
61
  return new SplashFTFontFile(engineA, idA, fileNameA, deleteFileA,
62
 
                              faceA, codeToGIDA, codeToGIDLenA);
 
62
                              faceA, codeToGIDA, codeToGIDLenA, gFalse);
63
63
}
64
64
 
65
65
SplashFontFile *SplashFTFontFile::loadTrueTypeFont(SplashFTFontEngine *engineA,
75
75
  }
76
76
 
77
77
  return new SplashFTFontFile(engineA, idA, fileNameA, deleteFileA,
78
 
                              faceA, codeToGIDA, codeToGIDLenA);
 
78
                              faceA, codeToGIDA, codeToGIDLenA, gTrue);
79
79
}
80
80
 
81
81
SplashFTFontFile::SplashFTFontFile(SplashFTFontEngine *engineA,
82
82
                                   SplashFontFileID *idA,
83
83
                                   char *fileNameA, GBool deleteFileA,
84
84
                                   FT_Face faceA,
85
 
                                   Gushort *codeToGIDA, int codeToGIDLenA):
 
85
                                   Gushort *codeToGIDA, int codeToGIDLenA,
 
86
                                   GBool trueTypeA):
86
87
  SplashFontFile(idA, fileNameA, deleteFileA)
87
88
{
88
89
  engine = engineA;
89
90
  face = faceA;
90
91
  codeToGID = codeToGIDA;
91
92
  codeToGIDLen = codeToGIDLenA;
 
93
  trueType = trueTypeA;
92
94
}
93
95
 
94
96
SplashFTFontFile::~SplashFTFontFile() {
100
102
  }
101
103
}
102
104
 
103
 
SplashFont *SplashFTFontFile::makeFont(SplashCoord *mat) {
 
105
SplashFont *SplashFTFontFile::makeFont(SplashCoord *mat,
 
106
                                       SplashCoord *textMat) {
104
107
  SplashFont *font;
105
108
 
106
 
  font = new SplashFTFont(this, mat);
 
109
  font = new SplashFTFont(this, mat, textMat);
107
110
  font->initCache();
108
111
  return font;
109
112
}