Skip to content

Commit 2c234ec

Browse files
committed
Fix -transform cut
Minor fixes.
1 parent 463a8c2 commit 2c234ec

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

VERSIONS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
New in 4.8.2-10 (25 Mar 2024):
1+
New in 4.8.2-11 (25 Mar 2024):
22
- module -T: added -transform "cut(cube)", added -morphooptiini ori and id,
33
improved -transform "cut(cubei)", made minor fixes and improvements.
44
- module -M: made minor improvements.

doc/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import sphinx_rtd_theme
1212

1313
project = u'Neper'
14-
version = u'4.8.2-10'
15-
release = u'4.8.2-10'
14+
version = u'4.8.2-11'
15+
release = u'4.8.2-11'
1616
author = u'Romain Quey'
1717
copyright = u'Romain Quey'
1818
language = 'en'

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(POLICY CMP0077)
77
cmake_policy(SET CMP0077 NEW)
88
endif()
99

10-
set(NEPER_VERSION \"4.8.2-10\")
10+
set(NEPER_VERSION \"4.8.2-11\")
1111
project(neper)
1212

1313
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8.1)

src/neper_t/net_tess/net_tess_opt/net_tess_opt_init/net_tess_opt_init_sset/net_tess_opt_init_sset_id/net_tess_opt_init_sset_id1.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ net_tess_opt_init_sset_id (int TessId, struct SEEDSET *SSet, char* idexpr, struc
1919
neut_tess_set_zero (&Tmp);
2020
fp = ut_file_open (idexpr, "R");
2121
neut_tess_fscanf (fp, &Tmp);
22+
if (!Tmp.CellId)
23+
{
24+
Tmp.CellId = ut_alloc_1d_int (Tmp.CellQty + 1);
25+
ut_array_1d_int_set_id (Tmp.CellId, Tmp.CellQty + 1);
26+
}
2227
(*pTOpt).SSet.SeedId = ut_alloc_1d_int ((*pTOpt).CellQty + 1);
2328
ut_array_1d_int_memcpy (Tmp.CellId + 1, (*pTOpt).CellQty, (*pTOpt).SSet.SeedId + 1);
2429
ut_file_close (fp, idexpr, "R");

src/neper_t/net_transform/net_transform_tess/net_transform_tess_cut/net_transform_tess_cut1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ net_transform_tess_cut (char *expr, struct TESS Dom, struct TESS *pTess)
2323

2424
// preparing
2525

26-
net_transform_tess_cut_pre (*pTess, expr, &TessGen, &Prim, &PrimQty);
26+
net_transform_tess_cut_pre (pTess, expr, &TessGen, &Prim, &PrimQty);
2727

2828
// recording interior seeds
2929

src/neper_t/net_transform/net_transform_tess/net_transform_tess_cut/net_transform_tess_cut2.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
#include"net_transform_tess_cut_.h"
66

77
void
8-
net_transform_tess_cut_pre (struct TESS Tess, char *expr,
8+
net_transform_tess_cut_pre (struct TESS *pTess, char *expr,
99
struct TESS *pTessGen, struct PRIM **pPrim,
1010
int *pPrimQty)
1111
{
12-
neut_tess_tess_gen (Tess, pTessGen);
13-
neut_tess_tess_cell (Tess, pTessGen);
12+
neut_tess_compress (pTess);
13+
neut_tess_tess_gen (*pTess, pTessGen);
14+
neut_tess_tess_cell (*pTess, pTessGen);
1415

1516
net_transform_tess_cut_pre_prim (expr, pPrim, pPrimQty, 1);
1617

src/neper_t/net_transform/net_transform_tess/net_transform_tess_cut/net_transform_tess_cut_.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include"net_transform_tess_cut.h"
1515

16-
extern void net_transform_tess_cut_pre (struct TESS Tess, char *expr, struct TESS *pTessGen,
16+
extern void net_transform_tess_cut_pre (struct TESS *pTess, char *expr, struct TESS *pTessGen,
1717
struct PRIM **pPrim, int *pPrimQty);
1818

1919
extern void net_transform_tess_cut_seedset_interior (struct PRIM *Prim, int PrimQty,

0 commit comments

Comments
 (0)