fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-06 08:30:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[truetype] Move the sizeof asserts to compile time.

Browse source 
Eliminate the need for a runtime test on the sizeof the private structures
by performing the check at compile time. This was provoked by Ginn Chenn
noting that the test was including a private header.
This commit is contained in:
Chris Wilson 2009-03-03 11:21:35 +00:00
parent e4b1f871e9
commit a8158d443e
3 changed files with 15 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cairo-truetype-subset.c
View file

@ -94,6 +94,21 @@ struct _cairo_truetype_font {
};
/*
* Test that the structs we define for TrueType tables have the
* correct size, ie. they are not padded.
*/
#define check(T, S) COMPILE_TIME_ASSERT (sizeof (T) == (S))
check (tt_head_t, 54);
check (tt_hhea_t, 36);
check (tt_maxp_t, 32);
check (tt_name_record_t, 12);
check (tt_name_t, 18);
check (tt_name_t, 18);
check (tt_composite_glyph_t, 18);
check (tt_glyph_data_t, 28);
#undef check
static cairo_status_t
cairo_truetype_font_use_glyph (cairo_truetype_font_t *font,
unsigned short glyph,

1
test/Makefile.sources
View file

@ -190,7 +190,6 @@ test_sources = \
transforms.c \
translate-show-surface.c \
trap-clip.c \
truetype-tables.c \
twin.c \
unantialiased-shapes.c \
unbounded-operator.c \

63
test/truetype-tables.c
View file

@ -1,63 +0,0 @@
/*
* Copyright © 2006 Red Hat, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
* and that both that copyright notice and this permission notice
* appear in supporting documentation, and that the name of
* Red Hat, Inc. not be used in advertising or publicity pertaining to
* distribution of the software without specific, written prior
* permission. Red Hat, Inc. makes no representations about the
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
* RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
* INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Behdad Esfahbod <behdad@behdad.org>
*/
/*
* Test that the structs we define for TrueType tables have the
* correct size, ie. they are not padded.
*/
#include "cairo-test.h"
#include <cairo-truetype-subset-private.h>
static cairo_test_status_t
preamble (cairo_test_context_t *ctx)
{
cairo_test_status_t ret = CAIRO_TEST_SUCCESS;
#define check(st, sz) \
if (sizeof (st) != (sz)) { \
cairo_test_log (ctx, "sizeof (%s): got %d, expected %d", #st, (int)sizeof (st), sz); \
ret = CAIRO_TEST_FAILURE; \
}
#if CAIRO_HAS_FONT_SUBSET
check (tt_head_t, 54);
check (tt_hhea_t, 36);
check (tt_maxp_t, 32);
check (tt_name_record_t, 12);
check (tt_name_t, 18);
check (tt_name_t, 18);
check (tt_composite_glyph_t, 18);
check (tt_glyph_data_t, 28);
#endif
return ret;
}
CAIRO_TEST (truetype_tables,
"Test that the size of TrueType table structs is correct",
"ft, api", /* keywords */
NULL, /* requirements */
0, 0,
preamble, NULL)