ruby-dcl 1.7.1 → 1.8.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ChangeLog +1149 -365
- data/LICENSE.txt +1 -1
- data/Rakefile +7 -11
- data/demo/gokuraku/hop/hop.rb +1 -2
- data/demo/gokuraku/jump/jump1.rb +1 -2
- data/demo/gokuraku/jump/jump2.rb +2 -3
- data/demo/gokuraku/layout/lay1.rb +1 -2
- data/demo/gokuraku/layout/lay2.rb +1 -2
- data/demo/gokuraku/step/step0.rb +1 -2
- data/demo/gokuraku/step/step1.rb +1 -2
- data/demo/gokuraku/step/step2.rb +1 -2
- data/demo/gokuraku/u1d/u1d1.rb +1 -2
- data/demo/gokuraku/u1d/u1d2.rb +1 -2
- data/demo/gokuraku/u2d/u2d1.rb +1 -2
- data/demo/gokuraku/u2d/u2d2.rb +1 -2
- data/demo/gokuraku/u2d/u2d3.rb +1 -2
- data/demo/gokuraku/u2d/u2d4.rb +1 -2
- data/demo/grph1/scpack/scpkt2.rb +1 -2
- data/demo/grph1/scpack/scpkt3.rb +1 -2
- data/demo/grph1/scpack/scpkt6.rb +1 -2
- data/demo/grph1/scpack/scpkt7.rb +1 -2
- data/demo/grph1/scpack/scpkt8.rb +1 -2
- data/demo/grph1/sgpack/sgfont.rb +2 -3
- data/demo/grph1/sgpack/sgfonz.rb +2 -3
- data/demo/grph1/sgpack/sgksx1.rb +1 -2
- data/demo/grph1/sgpack/sgksx2.rb +1 -2
- data/demo/grph1/sgpack/sgksx3.rb +1 -2
- data/demo/grph1/sgpack/sglidx.rb +1 -2
- data/demo/grph1/sgpack/sgltyp.rb +1 -2
- data/demo/grph1/sgpack/sgpk01.rb +1 -2
- data/demo/grph1/sgpack/sgpk02.rb +1 -2
- data/demo/grph1/sgpack/sgpk03.rb +1 -2
- data/demo/grph1/sgpack/sgpk04.rb +1 -2
- data/demo/grph1/sgpack/sgpk05.rb +1 -2
- data/demo/grph1/sgpack/sgpk06.rb +1 -2
- data/demo/grph1/sgpack/sgpk07.rb +9 -8
- data/demo/grph1/sgpack/sgpk08.rb +1 -2
- data/demo/grph1/sgpack/sgpk09.rb +1 -2
- data/demo/grph1/sgpack/sgpk10.rb +1 -2
- data/demo/grph1/sgpack/sgtclr.rb +1 -2
- data/demo/grph1/sgpack/sgtone.rb +1 -2
- data/demo/grph1/sgpack/sgtonz.rb +1 -2
- data/demo/grph1/slpack/slpk01.rb +1 -2
- data/demo/grph1/slpack/slpk02.rb +1 -2
- data/demo/grph1/slpack/slpk03.rb +1 -2
- data/demo/grph1/slpack/slpk04.rb +2 -3
- data/demo/grph2/grpack/grpk01.rb +1 -2
- data/demo/grph2/ucpack/ucpk01.rb +1 -2
- data/demo/grph2/ucpack/ucpk02.rb +1 -2
- data/demo/grph2/udegpk/u2df01.rb +1 -2
- data/demo/grph2/udegpk/u2df02.rb +1 -2
- data/demo/grph2/udegpk/u2df03.rb +3 -4
- data/demo/grph2/udegpk/u2df04.rb +1 -2
- data/demo/grph2/udegpk/u2df05.rb +1 -2
- data/demo/grph2/udegpk/u2df06.rb +1 -2
- data/demo/grph2/udegpk/u2df07.rb +1 -2
- data/demo/grph2/udegpk/u2df08.rb +1 -2
- data/demo/grph2/udegpk/u2df09b.rb +0 -1
- data/demo/grph2/udegpk/u2df09c.rb +0 -1
- data/demo/grph2/udegpk/u2df09e.rb +0 -1
- data/demo/grph2/udegpk/u2df09f.rb +0 -1
- data/demo/grph2/uipack/uipk01.rb +1 -2
- data/demo/grph2/uipack/uipk02.rb +26 -18
- data/demo/grph2/uipack/uipk03.rb +50 -0
- data/demo/grph2/ulpack/ulpk01.rb +1 -2
- data/demo/grph2/ulpack/ulpk01n.rb +1 -2
- data/demo/grph2/ulpack/ulpk02.rb +1 -2
- data/demo/grph2/ulpack/ulpk02n.rb +1 -2
- data/demo/grph2/umpack/test01.rb +1 -2
- data/demo/grph2/umpack/test02.rb +1 -2
- data/demo/grph2/umpack/test03.rb +1 -2
- data/demo/grph2/umpack/test04.rb +2 -3
- data/demo/grph2/umpack/test05.rb +1 -2
- data/demo/grph2/umpack/test05r.rb +86 -0
- data/demo/grph2/umpack/test06.rb +1 -2
- data/demo/grph2/umpack/test07.rb +1 -2
- data/demo/grph2/umpack/test08.rb +1 -2
- data/demo/grph2/umpack/test10.rb +0 -1
- data/demo/grph2/umpack/umpk01.rb +1 -2
- data/demo/grph2/umpack/umpk02.rb +1 -2
- data/demo/grph2/umpack/umpk03.rb +1 -2
- data/demo/grph2/umpack/umpk04.rb +1 -2
- data/demo/grph2/umpack/umpk05.rb +1 -2
- data/demo/grph2/uspack/uspk01.rb +1 -2
- data/demo/grph2/uspack/uspk02.rb +1 -2
- data/demo/grph2/uspack/uspk03.rb +1 -2
- data/demo/grph2/uspack/uspk04.rb +1 -2
- data/demo/grph2/uspack/uspk05.rb +1 -2
- data/demo/grph2/uspack/uspk06.rb +2 -3
- data/demo/grph2/uspack/uspk07.rb +1 -2
- data/demo/grph2/uspack/uspk08.rb +2 -3
- data/demo/grph2/uspack/uspk09.rb +1 -2
- data/demo/grph2/uspack/uspk10.rb +1 -2
- data/demo/grph2/uspack/uspk11.rb +1 -2
- data/demo/grph2/uspack/uspk12.rb +1 -2
- data/demo/grph2/uupack/uupk01.rb +1 -2
- data/demo/grph2/uupack/uupk02.rb +1 -2
- data/demo/grph2/uupack/uupk03.rb +1 -2
- data/demo/grph2/uupack/uupk04.rb +1 -2
- data/demo/grph2/uupack/uupk05.rb +1 -2
- data/demo/grph2/uupack/uupk06.rb +1 -2
- data/demo/grph2/uupack/uupk07.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz01.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz02.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz03.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz04.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz05.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz06.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz07.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz08.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz09.rb +1 -2
- data/demo/grph2/uxyzpk/uxyz10.rb +1 -2
- data/demo/grph2/ximage/ximg01.rb +2 -3
- data/demo/math1/clsplib/cslb01.rb +1 -2
- data/demo/math2/fftlib/fftl01.rb +1 -2
- data/demo/math2/fftlib/fftl02.rb +1 -2
- data/demo/math2/intrlib/intr01.rb +1 -2
- data/demo/math2/rnmlib/rnml01.rb +1 -2
- data/demo/math2/vstlib/vstl01.rb +1 -2
- data/demo/math2/vstlib/vstl02.rb +1 -2
- data/demo/misc2/tmpack/tmpk01.rb +46 -0
- data/demo/misc2/tmpack/tmpk02.rb +58 -0
- data/demo/misc2/tmpack/tmpk03.rb +56 -0
- data/demo/rakuraku/color/color1.rb +1 -2
- data/demo/rakuraku/color/color2.rb +5 -5
- data/demo/rakuraku/color/color3.rb +1 -2
- data/demo/rakuraku/kihon/kihon1.rb +1 -2
- data/demo/rakuraku/kihon/kihon2.rb +1 -2
- data/demo/rakuraku/kihon/kihon3.rb +1 -2
- data/demo/rakuraku/kihon/kihon4.rb +1 -2
- data/demo/rakuraku/kihon/kihon5.rb +1 -2
- data/demo/rakuraku/kihon/kihon6.rb +1 -2
- data/demo/rakuraku/kihon/kihon7.rb +10 -5
- data/demo/rakuraku/kihon/kihon8.rb +1 -2
- data/demo/rakuraku/kihon/kihon9.rb +1 -2
- data/demo/rakuraku/kihon/kihona.rb +1 -2
- data/demo/rakuraku/kihon/kihonb.rb +12 -11
- data/demo/rakuraku/kihon/kihonc.rb +1 -2
- data/demo/rakuraku/layout/lay1.rb +1 -2
- data/demo/rakuraku/layout/lay2.rb +1 -2
- data/demo/rakuraku/layout/lay3.rb +1 -2
- data/demo/rakuraku/map3d/map3d1.rb +1 -2
- data/demo/rakuraku/map3d/map3d2.rb +1 -2
- data/demo/rakuraku/map3d/map3d3.rb +1 -2
- data/demo/rakuraku/map3d/map3d4.rb +1 -2
- data/demo/rakuraku/map3d/map3d5.rb +1 -2
- data/demo/rakuraku/map3d/map3d6.rb +0 -1
- data/demo/rakuraku/map3d/map3d7.rb +0 -1
- data/demo/rakuraku/miss/miss1.rb +1 -2
- data/demo/rakuraku/miss/miss2.rb +1 -2
- data/demo/rakuraku/quick/quick1.rb +1 -2
- data/demo/rakuraku/quick/quick2.rb +1 -2
- data/demo/rakuraku/quick/quick3.rb +1 -2
- data/demo/rakuraku/quick/quick4.rb +1 -2
- data/demo/rakuraku/quick/quick5.rb +1 -2
- data/demo/rakuraku/u2d/u2d1.rb +1 -2
- data/demo/rakuraku/u2d/u2d2.rb +1 -2
- data/demo/rakuraku/u2d/u2d3.rb +1 -2
- data/demo/rakuraku/u2d/u2d4.rb +1 -2
- data/demo/rakuraku/u2d/u2d5.rb +1 -2
- data/demo/rakuraku/u2d/u2d6.rb +1 -2
- data/demo/rakuraku/u2d/u2d7.rb +1 -2
- data/demo/rakuraku/uspack/uspac1.rb +2 -3
- data/demo/rakuraku/uspack/uspac2.rb +1 -2
- data/demo/rakuraku/uspack/uspac3.rb +2 -3
- data/demo/rakuraku/uspack/uspac4.rb +1 -2
- data/demo/rakuraku/uxyz/uxyz1.rb +1 -2
- data/demo/rakuraku/uxyz/uxyz2.rb +1 -2
- data/demo/rakuraku/uxyz/uxyz3.rb +1 -2
- data/demo/rakuraku/uxyz/uxyz4.rb +1 -2
- data/demo/rakuraku/uxyz/uxyz5.rb +1 -2
- data/demo/rakuraku/uxyz/uxyz6.rb +1 -2
- data/demo/rakuraku/uxyz/uxyz7.rb +1 -2
- data/demo/rakuraku/uxyz/uxyz8.rb +1 -2
- data/demo/rubydcloriginal/uemrkz1.rb +0 -1
- data/ext/numru/dcl_cary2obj.c +29 -24
- data/ext/numru/dcl_narrayed_funcs.c +21 -21
- data/ext/numru/dcl_obj2cary.c +9 -5
- data/ext/numru/dcl_rubydcloriginal.c +14 -5
- data/ext/numru/extconf.rb +73 -61
- data/ext/numru/grph1_csgi.c +38 -8
- data/ext/numru/grph1_scpack.c +49 -46
- data/ext/numru/grph1_sgpack.c +167 -164
- data/ext/numru/grph1_slpack.c +23 -20
- data/ext/numru/grph1_stpack.c +44 -41
- data/ext/numru/grph1_swpack.c +155 -92
- data/ext/numru/grph2_grpack.c +22 -19
- data/ext/numru/grph2_ucpack.c +55 -52
- data/ext/numru/grph2_udpack.c +61 -58
- data/ext/numru/grph2_uepack.c +60 -57
- data/ext/numru/grph2_ugpack.c +49 -46
- data/ext/numru/grph2_uhpack.c +25 -22
- data/ext/numru/grph2_uipack.c +57 -54
- data/ext/numru/grph2_ulpack.c +59 -56
- data/ext/numru/grph2_umpack.c +75 -72
- data/ext/numru/grph2_uspack.c +97 -94
- data/ext/numru/grph2_uupack.c +78 -75
- data/ext/numru/grph2_uvpack.c +25 -22
- data/ext/numru/grph2_uwpack.c +30 -27
- data/ext/numru/grph2_uxpack.c +23 -20
- data/ext/numru/grph2_uypack.c +23 -20
- data/ext/numru/grph2_uzpack.c +69 -66
- data/ext/numru/init.c.default +6 -2
- data/ext/numru/math1_blklib.c +13 -10
- data/ext/numru/math1_chrlib.c +16 -13
- data/ext/numru/math1_clsplib.c +13 -10
- data/ext/numru/math1_fnclib.c +16 -13
- data/ext/numru/math1_gnmlib.c +21 -18
- data/ext/numru/math1_gt2dlib.c +18 -15
- data/ext/numru/math1_ifalib.c +18 -15
- data/ext/numru/math1_indxlib.c +24 -21
- data/ext/numru/math1_intlib.c +13 -10
- data/ext/numru/math1_lrllib.c +33 -30
- data/ext/numru/math1_maplib.c +14 -11
- data/ext/numru/math1_oslib.c +11 -8
- data/ext/numru/math1_rfalib.c +39 -36
- data/ext/numru/math1_rfblib.c +12 -9
- data/ext/numru/math1_sublib.c +13 -10
- data/ext/numru/math1_syslib.c +82 -79
- data/ext/numru/math1_vialib.c +31 -28
- data/ext/numru/math1_viblib.c +24 -21
- data/ext/numru/math1_vralib.c +31 -28
- data/ext/numru/math1_vrblib.c +24 -21
- data/ext/numru/math1_xfclib.c +12 -9
- data/ext/numru/math2_fftlib.c +28 -25
- data/ext/numru/math2_intrlib.c +11 -8
- data/ext/numru/math2_rnmlib.c +12 -9
- data/ext/numru/math2_shtlib.c +34 -31
- data/ext/numru/math2_vstlib.c +15 -12
- data/ext/numru/misc1_chnlib.c +12 -9
- data/ext/numru/misc1_datelib.c +36 -33
- data/ext/numru/misc1_fmtlib.c +10 -7
- data/ext/numru/misc1_misclib.c +11 -8
- data/ext/numru/misc1_randlib.c +13 -10
- data/ext/numru/misc1_timelib.c +20 -17
- data/ext/numru/misc2_tmpack.c +1200 -0
- data/lib/numru/dcl/dcl.rb +5676 -0
- data/lib/numru/dcl/version.rb +5 -0
- data/lib/numru/dcl.rb +6 -5580
- data/ruby-dcl.gemspec +13 -9
- metadata +25 -99
- data/.gitignore +0 -13
- data/.rspec +0 -2
- data/.travis.yml +0 -3
- data/GenWrapper/Makefile +0 -15
- data/GenWrapper/cproto2init.rb +0 -41
- data/GenWrapper/dcl_narrayed_funcs.rb +0 -181
- data/GenWrapper/dcl_rb_footing +0 -29
- data/GenWrapper/dcl_rb_heading +0 -123
- data/GenWrapper/def.rb +0 -20
- data/GenWrapper/elim_ary_size.rb +0 -398
- data/GenWrapper/etc/p_header +0 -64
- data/GenWrapper/pparse.rb +0 -137
- data/GenWrapper/proto/Makefile +0 -36
- data/GenWrapper/proto/grph1_00 +0 -17
- data/GenWrapper/proto/grph1_csgi.fp +0 -27
- data/GenWrapper/proto/grph1_scpack.fp +0 -442
- data/GenWrapper/proto/grph1_sgpack.fp +0 -1772
- data/GenWrapper/proto/grph1_slpack.fp +0 -316
- data/GenWrapper/proto/grph1_stpack.fp +0 -455
- data/GenWrapper/proto/grph1_swpack.fp +0 -826
- data/GenWrapper/proto/grph2_00 +0 -16
- data/GenWrapper/proto/grph2_grpack.fp +0 -139
- data/GenWrapper/proto/grph2_ucpack.fp +0 -522
- data/GenWrapper/proto/grph2_udpack.fp +0 -692
- data/GenWrapper/proto/grph2_uepack.fp +0 -601
- data/GenWrapper/proto/grph2_ugpack.fp +0 -436
- data/GenWrapper/proto/grph2_uhpack.fp +0 -246
- data/GenWrapper/proto/grph2_uipack.fp +0 -508
- data/GenWrapper/proto/grph2_ulpack.fp +0 -516
- data/GenWrapper/proto/grph2_umpack.fp +0 -676
- data/GenWrapper/proto/grph2_uspack.fp +0 -989
- data/GenWrapper/proto/grph2_uupack.fp +0 -663
- data/GenWrapper/proto/grph2_uvpack.fp +0 -246
- data/GenWrapper/proto/grph2_uwpack.fp +0 -203
- data/GenWrapper/proto/grph2_uxpack.fp +0 -295
- data/GenWrapper/proto/grph2_uypack.fp +0 -295
- data/GenWrapper/proto/grph2_uzpack.fp +0 -574
- data/GenWrapper/proto/math1_00 +0 -12
- data/GenWrapper/proto/math1_blklib.fp +0 -58
- data/GenWrapper/proto/math1_chrlib.fp +0 -83
- data/GenWrapper/proto/math1_clsplib.fp +0 -74
- data/GenWrapper/proto/math1_fnclib.fp +0 -79
- data/GenWrapper/proto/math1_gnmlib.fp +0 -118
- data/GenWrapper/proto/math1_gt2dlib.fp +0 -144
- data/GenWrapper/proto/math1_ifalib.fp +0 -123
- data/GenWrapper/proto/math1_indxlib.fp +0 -222
- data/GenWrapper/proto/math1_intlib.fp +0 -46
- data/GenWrapper/proto/math1_lrllib.fp +0 -276
- data/GenWrapper/proto/math1_maplib.fp +0 -24
- data/GenWrapper/proto/math1_oslib.fp +0 -28
- data/GenWrapper/proto/math1_rfalib.fp +0 -420
- data/GenWrapper/proto/math1_rfblib.fp +0 -51
- data/GenWrapper/proto/math1_sublib.fp +0 -60
- data/GenWrapper/proto/math1_syslib.fp +0 -767
- data/GenWrapper/proto/math1_vialib.fp +0 -339
- data/GenWrapper/proto/math1_viblib.fp +0 -264
- data/GenWrapper/proto/math1_vralib.fp +0 -339
- data/GenWrapper/proto/math1_vrblib.fp +0 -264
- data/GenWrapper/proto/math1_xfclib.fp +0 -68
- data/GenWrapper/proto/math2_00 +0 -12
- data/GenWrapper/proto/math2_fftlib.fp +0 -803
- data/GenWrapper/proto/math2_intrlib.fp +0 -32
- data/GenWrapper/proto/math2_odelib.fp_notused +0 -568
- data/GenWrapper/proto/math2_rnmlib.fp +0 -54
- data/GenWrapper/proto/math2_shtlib.fp +0 -1292
- data/GenWrapper/proto/math2_vstlib.fp +0 -84
- data/GenWrapper/proto/misc1_00 +0 -17
- data/GenWrapper/proto/misc1_chnlib.fp +0 -47
- data/GenWrapper/proto/misc1_datelib.fp +0 -352
- data/GenWrapper/proto/misc1_fmtlib.fp +0 -19
- data/GenWrapper/proto/misc1_misclib.fp +0 -26
- data/GenWrapper/proto/misc1_randlib.fp +0 -50
- data/GenWrapper/proto/misc1_timelib.fp +0 -151
- data/GenWrapper/proto2c.rb +0 -13
- data/GenWrapper/prototype.rb +0 -209
- data/GenWrapper/util.rb +0 -9
- data/GenWrapper/variable.rb +0 -671
- data/README +0 -29
- data/ToDo +0 -2
- data/bin/console +0 -14
- data/bin/setup +0 -7
- data/demo/grph2/ximage/MEMO +0 -23
- data/obsolete/README +0 -2
- data/obsolete/dcl_ext.html +0 -112
- data/obsolete/dcl_ext.rb +0 -313
data/ext/numru/grph2_ugpack.c
CHANGED
@@ -1,10 +1,9 @@
|
|
1
1
|
/*
|
2
|
-
* $Id
|
2
|
+
* $Id$
|
3
3
|
*/
|
4
4
|
|
5
5
|
#include <stdio.h>
|
6
6
|
#include "ruby.h"
|
7
|
-
#include "libtinyf2c.h"
|
8
7
|
#include "narray.h"
|
9
8
|
#include "cdcl.h"
|
10
9
|
|
@@ -15,6 +14,10 @@
|
|
15
14
|
|
16
15
|
#define DFLT_SIZE 32
|
17
16
|
|
17
|
+
#ifndef NARRAY_BIGMEM
|
18
|
+
typedef int na_shape_t;
|
19
|
+
#endif
|
20
|
+
|
18
21
|
extern char *dcl_obj2ccharary(VALUE, int, int);
|
19
22
|
extern integer *dcl_obj2cintegerary(VALUE);
|
20
23
|
extern real *dcl_obj2crealary(VALUE);
|
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
|
|
22
25
|
extern logical *dcl_obj2clogicalary(VALUE);
|
23
26
|
|
24
27
|
extern VALUE dcl_ccharary2obj(char *, int, int);
|
25
|
-
extern VALUE dcl_cintegerary2obj(integer *,
|
26
|
-
extern VALUE dcl_crealary2obj(real *,
|
27
|
-
extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
|
28
|
-
extern VALUE dcl_clogicalary2obj(logical *,
|
28
|
+
extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
|
29
|
+
extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
|
30
|
+
/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
|
31
|
+
extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
|
29
32
|
|
30
33
|
extern void dcl_freeccharary(char *);
|
31
34
|
extern void dcl_freecintegerary(integer *);
|
@@ -108,7 +111,7 @@ dcl_ugvect(obj, u, mu, v, mv, nx, ny)
|
|
108
111
|
i_v = dcl_obj2crealary(v);
|
109
112
|
|
110
113
|
|
111
|
-
|
114
|
+
ugvect__(i_u, &i_mu, i_v, &i_mv, &i_nx, &i_ny);
|
112
115
|
|
113
116
|
dcl_freecrealary(i_u);
|
114
117
|
dcl_freecrealary(i_v);
|
@@ -135,7 +138,7 @@ dcl_ugsut(obj, cside, cttl)
|
|
135
138
|
i_cttl = StringValuePtr(cttl);
|
136
139
|
|
137
140
|
|
138
|
-
|
141
|
+
ugsut__(i_cside, i_cttl, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
|
139
142
|
|
140
143
|
return Qnil;
|
141
144
|
|
@@ -148,7 +151,7 @@ dcl_ugpqnp(obj)
|
|
148
151
|
integer o_ncp;
|
149
152
|
VALUE ncp;
|
150
153
|
|
151
|
-
|
154
|
+
ugpqnp__(&o_ncp);
|
152
155
|
|
153
156
|
ncp = INT2NUM(o_ncp);
|
154
157
|
|
@@ -172,7 +175,7 @@ dcl_ugpqid(obj, cp)
|
|
172
175
|
i_cp = StringValuePtr(cp);
|
173
176
|
|
174
177
|
|
175
|
-
|
178
|
+
ugpqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
|
176
179
|
|
177
180
|
idx = INT2NUM(o_idx);
|
178
181
|
|
@@ -198,7 +201,7 @@ dcl_ugpqcp(obj, idx)
|
|
198
201
|
o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
|
199
202
|
memset(o_cp, '\0', DFLT_SIZE+1);
|
200
203
|
|
201
|
-
|
204
|
+
ugpqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
|
202
205
|
|
203
206
|
cp = rb_str_new2(o_cp);
|
204
207
|
|
@@ -224,7 +227,7 @@ dcl_ugpqcl(obj, idx)
|
|
224
227
|
o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
|
225
228
|
memset(o_cp, '\0', DFLT_SIZE+1);
|
226
229
|
|
227
|
-
|
230
|
+
ugpqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
|
228
231
|
|
229
232
|
cp = rb_str_new2(o_cp);
|
230
233
|
|
@@ -248,7 +251,7 @@ dcl_ugpqit(obj, idx)
|
|
248
251
|
i_idx = NUM2INT(idx);
|
249
252
|
|
250
253
|
|
251
|
-
|
254
|
+
ugpqit__(&i_idx, &o_itp);
|
252
255
|
|
253
256
|
itp = INT2NUM(o_itp);
|
254
257
|
|
@@ -272,7 +275,7 @@ dcl_ugpqvl(obj, idx)
|
|
272
275
|
i_idx = NUM2INT(idx);
|
273
276
|
|
274
277
|
|
275
|
-
|
278
|
+
ugpqvl__(&i_idx, &o_ipara);
|
276
279
|
|
277
280
|
ipara = INT2NUM(o_ipara);
|
278
281
|
|
@@ -299,7 +302,7 @@ dcl_ugpsvl(obj, idx, ipara)
|
|
299
302
|
i_ipara = NUM2INT(ipara);
|
300
303
|
|
301
304
|
|
302
|
-
|
305
|
+
ugpsvl__(&i_idx, &i_ipara);
|
303
306
|
|
304
307
|
return Qnil;
|
305
308
|
|
@@ -320,7 +323,7 @@ dcl_ugpqin(obj, cp)
|
|
320
323
|
i_cp = StringValuePtr(cp);
|
321
324
|
|
322
325
|
|
323
|
-
|
326
|
+
ugpqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
|
324
327
|
|
325
328
|
in = INT2NUM(o_in);
|
326
329
|
|
@@ -344,7 +347,7 @@ dcl_ugiget(obj, cp)
|
|
344
347
|
i_cp = StringValuePtr(cp);
|
345
348
|
|
346
349
|
|
347
|
-
|
350
|
+
ugiget__(i_cp, &o_ipara, (ftnlen)strlen(i_cp));
|
348
351
|
|
349
352
|
ipara = INT2NUM(o_ipara);
|
350
353
|
|
@@ -371,7 +374,7 @@ dcl_ugiset(obj, cp, ipara)
|
|
371
374
|
i_ipara = NUM2INT(ipara);
|
372
375
|
|
373
376
|
|
374
|
-
|
377
|
+
ugiset__(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
|
375
378
|
|
376
379
|
return Qnil;
|
377
380
|
|
@@ -395,7 +398,7 @@ dcl_ugistx(obj, cp, ipara)
|
|
395
398
|
i_ipara = NUM2INT(ipara);
|
396
399
|
|
397
400
|
|
398
|
-
|
401
|
+
ugistx__(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
|
399
402
|
|
400
403
|
return Qnil;
|
401
404
|
|
@@ -408,7 +411,7 @@ dcl_ugiqnp(obj)
|
|
408
411
|
integer o_ncp;
|
409
412
|
VALUE ncp;
|
410
413
|
|
411
|
-
|
414
|
+
ugiqnp__(&o_ncp);
|
412
415
|
|
413
416
|
ncp = INT2NUM(o_ncp);
|
414
417
|
|
@@ -432,7 +435,7 @@ dcl_ugiqid(obj, cp)
|
|
432
435
|
i_cp = StringValuePtr(cp);
|
433
436
|
|
434
437
|
|
435
|
-
|
438
|
+
ugiqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
|
436
439
|
|
437
440
|
idx = INT2NUM(o_idx);
|
438
441
|
|
@@ -458,7 +461,7 @@ dcl_ugiqcp(obj, idx)
|
|
458
461
|
o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
|
459
462
|
memset(o_cp, '\0', DFLT_SIZE+1);
|
460
463
|
|
461
|
-
|
464
|
+
ugiqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
|
462
465
|
|
463
466
|
cp = rb_str_new2(o_cp);
|
464
467
|
|
@@ -484,7 +487,7 @@ dcl_ugiqcl(obj, idx)
|
|
484
487
|
o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
|
485
488
|
memset(o_cp, '\0', DFLT_SIZE+1);
|
486
489
|
|
487
|
-
|
490
|
+
ugiqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
|
488
491
|
|
489
492
|
cp = rb_str_new2(o_cp);
|
490
493
|
|
@@ -508,7 +511,7 @@ dcl_ugiqvl(obj, idx)
|
|
508
511
|
i_idx = NUM2INT(idx);
|
509
512
|
|
510
513
|
|
511
|
-
|
514
|
+
ugiqvl__(&i_idx, &o_ipara);
|
512
515
|
|
513
516
|
ipara = INT2NUM(o_ipara);
|
514
517
|
|
@@ -535,7 +538,7 @@ dcl_ugisvl(obj, idx, ipara)
|
|
535
538
|
i_ipara = NUM2INT(ipara);
|
536
539
|
|
537
540
|
|
538
|
-
|
541
|
+
ugisvl__(&i_idx, &i_ipara);
|
539
542
|
|
540
543
|
return Qnil;
|
541
544
|
|
@@ -556,7 +559,7 @@ dcl_ugiqin(obj, cp)
|
|
556
559
|
i_cp = StringValuePtr(cp);
|
557
560
|
|
558
561
|
|
559
|
-
|
562
|
+
ugiqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
|
560
563
|
|
561
564
|
in = INT2NUM(o_in);
|
562
565
|
|
@@ -580,7 +583,7 @@ dcl_uglget(obj, cp)
|
|
580
583
|
i_cp = StringValuePtr(cp);
|
581
584
|
|
582
585
|
|
583
|
-
|
586
|
+
uglget__(i_cp, &o_lpara, (ftnlen)strlen(i_cp));
|
584
587
|
|
585
588
|
lpara = (o_lpara == FALSE_) ? Qfalse : Qtrue;
|
586
589
|
|
@@ -604,7 +607,7 @@ dcl_uglset(obj, cp, lpara)
|
|
604
607
|
i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
|
605
608
|
|
606
609
|
|
607
|
-
|
610
|
+
uglset__(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
|
608
611
|
|
609
612
|
return Qnil;
|
610
613
|
|
@@ -625,7 +628,7 @@ dcl_uglstx(obj, cp, lpara)
|
|
625
628
|
i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
|
626
629
|
|
627
630
|
|
628
|
-
|
631
|
+
uglstx__(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
|
629
632
|
|
630
633
|
return Qnil;
|
631
634
|
|
@@ -638,7 +641,7 @@ dcl_uglqnp(obj)
|
|
638
641
|
integer o_ncp;
|
639
642
|
VALUE ncp;
|
640
643
|
|
641
|
-
|
644
|
+
uglqnp__(&o_ncp);
|
642
645
|
|
643
646
|
ncp = INT2NUM(o_ncp);
|
644
647
|
|
@@ -662,7 +665,7 @@ dcl_uglqid(obj, cp)
|
|
662
665
|
i_cp = StringValuePtr(cp);
|
663
666
|
|
664
667
|
|
665
|
-
|
668
|
+
uglqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
|
666
669
|
|
667
670
|
idx = INT2NUM(o_idx);
|
668
671
|
|
@@ -688,7 +691,7 @@ dcl_uglqcp(obj, idx)
|
|
688
691
|
o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
|
689
692
|
memset(o_cp, '\0', DFLT_SIZE+1);
|
690
693
|
|
691
|
-
|
694
|
+
uglqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
|
692
695
|
|
693
696
|
cp = rb_str_new2(o_cp);
|
694
697
|
|
@@ -714,7 +717,7 @@ dcl_uglqcl(obj, idx)
|
|
714
717
|
o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
|
715
718
|
memset(o_cp, '\0', DFLT_SIZE+1);
|
716
719
|
|
717
|
-
|
720
|
+
uglqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
|
718
721
|
|
719
722
|
cp = rb_str_new2(o_cp);
|
720
723
|
|
@@ -738,7 +741,7 @@ dcl_uglqvl(obj, idx)
|
|
738
741
|
i_idx = NUM2INT(idx);
|
739
742
|
|
740
743
|
|
741
|
-
|
744
|
+
uglqvl__(&i_idx, &o_lpara);
|
742
745
|
|
743
746
|
lpara = (o_lpara == FALSE_) ? Qfalse : Qtrue;
|
744
747
|
|
@@ -762,7 +765,7 @@ dcl_uglsvl(obj, idx, lpara)
|
|
762
765
|
i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
|
763
766
|
|
764
767
|
|
765
|
-
|
768
|
+
uglsvl__(&i_idx, &i_lpara);
|
766
769
|
|
767
770
|
return Qnil;
|
768
771
|
|
@@ -783,7 +786,7 @@ dcl_uglqin(obj, cp)
|
|
783
786
|
i_cp = StringValuePtr(cp);
|
784
787
|
|
785
788
|
|
786
|
-
|
789
|
+
uglqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
|
787
790
|
|
788
791
|
in = INT2NUM(o_in);
|
789
792
|
|
@@ -807,7 +810,7 @@ dcl_ugrget(obj, cp)
|
|
807
810
|
i_cp = StringValuePtr(cp);
|
808
811
|
|
809
812
|
|
810
|
-
|
813
|
+
ugrget__(i_cp, &o_rpara, (ftnlen)strlen(i_cp));
|
811
814
|
|
812
815
|
rpara = rb_float_new((double)o_rpara);
|
813
816
|
|
@@ -834,7 +837,7 @@ dcl_ugrset(obj, cp, rpara)
|
|
834
837
|
i_rpara = (real)NUM2DBL(rpara);
|
835
838
|
|
836
839
|
|
837
|
-
|
840
|
+
ugrset__(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
|
838
841
|
|
839
842
|
return Qnil;
|
840
843
|
|
@@ -858,7 +861,7 @@ dcl_ugrstx(obj, cp, rpara)
|
|
858
861
|
i_rpara = (real)NUM2DBL(rpara);
|
859
862
|
|
860
863
|
|
861
|
-
|
864
|
+
ugrstx__(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
|
862
865
|
|
863
866
|
return Qnil;
|
864
867
|
|
@@ -871,7 +874,7 @@ dcl_ugrqnp(obj)
|
|
871
874
|
integer o_ncp;
|
872
875
|
VALUE ncp;
|
873
876
|
|
874
|
-
|
877
|
+
ugrqnp__(&o_ncp);
|
875
878
|
|
876
879
|
ncp = INT2NUM(o_ncp);
|
877
880
|
|
@@ -895,7 +898,7 @@ dcl_ugrqid(obj, cp)
|
|
895
898
|
i_cp = StringValuePtr(cp);
|
896
899
|
|
897
900
|
|
898
|
-
|
901
|
+
ugrqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
|
899
902
|
|
900
903
|
idx = INT2NUM(o_idx);
|
901
904
|
|
@@ -921,7 +924,7 @@ dcl_ugrqcp(obj, idx)
|
|
921
924
|
o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
|
922
925
|
memset(o_cp, '\0', DFLT_SIZE+1);
|
923
926
|
|
924
|
-
|
927
|
+
ugrqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
|
925
928
|
|
926
929
|
cp = rb_str_new2(o_cp);
|
927
930
|
|
@@ -947,7 +950,7 @@ dcl_ugrqcl(obj, idx)
|
|
947
950
|
o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
|
948
951
|
memset(o_cp, '\0', DFLT_SIZE+1);
|
949
952
|
|
950
|
-
|
953
|
+
ugrqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
|
951
954
|
|
952
955
|
cp = rb_str_new2(o_cp);
|
953
956
|
|
@@ -971,7 +974,7 @@ dcl_ugrqvl(obj, idx)
|
|
971
974
|
i_idx = NUM2INT(idx);
|
972
975
|
|
973
976
|
|
974
|
-
|
977
|
+
ugrqvl__(&i_idx, &o_rpara);
|
975
978
|
|
976
979
|
rpara = rb_float_new((double)o_rpara);
|
977
980
|
|
@@ -998,7 +1001,7 @@ dcl_ugrsvl(obj, idx, rpara)
|
|
998
1001
|
i_rpara = (real)NUM2DBL(rpara);
|
999
1002
|
|
1000
1003
|
|
1001
|
-
|
1004
|
+
ugrsvl__(&i_idx, &i_rpara);
|
1002
1005
|
|
1003
1006
|
return Qnil;
|
1004
1007
|
|
@@ -1019,7 +1022,7 @@ dcl_ugrqin(obj, cp)
|
|
1019
1022
|
i_cp = StringValuePtr(cp);
|
1020
1023
|
|
1021
1024
|
|
1022
|
-
|
1025
|
+
ugrqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
|
1023
1026
|
|
1024
1027
|
in = INT2NUM(o_in);
|
1025
1028
|
|
data/ext/numru/grph2_uhpack.c
CHANGED
@@ -1,10 +1,9 @@
|
|
1
1
|
/*
|
2
|
-
* $Id
|
2
|
+
* $Id$
|
3
3
|
*/
|
4
4
|
|
5
5
|
#include <stdio.h>
|
6
6
|
#include "ruby.h"
|
7
|
-
#include "libtinyf2c.h"
|
8
7
|
#include "narray.h"
|
9
8
|
#include "cdcl.h"
|
10
9
|
|
@@ -15,6 +14,10 @@
|
|
15
14
|
|
16
15
|
#define DFLT_SIZE 32
|
17
16
|
|
17
|
+
#ifndef NARRAY_BIGMEM
|
18
|
+
typedef int na_shape_t;
|
19
|
+
#endif
|
20
|
+
|
18
21
|
extern char *dcl_obj2ccharary(VALUE, int, int);
|
19
22
|
extern integer *dcl_obj2cintegerary(VALUE);
|
20
23
|
extern real *dcl_obj2crealary(VALUE);
|
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
|
|
22
25
|
extern logical *dcl_obj2clogicalary(VALUE);
|
23
26
|
|
24
27
|
extern VALUE dcl_ccharary2obj(char *, int, int);
|
25
|
-
extern VALUE dcl_cintegerary2obj(integer *,
|
26
|
-
extern VALUE dcl_crealary2obj(real *,
|
27
|
-
extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
|
28
|
-
extern VALUE dcl_clogicalary2obj(logical *,
|
28
|
+
extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
|
29
|
+
extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
|
30
|
+
/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
|
31
|
+
extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
|
29
32
|
|
30
33
|
extern void dcl_freeccharary(char *);
|
31
34
|
extern void dcl_freecintegerary(integer *);
|
@@ -102,7 +105,7 @@ dcl_uherb(obj, n, upx1, upx2, upy)
|
|
102
105
|
i_upy = dcl_obj2crealary(upy);
|
103
106
|
|
104
107
|
|
105
|
-
|
108
|
+
uherb__(&i_n, i_upx1, i_upx2, i_upy);
|
106
109
|
|
107
110
|
dcl_freecrealary(i_upx1);
|
108
111
|
dcl_freecrealary(i_upx2);
|
@@ -167,7 +170,7 @@ dcl_uherbz(obj, n, upx1, upx2, upy, itype, index, rsize)
|
|
167
170
|
i_upy = dcl_obj2crealary(upy);
|
168
171
|
|
169
172
|
|
170
|
-
|
173
|
+
uherbz__(&i_n, i_upx1, i_upx2, i_upy, &i_itype, &i_index, &i_rsize);
|
171
174
|
|
172
175
|
dcl_freecrealary(i_upx1);
|
173
176
|
dcl_freecrealary(i_upx2);
|
@@ -217,7 +220,7 @@ dcl_uhdif(obj, n, upx1, upx2, upy)
|
|
217
220
|
i_upy = dcl_obj2crealary(upy);
|
218
221
|
|
219
222
|
|
220
|
-
|
223
|
+
uhdif__(&i_n, i_upx1, i_upx2, i_upy);
|
221
224
|
|
222
225
|
dcl_freecrealary(i_upx1);
|
223
226
|
dcl_freecrealary(i_upx2);
|
@@ -277,7 +280,7 @@ dcl_uhdifz(obj, n, upx1, upx2, upy, itpat1, itpat2)
|
|
277
280
|
i_upy = dcl_obj2crealary(upy);
|
278
281
|
|
279
282
|
|
280
|
-
|
283
|
+
uhdifz__(&i_n, i_upx1, i_upx2, i_upy, &i_itpat1, &i_itpat2);
|
281
284
|
|
282
285
|
dcl_freecrealary(i_upx1);
|
283
286
|
dcl_freecrealary(i_upx2);
|
@@ -327,7 +330,7 @@ dcl_uhbrf(obj, n, upx1, upx2, upy)
|
|
327
330
|
i_upy = dcl_obj2crealary(upy);
|
328
331
|
|
329
332
|
|
330
|
-
|
333
|
+
uhbrf__(&i_n, i_upx1, i_upx2, i_upy);
|
331
334
|
|
332
335
|
dcl_freecrealary(i_upx1);
|
333
336
|
dcl_freecrealary(i_upx2);
|
@@ -392,7 +395,7 @@ dcl_uhbrfz(obj, n, upx1, upx2, upy, itype, index, rsize)
|
|
392
395
|
i_upy = dcl_obj2crealary(upy);
|
393
396
|
|
394
397
|
|
395
|
-
|
398
|
+
uhbrfz__(&i_n, i_upx1, i_upx2, i_upy, &i_itype, &i_index, &i_rsize);
|
396
399
|
|
397
400
|
dcl_freecrealary(i_upx1);
|
398
401
|
dcl_freecrealary(i_upx2);
|
@@ -442,7 +445,7 @@ dcl_uhbra(obj, n, upx1, upx2, upy)
|
|
442
445
|
i_upy = dcl_obj2crealary(upy);
|
443
446
|
|
444
447
|
|
445
|
-
|
448
|
+
uhbra__(&i_n, i_upx1, i_upx2, i_upy);
|
446
449
|
|
447
450
|
dcl_freecrealary(i_upx1);
|
448
451
|
dcl_freecrealary(i_upx2);
|
@@ -507,7 +510,7 @@ dcl_uhbraz(obj, n, upx1, upx2, upy, itpat1, itpat2, rsize)
|
|
507
510
|
i_upy = dcl_obj2crealary(upy);
|
508
511
|
|
509
512
|
|
510
|
-
|
513
|
+
uhbraz__(&i_n, i_upx1, i_upx2, i_upy, &i_itpat1, &i_itpat2, &i_rsize);
|
511
514
|
|
512
515
|
dcl_freecrealary(i_upx1);
|
513
516
|
dcl_freecrealary(i_upx2);
|
@@ -548,7 +551,7 @@ dcl_uhbrl(obj, n, upx, upy)
|
|
548
551
|
i_upy = dcl_obj2crealary(upy);
|
549
552
|
|
550
553
|
|
551
|
-
|
554
|
+
uhbrl__(&i_n, i_upx, i_upy);
|
552
555
|
|
553
556
|
dcl_freecrealary(i_upx);
|
554
557
|
dcl_freecrealary(i_upy);
|
@@ -603,7 +606,7 @@ dcl_uhbrlz(obj, n, upx, upy, itype, index, rsize)
|
|
603
606
|
i_upy = dcl_obj2crealary(upy);
|
604
607
|
|
605
608
|
|
606
|
-
|
609
|
+
uhbrlz__(&i_n, i_upx, i_upy, &i_itype, &i_index, &i_rsize);
|
607
610
|
|
608
611
|
dcl_freecrealary(i_upx);
|
609
612
|
dcl_freecrealary(i_upy);
|
@@ -652,7 +655,7 @@ dcl_uhbxf(obj, n, upx1, upx2, upy)
|
|
652
655
|
i_upy = dcl_obj2crealary(upy);
|
653
656
|
|
654
657
|
|
655
|
-
|
658
|
+
uhbxf__(&i_n, i_upx1, i_upx2, i_upy);
|
656
659
|
|
657
660
|
dcl_freecrealary(i_upx1);
|
658
661
|
dcl_freecrealary(i_upx2);
|
@@ -712,7 +715,7 @@ dcl_uhbxfz(obj, n, upx1, upx2, upy, itype, index)
|
|
712
715
|
i_upy = dcl_obj2crealary(upy);
|
713
716
|
|
714
717
|
|
715
|
-
|
718
|
+
uhbxfz__(&i_n, i_upx1, i_upx2, i_upy, &i_itype, &i_index);
|
716
719
|
|
717
720
|
dcl_freecrealary(i_upx1);
|
718
721
|
dcl_freecrealary(i_upx2);
|
@@ -762,7 +765,7 @@ dcl_uhbxa(obj, n, upx1, upx2, upy)
|
|
762
765
|
i_upy = dcl_obj2crealary(upy);
|
763
766
|
|
764
767
|
|
765
|
-
|
768
|
+
uhbxa__(&i_n, i_upx1, i_upx2, i_upy);
|
766
769
|
|
767
770
|
dcl_freecrealary(i_upx1);
|
768
771
|
dcl_freecrealary(i_upx2);
|
@@ -803,7 +806,7 @@ dcl_uhbxl(obj, n, upx, upy)
|
|
803
806
|
i_upy = dcl_obj2crealary(upy);
|
804
807
|
|
805
808
|
|
806
|
-
|
809
|
+
uhbxl__(&i_n, i_upx, i_upy);
|
807
810
|
|
808
811
|
dcl_freecrealary(i_upx);
|
809
812
|
dcl_freecrealary(i_upy);
|
@@ -862,7 +865,7 @@ dcl_uhbxaz(obj, n, upx1, upx2, upy, itpat1, itpat2)
|
|
862
865
|
i_upy = dcl_obj2crealary(upy);
|
863
866
|
|
864
867
|
|
865
|
-
|
868
|
+
uhbxaz__(&i_n, i_upx1, i_upx2, i_upy, &i_itpat1, &i_itpat2);
|
866
869
|
|
867
870
|
dcl_freecrealary(i_upx1);
|
868
871
|
dcl_freecrealary(i_upx2);
|
@@ -913,7 +916,7 @@ dcl_uhbxlz(obj, n, upx, upy, itype, index)
|
|
913
916
|
i_upy = dcl_obj2crealary(upy);
|
914
917
|
|
915
918
|
|
916
|
-
|
919
|
+
uhbxlz__(&i_n, i_upx, i_upy, &i_itype, &i_index);
|
917
920
|
|
918
921
|
dcl_freecrealary(i_upx);
|
919
922
|
dcl_freecrealary(i_upy);
|