[Git][freetype/freetype-demos][ftinspect-grayscale] 2 commits: [ftinspec

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

Commits:

b33c0ecf

by Charlie Jiang at 2023-03-03T09:52:15+01:00

[ftinspect] Fix uninitialized memory issue and reference misuse.

Fixes issue #23.

* src/ftinspect/engine/rendering.cpp (RenderingEngine::convertBitmapTo8Bpp):
Properly initialize `FT_Bitmap` since it is a value type.
(RenderingEngine::convertBitmapToQImage): Fix the accidental overwriting of
the source bitmap when converting the bitmap format (only happens for
`FT_PIXEL_MODE_GRAY2` and `FT_PIXEL_MODE_GRAY4`) due to a misuse of a C++
reference.

* src/ftinspect/glyphcomponents/glyphcontinuous.cpp
(GlyphContinuous::drawCacheGlyph): Fix a crash when the `QImage` was failed
to produce.

027f08ee

by Charlie Jiang at 2023-03-07T13:22:37+08:00

* src/ftinspect/engine/rendering.cpp: Support gray level scaling.

See 746d5be5: Convert to 256 grays.

2 changed files:

src/ftinspect/engine/rendering.cpp
src/ftinspect/glyphcomponents/glyphcontinuous.cpp

Changes:

src/ftinspect/engine/rendering.cpp

@@ -136,14 +136,33 @@ RenderingEngine::convertGlyphToBitmapGlyph(FT_Glyph src,
  FT_Bitmap
  RenderingEngine::convertBitmapTo8Bpp(FT_Bitmap* bitmap)
+ {
 -  FT_Bitmap out;
 -  out.buffer = NULL;
 +  FT_Bitmap out = {};
    // This will create a new bitmap object.
    auto error = FT_Bitmap_Convert(engine_->ftLibrary(), bitmap, &out, 1);
    if (error)
+   {
      // XXX handling?
+   }
++
 +  if (out.num_grays == 256)
 +    return out;
++
 +  // Scale gray values, too.
 +  auto buf = reinterpret_cast<uint32_t*>(out.buffer);
 +  uint32_t scale = 255U / (out.num_grays - 1);
++
 +  // Four bytes at a time.
 +  unsigned i = 0;
 +  unsigned size = std::abs(out.pitch) * out.rows;
 +  for (; i <= size - 4; i += 4, buf++)
 +    *buf *= scale;
++
 +  // The remaining bytes.
 +  for (; i < size; i++ )
 +    out.buffer[i] *= scale;
++
 +  out.num_grays = 256;
++
    return out;
+ }
@@ -167,7 +186,7 @@ RenderingEngine::convertBitmapToQImage(FT_Bitmap* src)
+ {
    QImage* result = NULL;
 -  auto& bmap = *src;
 +  auto bmap = *src;
    bool ownBitmap = false; // If true, we need to clean up `bmap`.
    int width = INT_MAX;

src/ftinspect/glyphcomponents/glyphcontinuous.cpp

@@ -552,6 +552,8 @@ GlyphContinuous::drawCacheGlyph(QPainter* painter,
                                  const GlyphCacheEntry& entry,
                                  bool colorInverted)
+ {
 +  if (!entry.image)
 +    return;
    // From `ftview.c:557`.
    // Well, metrics are also part of the cache...
    int width = entry.advance.x ? entry.advance.x >> 16

From:	Charlie Jiang (@cqjjjzr)
Subject:	[Git][freetype/freetype-demos][ftinspect-grayscale] 2 commits: [ftinspect] Fix uninitialized memory issue and reference misuse.
Date:	Tue, 07 Mar 2023 05:23:41 +0000