--- old/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.cc 2020-07-21 14:26:09.530861197 -0700 +++ /dev/null 2020-01-23 11:31:37.155195123 -0800 @@ -1,213 +0,0 @@ -/* - * Copyright © 2017 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-open-type.hh" - -#include "hb-ot-face.hh" -#include "hb-ot-var-avar-table.hh" -#include "hb-ot-var-fvar-table.hh" -#include "hb-ot-var-mvar-table.hh" -#include "hb-ot-var.h" - - -/** - * SECTION:hb-ot-var - * @title: hb-ot-var - * @short_description: OpenType Font Variations - * @include: hb-ot.h - * - * Functions for fetching information about OpenType Variable Fonts. - **/ - - -/* - * fvar/avar - */ - - -/** - * hb_ot_var_has_data: - * @face: #hb_face_t to test - * - * This function allows to verify the presence of OpenType variation data on the face. - * - * Return value: true if face has a `fvar' table and false otherwise - * - * Since: 1.4.2 - **/ -hb_bool_t -hb_ot_var_has_data (hb_face_t *face) -{ - return face->table.fvar->has_data (); -} - -/** - * hb_ot_var_get_axis_count: - * - * Since: 1.4.2 - **/ -unsigned int -hb_ot_var_get_axis_count (hb_face_t *face) -{ - return face->table.fvar->get_axis_count (); -} - -/** - * hb_ot_var_get_axes: - * - * Since: 1.4.2 - * Deprecated: 2.2.0 - **/ -unsigned int -hb_ot_var_get_axes (hb_face_t *face, - unsigned int start_offset, - unsigned int *axes_count /* IN/OUT */, - hb_ot_var_axis_t *axes_array /* OUT */) -{ - return face->table.fvar->get_axes_deprecated (start_offset, axes_count, axes_array); -} - -/** - * hb_ot_var_find_axis: - * - * Since: 1.4.2 - * Deprecated: 2.2.0 - **/ -hb_bool_t -hb_ot_var_find_axis (hb_face_t *face, - hb_tag_t axis_tag, - unsigned int *axis_index, - hb_ot_var_axis_t *axis_info) -{ - return face->table.fvar->find_axis_deprecated (axis_tag, axis_index, axis_info); -} - -/** - * hb_ot_var_get_axis_infos: - * - * Since: 2.2.0 - **/ -HB_EXTERN unsigned int -hb_ot_var_get_axis_infos (hb_face_t *face, - unsigned int start_offset, - unsigned int *axes_count /* IN/OUT */, - hb_ot_var_axis_info_t *axes_array /* OUT */) -{ - return face->table.fvar->get_axis_infos (start_offset, axes_count, axes_array); -} - -/** - * hb_ot_var_find_axis_info: - * - * Since: 2.2.0 - **/ -HB_EXTERN hb_bool_t -hb_ot_var_find_axis_info (hb_face_t *face, - hb_tag_t axis_tag, - hb_ot_var_axis_info_t *axis_info) -{ - return face->table.fvar->find_axis_info (axis_tag, axis_info); -} - - -/* - * Named instances. - */ - -unsigned int -hb_ot_var_get_named_instance_count (hb_face_t *face) -{ - return face->table.fvar->get_instance_count (); -} - -hb_ot_name_id_t -hb_ot_var_named_instance_get_subfamily_name_id (hb_face_t *face, - unsigned int instance_index) -{ - return face->table.fvar->get_instance_subfamily_name_id (instance_index); -} - -hb_ot_name_id_t -hb_ot_var_named_instance_get_postscript_name_id (hb_face_t *face, - unsigned int instance_index) -{ - return face->table.fvar->get_instance_postscript_name_id (instance_index); -} - -unsigned int -hb_ot_var_named_instance_get_design_coords (hb_face_t *face, - unsigned int instance_index, - unsigned int *coords_length, /* IN/OUT */ - float *coords /* OUT */) -{ - return face->table.fvar->get_instance_coords (instance_index, coords_length, coords); -} - - -/** - * hb_ot_var_normalize_variations: - * - * Since: 1.4.2 - **/ -void -hb_ot_var_normalize_variations (hb_face_t *face, - const hb_variation_t *variations, /* IN */ - unsigned int variations_length, - int *coords, /* OUT */ - unsigned int coords_length) -{ - for (unsigned int i = 0; i < coords_length; i++) - coords[i] = 0; - - const OT::fvar &fvar = *face->table.fvar; - for (unsigned int i = 0; i < variations_length; i++) - { - hb_ot_var_axis_info_t info; - if (hb_ot_var_find_axis_info (face, variations[i].tag, &info) && - info.axis_index < coords_length) - coords[info.axis_index] = fvar.normalize_axis_value (info.axis_index, variations[i].value); - } - - face->table.avar->map_coords (coords, coords_length); -} - -/** - * hb_ot_var_normalize_coords: - * - * Since: 1.4.2 - **/ -void -hb_ot_var_normalize_coords (hb_face_t *face, - unsigned int coords_length, - const float *design_coords, /* IN */ - int *normalized_coords /* OUT */) -{ - const OT::fvar &fvar = *face->table.fvar; - for (unsigned int i = 0; i < coords_length; i++) - normalized_coords[i] = fvar.normalize_axis_value (i, design_coords[i]); - - face->table.avar->map_coords (normalized_coords, coords_length); -} --- /dev/null 2020-01-23 11:31:37.155195123 -0800 +++ new/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc 2020-07-21 14:26:09.266861202 -0700 @@ -0,0 +1,213 @@ +/* + * Copyright © 2017 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-open-type.hh" + +#include "hb-ot-face.hh" +#include "hb-ot-var-avar-table.hh" +#include "hb-ot-var-fvar-table.hh" +#include "hb-ot-var-mvar-table.hh" +#include "hb-ot-var.h" + + +/** + * SECTION:hb-ot-var + * @title: hb-ot-var + * @short_description: OpenType Font Variations + * @include: hb-ot.h + * + * Functions for fetching information about OpenType Variable Fonts. + **/ + + +/* + * fvar/avar + */ + + +/** + * hb_ot_var_has_data: + * @face: #hb_face_t to test + * + * This function allows to verify the presence of OpenType variation data on the face. + * + * Return value: true if face has a `fvar' table and false otherwise + * + * Since: 1.4.2 + **/ +hb_bool_t +hb_ot_var_has_data (hb_face_t *face) +{ + return face->table.fvar->has_data (); +} + +/** + * hb_ot_var_get_axis_count: + * + * Since: 1.4.2 + **/ +unsigned int +hb_ot_var_get_axis_count (hb_face_t *face) +{ + return face->table.fvar->get_axis_count (); +} + +/** + * hb_ot_var_get_axes: + * + * Since: 1.4.2 + * Deprecated: 2.2.0 + **/ +unsigned int +hb_ot_var_get_axes (hb_face_t *face, + unsigned int start_offset, + unsigned int *axes_count /* IN/OUT */, + hb_ot_var_axis_t *axes_array /* OUT */) +{ + return face->table.fvar->get_axes_deprecated (start_offset, axes_count, axes_array); +} + +/** + * hb_ot_var_find_axis: + * + * Since: 1.4.2 + * Deprecated: 2.2.0 + **/ +hb_bool_t +hb_ot_var_find_axis (hb_face_t *face, + hb_tag_t axis_tag, + unsigned int *axis_index, + hb_ot_var_axis_t *axis_info) +{ + return face->table.fvar->find_axis_deprecated (axis_tag, axis_index, axis_info); +} + +/** + * hb_ot_var_get_axis_infos: + * + * Since: 2.2.0 + **/ +HB_EXTERN unsigned int +hb_ot_var_get_axis_infos (hb_face_t *face, + unsigned int start_offset, + unsigned int *axes_count /* IN/OUT */, + hb_ot_var_axis_info_t *axes_array /* OUT */) +{ + return face->table.fvar->get_axis_infos (start_offset, axes_count, axes_array); +} + +/** + * hb_ot_var_find_axis_info: + * + * Since: 2.2.0 + **/ +HB_EXTERN hb_bool_t +hb_ot_var_find_axis_info (hb_face_t *face, + hb_tag_t axis_tag, + hb_ot_var_axis_info_t *axis_info) +{ + return face->table.fvar->find_axis_info (axis_tag, axis_info); +} + + +/* + * Named instances. + */ + +unsigned int +hb_ot_var_get_named_instance_count (hb_face_t *face) +{ + return face->table.fvar->get_instance_count (); +} + +hb_ot_name_id_t +hb_ot_var_named_instance_get_subfamily_name_id (hb_face_t *face, + unsigned int instance_index) +{ + return face->table.fvar->get_instance_subfamily_name_id (instance_index); +} + +hb_ot_name_id_t +hb_ot_var_named_instance_get_postscript_name_id (hb_face_t *face, + unsigned int instance_index) +{ + return face->table.fvar->get_instance_postscript_name_id (instance_index); +} + +unsigned int +hb_ot_var_named_instance_get_design_coords (hb_face_t *face, + unsigned int instance_index, + unsigned int *coords_length, /* IN/OUT */ + float *coords /* OUT */) +{ + return face->table.fvar->get_instance_coords (instance_index, coords_length, coords); +} + + +/** + * hb_ot_var_normalize_variations: + * + * Since: 1.4.2 + **/ +void +hb_ot_var_normalize_variations (hb_face_t *face, + const hb_variation_t *variations, /* IN */ + unsigned int variations_length, + int *coords, /* OUT */ + unsigned int coords_length) +{ + for (unsigned int i = 0; i < coords_length; i++) + coords[i] = 0; + + const OT::fvar &fvar = *face->table.fvar; + for (unsigned int i = 0; i < variations_length; i++) + { + hb_ot_var_axis_info_t info; + if (hb_ot_var_find_axis_info (face, variations[i].tag, &info) && + info.axis_index < coords_length) + coords[info.axis_index] = fvar.normalize_axis_value (info.axis_index, variations[i].value); + } + + face->table.avar->map_coords (coords, coords_length); +} + +/** + * hb_ot_var_normalize_coords: + * + * Since: 1.4.2 + **/ +void +hb_ot_var_normalize_coords (hb_face_t *face, + unsigned int coords_length, + const float *design_coords, /* IN */ + int *normalized_coords /* OUT */) +{ + const OT::fvar &fvar = *face->table.fvar; + for (unsigned int i = 0; i < coords_length; i++) + normalized_coords[i] = fvar.normalize_axis_value (i, design_coords[i]); + + face->table.avar->map_coords (normalized_coords, coords_length); +}