FCL/sf/mw/qt: comparison src/gui/text/qfontengine

equal deleted inserted replaced

-:93b982ccede2
+:5daf16870df6
 cache_cost = 100;
 kerning_pairs_loaded = false;
 transform = false;
 antialias = true;
 freetype = 0;
-default_load_flags = 0;
+default_load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
 default_hint_style = HintNone;
 subpixelType = Subpixel_None;
 lcdFilterType = 0;
 #if defined(FT_LCD_FILTER_H)
 lcdFilterType = (int)((quintptr) FT_LCD_FILTER_DEFAULT);
 return true;
 }
 QFontEngineFT::Glyph *QFontEngineFT::loadGlyphMetrics(QGlyphSet *set, uint glyph) const
 {
-Glyph *g = set->glyph_data.value(glyph);
+Glyph *g = set->getGlyph(glyph);
 if (g)
 return g;
 int load_flags = FT_LOAD_DEFAULT | default_load_flags;
 if (set->outline_drawing)
 } else {
 format = Format_Mono;
 }
 }
-Glyph *g = set->glyph_data.value(glyph);
+Glyph *g = set->getGlyph(glyph);
 if (g && g->format == format) {
 if (uploadToServer && !g->uploadedToServer) {
-set->glyph_data[glyph] = 0;
+set->setGlyph(glyph, 0);
 delete g;
 g = 0;
 } else {
 return g;
 }
 if (uploadToServer) {
 uploadGlyphToServer(set, glyph, g, &info, glyph_buffer_size);
 }
-set->glyph_data[glyph] = g;
+set->setGlyph(glyph, g);
 return g;
 }
 bool QFontEngineFT::uploadGlyphToServer(QGlyphSet *set, uint glyphid, Glyph *g, GlyphInfo *info, int glyphDataSize) const
 }
 }
 if (!gs) {
 // don't try to load huge fonts
-bool draw_as_outline = fontDef.pixelSize * qSqrt(matrix.det()) >= 64;
+bool draw_as_outline = fontDef.pixelSize * qSqrt(qAbs(matrix.det())) >= 64;
 if (draw_as_outline)
 return 0;
 // don't cache more than 10 transformations
 if (transformedGlyphSets.count() >= 10) {
 } else {
 transformedGlyphSets.prepend(QGlyphSet());
 }
 gs = &transformedGlyphSets[0];
-qDeleteAll(gs->glyph_data);
+gs->clear();
-gs->glyph_data.clear();
 gs->id = allocateServerGlyphSet();
 gs->transformationMatrix = m;
 gs->outline_drawing = draw_as_outline;
 bool QFontEngineFT::loadGlyphs(QGlyphSet *gs, glyph_t *glyphs, int num_glyphs, GlyphFormat format)
 {
 FT_Face face = 0;
 for (int i = 0; i < num_glyphs; ++i) {
-Glyph *glyph = gs->glyph_data.value(glyphs[i]);
+Glyph *glyph = gs->getGlyph(glyphs[i]);
 if (glyph == 0 || glyph->format != format) {
 if (!face) {
 face = lockFace();
 FT_Matrix m = matrix;
 FT_Matrix_Multiply(&gs->transformationMatrix, &m);
 void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlags flags) const
 {
 FT_Face face = 0;
 if (flags & QTextEngine::DesignMetrics) {
 for (int i = 0; i < glyphs->numGlyphs; i++) {
-Glyph *g = defaultGlyphSet.glyph_data.value(glyphs->glyphs[i]);
+Glyph *g = defaultGlyphSet.getGlyph(glyphs->glyphs[i]);
 if (g) {
 glyphs->advances_x[i] = QFixed::fromFixed(g->linearAdvance);
 } else {
 if (!face)
 face = lockFace();
 }
 glyphs->advances_y[i] = 0;
 }
 } else {
 for (int i = 0; i < glyphs->numGlyphs; i++) {
-Glyph *g = defaultGlyphSet.glyph_data.value(glyphs->glyphs[i]);
+Glyph *g = defaultGlyphSet.getGlyph(glyphs->glyphs[i]);
 if (g) {
 glyphs->advances_x[i] = QFixed(g->advance);
 } else {
 if (!face)
 face = lockFace();
 overall.height = ascent() + descent() + 1;
 QFixed ymax = 0;
 QFixed xmax = 0;
 for (int i = 0; i < glyphs.numGlyphs; i++) {
-Glyph *g = defaultGlyphSet.glyph_data.value(glyphs.glyphs[i]);
+Glyph *g = defaultGlyphSet.getGlyph(glyphs.glyphs[i]);
 if (!g) {
 if (!face)
 face = lockFace();
 g = loadGlyph(glyphs.glyphs[i], Format_None, true);
 }
 glyph_metrics_t QFontEngineFT::boundingBox(glyph_t glyph)
 {
 FT_Face face = 0;
 glyph_metrics_t overall;
-Glyph *g = defaultGlyphSet.glyph_data.value(glyph);
+Glyph *g = defaultGlyphSet.getGlyph(glyph);
 if (!g) {
 face = lockFace();
 g = loadGlyph(glyph, Format_None, true);
 }
 if (g) {
 freeServerGlyphSet(transformedGlyphSets.at(0).id);
 } else {
 transformedGlyphSets.prepend(QGlyphSet());
 }
 glyphSet = &transformedGlyphSets[0];
-qDeleteAll(glyphSet->glyph_data);
+glyphSet->clear();
-glyphSet->glyph_data.clear();
 glyphSet->id = allocateServerGlyphSet();
 glyphSet->transformationMatrix = m;
 }
 Q_ASSERT(glyphSet);
 } else {
 glyphSet = &defaultGlyphSet;
 }
-Glyph * g = glyphSet->glyph_data.value(glyph);
+Glyph * g = glyphSet->getGlyph(glyph);
 if (!g) {
 face = lockFace();
 g = loadGlyphMetrics(glyphSet, glyph);
 }
 return img;
 }
 void QFontEngineFT::removeGlyphFromCache(glyph_t glyph)
 {
-delete defaultGlyphSet.glyph_data.take(glyph);
+defaultGlyphSet.removeGlyphFromCache(glyph);
 }
 int QFontEngineFT::glyphCount() const
 {
 int count = 0;
 {
 transformationMatrix.xx = 0x10000;
 transformationMatrix.yy = 0x10000;
 transformationMatrix.xy = 0;
 transformationMatrix.yx = 0;
+memset(fast_glyph_data, 0, sizeof(fast_glyph_data));
+fast_glyph_count = 0;
 }
 QFontEngineFT::QGlyphSet::~QGlyphSet()
 {
+clear();
+}
+void QFontEngineFT::QGlyphSet::clear()
+{
+if (fast_glyph_count > 0) {
+for (int i = 0; i < 256; ++i) {
+if (fast_glyph_data[i]) {
+delete fast_glyph_data[i];
+fast_glyph_data[i] = 0;
+}
+}
+fast_glyph_count = 0;
+}
 qDeleteAll(glyph_data);
+glyph_data.clear();
+}
+void QFontEngineFT::QGlyphSet::removeGlyphFromCache(int index)
+{
+if (index < 256) {
+if (fast_glyph_data[index]) {
+delete fast_glyph_data[index];
+fast_glyph_data[index] = 0;
+if (fast_glyph_count > 0)
+--fast_glyph_count;
+}
+} else {
+delete glyph_data.take(index);
+}
+}
+void QFontEngineFT::QGlyphSet::setGlyph(int index, Glyph *glyph)
+{
+if (index < 256) {
+if (!fast_glyph_data[index])
+++fast_glyph_count;
+fast_glyph_data[index] = glyph;
+} else {
+glyph_data.insert(index, glyph);
+}
 }
 unsigned long QFontEngineFT::allocateServerGlyphSet()
 {
 return 0;

branch	GCC_SURGE
changeset 31	5daf16870df6
parent 30	5dc02b23752f
child 33	3e2da88830cd