Mercurial > mplayer.hg
comparison libass/ass_render.h @ 34011:88eebbbbd6a0
Update included libass copy to 0.9.13 release.
Besides a license change to BSD license and other (minor?) fixes,
this fixes possible crashes with the latest (2.4.6?) freetype release.
author | reimar |
---|---|
date | Sun, 11 Sep 2011 10:33:13 +0000 |
parents | e64df5862cea |
children | 6e7f60f6f9d4 |
comparison
equal
deleted
inserted
replaced
34010:1930c0a745df | 34011:88eebbbbd6a0 |
---|---|
2 * Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2 * Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com> |
3 * Copyright (C) 2009 Grigori Goronzy <greg@geekmind.org> | 3 * Copyright (C) 2009 Grigori Goronzy <greg@geekmind.org> |
4 * | 4 * |
5 * This file is part of libass. | 5 * This file is part of libass. |
6 * | 6 * |
7 * libass is free software; you can redistribute it and/or modify | 7 * Permission to use, copy, modify, and distribute this software for any |
8 * it under the terms of the GNU General Public License as published by | 8 * purpose with or without fee is hereby granted, provided that the above |
9 * the Free Software Foundation; either version 2 of the License, or | 9 * copyright notice and this permission notice appear in all copies. |
10 * (at your option) any later version. | |
11 * | 10 * |
12 * libass is distributed in the hope that it will be useful, | 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
15 * GNU General Public License for more details. | 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
16 * | 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
17 * You should have received a copy of the GNU General Public License along | 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
18 * with libass; if not, write to the Free Software Foundation, Inc., | 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |
20 */ | 18 */ |
21 | 19 |
22 #ifndef LIBASS_RENDER_H | 20 #ifndef LIBASS_RENDER_H |
23 #define LIBASS_RENDER_H | 21 #define LIBASS_RENDER_H |
24 | 22 |
38 #include "ass_library.h" | 36 #include "ass_library.h" |
39 #include "ass_drawing.h" | 37 #include "ass_drawing.h" |
40 | 38 |
41 #define GLYPH_CACHE_MAX 1000 | 39 #define GLYPH_CACHE_MAX 1000 |
42 #define BITMAP_CACHE_MAX_SIZE 30 * 1048576 | 40 #define BITMAP_CACHE_MAX_SIZE 30 * 1048576 |
41 | |
42 #define PARSED_FADE (1<<0) | |
43 #define PARSED_A (1<<1) | |
43 | 44 |
44 typedef struct { | 45 typedef struct { |
45 double xMin; | 46 double xMin; |
46 double xMax; | 47 double xMax; |
47 double yMin; | 48 double yMin; |
141 // Renderer state. | 142 // Renderer state. |
142 // Values like current font face, color, screen position, clipping and so on are stored here. | 143 // Values like current font face, color, screen position, clipping and so on are stored here. |
143 typedef struct { | 144 typedef struct { |
144 ASS_Event *event; | 145 ASS_Event *event; |
145 ASS_Style *style; | 146 ASS_Style *style; |
147 int parsed_tags; | |
146 | 148 |
147 ASS_Font *font; | 149 ASS_Font *font; |
148 char *font_path; | 150 char *font_path; |
149 double font_size; | 151 double font_size; |
150 int flags; // decoration flags (underline/strike-through) | 152 int flags; // decoration flags (underline/strike-through) |