git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a706e8b
)
made art_svp_merge public
author
kramm
<kramm>
Thu, 8 May 2008 08:11:34 +0000
(08:11 +0000)
committer
kramm
<kramm>
Thu, 8 May 2008 08:11:34 +0000
(08:11 +0000)
lib/art/art_svp_ops.c
patch
|
blob
|
history
lib/art/art_svp_ops.h
patch
|
blob
|
history
diff --git
a/lib/art/art_svp_ops.c
b/lib/art/art_svp_ops.c
index
5bb837c
..
50c3c59
100644
(file)
--- a/
lib/art/art_svp_ops.c
+++ b/
lib/art/art_svp_ops.c
@@
-52,8
+52,7
@@
*
* Return value: The merged #ArtSVP.
**/
-static ArtSVP *
-art_svp_merge (const ArtSVP *svp1, const ArtSVP *svp2)
+ArtSVP * art_svp_merge (const ArtSVP *svp1, const ArtSVP *svp2)
{
ArtSVP *svp_new;
int ix;
diff --git
a/lib/art/art_svp_ops.h
b/lib/art/art_svp_ops.h
index
1104731
..
09cacbb
100644
(file)
--- a/
lib/art/art_svp_ops.h
+++ b/
lib/art/art_svp_ops.h
@@
-37,6
+37,8
@@
ArtSVP *art_svp_intersect (const ArtSVP *svp1, const ArtSVP *svp2);
ArtSVP *art_svp_diff (const ArtSVP *svp1, const ArtSVP *svp2);
ArtSVP *art_svp_minus (const ArtSVP *svp1, const ArtSVP *svp2);
+ArtSVP *art_svp_merge (const ArtSVP *svp1, const ArtSVP *svp2);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */