Attachment #111640 for bug #160294

View | Details | Raw Unified | Return to bug 160294
Collapse All | Expand All




  #[1]Index [2]Previous [3]Next
                       [gs-cvs] rev 6919 - trunk/gs/src
  leonardo at ghostscript.com [4]leonardo at ghostscript.com
  Mon Jul 17 12:11:34 PDT 2006
    * Previous message: [5][gs-cvs] rev 6918 - trunk/gs/src
    * Next message: [6][gs-cvs] rev 6920 - trunk/gs/lib
    * Messages sorted by: [7][ date ] [8][ thread ] [9][ subject ] [10][
      author ]
    __________________________________________________________________
  trunk/gs/src/gdevpsft.c
  trunk/gs/src/gxttf.h
++ trunk/gs/src/gdevpsft.c     2006-07-17 19:11:34 UTC (rev 6919)

/* ------ OS/2 ------ */
/* Write a generated OS/2 table. */
#define OS_2_LENGTH1 offset_of(ttf_OS_2_t, sxHeight[0]) /* OS/2 version 1. */
#define OS_2_LENGTH2 sizeof(ttf_OS_2_t) /* OS/2 version 2. */
private void
update_OS_2(ttf_OS_2_t *pos2, uint first_glyph, int num_glyphs)
{

     * We don't bother to set most of the fields.  The really important
     * ones, which affect character mapping, are usFirst/LastCharIndex.
     * We also need to set usWeightClass and usWidthClass to avoid
     * crashing ttfdump. Version 1 86-byte structure has all the fields
     * we need.
     */
    memset(&os2, 0, sizeof(os2));
    put_u16(os2.version, 1);
    put_u16(os2.usWeightClass, 400); /* Normal */
    put_u16(os2.usWidthClass, 5); /* Normal */
    update_OS_2(&os2, first_glyph, num_glyphs);
    stream_write(s, &os2, offset_of(ttf_OS_2_t, sxHeight[0]));
    put_pad(s, offset_of(ttf_OS_2_t, sxHeight[0]));
}
/* ------ post ------ */

    int have_hvhea[2];
    uint cmap_length = 0;
    ulong OS_2_start = 0;
    uint OS_2_length = OS_2_LENGTH1;
    int code;
    have_hvhea[0] = have_hvhea[1] = 0;

	    if (writing_cid)
		continue;
	    have_OS_2 = true;
	    if (length > OS_2_LENGTH2)
		return_error(gs_error_invalidfont);
	    OS_2_start = start;
	    OS_2_length = length;
++ trunk/gs/src/gxttf.h        2006-07-17 19:11:34 UTC (rev 6919)

	sTypoLineGap[2],
	usWinAscent[2],
	usWinDescent[2],
	ulCodePageRanges[8],

        sxHeight[2],            /* version 2 */
       sCapHeight[2],
       	usDefaultChar[2],
       	usBreakChar[2],
        usMaxContext[2];
} ttf_OS_2_t;
/* ------ vhea ------ */
    __________________________________________________________________
    * Previous message: [11][gs-cvs] rev 6918 - trunk/gs/src
    * Next message: [12][gs-cvs] rev 6920 - trunk/gs/lib
    * Messages sorted by: [13][ date ] [14][ thread ] [15][ subject ]
      [16][ author ]
    __________________________________________________________________
  [17]More information about the gs-cvs mailing list
  1. http://ghostscript.com/pipermail/gs-cvs/2006-July/index.html
  2. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html
  3. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html
  4. mailto:gs-cvs%40ghostscript.com?Subject=%5Bgs-cvs%5D%20%20rev%206919%20-%20trunk/gs/src&In-Reply-To=
  5. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html
  6. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html
  7. http://ghostscript.com/pipermail/gs-cvs/2006-July/date.html#6677
  8. http://ghostscript.com/pipermail/gs-cvs/2006-July/thread.html#6677
  9. http://ghostscript.com/pipermail/gs-cvs/2006-July/subject.html#6677
 10. http://ghostscript.com/pipermail/gs-cvs/2006-July/author.html#6677
 11. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html
 12. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html
 13. http://ghostscript.com/pipermail/gs-cvs/2006-July/date.html#6677
 14. http://ghostscript.com/pipermail/gs-cvs/2006-July/thread.html#6677
 15. http://ghostscript.com/pipermail/gs-cvs/2006-July/subject.html#6677
 16. http://ghostscript.com/pipermail/gs-cvs/2006-July/author.html#6677
 17. http://www.ghostscript.com/mailman/listinfo/gs-cvs

Return to bug 160294

Line Link Here

(-)file_not_specified_in_diff (-9 / +17 lines)
	#[1]Index [2]Previous [3]Next		#[1]Index [2]Previous [3]Next
1	[gs-cvs] rev 6919 - trunk/gs/src	1	[gs-cvs] rev 6919 - trunk/gs/src
2	leonardo at ghostscript.com [4]leonardo at ghostscript.com	2	leonardo at ghostscript.com [4]leonardo at ghostscript.com
3	Mon Jul 17 12:11:34 PDT 2006	3	Mon Jul 17 12:11:34 PDT 2006
4	* Previous message: [5][gs-cvs] rev 6918 - trunk/gs/src	4	* Previous message: [5][gs-cvs] rev 6918 - trunk/gs/src
5	* Next message: [6][gs-cvs] rev 6920 - trunk/gs/lib	5	* Next message: [6][gs-cvs] rev 6920 - trunk/gs/lib
6	* Messages sorted by: [7][ date ] [8][ thread ] [9][ subject ] [10][	6	* Messages sorted by: [7][ date ] [8][ thread ] [9][ subject ] [10][
7	author ]	7	author ]
8	__________________________________________________________________	8	__________________________________________________________________
9	trunk/gs/src/gdevpsft.c	9	trunk/gs/src/gdevpsft.c
10	trunk/gs/src/gxttf.h	10	trunk/gs/src/gxttf.h
11	-- trunk/gs/src/gdevpsft.c 2006-07-13 21:35:15 UTC (rev 6918)	11	++ trunk/gs/src/gdevpsft.c 2006-07-17 19:11:34 UTC (rev 6919)
Lines 479-485 Link Here
479	/* ------ OS/2 ------ */	479	/* ------ OS/2 ------ */
480	/* Write a generated OS/2 table. */	480	/* Write a generated OS/2 table. */
481	#define OS_2_LENGTH sizeof(ttf_OS_2_t)	481	#define OS_2_LENGTH1 offset_of(ttf_OS_2_t, sxHeight[0]) /* OS/2 version 1. */
		482	#define OS_2_LENGTH2 sizeof(ttf_OS_2_t) /* OS/2 version 2. */
482	private void	483	private void
483	update_OS_2(ttf_OS_2_t *pos2, uint first_glyph, int num_glyphs)	484	update_OS_2(ttf_OS_2_t *pos2, uint first_glyph, int num_glyphs)
484	{	485	{
Lines 504-518 Link Here
504	* We don't bother to set most of the fields. The really important	505	* We don't bother to set most of the fields. The really important
505	* ones, which affect character mapping, are usFirst/LastCharIndex.	506	* ones, which affect character mapping, are usFirst/LastCharIndex.
506	* We also need to set usWeightClass and usWidthClass to avoid	507	* We also need to set usWeightClass and usWidthClass to avoid
507	* crashing ttfdump.	508	* crashing ttfdump. Version 1 86-byte structure has all the fields
		509	* we need.
508	*/	510	*/
509	memset(&os2, 0, sizeof(os2));	511	memset(&os2, 0, sizeof(os2));
510	put_u16(os2.version, 1);	512	put_u16(os2.version, 1);
511	put_u16(os2.usWeightClass, 400); /* Normal */	513	put_u16(os2.usWeightClass, 400); /* Normal */
512	put_u16(os2.usWidthClass, 5); /* Normal */	514	put_u16(os2.usWidthClass, 5); /* Normal */
513	update_OS_2(&os2, first_glyph, num_glyphs);	515	update_OS_2(&os2, first_glyph, num_glyphs);
514	stream_write(s, &os2, sizeof(os2));	516	stream_write(s, &os2, offset_of(ttf_OS_2_t, sxHeight[0]));
515	put_pad(s, sizeof(os2));	517	put_pad(s, offset_of(ttf_OS_2_t, sxHeight[0]));
516	}	518	}
517	/* ------ post ------ */	519	/* ------ post ------ */
Lines 688-694 Link Here
688	int have_hvhea[2];	690	int have_hvhea[2];
689	uint cmap_length = 0;	691	uint cmap_length = 0;
690	ulong OS_2_start = 0;	692	ulong OS_2_start = 0;
691	uint OS_2_length = OS_2_LENGTH;	693	uint OS_2_length = OS_2_LENGTH1;
692	int code;	694	int code;
693	have_hvhea[0] = have_hvhea[1] = 0;	695	have_hvhea[0] = have_hvhea[1] = 0;
Lines 755-761 Link Here
755	if (writing_cid)	757	if (writing_cid)
756	continue;	758	continue;
757	have_OS_2 = true;	759	have_OS_2 = true;
758	if (length > OS_2_LENGTH)	760	if (length > OS_2_LENGTH2)
759	return_error(gs_error_invalidfont);	761	return_error(gs_error_invalidfont);
760	OS_2_start = start;	762	OS_2_start = start;
761	OS_2_length = length;	763	OS_2_length = length;
762	-- trunk/gs/src/gxttf.h 2006-07-13 21:35:15 UTC (rev 6918)	764	++ trunk/gs/src/gxttf.h 2006-07-17 19:11:34 UTC (rev 6919)
Lines 134-140 Link Here
134	sTypoLineGap[2],	134	sTypoLineGap[2],
135	usWinAscent[2],	135	usWinAscent[2],
136	usWinDescent[2],	136	usWinDescent[2],
137	ulCodePageRanges[8];	137	ulCodePageRanges[8],
		138
		139	sxHeight[2], /* version 2 */
		140	sCapHeight[2],
		141	usDefaultChar[2],
		142	usBreakChar[2],
		143	usMaxContext[2];
138	} ttf_OS_2_t;	144	} ttf_OS_2_t;
139	/* ------ vhea ------ */	145	/* ------ vhea ------ */
140	__________________________________________________________________	146	__________________________________________________________________
141	* Previous message: [11][gs-cvs] rev 6918 - trunk/gs/src	147	* Previous message: [11][gs-cvs] rev 6918 - trunk/gs/src
142	* Next message: [12][gs-cvs] rev 6920 - trunk/gs/lib	148	* Next message: [12][gs-cvs] rev 6920 - trunk/gs/lib
143	* Messages sorted by: [13][ date ] [14][ thread ] [15][ subject ]	149	* Messages sorted by: [13][ date ] [14][ thread ] [15][ subject ]
144	[16][ author ]	150	[16][ author ]
145	__________________________________________________________________	151	__________________________________________________________________
146	[17]More information about the gs-cvs mailing list	152	[17]More information about the gs-cvs mailing list
147	1. http://ghostscript.com/pipermail/gs-cvs/2006-July/index.html	153	1. http://ghostscript.com/pipermail/gs-cvs/2006-July/index.html
148	2. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html	154	2. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html
149	3. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html	155	3. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html
150	4. mailto:gs-cvs%40ghostscript.com?Subject=%5Bgs-cvs%5D%20%20rev%206919%20-%20trunk/gs/src&In-Reply-To=	156	4. mailto:gs-cvs%40ghostscript.com?Subject=%5Bgs-cvs%5D%20%20rev%206919%20-%20trunk/gs/src&In-Reply-To=
151	5. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html	157	5. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html
152	6. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html	158	6. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html
153	7. http://ghostscript.com/pipermail/gs-cvs/2006-July/date.html#6677	159	7. http://ghostscript.com/pipermail/gs-cvs/2006-July/date.html#6677
154	8. http://ghostscript.com/pipermail/gs-cvs/2006-July/thread.html#6677	160	8. http://ghostscript.com/pipermail/gs-cvs/2006-July/thread.html#6677
155	9. http://ghostscript.com/pipermail/gs-cvs/2006-July/subject.html#6677	161	9. http://ghostscript.com/pipermail/gs-cvs/2006-July/subject.html#6677
156	10. http://ghostscript.com/pipermail/gs-cvs/2006-July/author.html#6677	162	10. http://ghostscript.com/pipermail/gs-cvs/2006-July/author.html#6677
157	11. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html	163	11. http://ghostscript.com/pipermail/gs-cvs/2006-July/006676.html
158	12. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html	164	12. http://ghostscript.com/pipermail/gs-cvs/2006-July/006678.html
159	13. http://ghostscript.com/pipermail/gs-cvs/2006-July/date.html#6677	165	13. http://ghostscript.com/pipermail/gs-cvs/2006-July/date.html#6677
160	14. http://ghostscript.com/pipermail/gs-cvs/2006-July/thread.html#6677	166	14. http://ghostscript.com/pipermail/gs-cvs/2006-July/thread.html#6677
161	15. http://ghostscript.com/pipermail/gs-cvs/2006-July/subject.html#6677	167	15. http://ghostscript.com/pipermail/gs-cvs/2006-July/subject.html#6677
162	16. http://ghostscript.com/pipermail/gs-cvs/2006-July/author.html#6677	168	16. http://ghostscript.com/pipermail/gs-cvs/2006-July/author.html#6677
163	17. http://www.ghostscript.com/mailman/listinfo/gs-cvs	169	17. http://www.ghostscript.com/mailman/listinfo/gs-cvs