| author | jacotton |
| Wed, 06 Jan 2010 12:52:05 -0800 | |
| changeset 875 | 3c34236236b3 |
| permissions | -rw-r--r-- |
|
875
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
1 |
--- modules/om/generic/omGeneric.c.old Thu Dec 31 23:28:51 2009 |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
2 |
+++ modules/om/generic/omGeneric.c Sat Jan 3 09:10:58 2010 |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
3 |
@@ -437,11 +437,10 @@ |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
4 |
} |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
5 |
} |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
6 |
|
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
7 |
- if(font_set->vrotate_num > 0) {
|
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
8 |
+ if(font_set->vrotate_num > 0 && font_set->vrotate != NULL) {
|
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
9 |
font_data = (FontData) font_set->vrotate; |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
10 |
font_data_count = font_set->vrotate_num; |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
11 |
for( ; font_data_count-- ; font_data++) {
|
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
12 |
- if(font_data != NULL) |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
13 |
if(font_data->font != NULL) {
|
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
14 |
check_fontset_extents(&overall, &logical_ascent, |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
15 |
&logical_descent, |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
16 |
@@ -597,6 +596,7 @@ |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
17 |
if((ptr = strchr(ptr, '-'))) {
|
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
18 |
*ptr = '\0'; |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
19 |
} else {
|
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
20 |
+ field_num++; /* Count last field */ |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
21 |
break; |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
22 |
} |
|
3c34236236b3
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale
jacotton
parents:
diff
changeset
|
23 |
} |