Make built-in font data read-only
Ian Pilcher
ian.pilcher at home.com
Tue Jul 24 14:55:08 CDT 2001
Modified files:
dlls/wineps: mkagl.c psdrv.h
dlls/wineps/data: AvantGarde_Book.c AvantGarde_BookOblique.c
AvantGarde_Demi.c AvantGarde_DemiOblique.c
Bookman_Demi.c Bookman_DemiItalic.c
Bookman_Light.c Bookman_LightItalic.c
Courier.c Courier_Bold.c Courier_BoldOblique.c
Courier_Oblique.c Helvetica.c Helvetica_Bold.c
Helvetica_BoldOblique.c Helvetica_Narrow.c
Helvetica_Narrow_Bold.c
Helvetica_Narrow_BoldOblique.c
Helvetica_Narrow_Oblique.c Helvetica_Oblique.c
NewCenturySchlbk_Bold.c
NewCenturySchlbk_BoldItalic.c
NewCenturySchlbk_Italic.c NewCenturySchlbk_Roman.c
Palatino_Bold.c Palatino_BoldItalic.c
Palatino_Italic.c Palatino_Roman.c Symbol.c
Times_Bold.c Times_BoldItalic.c Times_Italic.c
Times_Roman.c ZapfChancery_MediumItalic.c
ZapfDingbats.c agl.c agl.h
Log message:
Ian Pilcher <ian.pilcher at home.com>
WINEPS: make built-in font data read-only
--
========================================================================
Ian Pilcher ian.pilcher at home.com
========================================================================
-------------- next part --------------
diff -urN ../wine-20010723cvs/dlls/wineps/data/AvantGarde_Book.c ./dlls/wineps/data/AvantGarde_Book.c
--- ../wine-20010723cvs/dlls/wineps/data/AvantGarde_Book.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/AvantGarde_Book.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_AvantGarde_Book[228] =
+static const AFMMETRICS met_AvantGarde_Book[228] =
{
{
32, 0x0020, 277, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_AvantGarde_Book =
+const AFM PSDRV_AvantGarde_Book =
{
"AvantGarde-Book", /* FontName */
"ITC Avant Garde Gothic Book", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/AvantGarde_BookOblique.c ./dlls/wineps/data/AvantGarde_BookOblique.c
--- ../wine-20010723cvs/dlls/wineps/data/AvantGarde_BookOblique.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/AvantGarde_BookOblique.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_AvantGarde_BookOblique[228] =
+static const AFMMETRICS met_AvantGarde_BookOblique[228] =
{
{
32, 0x0020, 277, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_AvantGarde_BookOblique =
+const AFM PSDRV_AvantGarde_BookOblique =
{
"AvantGarde-BookOblique", /* FontName */
"ITC Avant Garde Gothic Book Oblique", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/AvantGarde_Demi.c ./dlls/wineps/data/AvantGarde_Demi.c
--- ../wine-20010723cvs/dlls/wineps/data/AvantGarde_Demi.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/AvantGarde_Demi.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_AvantGarde_Demi[228] =
+static const AFMMETRICS met_AvantGarde_Demi[228] =
{
{
32, 0x0020, 280, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_AvantGarde_Demi =
+const AFM PSDRV_AvantGarde_Demi =
{
"AvantGarde-Demi", /* FontName */
"ITC Avant Garde Gothic Demi", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/AvantGarde_DemiOblique.c ./dlls/wineps/data/AvantGarde_DemiOblique.c
--- ../wine-20010723cvs/dlls/wineps/data/AvantGarde_DemiOblique.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/AvantGarde_DemiOblique.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_AvantGarde_DemiOblique[228] =
+static const AFMMETRICS met_AvantGarde_DemiOblique[228] =
{
{
32, 0x0020, 280, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_AvantGarde_DemiOblique =
+const AFM PSDRV_AvantGarde_DemiOblique =
{
"AvantGarde-DemiOblique", /* FontName */
"ITC Avant Garde Gothic Demi Oblique", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Bookman_Demi.c ./dlls/wineps/data/Bookman_Demi.c
--- ../wine-20010723cvs/dlls/wineps/data/Bookman_Demi.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Bookman_Demi.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Bookman_Demi[228] =
+static const AFMMETRICS met_Bookman_Demi[228] =
{
{
32, 0x0020, 340, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Bookman_Demi =
+const AFM PSDRV_Bookman_Demi =
{
"Bookman-Demi", /* FontName */
"ITC Bookman Demi", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Bookman_DemiItalic.c ./dlls/wineps/data/Bookman_DemiItalic.c
--- ../wine-20010723cvs/dlls/wineps/data/Bookman_DemiItalic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Bookman_DemiItalic.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Bookman_DemiItalic[228] =
+static const AFMMETRICS met_Bookman_DemiItalic[228] =
{
{
32, 0x0020, 340, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Bookman_DemiItalic =
+const AFM PSDRV_Bookman_DemiItalic =
{
"Bookman-DemiItalic", /* FontName */
"ITC Bookman Demi Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Bookman_Light.c ./dlls/wineps/data/Bookman_Light.c
--- ../wine-20010723cvs/dlls/wineps/data/Bookman_Light.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Bookman_Light.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Bookman_Light[228] =
+static const AFMMETRICS met_Bookman_Light[228] =
{
{
32, 0x0020, 320, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Bookman_Light =
+const AFM PSDRV_Bookman_Light =
{
"Bookman-Light", /* FontName */
"ITC Bookman Light", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Bookman_LightItalic.c ./dlls/wineps/data/Bookman_LightItalic.c
--- ../wine-20010723cvs/dlls/wineps/data/Bookman_LightItalic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Bookman_LightItalic.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Bookman_LightItalic[228] =
+static const AFMMETRICS met_Bookman_LightItalic[228] =
{
{
32, 0x0020, 300, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Bookman_LightItalic =
+const AFM PSDRV_Bookman_LightItalic =
{
"Bookman-LightItalic", /* FontName */
"ITC Bookman Light Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Courier.c ./dlls/wineps/data/Courier.c
--- ../wine-20010723cvs/dlls/wineps/data/Courier.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Courier.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Courier[243] =
+static const AFMMETRICS met_Courier[243] =
{
{
32, 0x0020, 600, PSDRV_AGLGlyphNames + 1169,
@@ -1004,7 +1004,7 @@
* Font metrics
*/
-AFM PSDRV_Courier =
+const AFM PSDRV_Courier =
{
"Courier", /* FontName */
"Courier", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Courier_Bold.c ./dlls/wineps/data/Courier_Bold.c
--- ../wine-20010723cvs/dlls/wineps/data/Courier_Bold.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Courier_Bold.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Courier_Bold[243] =
+static const AFMMETRICS met_Courier_Bold[243] =
{
{
32, 0x0020, 600, PSDRV_AGLGlyphNames + 1169,
@@ -1004,7 +1004,7 @@
* Font metrics
*/
-AFM PSDRV_Courier_Bold =
+const AFM PSDRV_Courier_Bold =
{
"Courier-Bold", /* FontName */
"Courier Bold", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Courier_BoldOblique.c ./dlls/wineps/data/Courier_BoldOblique.c
--- ../wine-20010723cvs/dlls/wineps/data/Courier_BoldOblique.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Courier_BoldOblique.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Courier_BoldOblique[243] =
+static const AFMMETRICS met_Courier_BoldOblique[243] =
{
{
32, 0x0020, 600, PSDRV_AGLGlyphNames + 1169,
@@ -1004,7 +1004,7 @@
* Font metrics
*/
-AFM PSDRV_Courier_BoldOblique =
+const AFM PSDRV_Courier_BoldOblique =
{
"Courier-BoldOblique", /* FontName */
"Courier Bold Oblique", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Courier_Oblique.c ./dlls/wineps/data/Courier_Oblique.c
--- ../wine-20010723cvs/dlls/wineps/data/Courier_Oblique.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Courier_Oblique.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Courier_Oblique[243] =
+static const AFMMETRICS met_Courier_Oblique[243] =
{
{
32, 0x0020, 600, PSDRV_AGLGlyphNames + 1169,
@@ -1004,7 +1004,7 @@
* Font metrics
*/
-AFM PSDRV_Courier_Oblique =
+const AFM PSDRV_Courier_Oblique =
{
"Courier-Oblique", /* FontName */
"Courier Oblique", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Helvetica.c ./dlls/wineps/data/Helvetica.c
--- ../wine-20010723cvs/dlls/wineps/data/Helvetica.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Helvetica.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Helvetica[228] =
+static const AFMMETRICS met_Helvetica[228] =
{
{
32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Helvetica =
+const AFM PSDRV_Helvetica =
{
"Helvetica", /* FontName */
"Helvetica", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Helvetica_Bold.c ./dlls/wineps/data/Helvetica_Bold.c
--- ../wine-20010723cvs/dlls/wineps/data/Helvetica_Bold.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Helvetica_Bold.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Helvetica_Bold[228] =
+static const AFMMETRICS met_Helvetica_Bold[228] =
{
{
32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Helvetica_Bold =
+const AFM PSDRV_Helvetica_Bold =
{
"Helvetica-Bold", /* FontName */
"Helvetica Bold", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Helvetica_BoldOblique.c ./dlls/wineps/data/Helvetica_BoldOblique.c
--- ../wine-20010723cvs/dlls/wineps/data/Helvetica_BoldOblique.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Helvetica_BoldOblique.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Helvetica_BoldOblique[228] =
+static const AFMMETRICS met_Helvetica_BoldOblique[228] =
{
{
32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Helvetica_BoldOblique =
+const AFM PSDRV_Helvetica_BoldOblique =
{
"Helvetica-BoldOblique", /* FontName */
"Helvetica Bold Oblique", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Helvetica_Narrow.c ./dlls/wineps/data/Helvetica_Narrow.c
--- ../wine-20010723cvs/dlls/wineps/data/Helvetica_Narrow.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Helvetica_Narrow.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Helvetica_Narrow[228] =
+static const AFMMETRICS met_Helvetica_Narrow[228] =
{
{
32, 0x0020, 228, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Helvetica_Narrow =
+const AFM PSDRV_Helvetica_Narrow =
{
"Helvetica-Narrow", /* FontName */
"Helvetica Narrow", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Helvetica_Narrow_Bold.c ./dlls/wineps/data/Helvetica_Narrow_Bold.c
--- ../wine-20010723cvs/dlls/wineps/data/Helvetica_Narrow_Bold.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Helvetica_Narrow_Bold.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Helvetica_Narrow_Bold[228] =
+static const AFMMETRICS met_Helvetica_Narrow_Bold[228] =
{
{
32, 0x0020, 228, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Helvetica_Narrow_Bold =
+const AFM PSDRV_Helvetica_Narrow_Bold =
{
"Helvetica-Narrow-Bold", /* FontName */
"Helvetica Narrow Bold", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c ./dlls/wineps/data/Helvetica_Narrow_BoldOblique.c
--- ../wine-20010723cvs/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Helvetica_Narrow_BoldOblique.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Helvetica_Narrow_BoldOblique[228] =
+static const AFMMETRICS met_Helvetica_Narrow_BoldOblique[228] =
{
{
32, 0x0020, 228, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Helvetica_Narrow_BoldOblique =
+const AFM PSDRV_Helvetica_Narrow_BoldOblique =
{
"Helvetica-Narrow-BoldOblique", /* FontName */
"Helvetica Narrow Bold Oblique", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Helvetica_Narrow_Oblique.c ./dlls/wineps/data/Helvetica_Narrow_Oblique.c
--- ../wine-20010723cvs/dlls/wineps/data/Helvetica_Narrow_Oblique.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Helvetica_Narrow_Oblique.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Helvetica_Narrow_Oblique[228] =
+static const AFMMETRICS met_Helvetica_Narrow_Oblique[228] =
{
{
32, 0x0020, 228, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Helvetica_Narrow_Oblique =
+const AFM PSDRV_Helvetica_Narrow_Oblique =
{
"Helvetica-Narrow-Oblique", /* FontName */
"Helvetica Narrow Oblique", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Helvetica_Oblique.c ./dlls/wineps/data/Helvetica_Oblique.c
--- ../wine-20010723cvs/dlls/wineps/data/Helvetica_Oblique.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Helvetica_Oblique.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Helvetica_Oblique[228] =
+static const AFMMETRICS met_Helvetica_Oblique[228] =
{
{
32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Helvetica_Oblique =
+const AFM PSDRV_Helvetica_Oblique =
{
"Helvetica-Oblique", /* FontName */
"Helvetica Oblique", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/NewCenturySchlbk_Bold.c ./dlls/wineps/data/NewCenturySchlbk_Bold.c
--- ../wine-20010723cvs/dlls/wineps/data/NewCenturySchlbk_Bold.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/NewCenturySchlbk_Bold.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_NewCenturySchlbk_Bold[228] =
+static const AFMMETRICS met_NewCenturySchlbk_Bold[228] =
{
{
32, 0x0020, 287, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_NewCenturySchlbk_Bold =
+const AFM PSDRV_NewCenturySchlbk_Bold =
{
"NewCenturySchlbk-Bold", /* FontName */
"New Century Schoolbook Bold", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c ./dlls/wineps/data/NewCenturySchlbk_BoldItalic.c
--- ../wine-20010723cvs/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/NewCenturySchlbk_BoldItalic.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_NewCenturySchlbk_BoldItalic[228] =
+static const AFMMETRICS met_NewCenturySchlbk_BoldItalic[228] =
{
{
32, 0x0020, 287, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_NewCenturySchlbk_BoldItalic =
+const AFM PSDRV_NewCenturySchlbk_BoldItalic =
{
"NewCenturySchlbk-BoldItalic", /* FontName */
"New Century Schoolbook Bold Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/NewCenturySchlbk_Italic.c ./dlls/wineps/data/NewCenturySchlbk_Italic.c
--- ../wine-20010723cvs/dlls/wineps/data/NewCenturySchlbk_Italic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/NewCenturySchlbk_Italic.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_NewCenturySchlbk_Italic[228] =
+static const AFMMETRICS met_NewCenturySchlbk_Italic[228] =
{
{
32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_NewCenturySchlbk_Italic =
+const AFM PSDRV_NewCenturySchlbk_Italic =
{
"NewCenturySchlbk-Italic", /* FontName */
"New Century Schoolbook Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/NewCenturySchlbk_Roman.c ./dlls/wineps/data/NewCenturySchlbk_Roman.c
--- ../wine-20010723cvs/dlls/wineps/data/NewCenturySchlbk_Roman.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/NewCenturySchlbk_Roman.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_NewCenturySchlbk_Roman[228] =
+static const AFMMETRICS met_NewCenturySchlbk_Roman[228] =
{
{
32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_NewCenturySchlbk_Roman =
+const AFM PSDRV_NewCenturySchlbk_Roman =
{
"NewCenturySchlbk-Roman", /* FontName */
"New Century Schoolbook Roman", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Palatino_Bold.c ./dlls/wineps/data/Palatino_Bold.c
--- ../wine-20010723cvs/dlls/wineps/data/Palatino_Bold.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Palatino_Bold.c Tue Jul 24 13:40:45 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Palatino_Bold[228] =
+static const AFMMETRICS met_Palatino_Bold[228] =
{
{
32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Palatino_Bold =
+const AFM PSDRV_Palatino_Bold =
{
"Palatino-Bold", /* FontName */
"Palatino Bold", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Palatino_BoldItalic.c ./dlls/wineps/data/Palatino_BoldItalic.c
--- ../wine-20010723cvs/dlls/wineps/data/Palatino_BoldItalic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Palatino_BoldItalic.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Palatino_BoldItalic[228] =
+static const AFMMETRICS met_Palatino_BoldItalic[228] =
{
{
32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Palatino_BoldItalic =
+const AFM PSDRV_Palatino_BoldItalic =
{
"Palatino-BoldItalic", /* FontName */
"Palatino Bold Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Palatino_Italic.c ./dlls/wineps/data/Palatino_Italic.c
--- ../wine-20010723cvs/dlls/wineps/data/Palatino_Italic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Palatino_Italic.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Palatino_Italic[228] =
+static const AFMMETRICS met_Palatino_Italic[228] =
{
{
32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Palatino_Italic =
+const AFM PSDRV_Palatino_Italic =
{
"Palatino-Italic", /* FontName */
"Palatino Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Palatino_Roman.c ./dlls/wineps/data/Palatino_Roman.c
--- ../wine-20010723cvs/dlls/wineps/data/Palatino_Roman.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Palatino_Roman.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Palatino_Roman[228] =
+static const AFMMETRICS met_Palatino_Roman[228] =
{
{
32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Palatino_Roman =
+const AFM PSDRV_Palatino_Roman =
{
"Palatino-Roman", /* FontName */
"Palatino Roman", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Symbol.c ./dlls/wineps/data/Symbol.c
--- ../wine-20010723cvs/dlls/wineps/data/Symbol.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Symbol.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Symbol[188] =
+static const AFMMETRICS met_Symbol[188] =
{
{
32, 0xf020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -784,7 +784,7 @@
* Font metrics
*/
-AFM PSDRV_Symbol =
+const AFM PSDRV_Symbol =
{
"Symbol", /* FontName */
"Symbol", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Times_Bold.c ./dlls/wineps/data/Times_Bold.c
--- ../wine-20010723cvs/dlls/wineps/data/Times_Bold.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Times_Bold.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Times_Bold[228] =
+static const AFMMETRICS met_Times_Bold[228] =
{
{
32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Times_Bold =
+const AFM PSDRV_Times_Bold =
{
"Times-Bold", /* FontName */
"Times Bold", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Times_BoldItalic.c ./dlls/wineps/data/Times_BoldItalic.c
--- ../wine-20010723cvs/dlls/wineps/data/Times_BoldItalic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Times_BoldItalic.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Times_BoldItalic[228] =
+static const AFMMETRICS met_Times_BoldItalic[228] =
{
{
32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Times_BoldItalic =
+const AFM PSDRV_Times_BoldItalic =
{
"Times-BoldItalic", /* FontName */
"Times Bold Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Times_Italic.c ./dlls/wineps/data/Times_Italic.c
--- ../wine-20010723cvs/dlls/wineps/data/Times_Italic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Times_Italic.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Times_Italic[228] =
+static const AFMMETRICS met_Times_Italic[228] =
{
{
32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Times_Italic =
+const AFM PSDRV_Times_Italic =
{
"Times-Italic", /* FontName */
"Times Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/Times_Roman.c ./dlls/wineps/data/Times_Roman.c
--- ../wine-20010723cvs/dlls/wineps/data/Times_Roman.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/Times_Roman.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_Times_Roman[228] =
+static const AFMMETRICS met_Times_Roman[228] =
{
{
32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_Times_Roman =
+const AFM PSDRV_Times_Roman =
{
"Times-Roman", /* FontName */
"Times Roman", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/ZapfChancery_MediumItalic.c ./dlls/wineps/data/ZapfChancery_MediumItalic.c
--- ../wine-20010723cvs/dlls/wineps/data/ZapfChancery_MediumItalic.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/ZapfChancery_MediumItalic.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_ZapfChancery_MediumItalic[228] =
+static const AFMMETRICS met_ZapfChancery_MediumItalic[228] =
{
{
32, 0x0020, 220, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@
* Font metrics
*/
-AFM PSDRV_ZapfChancery_MediumItalic =
+const AFM PSDRV_ZapfChancery_MediumItalic =
{
"ZapfChancery-MediumItalic", /* FontName */
"ITC Zapf Chancery Medium Italic", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/ZapfDingbats.c ./dlls/wineps/data/ZapfDingbats.c
--- ../wine-20010723cvs/dlls/wineps/data/ZapfDingbats.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/ZapfDingbats.c Tue Jul 24 13:40:46 2001
@@ -23,7 +23,7 @@
* Glyph metrics
*/
-static AFMMETRICS met_ZapfDingbats[188] =
+static const AFMMETRICS met_ZapfDingbats[188] =
{
{
32, 0xf020, 278, PSDRV_AGLGlyphNames + 1169,
@@ -784,7 +784,7 @@
* Font metrics
*/
-AFM PSDRV_ZapfDingbats =
+const AFM PSDRV_ZapfDingbats =
{
"ZapfDingbats", /* FontName */
"ITC Zapf Dingbats", /* FullName */
diff -urN ../wine-20010723cvs/dlls/wineps/data/agl.c ./dlls/wineps/data/agl.c
--- ../wine-20010723cvs/dlls/wineps/data/agl.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/agl.c Tue Jul 24 13:40:46 2001
@@ -25,7 +25,7 @@
* Built-in font metrics
*/
-AFM *const PSDRV_BuiltinAFMs[] =
+const AFM *const PSDRV_BuiltinAFMs[] =
{
&PSDRV_AvantGarde_Demi,
&PSDRV_AvantGarde_DemiOblique,
diff -urN ../wine-20010723cvs/dlls/wineps/data/agl.h ./dlls/wineps/data/agl.h
--- ../wine-20010723cvs/dlls/wineps/data/agl.h Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/data/agl.h Tue Jul 24 13:40:46 2001
@@ -1,38 +1,38 @@
-extern AFM PSDRV_AvantGarde_Demi;
-extern AFM PSDRV_AvantGarde_DemiOblique;
-extern AFM PSDRV_AvantGarde_Book;
-extern AFM PSDRV_AvantGarde_BookOblique;
-extern AFM PSDRV_Bookman_Demi;
-extern AFM PSDRV_Bookman_DemiItalic;
-extern AFM PSDRV_Bookman_Light;
-extern AFM PSDRV_Bookman_LightItalic;
-extern AFM PSDRV_Courier_Bold;
-extern AFM PSDRV_Courier_BoldOblique;
-extern AFM PSDRV_Courier;
-extern AFM PSDRV_Courier_Oblique;
-extern AFM PSDRV_Helvetica;
-extern AFM PSDRV_Helvetica_Bold;
-extern AFM PSDRV_Helvetica_BoldOblique;
-extern AFM PSDRV_Helvetica_Narrow;
-extern AFM PSDRV_Helvetica_Narrow_Bold;
-extern AFM PSDRV_Helvetica_Narrow_BoldOblique;
-extern AFM PSDRV_Helvetica_Narrow_Oblique;
-extern AFM PSDRV_Helvetica_Oblique;
-extern AFM PSDRV_NewCenturySchlbk_Bold;
-extern AFM PSDRV_NewCenturySchlbk_BoldItalic;
-extern AFM PSDRV_NewCenturySchlbk_Italic;
-extern AFM PSDRV_NewCenturySchlbk_Roman;
-extern AFM PSDRV_Palatino_Bold;
-extern AFM PSDRV_Palatino_BoldItalic;
-extern AFM PSDRV_Palatino_Italic;
-extern AFM PSDRV_Palatino_Roman;
-extern AFM PSDRV_Symbol;
-extern AFM PSDRV_Times_Bold;
-extern AFM PSDRV_Times_BoldItalic;
-extern AFM PSDRV_Times_Italic;
-extern AFM PSDRV_Times_Roman;
-extern AFM PSDRV_ZapfChancery_MediumItalic;
-extern AFM PSDRV_ZapfDingbats;
+extern const AFM PSDRV_AvantGarde_Demi;
+extern const AFM PSDRV_AvantGarde_DemiOblique;
+extern const AFM PSDRV_AvantGarde_Book;
+extern const AFM PSDRV_AvantGarde_BookOblique;
+extern const AFM PSDRV_Bookman_Demi;
+extern const AFM PSDRV_Bookman_DemiItalic;
+extern const AFM PSDRV_Bookman_Light;
+extern const AFM PSDRV_Bookman_LightItalic;
+extern const AFM PSDRV_Courier_Bold;
+extern const AFM PSDRV_Courier_BoldOblique;
+extern const AFM PSDRV_Courier;
+extern const AFM PSDRV_Courier_Oblique;
+extern const AFM PSDRV_Helvetica;
+extern const AFM PSDRV_Helvetica_Bold;
+extern const AFM PSDRV_Helvetica_BoldOblique;
+extern const AFM PSDRV_Helvetica_Narrow;
+extern const AFM PSDRV_Helvetica_Narrow_Bold;
+extern const AFM PSDRV_Helvetica_Narrow_BoldOblique;
+extern const AFM PSDRV_Helvetica_Narrow_Oblique;
+extern const AFM PSDRV_Helvetica_Oblique;
+extern const AFM PSDRV_NewCenturySchlbk_Bold;
+extern const AFM PSDRV_NewCenturySchlbk_BoldItalic;
+extern const AFM PSDRV_NewCenturySchlbk_Italic;
+extern const AFM PSDRV_NewCenturySchlbk_Roman;
+extern const AFM PSDRV_Palatino_Bold;
+extern const AFM PSDRV_Palatino_BoldItalic;
+extern const AFM PSDRV_Palatino_Italic;
+extern const AFM PSDRV_Palatino_Roman;
+extern const AFM PSDRV_Symbol;
+extern const AFM PSDRV_Times_Bold;
+extern const AFM PSDRV_Times_BoldItalic;
+extern const AFM PSDRV_Times_Italic;
+extern const AFM PSDRV_Times_Roman;
+extern const AFM PSDRV_ZapfChancery_MediumItalic;
+extern const AFM PSDRV_ZapfDingbats;
#define GN_A (PSDRV_AGLGlyphNames + 0)
#define GN_AE (PSDRV_AGLGlyphNames + 1)
#define GN_AEacute (PSDRV_AGLGlyphNames + 2)
diff -urN ../wine-20010723cvs/dlls/wineps/mkagl.c ./dlls/wineps/mkagl.c
--- ../wine-20010723cvs/dlls/wineps/mkagl.c Tue Jul 24 13:41:14 2001
+++ ./dlls/wineps/mkagl.c Tue Jul 24 13:40:46 2001
@@ -164,7 +164,7 @@
" * Built-in font metrics\n"
" */\n"
"\n"
- "AFM *const PSDRV_BuiltinAFMs[] =\n"
+ "const AFM *const PSDRV_BuiltinAFMs[] =\n"
"{\n", f_c);
@@ -209,7 +209,7 @@
if (font_family[i] == '-')
font_family[i] = '_';
- fprintf(f_h, "extern AFM PSDRV_%s;\n", font_family);
+ fprintf(f_h, "extern const AFM PSDRV_%s;\n", font_family);
fprintf(f_c, " &PSDRV_%s,\n", font_family);
while (1)
diff -urN ../wine-20010723cvs/dlls/wineps/psdrv.h ./dlls/wineps/psdrv.h
--- ../wine-20010723cvs/dlls/wineps/psdrv.h Tue Jul 24 13:40:58 2001
+++ ./dlls/wineps/psdrv.h Tue Jul 24 13:42:07 2001
@@ -93,7 +93,7 @@
} FONTFAMILY;
extern FONTFAMILY *PSDRV_AFMFontList;
-extern AFM *const PSDRV_BuiltinAFMs[]; /* last element is NULL */
+extern const AFM *const PSDRV_BuiltinAFMs[]; /* last element is NULL */
typedef struct _tagFONTNAME {
char *Name;
More information about the wine-patches
mailing list