Commit d0079e669e956c6ad8bed7df559fe4ab0216f851
2000-06-23T00:07:06
improved the Type1 drivers to deal with the case where the lenIV field is set to -1 to indicate unencoded charstrings fixed some source code to prevent a compiler bug on IRIX fixed the module version's in the "type1z" driver
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302
diff --git a/src/renderer/ftrender.c b/src/renderer/ftrender.c
deleted file mode 100644
index a376d50..0000000
--- a/src/renderer/ftrender.c
+++ /dev/null
@@ -1,161 +0,0 @@
-#include <freetype/internal/ftobjs.h>
-
- /* sets render-specific mode */
- static FT_Error ft_renderer_set_mode( FT_Renderer render,
- FT_ULong mode_tag,
- FT_Pointer data )
- {
- /* we simply pass it to the raster */
- return render->clazz->raster_class->raster_set_mode(
- render->raster, mode_tag, data );
- }
-
-
- /* convert a slot's glyph image into a bitmap */
- static FT_Error ft_renderer_render( FT_Renderer render,
- FT_GlyphSlot slot,
- FT_UInt mode )
- {
- FT_Error error;
- FT_Outline* outline;
- FT_BBox cbox;
- FT_UInt width, height, pitch;
- FT_Bitmap* bitmap;
- FT_Memory memory;
-
- FT_Raster_Params params;
-
- /* first of all, transform the outline */
- if (slot->format != ft_glyph_format_outline)
- {
- error = FT_Err_Invalid_Argument;
- goto Exit;
- }
-
- outline = &slot->outline;
-
- FT_Outline_Transform( outline, &slot->transform_matrix );
- FT_Outline_Translate( outline, slot->transform_delta.x,
- slot->transform_delta.y );
-
- /* compute the control box, and grid fit it */
- FT_Outline_Get_CBox( outline, &cbox );
-
- cbox.xMin &= -64;
- cbox.yMin &= -64;
- cbox.xMax = (cbox.xMax+63) & -64;
- cbox.yMax = (cbox.yMax+63) & -64;
-
- width = (cbox.xMax - cbox.xMin) >> 6;
- height = (cbox.yMax - cbox.yMin) >> 6;
- bitmap = &slot->bitmap;
- memory = slot->face->memory;
-
- /* release old bitmap buffer */
- if ((slot->flags & ft_glyph_own_bitmap))
- FREE(bitmap->buffer);
-
- /* allocate new one, depends on pixel format */
- if ( mode & ft_render_mode_antialias )
- {
- pitch = width;
- bitmap->pixel_mode = ft_pixel_mode_grays;
- bitmap->num_grays = 256;
- }
- else
- {
- pitch = (width+7) >> 3;
- bitmap->pixel_mode = ft_pixel_mode_mono;
- }
-
- bitmap->width = width;
- bitmap->rows = height;
- bitmap->pitch = pitch;
-
- if (ALLOC( bitmap->buffer, (FT_ULong)pitch * height ))
- goto Exit;
-
- /* translate outline to render it into the bitmap */
- FT_Outline_Translate( outline, -cbox.xMin, -cbox.yMin );
-
- /* set up parameters */
- params.target = bitmap;
- params.source = outline;
- params.flags = 0;
-
- if ( bitmap->pixel_mode == ft_pixel_mode_grays )
- params.flags |= ft_raster_flag_aa;
-
- /* render outline into the bitmap */
- error = render->render( render->raster, ¶ms );
- if (error) goto Exit;
-
- slot->format = ft_glyph_format_bitmap;
- slot->bitmap_left = cbox.xMin >> 6;
- slot->bitmap_top = cbox.yMax >> 6;
-
- Exit:
- return error;
- }
-
-#ifndef FT_CONFIG_OPTION_NO_STD_RASTER
-
-#include <freetype/ftraster.h>
-
- const FT_Renderer_Class ft_standard_renderer_class =
- {
- {
- ft_module_renderer,
- sizeof( FT_RendererRec ),
-
- "standard renderer",
- 0x10000,
- 0x20000,
-
- 0, /* module specific interface */
-
- (FT_Module_Constructor) 0,
- (FT_Module_Destructor) 0,
- (FT_Module_Requester) 0
- },
-
- ft_glyph_format_outline,
-
- (FTRenderer_render) ft_renderer_render,
- (FTRenderer_setMode) ft_renderer_set_mode,
-
- (FT_Raster_Funcs*) &ft_standard_raster
- };
-
-#endif /* !FT_CONFIG_OPTION_NO_STD_RASTER */
-
-#ifndef FT_CONFIG_OPTION_NO_SMOOTH_RASTER
-
-#include <freetype/ftgrays.h>
-
- const FT_Renderer_Class ft_smooth_renderer_class =
- {
- {
- ft_module_renderer,
- sizeof( FT_RendererRec ),
-
- "smooth renderer",
- 0x10000,
- 0x20000,
-
- 0, /* module specific interface */
-
- (FT_Module_Constructor) 0,
- (FT_Module_Destructor) 0,
- (FT_Module_Requester) 0
- },
-
- ft_glyph_format_outline,
-
- (FTRenderer_render) ft_renderer_render,
- (FTRenderer_setMode) ft_renderer_set_mode,
-
- (FT_Raster_Funcs*) &ft_grays_raster
- };
-
-#endif /* !FT_CONFIG_OPTION_NO_SMOOTH_RASTER */
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index ff06bc8..a7dbbb5 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -830,7 +830,14 @@
case op_div:
if (top[1])
- *top++ = top[0] / top[1];
+ {
+ /* this code was originally "*top++ = top[1]/top[0]" */
+ /* however, it didn't run correctly on IRIX 6.5 using */
+ /* the MISPRO 7.2 compiler suite. The following code */
+ /* should run flawlessly.. */
+ *top = top[0] / top[1];
+ ++top;
+ }
else
{
FT_ERROR(( "T1.Parse_CHarStrings : division by 0\n" ));
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 7f3751a..0b95085 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -719,11 +719,20 @@
{
FT_Byte* base = tokzer->base + tokzer->cursor;
- t1_decrypt( base, count, 4330 );
tokzer->cursor += count;
- base += face->type1.private_dict.lenIV;
- count -= face->type1.private_dict.lenIV;
+ /* some fonts use a value of -1 for lenIV to indicate that */
+ /* the charstrings are unencoded.. */
+ /* */
+ /* thanks to Tom Kacvinsky for pointing this out.. */
+ /* */
+ if (face->type1.private_dict.lenIV >= 0)
+ {
+ t1_decrypt( base, count, 4330 );
+
+ base += face->type1.private_dict.lenIV;
+ count -= face->type1.private_dict.lenIV;
+ }
error = T1_Add_Table( &parser->table, index, base, count );
}
@@ -803,11 +812,20 @@
{
FT_Byte* base = tokzer->base + tokzer->cursor;
- t1_decrypt( base, count, 4330 );
tokzer->cursor += count; /* skip */
+
+ /* some fonts use a value of -1 for lenIV to indicate that */
+ /* the charstrings are unencoded.. */
+ /* */
+ /* thanks to Tom Kacvinsky for pointing this out.. */
+ /* */
+ if (face->type1.private_dict.lenIV >= 0)
+ {
+ t1_decrypt( base, count, 4330 );
- base += face->type1.private_dict.lenIV;
- count -= face->type1.private_dict.lenIV;
+ base += face->type1.private_dict.lenIV;
+ count -= face->type1.private_dict.lenIV;
+ }
error = T1_Add_Table( &parser->table, index*2+1, base, count );
}
diff --git a/src/type1z/t1driver.c b/src/type1z/t1driver.c
index 12c483b..3601a0c 100644
--- a/src/type1z/t1driver.c
+++ b/src/type1z/t1driver.c
@@ -229,9 +229,9 @@
ft_module_font_driver | ft_module_driver_scalable,
sizeof( FT_DriverRec ),
- "type1",
- 100,
- 200,
+ "type1z",
+ 0x10000,
+ 0x20000,
0, /* format interface */
diff --git a/src/type1z/t1load.c b/src/type1z/t1load.c
index 779c7c5..0029e4d 100644
--- a/src/type1z/t1load.c
+++ b/src/type1z/t1load.c
@@ -1078,9 +1078,17 @@
index = T1_ToInt(parser);
if (!read_binary_data(parser,&size,&base)) return;
- T1_Decrypt( base, size, 4330 );
- size -= face->type1.private_dict.lenIV;
- base += face->type1.private_dict.lenIV;
+ /* some fonts use a value of -1 for lenIV to indicate that */
+ /* the charstrings are unencoded.. */
+ /* */
+ /* thanks to Tom Kacvinsky for pointing this out.. */
+ /* */
+ if (face->type1.private_dict.lenIV >= 0)
+ {
+ T1_Decrypt( base, size, 4330 );
+ size -= face->type1.private_dict.lenIV;
+ base += face->type1.private_dict.lenIV;
+ }
error = T1_Add_Table( table, index, base, size );
if (error) goto Fail;
@@ -1162,9 +1170,17 @@
parser->cursor = cur2;
if (!read_binary_data(parser,&size,&base)) return;
- T1_Decrypt( base, size, 4330 );
- size -= face->type1.private_dict.lenIV;
- base += face->type1.private_dict.lenIV;
+ /* some fonts use a value of -1 for lenIV to indicate that */
+ /* the charstrings are unencoded.. */
+ /* */
+ /* thanks to Tom Kacvinsky for pointing this out.. */
+ /* */
+ if (face->type1.private_dict.lenIV >= 0)
+ {
+ T1_Decrypt( base, size, 4330 );
+ size -= face->type1.private_dict.lenIV;
+ base += face->type1.private_dict.lenIV;
+ }
error = T1_Add_Table( code_table, n, base, size );
if (error) goto Fail;