[Commit] libic/src Makefile.am,1.5,1.6 ic.h,1.7,1.8

Carl Worth commit@keithp.com
Fri, 25 Apr 2003 13:18:16 -0700


Committed by: cworth

Update of /local/src/CVS/libic/src
In directory home.keithp.com:/tmp/cvs-serv17625/src

Modified Files:
	Makefile.am ic.h 
Log Message:
Fixed to not reference XFixed. Fixed libtool versioning

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/libic/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	17 Apr 2003 15:48:22 -0000	1.5
+++ Makefile.am	25 Apr 2003 20:18:13 -0000	1.6
@@ -25,4 +25,4 @@
 
 INCLUDES = $(X_CFLAGS) $(LIBIC_CFLAGS)
 
-ldadds = $(LIBIC_LIBS)
+libic_la_LIBADD = $(LIBIC_LIBS)

Index: ic.h
===================================================================
RCS file: /local/src/CVS/libic/src/ic.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ic.h	23 Apr 2003 14:17:57 -0000	1.7
+++ ic.h	25 Apr 2003 20:18:13 -0000	1.8
@@ -29,6 +29,11 @@
 
 #include "pixregion.h"
 
+/* NOTE: Must be manually synchronized with LIBIC_VERSION in configure.in */
+#define IC_MAJOR	0
+#define IC_MINOR	1
+#define IC_REVISION	0
+
 #if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
 #define _ICFUNCPROTOBEGIN extern "C" {	/* do not leave open across includes */
 #define _ICFUNCPROTOEND }
@@ -96,8 +101,10 @@
 IcImageSetClipRegion (IcImage	*image,
 		      PixRegion	*region);
 
+typedef int IcFixed16_16;
+
 typedef struct _IcTransform {
-    XFixed	    matrix[3][3];
+    IcFixed16_16    matrix[3][3];
 } IcTransform;
 
 int