walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[util] Add --batch to hb-view / hb-ot-shape-closure

This commit is contained in:
Behdad Esfahbod 2021-08-12 10:39:46 -06:00
parent 302bde0bfb
commit 4d73b3d9b1
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/batch.hh
View File

@ -25,6 +25,8 @@
#ifndef BATCH_HH #ifndef BATCH_HH
#define BATCH_HH #define BATCH_HH
#include "options.hh"
typedef int (*main_func_t) (int argc, char **argv); typedef int (*main_func_t) (int argc, char **argv);
template <typename main_t, bool report_status=false> template <typename main_t, bool report_status=false>

8
util/hb-ot-shape-closure.cc
View File

@ -24,10 +24,11 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "shape-options.hh" #include "batch.hh"
#include "font-options.hh" #include "font-options.hh"
#include "text-options.hh"
#include "main-font-text.hh" #include "main-font-text.hh"
#include "shape-options.hh"
#include "text-options.hh"
const unsigned DEFAULT_FONT_SIZE = FONT_SIZE_NONE; const unsigned DEFAULT_FONT_SIZE = FONT_SIZE_NONE;
const unsigned SUBPIXEL_BITS = 0; const unsigned SUBPIXEL_BITS = 0;
@ -115,5 +116,6 @@ struct shape_closure_consumer_t
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
return main_font_text_t<shape_closure_consumer_t, font_options_t, text_options_t> () (argc, argv); using main_t = main_font_text_t<shape_closure_consumer_t, font_options_t, text_options_t>;
return batch_main<main_t> (argc, argv);
} }

8
util/hb-shape.cc
View File

@ -25,13 +25,13 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "output-options.hh" #include "batch.hh"
#include "font-options.hh" #include "font-options.hh"
#include "text-options.hh" #include "main-font-text.hh"
#include "output-options.hh"
#include "shape-consumer.hh" #include "shape-consumer.hh"
#include "shape-format.hh" #include "shape-format.hh"
#include "batch.hh" #include "text-options.hh"
#include "main-font-text.hh"
const unsigned DEFAULT_FONT_SIZE = FONT_SIZE_UPEM; const unsigned DEFAULT_FONT_SIZE = FONT_SIZE_UPEM;
const unsigned SUBPIXEL_BITS = 0; const unsigned SUBPIXEL_BITS = 0;

6
util/hb-subset.cc
View File

@ -25,12 +25,10 @@
* Google Author(s): Garret Rieger, Rod Sheeter * Google Author(s): Garret Rieger, Rod Sheeter
*/ */
#include <stdio.h>
#include "output-options.hh"
#include "face-options.hh"
#include "batch.hh" #include "batch.hh"
#include "face-options.hh"
#include "main-font-text.hh" #include "main-font-text.hh"
#include "output-options.hh"
#include <hb-subset.h> #include <hb-subset.h>

10
util/hb-view.cc
View File

@ -25,11 +25,12 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "shape-consumer.hh" #include "batch.hh"
#include "view-cairo.hh"
#include "font-options.hh" #include "font-options.hh"
#include "text-options.hh"
#include "main-font-text.hh" #include "main-font-text.hh"
#include "shape-consumer.hh"
#include "text-options.hh"
#include "view-cairo.hh"
const unsigned DEFAULT_FONT_SIZE = 256; const unsigned DEFAULT_FONT_SIZE = 256;
const unsigned SUBPIXEL_BITS = 6; const unsigned SUBPIXEL_BITS = 6;
@ -37,5 +38,6 @@ const unsigned SUBPIXEL_BITS = 6;
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
return main_font_text_t<shape_consumer_t<view_cairo_t>, font_options_t, shape_text_options_t> () (argc, argv); using main_t = main_font_text_t<shape_consumer_t<view_cairo_t>, font_options_t, shape_text_options_t>;
return batch_main<main_t> (argc, argv);
} }