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

[hb-cairo] Rename files to C++

This commit is contained in:
Behdad Esfahbod 2022-12-25 15:55:14 -07:00
parent a230eb8cf5
commit 1ad24421a6
4 changed files with 36 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/hb-cairo-utils.c → src/hb-cairo-utils.cc
View File

@ -24,34 +24,16 @@
* Google Author(s): Matthias Clasen * Google Author(s): Matthias Clasen
*/ */
#include "config.h" #include "hb.hh"
#include "hb-cairo-utils.h" #include "hb-cairo-utils.hh"
#include <cairo.h> #include <cairo.h>
#include <hb-ot.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#define _USE_MATH_DEFINES
#include <math.h>
#include <assert.h>
#ifndef MIN
#define MIN(x,y) ((x) < (y) ? (x) : (y))
#endif
#ifndef MAX
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#endif
#ifndef FALSE
#define TRUE 1
#define FALSE 0
#endif
#define PREALLOCATED_COLOR_STOPS 16 #define PREALLOCATED_COLOR_STOPS 16
#define _2_M_PIf (2.f * float (M_PI))
typedef struct { typedef struct {
float r, g, b, a; float r, g, b, a;
} color_t; } color_t;
@ -116,9 +98,9 @@ hb_cairo_paint_glyph_image (cairo_t *cr,
hb_glyph_extents_t *extents) hb_glyph_extents_t *extents)
{ {
if (!extents) /* SVG currently. */ if (!extents) /* SVG currently. */
return FALSE; return false;
cairo_surface_t *surface = NULL; cairo_surface_t *surface = nullptr;
#ifdef CAIRO_HAS_PNG_FUNCTIONS #ifdef CAIRO_HAS_PNG_FUNCTIONS
if (format == HB_PAINT_IMAGE_FORMAT_PNG) if (format == HB_PAINT_IMAGE_FORMAT_PNG)
@ -140,15 +122,15 @@ hb_cairo_paint_glyph_image (cairo_t *cr,
/* Byte-endian conversion. */ /* Byte-endian conversion. */
unsigned data_size = hb_blob_get_length (blob); unsigned data_size = hb_blob_get_length (blob);
if (data_size < width * height * 4) if (data_size < width * height * 4)
return FALSE; return false;
unsigned char *data; unsigned char *data;
#ifdef __BYTE_ORDER #ifdef __BYTE_ORDER
if (__BYTE_ORDER == __BIG_ENDIAN) if (__BYTE_ORDER == __BIG_ENDIAN)
{ {
data = (unsigned char *) hb_blob_get_data_writable (blob, NULL); data = (unsigned char *) hb_blob_get_data_writable (blob, nullptr);
if (!data) if (!data)
return FALSE; return false;
unsigned count = width * height * 4; unsigned count = width * height * 4;
for (unsigned i = 0; i < count; i += 4) for (unsigned i = 0; i < count; i += 4)
@ -164,7 +146,7 @@ hb_cairo_paint_glyph_image (cairo_t *cr,
} }
else else
#endif #endif
data = (unsigned char *) hb_blob_get_data (blob, NULL); data = (unsigned char *) hb_blob_get_data (blob, nullptr);
surface = cairo_image_surface_create_for_data (data, surface = cairo_image_surface_create_for_data (data,
CAIRO_FORMAT_ARGB32, CAIRO_FORMAT_ARGB32,
@ -178,7 +160,7 @@ hb_cairo_paint_glyph_image (cairo_t *cr,
} }
if (!surface) if (!surface)
return FALSE; return false;
cairo_save (cr); cairo_save (cr);
/* this clip is here to work around recording surface limitations */ /* this clip is here to work around recording surface limitations */
@ -212,7 +194,7 @@ hb_cairo_paint_glyph_image (cairo_t *cr,
cairo_restore (cr); cairo_restore (cr);
return TRUE; return true;
} }
static void static void
@ -274,8 +256,8 @@ normalize_color_line (hb_color_stop_t *stops,
min = max = stops[0].offset; min = max = stops[0].offset;
for (unsigned int i = 0; i < len; i++) for (unsigned int i = 0; i < len; i++)
{ {
min = MIN (min, stops[i].offset); min = hb_min (min, stops[i].offset);
max = MAX (max, stops[i].offset); max = hb_max (max, stops[i].offset);
} }
if (min != max) if (min != max)
@ -303,7 +285,7 @@ hb_cairo_paint_linear_gradient (cairo_t *cr,
float min, max; float min, max;
cairo_pattern_t *pattern; cairo_pattern_t *pattern;
len = hb_color_line_get_color_stops (color_line, 0, NULL, NULL); len = hb_color_line_get_color_stops (color_line, 0, nullptr, nullptr);
if (len > PREALLOCATED_COLOR_STOPS) if (len > PREALLOCATED_COLOR_STOPS)
stops = (hb_color_stop_t *) malloc (len * sizeof (hb_color_stop_t)); stops = (hb_color_stop_t *) malloc (len * sizeof (hb_color_stop_t));
hb_color_line_get_color_stops (color_line, 0, &len, stops); hb_color_line_get_color_stops (color_line, 0, &len, stops);
@ -351,7 +333,7 @@ hb_cairo_paint_radial_gradient (cairo_t *cr,
float rr0, rr1; float rr0, rr1;
cairo_pattern_t *pattern; cairo_pattern_t *pattern;
len = hb_color_line_get_color_stops (color_line, 0, NULL, NULL); len = hb_color_line_get_color_stops (color_line, 0, nullptr, nullptr);
if (len > PREALLOCATED_COLOR_STOPS) if (len > PREALLOCATED_COLOR_STOPS)
stops = (hb_color_stop_t *) malloc (len * sizeof (hb_color_stop_t)); stops = (hb_color_stop_t *) malloc (len * sizeof (hb_color_stop_t));
hb_color_line_get_color_stops (color_line, 0, &len, stops); hb_color_line_get_color_stops (color_line, 0, &len, stops);
@ -408,7 +390,7 @@ premultiply (color_t *c)
static inline void static inline void
unpremultiply (color_t *c) unpremultiply (color_t *c)
{ {
if (c->a != 0.) if (c->a != 0.f)
{ {
c->r /= c->a; c->r /= c->a;
c->g /= c->a; c->g /= c->a;
@ -584,7 +566,7 @@ add_sweep_gradient_patches (hb_color_stop_t *stops,
start_angle, &c, start_angle, &c,
pattern); pattern);
} }
if (end_angle < 2 * M_PI) if (end_angle < _2_M_PIf)
{ {
c.r = hb_color_get_red (stops[n_stops - 1].color) / 255.; c.r = hb_color_get_red (stops[n_stops - 1].color) / 255.;
c.g = hb_color_get_green (stops[n_stops - 1].color) / 255.; c.g = hb_color_get_green (stops[n_stops - 1].color) / 255.;
@ -592,7 +574,7 @@ add_sweep_gradient_patches (hb_color_stop_t *stops,
c.a = hb_color_get_alpha (stops[n_stops - 1].color) / 255.; c.a = hb_color_get_alpha (stops[n_stops - 1].color) / 255.;
add_sweep_gradient_patches1 (cx, cy, radius, add_sweep_gradient_patches1 (cx, cy, radius,
end_angle, &c, end_angle, &c,
2 * M_PI, &c, _2_M_PIf, &c,
pattern); pattern);
} }
} }
@ -654,7 +636,7 @@ add_sweep_gradient_patches (hb_color_stop_t *stops,
color0 = colors[n_stops-1]; color0 = colors[n_stops-1];
add_sweep_gradient_patches1 (cx, cy, radius, add_sweep_gradient_patches1 (cx, cy, radius,
0., &color0, 0., &color0,
2 * M_PI, &color0, _2_M_PIf, &color0,
pattern); pattern);
goto done; goto done;
} }
@ -666,7 +648,7 @@ add_sweep_gradient_patches (hb_color_stop_t *stops,
for (pos++; pos < n_stops; pos++) for (pos++; pos < n_stops; pos++)
{ {
if (angles[pos] <= 2 * M_PI) if (angles[pos] <= _2_M_PIf)
{ {
add_sweep_gradient_patches1 (cx, cy, radius, add_sweep_gradient_patches1 (cx, cy, radius,
angles[pos - 1], &colors[pos-1], angles[pos - 1], &colors[pos-1],
@ -675,11 +657,11 @@ add_sweep_gradient_patches (hb_color_stop_t *stops,
} }
else else
{ {
float k = (2 * M_PI - angles[pos - 1]) / (angles[pos] - angles[pos - 1]); float k = (_2_M_PIf - angles[pos - 1]) / (angles[pos] - angles[pos - 1]);
interpolate_colors (&colors[pos - 1], &colors[pos], k, &color1); interpolate_colors (&colors[pos - 1], &colors[pos], k, &color1);
add_sweep_gradient_patches1 (cx, cy, radius, add_sweep_gradient_patches1 (cx, cy, radius,
angles[pos - 1], &colors[pos - 1], angles[pos - 1], &colors[pos - 1],
2 * M_PI, &color1, _2_M_PIf, &color1,
pattern); pattern);
break; break;
} }
@ -691,7 +673,7 @@ add_sweep_gradient_patches (hb_color_stop_t *stops,
color0 = colors[n_stops - 1]; color0 = colors[n_stops - 1];
add_sweep_gradient_patches1 (cx, cy, radius, add_sweep_gradient_patches1 (cx, cy, radius,
angles[n_stops - 1], &color0, angles[n_stops - 1], &color0,
2 * M_PI, &color0, _2_M_PIf, &color0,
pattern); pattern);
goto done; goto done;
} }
@ -774,14 +756,14 @@ add_sweep_gradient_patches (hb_color_stop_t *stops,
a1, c1, a1, c1,
pattern); pattern);
} }
else if (a1 >= 2 * M_PI) else if (a1 >= _2_M_PIf)
{ {
color_t color; color_t color;
float f = (2 * M_PI - a0)/(a1 - a0); float f = (_2_M_PIf - a0)/(a1 - a0);
interpolate_colors (c0, c1, f, &color); interpolate_colors (c0, c1, f, &color);
add_sweep_gradient_patches1 (cx, cy, radius, add_sweep_gradient_patches1 (cx, cy, radius,
a0, c0, a0, c0,
2 * M_PI, &color, _2_M_PIf, &color,
pattern); pattern);
goto done; goto done;
} }
@ -819,7 +801,7 @@ hb_cairo_paint_sweep_gradient (cairo_t *cr,
float max_x, max_y, radius; float max_x, max_y, radius;
cairo_pattern_t *pattern; cairo_pattern_t *pattern;
len = hb_color_line_get_color_stops (color_line, 0, NULL, NULL); len = hb_color_line_get_color_stops (color_line, 0, nullptr, nullptr);
if (len > PREALLOCATED_COLOR_STOPS) if (len > PREALLOCATED_COLOR_STOPS)
stops = (hb_color_stop_t *) malloc (len * sizeof (hb_color_stop_t)); stops = (hb_color_stop_t *) malloc (len * sizeof (hb_color_stop_t));
hb_color_line_get_color_stops (color_line, 0, &len, stops); hb_color_line_get_color_stops (color_line, 0, &len, stops);
@ -827,8 +809,8 @@ hb_cairo_paint_sweep_gradient (cairo_t *cr,
qsort (stops, len, sizeof (hb_color_stop_t), cmp_color_stop); qsort (stops, len, sizeof (hb_color_stop_t), cmp_color_stop);
cairo_clip_extents (cr, &x1, &y1, &x2, &y2); cairo_clip_extents (cr, &x1, &y1, &x2, &y2);
max_x = MAX ((x1 - cx) * (x1 - cx), (x2 - cx) * (x2 - cx)); max_x = (float) hb_max ((x1 - (double) cx) * (x1 - (double) cx), (x2 - (double) cx) * (x2 - (double) cx));
max_y = MAX ((y1 - cy) * (y1 - cy), (y2 - cy) * (y2 - cy)); max_y = (float) hb_max ((y1 - (double) cy) * (y1 - (double) cy), (y2 - (double) cy) * (y2 - (double) cy));
radius = sqrt (max_x + max_y); radius = sqrt (max_x + max_y);
extend = cairo_extend (hb_color_line_get_extend (color_line)); extend = cairo_extend (hb_color_line_get_extend (color_line));

0
src/hb-cairo-utils.h → src/hb-cairo-utils.hh
View File

11
src/hb-cairo.c → src/hb-cairo.cc
View File

@ -24,14 +24,11 @@
* Red Hat Author(s): Matthias Clasen * Red Hat Author(s): Matthias Clasen
*/ */
#include "config.h" #include "hb.hh"
#include <stddef.h>
#include "hb-ot.h"
#include "hb-cairo.h" #include "hb-cairo.h"
#include "hb-cairo-utils.h"
#include "hb-cairo-utils.hh"
static void static void
move_to (hb_draw_funcs_t *dfuncs, move_to (hb_draw_funcs_t *dfuncs,
@ -397,5 +394,5 @@ hb_cairo_font_face_create (hb_font_t *font)
hb_font_t * hb_font_t *
hb_cairo_font_face_get_font (cairo_font_face_t *font_face) hb_cairo_font_face_get_font (cairo_font_face_t *font_face)
{ {
return cairo_font_face_get_user_data (font_face, &hb_cairo_font_user_data_key); return (hb_font_t *) cairo_font_face_get_user_data (font_face, &hb_cairo_font_user_data_key);
} }

4
src/meson.build
View File

@ -578,8 +578,8 @@ libharfbuzz_subset_dep = declare_dependency(
meson.override_dependency('harfbuzz-subset', libharfbuzz_subset_dep) meson.override_dependency('harfbuzz-subset', libharfbuzz_subset_dep)
hb_cairo_sources = [ hb_cairo_sources = [
'hb-cairo.c', 'hb-cairo.cc',
'hb-cairo-utils.c' 'hb-cairo-utils.cc'
] ]
cairo_dep = dependency('cairo') cairo_dep = dependency('cairo')