Репозитории ALT
S: | 5.1.2-alt7 |
D: | 5.1.2-alt1 |
5.1: | 5.1.2-alt3 |
4.1: | 5.0.2-alt2 |
4.0: | 5.0.2-alt1.M40.1 |
+backports: | 5.0.2-alt1.M40.1 |
3.0: | 5.0.2-alt1 |
Группа :: Система/Библиотеки
Пакет: t1lib
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: t1lib-5.0.2-deb-alt-fixes.patch
Скачать
Скачать
diff -uprk.orig t1lib-5.0.2.orig/lib/Makefile.in t1lib-5.0.2/lib/Makefile.in
--- t1lib-5.0.2.orig/lib/Makefile.in 2004-04-12 17:38:29 +0400
+++ t1lib-5.0.2/lib/Makefile.in 2004-04-12 18:31:17 +0400
@@ -128,15 +128,15 @@ t1lib_target:
libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS)
$(LIBTOOL) --mode=link \
- $(CC) -o $@ $(TYPE1_OBJS) $(T1LIB_OBJS) \
+ $(CC) -o $@ $(TYPE1_OBJS) $(T1LIB_OBJS) -lm \
-version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
-rpath $(libdir)
cp t1lib/t1lib.h .
-libt1x.la: $(T1LIBX_OBJS)
+libt1x.la: $(T1LIBX_OBJS) libt1.la
$(LIBTOOL) --mode=link \
- $(CC) -o $@ $(T1LIBX_OBJS) \
+ $(CC) -o $@ $(T1LIBX_OBJS) $(X_LIBS) $(XLIB) -L. -lt1 \
-version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
-rpath $(libdir)
cp t1lib/t1libx.h .
diff -uprk.orig t1lib-5.0.2.orig/lib/type1/type1.c t1lib-5.0.2/lib/type1/type1.c
--- t1lib-5.0.2.orig/lib/type1/type1.c 2004-03-05 05:48:28 +0300
+++ t1lib-5.0.2/lib/type1/type1.c 2004-04-12 17:57:08 +0400
@@ -1699,7 +1699,7 @@ static int RLineTo(dx, dy)
long pindex = 0;
/* compute hinting for previous segment! */
- FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy);
+ FindStems( currx, curry, (numppoints > 1) ? currx-ppoints[numppoints-2].x : 0, (numppoints > 1) ? curry-ppoints[numppoints-2].y : 0, dx, dy);
/* Allocate a new path point and pre-setup data */
pindex = nextPPoint();
@@ -1727,7 +1727,7 @@ static int RRCurveTo(dx1, dy1, dx2, dy2,
long pindex = 0;
/* compute hinting for previous point! */
- FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1);
+ FindStems( currx, curry, (numppoints > 1) ? currx-ppoints[numppoints-2].x : 0, (numppoints > 1) ? curry-ppoints[numppoints-2].y : 0, dx1, dy1);
/* Allocate three new path points and pre-setup data */
pindex = nextPPoint();
@@ -1743,7 +1743,7 @@ static int RRCurveTo(dx1, dy1, dx2, dy2,
curry += dy1;
/* compute hinting for previous point! */
- FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx2, dy2);
+ FindStems( currx, curry, (numppoints > 1) ? currx-ppoints[numppoints-2].x : 0, (numppoints > 1) ? curry-ppoints[numppoints-2].y : 0, dx2, dy2);
pindex = nextPPoint();
ppoints[pindex].x = currx + dx2;
@@ -1758,7 +1758,7 @@ static int RRCurveTo(dx1, dy1, dx2, dy2,
curry += dy2;
/* compute hinting for previous point! */
- FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx3, dy3);
+ FindStems( currx, curry, (numppoints > 1) ? currx-ppoints[numppoints-2].x : 0, (numppoints > 1) ? curry-ppoints[numppoints-2].y : 0, dx3, dy3);
pindex = nextPPoint();
ppoints[pindex].x = currx + dx3;
@@ -1810,7 +1810,7 @@ static int DoClosePath()
/* restore numppoints and setup hinting for current point */
numppoints = tmpind;
- FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y,
+ FindStems( currx, curry, (numppoints > 1) ? currx-ppoints[numppoints-2].x : 0, (numppoints > 1) ? curry-ppoints[numppoints-2].y : 0,
deltax, deltay);
}
@@ -1893,17 +1893,7 @@ static int RMoveTo(dx,dy)
long pindex = 0;
/* Compute hinting for this path point! */
- if ( numppoints == 1 ) {
- /* Since RMoveTo for this case starts a new path segment
- (flex-constructs have already been handled), the current
- point is hinted here only taking the next point into account,
- but not the previous. Later on, in DoClosePath(), we'll step
- back to this point and the position might be rehinted. */
- FindStems( currx, curry, 0, 0, dx, dy);
- }
- else {
- FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy);
- }
+ FindStems( currx, curry, (numppoints > 1) ? ppoints[numppoints-2].x : 0, (numppoints > 1) ? ppoints[numppoints-2].y : 0, dx, dy);
diff -uprk.orig t1lib-5.0.2.orig/xglyph/xglyph.c t1lib-5.0.2/xglyph/xglyph.c
--- t1lib-5.0.2.orig/xglyph/xglyph.c 2003-01-03 06:26:54 +0300
+++ t1lib-5.0.2/xglyph/xglyph.c 2004-04-12 17:50:25 +0400
@@ -526,9 +526,12 @@ int main( int argc, char **argv)
/* Check for environment entry. If not set, set it to current
directory so that configuration file is found there */
+ /* It is insecure. */
+#if 0
if (getenv("T1LIB_CONFIG")==NULL){
putenv( "T1LIB_CONFIG=./t1lib.config");
}
+#endif
/* Set log-level: */