[Git][freetype/freetype-demos][gsoc-2022-chariri-2] 3 commits: [ftinspec

Charlie Jiang pushed to branch gsoc-2022-chariri-2 at FreeType / FreeType Demo Programs

Commits:

22616463

by Charlie Jiang at 2022-07-21T14:52:42+08:00

[ftinspect] Fix Singular Grid View.

When drawing a `FT_BitmapGlyph`, sometimes the `bitmap->top` need to be
negated while sometimes not, so add a argument to control this behavior.

* src/ftinspect/engine/engine.cpp, src/ftinspect/engine/engine.hpp:
  Add `inverseRectY` arg to `Engine::convertGlyphToQImage`.

* src/ftinspect/rendering/glyphbitmap.cpp: Negate Y coord.

* src/ftinspect/rendering/glyphcontinuous.cpp: Don't negate Y coord.

7aece3a7

by Charlie Jiang at 2022-07-22T07:56:10+08:00

* src/ftinspect/engine/engine.hpp: Fix ftinspect segfault.

Always initialize fields in the constructor. The uninitialized `scaler_` is
preventing the guard at `engine.cpp:339` from effecting.

17c09dca

by Charlie Jiang at 2022-07-22T08:05:03+08:00

[ftinspect] Fix CharMap selector when the font file is symlink.

When the font file is a symlink, the font will be periodically reloaded
every 1s. When reloading, if the font's charmaps have no change, then the
charmap selector shouldn't be re-populated, or it would be hard to change
the current charmap.

* src/ftinspect/panels/continuous.cpp: Add a guard to prevent unnecessary
  combobox repopulating.

* src/ftinspect/engine/charmap.hpp: Add proper `operator==` for class
  `CharMapInfo`.

6 changed files:

src/ftinspect/engine/charmap.hpp
src/ftinspect/engine/engine.cpp
src/ftinspect/engine/engine.hpp
src/ftinspect/panels/continuous.cpp
src/ftinspect/rendering/glyphbitmap.cpp
src/ftinspect/rendering/glyphcontinuous.cpp

Changes:

src/ftinspect/engine/charmap.hpp

@@ -27,6 +27,21 @@ struct CharMapInfo
    QString stringifyIndex(int code, int index);
    QString stringifyIndexShort(int code);
++
 +  friend bool
 +  operator==(const CharMapInfo& lhs, const CharMapInfo& rhs)
 +  {
 +    return lhs.index == rhs.index && lhs.encoding == rhs.encoding;
 +  }
++
++
 +  friend bool
 +  operator!=(const CharMapInfo& lhs, const CharMapInfo& rhs)
 +  {
 +    return !(lhs == rhs);
 +  }
++
++
  private:
    int computeMaxIndex();
    static int maxIndexForFaceAndCharMap(FT_CharMap charMap, unsigned max);

src/ftinspect/engine/engine.cpp

@@ -882,7 +882,9 @@ cleanup:
  QImage*
 -Engine::convertGlyphToQImage(FT_Glyph src, QRect* outRect)
 +Engine::convertGlyphToQImage(FT_Glyph src,
 +                             QRect* outRect,
 +                             bool inverseRectY)
+ {
    FT_BitmapGlyph bitmapGlyph;
    bool ownBitmapGlyph
@@ -895,7 +897,10 @@ Engine::convertGlyphToQImage(FT_Glyph src, QRect* outRect)
    if (result && outRect)
+   {
      outRect->setLeft(bitmapGlyph->left);
 -    outRect->setTop(bitmapGlyph->top);
 +    if (inverseRectY)
 +      outRect->setTop(-bitmapGlyph->top);
 +    else
 +      outRect->setTop(bitmapGlyph->top);
      outRect->setWidth(bitmapGlyph->bitmap.width);
      outRect->setHeight(bitmapGlyph->bitmap.rows);
+   }
@@ -908,7 +913,7 @@ Engine::convertGlyphToQImage(FT_Glyph src, QRect* outRect)
  QPoint
 -Engine::computeGlyphOffset(FT_Glyph glyph)
 +Engine::computeGlyphOffset(FT_Glyph glyph, bool inverseY)
+ {
    if (glyph->format == FT_GLYPH_FORMAT_OUTLINE)
+   {
@@ -919,13 +924,17 @@ Engine::computeGlyphOffset(FT_Glyph glyph)
      cbox.yMin &= ~63;
      cbox.xMax = (cbox.xMax + 63) & ~63;
      cbox.yMax = (cbox.yMax + 63) & ~63;
 +    if (inverseY)
 +      cbox.yMax = -cbox.yMax;
      return { static_cast<int>(cbox.xMin) / 64,
                 static_cast<int>(cbox.yMax / 64) };
+   }
    if (glyph->format == FT_GLYPH_FORMAT_BITMAP)
+   {
      auto bg = reinterpret_cast<FT_BitmapGlyph>(glyph);
 -    return { bg->left, -bg->top };
 +    if (inverseY)
 +      return { bg->left, -bg->top };
 +    return { bg->left, bg->top };
+   }
    return {};

src/ftinspect/engine/engine.hpp

@@ -89,8 +89,10 @@ public:
    bool convertGlyphToBitmapGlyph(FT_Glyph src, FT_Glyph* out);
    FT_Bitmap convertBitmapTo8Bpp(FT_Bitmap* bitmap);
    QImage* convertBitmapToQImage(FT_Bitmap* src);
 -  QImage* convertGlyphToQImage(FT_Glyph src, QRect* outRect);
 -  QPoint computeGlyphOffset(FT_Glyph glyph);
 +  QImage* convertGlyphToQImage(FT_Glyph src,
 +                               QRect* outRect,
 +                               bool inverseRectY);
 +  QPoint computeGlyphOffset(FT_Glyph glyph, bool inverseY);
    // reload current triplet, but with updated settings, useful for updating
    // `ftSize_` only
@@ -191,7 +193,7 @@ private:
    FTC_SBitCache sbitsCache_;
    FTC_CMapCache cmapCache_;
 -  FTC_ScalerRec scaler_;
 +  FTC_ScalerRec scaler_ = {};
    FT_Size ftSize_;
    FTC_ImageTypeRec imageType_;

src/ftinspect/panels/continuous.cpp

@@ -112,6 +112,11 @@ ContinuousTab::setGlyphBeginindex(int index)
  void
  ContinuousTab::setCharMaps(std::vector<CharMapInfo>& charMaps)
+ {
 +  if (charMaps_ == charMaps)
 +  {
 +    charMaps_ = charMaps; // Still need to substitute because ptr may differ
 +    return;
 +  }
    charMaps_ = charMaps;
    int oldIndex = charMapSelector_->currentIndex();
    unsigned oldEncoding = 0u;

src/ftinspect/rendering/glyphbitmap.cpp


                          Engine* engine)
 {
   QRect bRect;
-  image_ = engine->convertGlyphToQImage(glyph, &bRect);
+  image_ = engine->convertGlyphToQImage(glyph, &bRect, true);
   boundingRect_ = bRect; // QRectF to QRect
 }
 

src/ftinspect/rendering/glyphcontinuous.cpp

@@ -244,7 +244,7 @@ GlyphContinuous::drawSingleGlyph(QPainter* painter, FT_Glyph glyph)
+   }
    QRect rect;
 -  QImage* image = engine_->convertGlyphToQImage(glyph, &rect);
 +  QImage* image = engine_->convertGlyphToQImage(glyph, &rect, false);
    rect.setTop(height() - rect.top());
    painter->drawImage(rect.topLeft(), *image);

From:	Charlie Jiang (@cqjjjzr)
Subject:	[Git][freetype/freetype-demos][gsoc-2022-chariri-2] 3 commits: [ftinspect] Fix Singular Grid View.
Date:	Fri, 22 Jul 2022 00:10:54 +0000