LibSpiro version 0.3

Collective fixes from tagpoint v0.2 (20130930) up to now (20150131).
Most fixes are for setting-up libspiro to be seen as a package, and to
solve some bugs listed on various distro sites. Also added two functions
similar to original TaggedSpiroCPsToBezier() and SpiroCPsToBezier() for
use by developers that need functions that require a void/nothing return.

Author: JoesCat

ChangeLog

@@ -1,3 +1,12 @@
+- 31-Jan-2015
+    * Libspiro Version 0.3.20150131
+    * Allow Libspiro to be included using PKG_CHECK_MODULES().
+    * Bug fixes in configure.ac m4 calls that caused problems seen in:
+	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196780
+	https://bugs.archlinux.org/task/43373
+    * Add TaggedSpiroCPsToBezier1() and SpiroCPsToBezier1() for programs
+      that cannot use TaggedSpiroCPsToBezier0() or SpiroCPsToBezier0().
+
 - 30-Sep-2013
     * Libspiro Version 0.2.20130930
 

README

@@ -3,7 +3,8 @@ smooth continuous curves based on a given set of codes and X,Y constraints.
 
 The main user(s) of Libspiro are Font editing programs such as FontForge,
 and forked copies have been seen in more artistic programs such as InkScape,
-or in libraries such as GEGL. There may be other possible uses in future.
+or in libraries such as GEGL. There may be other possible uses in future,
+and this library has strong potential in graphical and vector type programs.
 
 Developers interested in also sharing and making use of LibSpiro will likely
 want to read (in this order to understand LibSpiro better):

README.md

@@ -26,14 +26,15 @@ Then the usual steps to compile it:
 ```sh
 ./configure
 make
-make install
+make check
+sudo make install
 ```
 
 ## Usage
 
 ### In FontForge
 
-FontForge will autodetect libspiro when it is installed in the usual way. 
+FontForge will autodetect libspiro when it is installed in the usual way.
 
 An exception to this is with the Mac bundled version (where `FontForge.app` is copied to `/Applications`.) To install your compiled version into the bundle, run ```sh ./configure --prefix=/Applications/FontForge.app/Contents/Resources/opt/local/ ```
 
@@ -55,8 +56,8 @@ Mac OS X: A helping script, `./fontforge.sh` is provided to run FontForge inside
   - [bezier context](#the-bzier-context)
 - [Header file](#calling-into-libspiro)
 - Entry points
-  - [SpiroCPsToBezier](#spirocpstobezier)(spiros_cp *,int n,int is_closed,bezctx *)
-  - [TaggedSpiroCPsToBezier](#taggedspirocpstobezier)(spiros_cp *,bezctx *) 
+  - int [SpiroCPsToBezier0](#spirocpstobezier)(spiro_cp *,int n,int is_closed,bezctx *)
+  - int [TaggedSpiroCPsToBezier0](#taggedspirocpstobezier)(spiro_cp *,bezctx *)
 
 #### Basic Types
 
@@ -121,23 +122,23 @@ You must create a super-class of this abstract type that handles the creation of
 
 #### Calling into libspiro
 
-Libspiro needs a header file:
+Your program needs this Libspiro header file:
 
 ```c
 #include <spiroentrypoints.h>
 ```
 
 You must define a bezier context that is appropriate for your internal splines (See [Raph's PostScript example](bezctx.md)).
 
-#### SpiroCPsToBezier
+#### SpiroCPsToBezier0
 
 You must create an array of spiro control points:
 
 ```c
    spiro_cp points[4];
-   
+
      /* This defines something very like a circle, centered at the origin with radius 100 */
-   
+
    points[0].x = -100; points[0].y =    0; points[0].ty = SPIRO_G4;
    points[1].x =    0; points[1].y =  100; points[1].ty = SPIRO_G4;
    points[2].x =  100; points[2].y =    0; points[2].ty = SPIRO_G4;
@@ -146,25 +147,25 @@ You must create an array of spiro control points:
 
 ![](closedspiro.png)
 
-Then call `SpiroCPsToBezier`, a routine which takes 4 arguments
+Then call `SpiroCPsToBezier0`, a routine which takes 4 arguments and returns bc and an integer pass/fail flag.
 
-1. An array of spiros
-2. The number of elements in the array
+1. An array of input spiros
+2. The number of elements in the spiros array
 3. Whether this describes a closed (True) or open (False) contour
-4. A bezier context
+4. A bezier results output context
+5. An integer success flag. 1 = completed task and have valid bezier results, or  0 = unable to complete task, bezier results are invalid.
    ```c
     bc = new_bezctx_ps();
-    SpiroCPsToBezier(points,4,True,bc)
+    success = SpiroCPsToBezier0(points,4,True,bc)
     bezctx_ps_close(bc);
-   ```
 
-#### TaggedSpiroCPsToBezier
+#### TaggedSpiroCPsToBezier0
 
-Or call `TaggedSpiroCPsToBezier`. This routine requires that the array of spiro control points be tagged according to Raph's internal conventions. A closed curve will have an extra control point attached to the end of it with a type of `SPIRO_END`;
+Or call `TaggedSpiroCPsToBezier0`. This routine requires that the array of spiro control points be tagged according to Raph's internal conventions. A closed curve will have an extra control point attached to the end of it with a type of `SPIRO_END`;
 
 ```c
    spiro_cp points[5];
-   
+
    points[0].x = -100; points[0].y =    0; points[0].ty = SPIRO_G4;
    points[1].x =    0; points[1].y =  100; points[1].ty = SPIRO_G4;
    points[2].x =  100; points[2].y =    0; points[2].ty = SPIRO_G4;
@@ -178,7 +179,7 @@ An open curve will have the type of the first control point set to `SPIRO_OPEN_C
 
 ```c
    spiro_cp points[4];
-   
+
    points[0].x = -100; points[0].y =    0; points[0].ty = SPIRO_OPEN_CONTOUR;
    points[1].x =    0; points[1].y =  100; points[1].ty = SPIRO_G4;
    points[2].x =  100; points[2].y =    0; points[2].ty = SPIRO_G4;
@@ -189,13 +190,14 @@ An open curve will have the type of the first control point set to `SPIRO_OPEN_C
 
 (In an open contour the point types of the first and last control points are going to be ignored).
 
-In this case there is no need to provide a point count nor an open/closed contour flag. That information can be obtained from the control points themselves. So `TaggedSpiroCPsToBezier` only takes 2 arguments
+In this case there is no need to provide a point count nor an open/closed contour flag. That information can be obtained from the control points themselves. So `TaggedSpiroCPsToBezier0` only takes 2 arguments and returns bc and an integer pass/fail flag.
 
-1. An array of spiros
-2. A bezier context
+1. An array of input spiros
+2. A bezier results output context
+3. An integer success flag. 1 = completed task and have valid bezier results, or  0 = unable to complete task, bezier results are invalid.
    ```c
     bc = new_bezctx_ps();
-    TaggedSpiroCPsToBezier(points,bc)
+    success = TaggedSpiroCPsToBezier0(points,bc)
     bezctx_ps_close(bc);
    ```
 

config.guess

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-11-04'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

config.sub

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-12-03'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \

configure.ac

@@ -6,7 +6,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.61])
 #-------------------------------------------
 # PackageTimestamp version
-m4_define([spiro_package_stamp], [20130930])
+m4_define([spiro_package_stamp], [20150131])
 #-------------------------------------------
 # Making point releases:
 #   spiro_major_version += 0;
@@ -21,7 +21,7 @@ m4_define([spiro_package_stamp], [20130930])
 #   spiro_minor_version = 0;
 #
 m4_define([spiro_major_version], [0])
-m4_define([spiro_minor_version], [2])
+m4_define([spiro_minor_version], [3])
 m4_define([spiro_version],
           [spiro_major_version.spiro_minor_version.spiro_package_stamp])
 m4_define([spiro_info],

spiroentrypoints.c

@@ -74,3 +74,10 @@ TaggedSpiroCPsToBezier0(spiro_cp *spiros,bezctx *bc)
     }
     return 0 ; // spiro did not converge or encountered non-finite values
 }
+
+void SpiroCPsToBezier1(spiro_cp *spiros,int n,int isclosed,bezctx *bc,int *done) {
+    *done = SpiroCPsToBezier0(spiros,n,isclosed,bc);
+}
+void TaggedSpiroCPsToBezier1(spiro_cp *spiros,bezctx *bc,int *done) {
+    *done = TaggedSpiroCPsToBezier0(spiros,bc);
+}

spiroentrypoints.h

@@ -24,6 +24,9 @@ extern void TaggedSpiroCPsToBezier(spiro_cp *spiros,bezctx *bc);
 extern void SpiroCPsToBezier(spiro_cp *spiros,int n,int isclosed,bezctx *bc);
 
 
+
+/* These functions are available in libspiro-0.2.20130930 or higher */
+
 /* The two functions below return 1 upon success and 0 upon failure */
 
 /* The spiros array should indicate it's own end... So              */
@@ -37,4 +40,14 @@ extern int TaggedSpiroCPsToBezier0(spiro_cp *spiros,bezctx *bc);
 /* Open contours do not need to start with '{', nor to end with '}' */
 /* Close contours do not need to end with 'z'                       */
 extern int SpiroCPsToBezier0(spiro_cp *spiros,int n,int isclosed,bezctx *bc);
+
+
+
+/* These functions are available in libspiro-0.3.20150131 or higher */
+
+/* If you can't use TaggedSpiroCPsToBezier0(), SpiroCPsToBezier0(), */
+/* these functions are enhanced versions of the original functions, */
+/* where spiro success/failure replies are passd back through *done */
+extern void TaggedSpiroCPsToBezier1(spiro_cp *spiros,bezctx *bc,int *done);
+extern void SpiroCPsToBezier1(spiro_cp *spiros,int n,int isclosed,bezctx *bc,int *done);
 #endif

tests/call-test.c

@@ -1,5 +1,5 @@
 /* Test libspiro normal library calls
-Copyright (C) 2013 Jose Da Silva
+Copyright (C) 2013, Joe Da Silva
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -160,7 +160,7 @@ int test_curve(int c) {
     int nextknot[17];
     spiro_seg *segs = NULL;
     bezctx *bc;
-    int i;
+    int i,done;
 
     /* Load sample data so that we can see if library is callable */
     load_test_curve(spiro,nextknot,c);
@@ -198,6 +198,22 @@ int test_curve(int c) {
 	return -1;
     }
 
+    /* Check if TaggedSpiroCPsToBezier1() works okay */
+    printf("---\ntesting TaggedSpiroCPsToBezier1() using data=path%d[].\n",c);
+    TaggedSpiroCPsToBezier1(spiro,bc,&done);
+    if ( done!=1 ) {
+	printf("error with TaggedSpiroCPsToBezier1() using data=path%d[].\n",c);
+	return -1;
+    }
+
+    /* Check if SpiroCPsToBezier1() works okay */
+    printf("---\ntesting SpiroCPsToBezier1() using data=path%d[].\n",c);
+    SpiroCPsToBezier1(spiro,cl[c],(c==0 ? 1 : 0),bc,&done);
+    if ( done!=1 ) {
+	printf("error with SpiroCPsToBezier1() using data=path%d[].\n",c);
+	return -1;
+    }
+
     free(bc);
     return 0;
 }