Sat Oct 18 11:43:45 2008 UTC ()
Changes 20080927:
* Bug fixes and improvements


(adam)
diff -r1.51 -r1.52 pkgsrc/fonts/fontforge/Makefile
diff -r1.20 -r1.21 pkgsrc/fonts/fontforge/PLIST
diff -r1.42 -r1.43 pkgsrc/fonts/fontforge/distinfo
diff -r1.15 -r1.16 pkgsrc/fonts/fontforge/patches/patch-ae
diff -r1.4 -r1.5 pkgsrc/fonts/fontforge/patches/patch-af
cvs diff -r1.51 -r1.52 pkgsrc/fonts/fontforge/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/Makefile 2008/09/17 16:34:40 1.51
+++ pkgsrc/fonts/fontforge/Makefile 2008/10/18 11:43:45 1.52
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.51 2008/09/17 16:34:40 rillig Exp $ 1# $NetBSD: Makefile,v 1.52 2008/10/18 11:43:45 adam Exp $
2 2
3DISTNAME= fontforge_full-${VERSION} 3DISTNAME= fontforge_full-${VERSION}
4PKGNAME= fontforge-${VERSION} 4PKGNAME= fontforge-${VERSION}
5CATEGORIES= fonts editors 5CATEGORIES= fonts editors
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= http://fontforge.sourceforge.net/ 10HOMEPAGE= http://fontforge.sourceforge.net/
11COMMENT= Postscript font editor 11COMMENT= Postscript font editor
12 12
13VERSION= 20080720 13VERSION= 20080927
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 17MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
18 18
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_LANGUAGES+= c c++ fortran 20USE_LANGUAGES+= c c++ fortran
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22USE_TOOLS+= gmake msgfmt 22USE_TOOLS+= gmake msgfmt
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --without-freetype-src 24CONFIGURE_ARGS+= --without-freetype-src
25CONFIGURE_ARGS+= --without-python 25CONFIGURE_ARGS+= --without-python
26CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} 
27WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 26WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
28BROKEN_GETTEXT_DETECTION= yes 27BROKEN_GETTEXT_DETECTION= yes
29 28
30# checks for X11/Intrinsic.h 29# checks for X11/Intrinsic.h
31BUILDLINK_DEPMETHOD.libXt?= build 30BUILDLINK_DEPMETHOD.libXt?= build
32.include "../../x11/libXt/buildlink3.mk" 31.include "../../x11/libXt/buildlink3.mk"
33 32
34.include "../../converters/libiconv/buildlink3.mk" 33.include "../../converters/libiconv/buildlink3.mk"
35.include "../../devel/gettext-lib/buildlink3.mk" 34.include "../../devel/gettext-lib/buildlink3.mk"
36.include "../../graphics/freetype2/buildlink3.mk" 35.include "../../graphics/freetype2/buildlink3.mk"
37.include "../../graphics/jpeg/buildlink3.mk" 36.include "../../graphics/jpeg/buildlink3.mk"
38.include "../../graphics/libungif/buildlink3.mk" 37.include "../../graphics/libungif/buildlink3.mk"
39.include "../../graphics/png/buildlink3.mk" 38.include "../../graphics/png/buildlink3.mk"
cvs diff -r1.20 -r1.21 pkgsrc/fonts/fontforge/PLIST (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/PLIST 2008/07/29 05:17:01 1.20
+++ pkgsrc/fonts/fontforge/PLIST 2008/10/18 11:43:45 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.20 2008/07/29 05:17:01 adam Exp $ 1@comment $NetBSD: PLIST,v 1.21 2008/10/18 11:43:45 adam Exp $
2bin/fontforge 2bin/fontforge
3bin/fontimage 3bin/fontimage
4bin/fontlint 4bin/fontlint
5bin/sfddiff 5bin/sfddiff
6include/fontforge/PfEd.h 6include/fontforge/PfEd.h
7include/fontforge/autowidth.h 7include/fontforge/autowidth.h
8include/fontforge/baseviews.h 8include/fontforge/baseviews.h
9include/fontforge/basics.h 9include/fontforge/basics.h
10include/fontforge/bezctx_ff.h 10include/fontforge/bezctx_ff.h
11include/fontforge/bitmapcontrol.h 11include/fontforge/bitmapcontrol.h
12include/fontforge/chardata.h 12include/fontforge/chardata.h
13include/fontforge/charset.h 13include/fontforge/charset.h
14include/fontforge/config.h 14include/fontforge/config.h
@@ -60,26 +60,27 @@ include/fontforge/uiinterface.h @@ -60,26 +60,27 @@ include/fontforge/uiinterface.h
60include/fontforge/unicoderange.h 60include/fontforge/unicoderange.h
61include/fontforge/ustring.h 61include/fontforge/ustring.h
62include/fontforge/utype.h 62include/fontforge/utype.h
63lib/libfontforge.la 63lib/libfontforge.la
64lib/libgdraw.la 64lib/libgdraw.la
65lib/libgioftp.la 65lib/libgioftp.la
66lib/libgunicode.la 66lib/libgunicode.la
67lib/libgutils.la 67lib/libgutils.la
68lib/pkgconfig/fontforge.pc 68lib/pkgconfig/fontforge.pc
69man/man1/fontforge.1 69man/man1/fontforge.1
70man/man1/fontimage.1 70man/man1/fontimage.1
71man/man1/fontlint.1 71man/man1/fontlint.1
72man/man1/sfddiff.1 72man/man1/sfddiff.1
 73share/fontforge/pixmaps/colorwheel.png
73share/fontforge/pixmaps/editclear.png 74share/fontforge/pixmaps/editclear.png
74share/fontforge/pixmaps/editclearback.png 75share/fontforge/pixmaps/editclearback.png
75share/fontforge/pixmaps/editcopy.png 76share/fontforge/pixmaps/editcopy.png
76share/fontforge/pixmaps/editcopyfg2bg.png 77share/fontforge/pixmaps/editcopyfg2bg.png
77share/fontforge/pixmaps/editcopylayer2layer.png 78share/fontforge/pixmaps/editcopylayer2layer.png
78share/fontforge/pixmaps/editcopylbearing.png 79share/fontforge/pixmaps/editcopylbearing.png
79share/fontforge/pixmaps/editcopylookupdata.png 80share/fontforge/pixmaps/editcopylookupdata.png
80share/fontforge/pixmaps/editcopyrbearing.png 81share/fontforge/pixmaps/editcopyrbearing.png
81share/fontforge/pixmaps/editcopyref.png 82share/fontforge/pixmaps/editcopyref.png
82share/fontforge/pixmaps/editcopyvwidth.png 83share/fontforge/pixmaps/editcopyvwidth.png
83share/fontforge/pixmaps/editcopywidth.png 84share/fontforge/pixmaps/editcopywidth.png
84share/fontforge/pixmaps/editcut.png 85share/fontforge/pixmaps/editcut.png
85share/fontforge/pixmaps/editfind.png 86share/fontforge/pixmaps/editfind.png
@@ -92,26 +93,27 @@ share/fontforge/pixmaps/editredo.png @@ -92,26 +93,27 @@ share/fontforge/pixmaps/editredo.png
92share/fontforge/pixmaps/editrmundoes.png 93share/fontforge/pixmaps/editrmundoes.png
93share/fontforge/pixmaps/editrplref.png 94share/fontforge/pixmaps/editrplref.png
94share/fontforge/pixmaps/editsameas.png 95share/fontforge/pixmaps/editsameas.png
95share/fontforge/pixmaps/editselect.png 96share/fontforge/pixmaps/editselect.png
96share/fontforge/pixmaps/editundo.png 97share/fontforge/pixmaps/editundo.png
97share/fontforge/pixmaps/editunlink.png 98share/fontforge/pixmaps/editunlink.png
98share/fontforge/pixmaps/elementaddextrema.png 99share/fontforge/pixmaps/elementaddextrema.png
99share/fontforge/pixmaps/elementalign.png 100share/fontforge/pixmaps/elementalign.png
100share/fontforge/pixmaps/elementanticlock.png 101share/fontforge/pixmaps/elementanticlock.png
101share/fontforge/pixmaps/elementautotrace.png 102share/fontforge/pixmaps/elementautotrace.png
102share/fontforge/pixmaps/elementbdfinfo.png 103share/fontforge/pixmaps/elementbdfinfo.png
103share/fontforge/pixmaps/elementbitmapsavail.png 104share/fontforge/pixmaps/elementbitmapsavail.png
104share/fontforge/pixmaps/elementbuildaccent.png 105share/fontforge/pixmaps/elementbuildaccent.png
 106share/fontforge/pixmaps/elementbuildcomposit.png
105share/fontforge/pixmaps/elementclockwise.png 107share/fontforge/pixmaps/elementclockwise.png
106share/fontforge/pixmaps/elementcomparefonts.png 108share/fontforge/pixmaps/elementcomparefonts.png
107share/fontforge/pixmaps/elementcomparelayers.png 109share/fontforge/pixmaps/elementcomparelayers.png
108share/fontforge/pixmaps/elementcorrectdir.png 110share/fontforge/pixmaps/elementcorrectdir.png
109share/fontforge/pixmaps/elementexpandstroke.png 111share/fontforge/pixmaps/elementexpandstroke.png
110share/fontforge/pixmaps/elementfindprobs.png 112share/fontforge/pixmaps/elementfindprobs.png
111share/fontforge/pixmaps/elementfontinfo.png 113share/fontforge/pixmaps/elementfontinfo.png
112share/fontforge/pixmaps/elementgetinfo.png 114share/fontforge/pixmaps/elementgetinfo.png
113share/fontforge/pixmaps/elementglyphinfo.png 115share/fontforge/pixmaps/elementglyphinfo.png
114share/fontforge/pixmaps/elementhbaselines.png 116share/fontforge/pixmaps/elementhbaselines.png
115share/fontforge/pixmaps/elementinterpolatefonts.png 117share/fontforge/pixmaps/elementinterpolatefonts.png
116share/fontforge/pixmaps/elementmathinfo.png 118share/fontforge/pixmaps/elementmathinfo.png
117share/fontforge/pixmaps/elementmergefonts.png 119share/fontforge/pixmaps/elementmergefonts.png
cvs diff -r1.42 -r1.43 pkgsrc/fonts/fontforge/distinfo (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/distinfo 2008/07/29 05:17:01 1.42
+++ pkgsrc/fonts/fontforge/distinfo 2008/10/18 11:43:45 1.43
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.42 2008/07/29 05:17:01 adam Exp $ 1$NetBSD: distinfo,v 1.43 2008/10/18 11:43:45 adam Exp $
2 2
3SHA1 (fontforge_full-20080720.tar.bz2) = e964955d5257b5c88887823293d069ce372bf0fa 3SHA1 (fontforge_full-20080927.tar.bz2) = bf80dd035d0ff26da1f5cc4aa55dcd9b6ff9e748
4RMD160 (fontforge_full-20080720.tar.bz2) = 9f2c8a0afaa2be55a7f69db2272c886aaf5a6bfd 4RMD160 (fontforge_full-20080927.tar.bz2) = 8f8fb0026b967602184bfefd83d5234fc684f340
5Size (fontforge_full-20080720.tar.bz2) = 5039266 bytes 5Size (fontforge_full-20080927.tar.bz2) = 5072410 bytes
6SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070 6SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
7SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd 7SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
8SHA1 (patch-ae) = 3c86aed655da00ebc56a5a9cd02fe3a8bfd43eec 8SHA1 (patch-ae) = a5ccbd571154dc03fbb4e3dae31615e6d064832d
9SHA1 (patch-af) = ddf487cf9a2252a67f7afbcaa62fdbdf7b68c8ae 9SHA1 (patch-af) = b71942feaf59b69d02782679219dd694e1054b3d
cvs diff -r1.15 -r1.16 pkgsrc/fonts/fontforge/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/patches/Attic/patch-ae 2008/07/29 05:17:01 1.15
+++ pkgsrc/fonts/fontforge/patches/Attic/patch-ae 2008/10/18 11:43:45 1.16
@@ -1,56 +1,56 @@ @@ -1,56 +1,56 @@
1$NetBSD: patch-ae,v 1.15 2008/07/29 05:17:01 adam Exp $ 1$NetBSD: patch-ae,v 1.16 2008/10/18 11:43:45 adam Exp $
2 2
3--- configure.orig 2008-07-13 16:36:19.000000000 +0200 3--- configure.orig 2008-09-15 01:31:08.000000000 +0200
4+++ configure 4+++ configure
5@@ -20189,8 +20189,8 @@ fi 5@@ -19759,8 +19759,8 @@ if test $ac_cv_file__usr_include_libxml2
6  6 CFLAGS="$CFLAGS -I/usr/include/libxml2/"
7 fi 7 else
8  8
9-{ echo "$as_me:$LINENO: checking for /usr/include/libxml2/libxml" >&5 9- echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
10-echo $ECHO_N "checking for /usr/include/libxml2/libxml... $ECHO_C" >&6; } 10-echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6
11+{ echo "$as_me:$LINENO: checking for ${LOCALBASE}/libxml2/libxml" >&5 11+ echo "$as_me:$LINENO: checking for ${PREFIX}/include/libxml2/libxml" >&5
12+echo $ECHO_N "checking for ${LOCALBASE}/libxml2/libxml... $ECHO_C" >&6; } 12+echo $ECHO_N "checking for ${PREFIX}/include/libxml2/libxml... $ECHO_C" >&6
13 if test "${ac_cv_file__usr_include_libxml2_libxml+set}" = set; then 13 if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
14 echo $ECHO_N "(cached) $ECHO_C" >&6 14 echo $ECHO_N "(cached) $ECHO_C" >&6
15 else 15 else
16@@ -20219,7 +20219,7 @@ else 16@@ -19768,7 +19768,7 @@ else
17 { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 17 { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
18 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} 18 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
19 { (exit 1); exit 1; }; } 19 { (exit 1); exit 1; }; }
20-if test -r "/usr/local/include/libxml2/libxml"; then 20-if test -r "/usr/local/include/libxml2/libxml"; then
21+if test -r "${LOCALBASE}/include/libxml2/libxml"; then 21+if test -r "${PREFIX}/include/libxml2/libxml"; then
22 ac_cv_file__usr_local_include_libxml2_libxml=yes 22 ac_cv_file__usr_local_include_libxml2_libxml=yes
23 else 23 else
24 ac_cv_file__usr_local_include_libxml2_libxml=no 24 ac_cv_file__usr_local_include_libxml2_libxml=no
25@@ -20228,7 +20228,7 @@ fi 25@@ -19777,7 +19777,7 @@ fi
26 { echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5 26 echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
27 echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6; } 27 echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6
28 if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then 28 if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
29- CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/" 29- CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
30+ CFLAGS="$CFLAGS -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2/" 30+ CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/"
31 else 31 else
32 cat >>confdefs.h <<\_ACEOF 32 cat >>confdefs.h <<\_ACEOF
33 #define _NO_LIBXML 1 33 #define _NO_LIBXML 1
34@@ -22938,7 +22938,7 @@ fi 34@@ -22640,7 +22640,7 @@ fi
35  35
36 # Standard set of common directories for X headers. 36 # Standard set of common directories for X headers.
37 # Check X11 before X11Rn because it is often a symlink to the current release. 37 # Check X11 before X11Rn because it is often a symlink to the current release.
38-ac_x_header_dirs=' 38-ac_x_header_dirs='
39+ac_x_header_dirs=" 39+ac_x_header_dirs="
40 /usr/X11/include 40 /usr/X11/include
41 /usr/X11R6/include 41 /usr/X11R6/include
42 /usr/X11R5/include 42 /usr/X11R5/include
43@@ -22949,29 +22949,29 @@ ac_x_header_dirs=' 43@@ -22651,29 +22651,29 @@ ac_x_header_dirs='
44 /usr/include/X11R5 44 /usr/include/X11R5
45 /usr/include/X11R4 45 /usr/include/X11R4
46  46
47-/usr/local/X11/include 47-/usr/local/X11/include
48-/usr/local/X11R6/include 48-/usr/local/X11R6/include
49-/usr/local/X11R5/include 49-/usr/local/X11R5/include
50-/usr/local/X11R4/include 50-/usr/local/X11R4/include
51- 51-
52-/usr/local/include/X11 52-/usr/local/include/X11
53-/usr/local/include/X11R6 53-/usr/local/include/X11R6
54-/usr/local/include/X11R5 54-/usr/local/include/X11R5
55-/usr/local/include/X11R4 55-/usr/local/include/X11R4
56+${prefix}/X11/include 56+${prefix}/X11/include
@@ -71,23 +71,23 @@ $NetBSD: patch-ae,v 1.15 2008/07/29 05:1 @@ -71,23 +71,23 @@ $NetBSD: patch-ae,v 1.15 2008/07/29 05:1
71-/usr/local/include 71-/usr/local/include
72+${prefix}/include 72+${prefix}/include
73 /usr/unsupported/include 73 /usr/unsupported/include
74 /usr/athena/include 74 /usr/athena/include
75-/usr/local/x11r5/include 75-/usr/local/x11r5/include
76+${prefix}/x11r5/include 76+${prefix}/x11r5/include
77 /usr/lpp/Xamples/include 77 /usr/lpp/Xamples/include
78  78
79 /usr/openwin/include 79 /usr/openwin/include
80-/usr/openwin/share/include' 80-/usr/openwin/share/include'
81+/usr/openwin/share/include" 81+/usr/openwin/share/include"
82  82
83 if test "$ac_x_includes" = no; then 83 if test "$ac_x_includes" = no; then
84 # Guess where to find include files, by looking for Xlib.h. 84 # Guess where to find include files, by looking for Intrinsic.h.
85@@ -25868,7 +25868,7 @@ if test "$gww_has_gettext" = "yes" >/dev 85@@ -25686,7 +25686,7 @@ if test "$gww_has_gettext" = "yes" >/dev
86  86
87 cat </dev/null >$ac_confdir/po/Makefile.in 87 cat </dev/null >$ac_confdir/po/Makefile.in
88 echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in 88 echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
89- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in 89- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in
90+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in 90+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in
91 echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in 91 echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in
92 echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in 92 echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in
93 echo '' >> $ac_confdir/po/Makefile.in 93 echo '' >> $ac_confdir/po/Makefile.in
cvs diff -r1.4 -r1.5 pkgsrc/fonts/fontforge/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/patches/Attic/patch-af 2008/06/23 11:38:51 1.4
+++ pkgsrc/fonts/fontforge/patches/Attic/patch-af 2008/10/18 11:43:45 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-af,v 1.4 2008/06/23 11:38:51 drochner Exp $ 1$NetBSD: patch-af,v 1.5 2008/10/18 11:43:45 adam Exp $
2 2
3--- fontforge/cvimportdlg.c.orig 2008-04-17 14:36:53.000000000 +0200 3--- fontforge/cvimportdlg.c.orig 2008-08-19 01:22:41.000000000 +0200
4+++ fontforge/cvimportdlg.c 4+++ fontforge/cvimportdlg.c
5@@ -51,6 +51,7 @@ return; 5@@ -60,6 +60,7 @@ return;
6 fclose(plate); 6 fclose(plate);
7 } 7 }
8  8
9+#ifndef _NO_LIBXML 9+#ifndef _NO_LIBXML
10 static void ImportSVG(CharView *cv,char *path) { 10 static void ImportSVG(CharView *cv,char *path) {
11 SCImportSVG(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false); 11 SCImportSVG(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false);
12 } 12 }
13@@ -58,6 +59,7 @@ static void ImportSVG(CharView *cv,char  13@@ -67,6 +68,7 @@ static void ImportSVG(CharView *cv,char
14 static void ImportGlif(CharView *cv,char *path) { 14 static void ImportGlif(CharView *cv,char *path) {
15 SCImportGlif(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false); 15 SCImportGlif(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false);
16 } 16 }
17+#endif 17+#endif
18  18
19 static void ImportFig(CharView *cv,char *path) { 19 static void ImportFig(CharView *cv,char *path) {
20 SCImportFig(cv->b.sc,CVLayer((CharViewBase *) cv),path,false); 20 SCImportFig(cv->b.sc,CVLayer((CharViewBase *) cv),path,false);