main/graphite/graphite-2.3.1.patch

18  // Uncomment this to allow multiple versions of gr to coexist
19  // in the same program e.g. pangographite with gtk uses namespace gr
24 -//#define gr gr2
25 +#define gr gr3ooo
263 -       void * pSimpleGlyf = GlyfLookup(static_cast<gr::gid16>(rgnCompId[i]),
264 +       pSimpleGlyf = GlyfLookup(static_cast<gr::gid16>(rgnCompId[i]),
270  bool GlyfPoints(gr::gid16 nGlyphId, const void * pGlyf,
1807 -bool GrUtfTextSrc::getRightToLeft(gr::toffset ich)
1808 +bool GrUtfTextSrc::getRightToLeft(gr::toffset /*ich*/)
1813 -unsigned int GrUtfTextSrc::getDirectionDepth(gr::toffset ich)
1814 +unsigned int GrUtfTextSrc::getDirectionDepth(gr::toffset /*ich*/)
1822 -size_t GrUtfTextSrc::getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset)
1823 +size_t GrUtfTextSrc::getFontFeatures(gr::toffset /*ich*/, gr::FeatureSetting * /*prgfset*/)
1831 -GrUtfTextSrc::getFontSize(gr::toffset ich)
1832 +GrUtfTextSrc::getFontSize(gr::toffset /*ich*/)
1839 -GrUtfTextSrc::getBold(gr::toffset ich)
1840 +GrUtfTextSrc::getBold(gr::toffset /*ich*/)
1848 -GrUtfTextSrc::getItalic(gr::toffset ich)
1849 +GrUtfTextSrc::getItalic(gr::toffset /*ich*/)
1857 -gr::isocode GrUtfTextSrc::getLanguage(gr::toffset ich)
1858 +gr::isocode GrUtfTextSrc::getLanguage(gr::toffset /*ich*/)
1860    gr::isocode unknown;
1865    virtual size_t fetch(gr::toffset ichMin, size_t cch, gr::utf32 * prgchBuffer);
1866    virtual size_t fetch(gr::toffset ichMin, size_t cch, gr::utf16 * prgchwBuffer);
1867    virtual size_t fetch(gr::toffset ichMin, size_t cch, gr::utf8  * prgchsBuffer);
1868 -  virtual gr::GrResult getFaceName(int ich, unsigned int cchMax,
1869 +  virtual gr::GrResult getFaceName(int /*ich*/, unsigned int /*cchMax*/,
1870      gr::utf16 * prgchFaceName, unsigned int * pcchLen)
1874    virtual bool getItalic(gr::toffset ich);
1875    virtual bool getRightToLeft(gr::toffset ich);
1876    virtual unsigned int getDirectionDepth(gr::toffset ich);
1877 -  virtual float getVerticalOffset(gr::toffset ich) { return 0;};
1878 +  virtual float getVerticalOffset(gr::toffset /*ich*/) { return 0;};
1879    virtual gr::isocode getLanguage(gr::toffset ich);
1881    virtual std::pair<gr::toffset, gr::toffset> propertyRange(gr::toffset ich);
1882    virtual size_t getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset);
1883 -  virtual bool sameSegment(gr::toffset ich1, gr::toffset ich2) { return true; };
1884 +  virtual bool sameSegment(gr::toffset /*ich1*/, gr::toffset /*ich2*/) { return true; };
1889    virtual void getColors(gr::toffset ich, int * pclrFore, int * pclrBack);
1892 -  virtual gr::GrResult Fetch(int ichMin, int ichLim, gr::utf16 * prgchBuf) { return gr::kresNotImp…
1893 -  virtual gr::GrResult get_Length(int * pcch) { return gr::kresNotImpl; };
1894 -  virtual gr::GrResult GetFontVariations(int ich,
1896 -    int * pichMin, int * pichLim) { return gr::kresNotImpl; };
1897 +  virtual gr::GrResult Fetch(int /*ichMin*/, int /*ichLim*/, gr::utf16 * /*prgchBuf*/) { return gr…
1898 +  virtual gr::GrResult get_Length(int * /*pcch*/) { return gr::kresNotImpl; };
1899 +  virtual gr::GrResult GetFontVariations(int /*ich*/,
1901 +    int * /*pichMin*/, int * /*pichLim*/) { return gr::kresNotImpl; };
1908  typedef std::pair< gr::GlyphIterator, gr::GlyphIterator > GlyphRange;
1986     virtual size_t fetch(toffset ichMin, size_t cch, gr::utf16 * prgchwBuffer);
2058  void WinFont::getGlyphMetrics(gid16 chw, gr::Rect & boundingBox, gr::Point & advances)
2079 +        (*m_pGlyphMetricMap)[chw] = std::pair<gr::Rect,gr::Point>(boundingBox, advances);
2158  namespace gr
2160 +typedef std::map<gid16, std::pair<gr::Rect, gr::Point> > GlyphMetricMap;
2205         // Note: size of prgfset buffer = gr::kMaxFeatures = 64
2429  namespace gr