fixup! feat(pandagl): calculate baseline position based on Ascender a…

…nd BBox

lib/pandagl/src/font/bitmap.c

@@ -94,6 +94,18 @@ int pd_canvas_mix_font_bitmap(pd_canvas_t *graph, pd_pos_t pos,
  pd_canvas_t write_slot;
  pd_rect_t r_rect, w_rect;
 
+ if (pos.x > 0) {
+ printf("pos.x\n");
+ }
+ if (pos.y > 0) {
+ printf("pos.y=%d\n", pos.y);
+ }
+ if (pos.x > (int)graph->width) {
+ printf("width\n");
+ }
+ if (pos.y > (int)graph->height) {
+ printf("height=%u\n", graph->height);
+ }
  if (pos.x > (int)graph->width || pos.y > (int)graph->height) {
  return -2;
  }

lib/pandagl/src/font/inconsolata.c

@@ -7593,18 +7593,19 @@ int pd_render_inconsolata_font_bitmap(pd_font_bitmap_t *bmp, unsigned ch, int si
  if (size < 12) {
  return -1;
  }
+ bmp->metrics.hori_advance = (int)(size / 2.0 + 0.5);
+ bmp->metrics.vert_advance = size;
+ bmp->metrics.bbox_width = bmp->metrics.hori_advance;
+ bmp->metrics.bbox_height = size;
+ bmp->metrics.ascender = size * 4 / 5;
+ bmp->rows = size;
+ bmp->width = bmp->metrics.hori_advance;
+ bmp->buffer = calloc(bmp->rows*bmp->width, sizeof(uint8_t));
+ bmp->pitch = bmp->width;
+ bmp->top = size * 4 / 5;
+ bmp->left = 0;
  /* 不在范围内的字符都用框框表示 */
  if (ch < ' ' || ch > '~' || size > 18) {
- bmp->metrics.hori_advance = (int)(size / 2.0 + 0.5);
- bmp->metrics.vert_advance = size;
- bmp->metrics.bbox_height = size;
- bmp->metrics.bbox_width = bmp->metrics.hori_advance;
- bmp->rows = size;
- bmp->width = bmp->metrics.hori_advance;
- bmp->buffer = calloc(bmp->rows * bmp->width, 1);
- bmp->pitch = bmp->width;
- bmp->top = size * 4 / 5;
- bmp->left = 0;
  j = (bmp->rows - 1) * bmp->width;
  for (i = 0; i < bmp->width; ++i, ++j) {
  bmp->buffer[i] = 255;
@@ -7623,12 +7624,6 @@ int pd_render_inconsolata_font_bitmap(pd_font_bitmap_t *bmp, unsigned ch, int si
  }
  /* 空格就直接填充空白 */
  if (ch == ' ') {
- bmp->metrics.hori_advance = (int)(size / 2.0 + 0.5);
- bmp->metrics.vert_advance = size;
- bmp->rows = size;
- bmp->width = bmp->metrics.hori_advance;
- bmp->buffer = calloc(bmp->rows*bmp->width, 1);
- bmp->pitch = bmp->width;
  bmp->top = 0;
  bmp->left = 0;
  return 0;
@@ -7638,8 +7633,6 @@ int pd_render_inconsolata_font_bitmap(pd_font_bitmap_t *bmp, unsigned ch, int si
  *bmp = pd_inconsolata_font_bitmap_info[i][j];
  j = *(ptr = (int*)&bmp->buffer);
  byte_ptr = &pd_inconsolata_font_bitmap[i][j];
- size = sizeof(unsigned char)*bmp->width*bmp->rows;
- bmp->buffer = (uint8_t*)malloc(size);
- memcpy(bmp->buffer, byte_ptr, size);
+ memcpy(bmp->buffer, byte_ptr, sizeof(uint8_t)*bmp->width*bmp->rows);
  return 0;
 }

tests/run_tests.c

@@ -18,7 +18,7 @@
 
 int main(int argc, char **argv)
 {
- logger_set_level(LOGGER_LEVEL_ERROR);
+ logger_set_level(LOGGER_LEVEL_ALL);
  ctest_describe("test settings", test_settings);
  ctest_describe("test thread", test_thread);
  ctest_describe("test font load", test_font_load);

xmake.lua

@@ -63,6 +63,7 @@ target("lcui_tests")
  table.insert(argv, "valgrind")
  table.insert(argv, "--leak-check=full")
  table.insert(argv, "--error-exitcode=42")
+ table.insert(argv, "--num-callers=20")
  table.insert(argv, target:targetfile())
  os.execv("sudo", argv)
  end