Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
23f85c8a
by Alexei Podtelezhnikov at 2021-04-22T23:34:08-04:00
2 changed files:
Changes:
1 |
+2021-04-22 Alexei Podtelezhnikov <apodtele@gmail.com>
|
|
2 |
+ |
|
3 |
+ [cache] Optimize SBit copying.
|
|
4 |
+ |
|
5 |
+ * src/cache/ftcsbits.c (ftc_snode_load): Do not initialize the buffer.
|
|
6 |
+ (ftc_sbit_copy_bitmap): Accept zero size, s/FT_ALLOC/FT_QALLOC/.
|
|
7 |
+ |
|
1 | 8 |
2021-04-22 Alexei Podtelezhnikov <apodtele@gmail.com>
|
2 | 9 |
|
3 | 10 |
[gxvalid,otvalid] s/FT_ALLOC/FT_QALLOC/ for initialized buffers.
|
... | ... | @@ -52,10 +52,8 @@ |
52 | 52 |
pitch = -pitch;
|
53 | 53 |
|
54 | 54 |
size = (FT_ULong)pitch * bitmap->rows;
|
55 |
- if ( !size )
|
|
56 |
- return FT_Err_Ok;
|
|
57 | 55 |
|
58 |
- if ( !FT_ALLOC( sbit->buffer, size ) )
|
|
56 |
+ if ( !FT_QALLOC( sbit->buffer, size ) )
|
|
59 | 57 |
FT_MEM_COPY( sbit->buffer, bitmap->buffer, size );
|
60 | 58 |
|
61 | 59 |
return error;
|
... | ... | @@ -122,8 +120,6 @@ |
122 | 120 |
sbit = snode->sbits + ( gindex - gnode->gindex );
|
123 | 121 |
clazz = (FTC_SFamilyClass)family->clazz;
|
124 | 122 |
|
125 |
- sbit->buffer = NULL;
|
|
126 |
- |
|
127 | 123 |
error = clazz->family_load_glyph( family, gindex, manager, &face );
|
128 | 124 |
if ( error )
|
129 | 125 |
goto BadGlyph;
|