[Git][freetype/freetype-demos][ftinspect-psname] 3 commits: * src/ftmult

Charlie Jiang pushed to branch ftinspect-psname at FreeType / FreeType Demo Programs

Commits:

91b961fa

by Charlie Jiang at 2023-10-03T21:04:12+08:00

* src/ftmulti.c: Fix crash when exiting due to `FT_Get_MM_Var` and `free` mismatch.

3228489a

by Charlie Jiang at 2023-10-05T15:21:59+08:00

[ftinspect] Separate the `FTC_FaceID` of faces/sizes for rendering and ...

... information retrieval.

This fixes the PostScript name display in the Font Info tab.

* src/ftinspect/engine/engine.cpp, src/ftinspect/engine/engine.hpp:
  Use the highest bit of `FTC_FaceID` to indicate that the face/size is for
  rendering (safe for some modification to the face, e.g. MM/GX coords).

ada48b53

by Charlie Jiang at 2023-10-05T15:21:59+08:00

[ftinspect] Add PostScript constructed name display for MM/GX fonts.

Fixes #57 . Added a text box showing current constructed PostScript name
with MM/GX coords included according to TN #5902.

* src/ftinspect/panels/settingpanelmmgx.cpp,
  src/ftinspect/panels/settingpanelmmgx.hpp:
  Add the PostScript name text box.
  Track the dirty state of the axes, so when all axes are in "default" state
  the "basic" PS name will be displayed (e.g. "NotoSansCJKtc-DemiLight"),
  while when any axis has its value modified, the constructed PS name will
  be displayed (e.g. "NotoSansCJKTC_350wght").
  Even when the value equals to the default one, as long as the value was
  touched by user, the name will be the constructed one. To clear the dirty
  state, the "Def" button for each axis, or the "Reset to Default" button
  should be used.

* src/ftinspect/engine/engine.cpp, src/ftinspect/engine/engine.hpp:
  Add two fields tracking PS name (one with "basic" name, and one possibly
  constructed from MM/GX coords).

* src/ftinspect/engine/fontinfo.cpp: Change to use the PS name from engine.

6 changed files:

src/ftinspect/engine/engine.cpp
src/ftinspect/engine/engine.hpp
src/ftinspect/engine/fontinfo.cpp
src/ftinspect/panels/settingpanelmmgx.cpp
src/ftinspect/panels/settingpanelmmgx.hpp
src/ftmulti.c

Changes:

src/ftinspect/engine/engine.cpp

@@ -79,18 +79,14 @@ faceRequester(FTC_FaceID ftcFaceID,
                FT_Pointer requestData,
                FT_Face* faceP)
+ {
 -  Engine* engine = static_cast<Engine*>(requestData);
 -  // `ftcFaceID` is actually an integer
 -  // -> First convert pointer to same-width integer, then discard superfluous
 -  //    bits (e.g., on x86_64 where pointers are wider than `int`).
 -  int val = static_cast<int>(reinterpret_cast<intptr_t>(ftcFaceID));
 -  // Make sure this does not cause information loss.
 -  Q_ASSERT_X(sizeof(void*) >= sizeof(int),
 -             "faceRequester",
 -             "Pointer size must be at least the size of int"
 -             " in order to treat FTC_FaceID correctly");
+-
 -  const FaceID& faceID = engine->faceIDMap_.key(val);
 +  auto* engine = static_cast<Engine*>(requestData);
 +  // The highest bit of ftcFaceID:
 +  // 0 - fallback face (for information retrieval),
 +  // 1 - rendering face/size
 +  // Trim the highest bit
 +  auto faceIdInt = reinterpret_cast<uintptr_t>(ftcFaceID) & (UINTPTR_MAX >> 1);
++
 +  const FaceID& faceID = engine->faceIDMap_.key(faceIdInt);
    // This is the only place where we have to check the validity of the font
    // index; note that the validity of both the face and named instance index
@@ -179,6 +175,8 @@ Engine::withFace(FaceID id,
+ {
    FT_Face face;
    // Search triplet (fontIndex, faceIndex, namedInstanceIndex).
 +  // numId doesn't have the highest bit set, so the face is looked up for
 +  // retrieving info, thus no rendering / writing should be done in the callback
    auto numId = reinterpret_cast<FTC_FaceID>(faceIDMap_.value(id));
    if (numId)
+   {
@@ -292,6 +290,47 @@ Engine::currentFontTricky()
+ }
 +FTC_FaceID getFTCIdWithHighestBitSet(FTC_FaceID id)
 +{
 +  Q_ASSERT_X(sizeof(FTC_FaceID) >= sizeof(uintptr_t),
 +      "getFTCIdWithHighestBitSet",
 +      "FTC_FaceID must be longer than uintptr_t");
 +  return reinterpret_cast<FTC_FaceID>(
 +      reinterpret_cast<uintptr_t>(id)
 +      | (UINTPTR_MAX & ~INTPTR_MAX)
 +    );
 +}
++
++
 +FTC_FaceID getFTCIdWithHighestBitClear(FTC_FaceID id)
 +{
 +  Q_ASSERT_X(sizeof(FTC_FaceID) >= sizeof(uintptr_t),
 +      "getFTCIdWithHighestBitClear",
 +      "FTC_FaceID must be longer than uintptr_t");
 +  return reinterpret_cast<FTC_FaceID>(
 +      reinterpret_cast<uintptr_t>(id) & INTPTR_MAX
 +    );
 +}
++
++
 +void
 +Engine::loadFontWithFTCId(FTC_FaceID ftcId)
 +{
 +  if (!FTC_Manager_LookupFace(cacheManager_, ftcId,
 +                              &ftFallbackFace_))
 +  {
 +    scaler_.face_id = getFTCIdWithHighestBitSet(ftcId);
 +    if (FTC_Manager_LookupSize(cacheManager_, &scaler_, &ftSize_))
 +      ftSize_ = NULL; // Good font, bad size.
 +  }
 +  else
 +  {
 +    ftFallbackFace_ = NULL;
 +    ftSize_ = NULL;
 +  }
 +}
++
++
  int
  Engine::loadFont(int fontIndex,
                   long faceIndex,
@@ -307,50 +346,36 @@ Engine::loadFont(int fontIndex,
    auto id = FaceID(fontIndex, faceIndex, namedInstanceIndex);
    // Search triplet (fontIndex, faceIndex, namedInstanceIndex).
 -  scaler_.face_id = reinterpret_cast<FTC_FaceID>(faceIDMap_.value(id));
 -  if (scaler_.face_id)
 +  auto face_id = reinterpret_cast<FTC_FaceID>(faceIDMap_.value(id));
 +  if (face_id)
+   {
      // Found.
 -    if (!FTC_Manager_LookupFace(cacheManager_, scaler_.face_id,
 -                               &ftFallbackFace_))
 -    {
 +    loadFontWithFTCId(face_id);
 +    if (ftFallbackFace_)
        numGlyphs = ftFallbackFace_->num_glyphs;
 -      if (FTC_Manager_LookupSize(cacheManager_, &scaler_, &ftSize_))
 -        ftSize_ = NULL; // Good font, bad size.
 -    }
 -    else
 -    {
 -      ftFallbackFace_ = NULL;
 -      ftSize_ = NULL;
 -    }
+   }
    else if (fontIndex >= 0)
+   {
 -    if (faceCounter_ >= INT_MAX) // Prevent overflow.
 +    if (faceCounter_ >= INTPTR_MAX) // Prevent overflow.
        return -1;
      // Not found; try to load triplet
      // (fontIndex, faceIndex, namedInstanceIndex).
 -    scaler_.face_id = reinterpret_cast<FTC_FaceID>(faceCounter_);
 +    face_id = reinterpret_cast<FTC_FaceID>(faceCounter_);
      faceIDMap_.insert(id, faceCounter_++);
+-
 -    if (!FTC_Manager_LookupFace(cacheManager_, scaler_.face_id,
 -                                &ftFallbackFace_))
 -    {
 +    loadFontWithFTCId(face_id);
 +    if (ftFallbackFace_)
        numGlyphs = ftFallbackFace_->num_glyphs;
 -      if (FTC_Manager_LookupSize(cacheManager_, &scaler_, &ftSize_))
 -        ftSize_ = NULL; // Good font, bad size.
 -    }
      else
+     {
        faceIDMap_.remove(id);
        faceCounter_--;
 -      ftFallbackFace_ = NULL;
 -      ftSize_ = NULL;
 +      scaler_.face_id = 0;
 +      face_id = 0;
+     }
+   }
 -  imageType_.face_id = scaler_.face_id;
 +  imageType_.face_id = face_id ? getFTCIdWithHighestBitSet(face_id) : 0;
    if (numGlyphs < 0)
+   {
@@ -367,6 +392,12 @@ Engine::loadFont(int fontIndex,
+   {
      curFamilyName_ = QString(ftFallbackFace_->family_name);
      curStyleName_ = QString(ftFallbackFace_->style_name);
 +    auto* psName = FT_Get_Postscript_Name(ftFallbackFace_);
 +    if (psName)
 +      curPostScriptNameWithoutCoords_ = psName;
 +    else
 +      curPostScriptNameWithoutCoords_ = QString();
 +    curPostScriptNameWithCoords_ = curPostScriptNameWithoutCoords_;
      const char* moduleName = FT_FACE_DRIVER_NAME(ftFallbackFace_);
@@ -403,16 +434,17 @@ Engine::reloadFont()
    palette_ = NULL;
    if (!scaler_.face_id)
      return;
 -  imageType_.face_id = scaler_.face_id;
 +  imageType_.face_id = getFTCIdWithHighestBitSet(scaler_.face_id);
    if (FTC_Manager_LookupFace(cacheManager_,
 -                             scaler_.face_id,
 +                             getFTCIdWithHighestBitClear(scaler_.face_id),
                               &ftFallbackFace_))
+   {
      ftFallbackFace_ = NULL;
      ftSize_ = NULL;
      return;
+   }
 +  scaler_.face_id = getFTCIdWithHighestBitSet(scaler_.face_id);
    if (FTC_Manager_LookupSize(cacheManager_, &scaler_, &ftSize_))
      ftSize_ = NULL; // Good font, bad size.
+ }
@@ -847,6 +879,9 @@ Engine::applyMMGXDesignCoords(FT_Fixed* coords,
    FT_Set_Var_Design_Coordinates(ftSize_->face,
                                  static_cast<unsigned>(count),
                                  coords);
 +  auto* psName = FT_Get_Postscript_Name(ftSize_->face);
 +  if (psName)
 +    curPostScriptNameWithCoords_ = psName;
+ }
@@ -1062,6 +1097,9 @@ Engine::switchNamedInstance(int index)
+ {
    if (!ftFallbackFace_ || !FT_HAS_MULTIPLE_MASTERS(ftFallbackFace_))
      return;
 +  // Writing to ftFallbackFace: since the faces are indexed by named instance
 +  // id, it's safe to set the NI of fallback face
 +  // This helps the PostScript Name label show the correct name.
    auto err = FT_Set_Named_Instance(ftFallbackFace_, index);
    if (err)
+   {
@@ -1070,12 +1108,12 @@ Engine::switchNamedInstance(int index)
    if (ftSize_)
+   {
      err = FT_Set_Named_Instance(ftSize_->face, index);
 -    if (err)
 -    {
 -      // XXX error handling
 -    }
 +  if (err)
 +  {
 +    // XXX error handling
+   }
+ }
 +}
  // end of engine.cpp

src/ftinspect/engine/engine.hpp

@@ -76,6 +76,7 @@ public:
    //////// Actions
 +  void loadFontWithFTCId(FTC_FaceID ftcId);
    int loadFont(int fontIndex,
                 long faceIndex,
                 int namedInstanceIndex); // Return number of glyphs.
@@ -128,6 +129,14 @@ public:
    int currentFontType() const { return fontType_; }
    const QString& currentFamilyName() { return curFamilyName_; }
    const QString& currentStyleName() { return curStyleName_; }
 +  const QString& currentPostScriptNameWithoutCoords()
 +  {
 +    return curPostScriptNameWithoutCoords_;
 +  }
 +  const QString& currentPostScriptNameWithCoords()
 +  {
 +    return curPostScriptNameWithCoords_;
 +  }
    int currentFontNumberOfGlyphs() { return curNumGlyphs_; }
    std::vector<PaletteInfo>& currentFontPalettes() { return curPaletteInfos_; }
@@ -234,6 +243,8 @@ private:
    int fontType_ = FontType_Other;
    QString curFamilyName_;
    QString curStyleName_;
 +  QString curPostScriptNameWithoutCoords_;
 +  QString curPostScriptNameWithCoords_;
    int curNumGlyphs_ = -1;
    std::vector<CharMapInfo> curCharMaps_;
    std::vector<PaletteInfo> curPaletteInfos_;
@@ -291,6 +302,7 @@ private:
    void switchNamedInstance(int index);
    // It is safe to put the implementation into the corresponding cpp file.
 +  // Note: no rendering / writing should be done in the callback
    template <class Func>
    void withFace(FaceID id,
                  Func func);

src/ftinspect/engine/fontinfo.cpp

@@ -202,9 +202,7 @@ FontBasicInfo::get(Engine* engine)
    if (face->style_name)
      result.styleName = QString(face->style_name);
 -  auto psName = FT_Get_Postscript_Name(face);
 -  if (psName)
 -    result.postscriptName = QString(psName);
 +  result.postscriptName = engine->currentPostScriptNameWithoutCoords();
    auto head = static_cast<TT_Header*>(FT_Get_Sfnt_Table(face, FT_SFNT_HEAD));
    if (head)

src/ftinspect/panels/settingpanelmmgx.cpp

@@ -74,6 +74,10 @@ SettingPanelMMGX::applySettings()
    engine_->reloadFont();
    engine_->applyMMGXDesignCoords(currentValues_.data(),
                                   currentValues_.size());
 +  if (checkDirty())
 +    psNameText_->setPlainText(engine_->currentPostScriptNameWithCoords());
 +  else
 +    psNameText_->setPlainText(engine_->currentPostScriptNameWithoutCoords());
+ }
@@ -88,6 +92,15 @@ SettingPanelMMGX::checkHidden()
+ }
 +bool
 +SettingPanelMMGX::checkDirty() const
 +{
 +  for (auto w : itemWidgets_)
 +    if (w->dirty()) return true;
 +  return false;
 +}
++
++
  void
  SettingPanelMMGX::createLayout()
+ {
@@ -96,15 +109,19 @@ SettingPanelMMGX::createLayout()
    resetDefaultButton_ = new QPushButton(tr("Reset Default"), this);
    itemsListWidget_ = new QWidget(this);
    scrollArea_ = new UnboundScrollArea(this);
 +  psNameBox_ = new QGroupBox("PostScript Name", this);
 +  psNameText_ = new QPlainTextEdit(psNameBox_);
    scrollArea_->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
    scrollArea_->setWidget(itemsListWidget_);
    scrollArea_->setWidgetResizable(true);
    itemsListWidget_->setAutoFillBackground(false);
 +  psNameText_->setReadOnly(true);
    mainLayout_ = new QVBoxLayout;
    listLayout_ = new QVBoxLayout;
    listWrapperLayout_ = new QVBoxLayout;
 +  psNameBoxLayout_ = new QVBoxLayout;
    listLayout_->setSpacing(0);
    listLayout_->setContentsMargins(0, 0, 0, 0);
@@ -115,10 +132,16 @@ SettingPanelMMGX::createLayout()
    listWrapperLayout_->addLayout(listLayout_);
    listWrapperLayout_->addStretch(1);
 +  psNameText_->setMaximumHeight(50);
 +  psNameText_->setMinimumHeight(50);
 +  psNameBox_->setLayout(psNameBoxLayout_);
 +  psNameBoxLayout_->addWidget(psNameText_);
++
    mainLayout_->addWidget(showHiddenCheckBox_);
    mainLayout_->addWidget(groupingCheckBox_);
    mainLayout_->addWidget(resetDefaultButton_);
 -  mainLayout_->addWidget(scrollArea_, 1);
 +  mainLayout_->addWidget(scrollArea_, 2);
 +  mainLayout_->addWidget(psNameBox_, 0);
    setLayout(mainLayout_);
+ }
@@ -169,7 +192,7 @@ SettingPanelMMGX::resetDefaultClicked()
+ {
    for (auto w : itemWidgets_)
      w->resetDefault();
+-
++
    retrieveValues();
    emit mmgxCoordsChanged();
+ }
@@ -234,6 +257,7 @@ void
  MMGXSettingItem::setValue(FT_Fixed value)
+ {
    actualValue_ = value;
 +  dirty_ = true;
    updateSlider();
    updateLineEdit();
+ }
@@ -243,6 +267,7 @@ void
  MMGXSettingItem::resetDefault()
+ {
    setValue(static_cast<FT_Fixed>(axisInfo_.def * 65536.0));
 +  dirty_ = false;
+ }
@@ -305,6 +330,7 @@ MMGXSettingItem::sliderValueChanged()
                   * (axisInfo_.maximum - axisInfo_.minimum)
                 + axisInfo_.minimum;
    actualValue_ = static_cast<FT_Fixed>(value * 65536.0);
 +  dirty_ = true;
    if (axisInfo_.isMM)
      actualValue_ = FT_RoundFix(actualValue_);
@@ -326,6 +352,7 @@ MMGXSettingItem::lineEditChanged()
+   }
    actualValue_ = static_cast<FT_Fixed>(newValue / 65536.0);
 +  dirty_ = true;
    updateSlider();
    emit valueChanged();

src/ftinspect/panels/settingpanelmmgx.hpp

@@ -12,11 +12,13 @@
  #include <QCheckBox>
  #include <QDoubleValidator>
  #include <QFrame>
 +#include <QGroupBox>
  #include <QGridLayout>
  #include <QLabel>
  #include <QLineEdit>
  #include <QPushButton>
  #include <QScrollArea>
 +#include <QPlainTextEdit>
  #include <QSlider>
  #include <QToolButton>
  #include <QWidget>
@@ -40,6 +42,7 @@ public:
    void reloadFont();
    void applySettings();
    void checkHidden();
 +  bool checkDirty() const;
    std::vector<FT_Fixed>& mmgxCoords() { return currentValues_; }
  signals:
@@ -53,11 +56,14 @@ private:
    QPushButton* resetDefaultButton_;
    QWidget* itemsListWidget_;
    UnboundScrollArea* scrollArea_;
 +  QGroupBox* psNameBox_;
 +  QPlainTextEdit* psNameText_;
    std::vector<MMGXSettingItem*> itemWidgets_;
    QVBoxLayout* mainLayout_;
    QVBoxLayout* listLayout_;
    QVBoxLayout* listWrapperLayout_;
 +  QVBoxLayout* psNameBoxLayout_;
    std::vector<FT_Fixed> currentValues_;
    std::vector<MMGXAxisInfo> currentAxes_;
@@ -83,6 +89,7 @@ public:
    void updateInfo(MMGXAxisInfo& info);
    FT_Fixed value() { return actualValue_; }
 +  bool dirty() { return dirty_; }
    void setValue(FT_Fixed value);
    void resetDefault();
@@ -100,6 +107,7 @@ private:
    FT_Fixed actualValue_;
    MMGXAxisInfo axisInfo_;
 +  bool dirty_ = false;
    void createLayout();
    void createConnections();

src/ftmulti.c

@@ -1262,7 +1262,7 @@
      grDoneSurface( surface );
      grDoneDevices();
 -    free            ( multimaster );
 +    FT_Done_MM_Var  ( library, multimaster );
      FT_Done_Face    ( face        );
      FT_Done_FreeType( library     );

From:	Charlie Jiang (@cqjjjzr)
Subject:	[Git][freetype/freetype-demos][ftinspect-psname] 3 commits: * src/ftmulti.c: Fix crash when exiting due to `FT_Get_MM_Var` and `free` mismatch.
Date:	Thu, 05 Oct 2023 07:22:35 +0000