diff options
author | joye <joye> | 2013-09-05 18:34:07 (GMT) |
---|---|---|
committer | joye <joye> | 2013-09-05 18:34:07 (GMT) |
commit | 4b75443ae0ecb64af6b782bea615182a0fb72faa (patch) | |
tree | b20427ad90eabaad88a05c3fba1d88dd3ee2ac9f | |
parent | db9a77f7616abf01af1e05b8ab68bc4865151743 (diff) | |
download | blt-4b75443ae0ecb64af6b782bea615182a0fb72faa.zip blt-4b75443ae0ecb64af6b782bea615182a0fb72faa.tar.gz blt-4b75443ae0ecb64af6b782bea615182a0fb72faa.tar.bz2 |
*** empty log message ***
-rw-r--r-- | src/bltConfig.C | 5 | ||||
-rw-r--r-- | src/bltGrAxis.C | 1 | ||||
-rw-r--r-- | src/bltGrElemLine.C | 4 | ||||
-rw-r--r-- | src/bltGrElemLineSpline.C | 4 | ||||
-rw-r--r-- | src/bltGrElemOp.C | 4 | ||||
-rw-r--r-- | src/bltGrMarker.C | 2 | ||||
-rw-r--r-- | src/bltGrMisc.C | 7 | ||||
-rw-r--r-- | src/bltGrPenOp.C | 4 | ||||
-rw-r--r-- | src/bltGrText.C | 27 | ||||
-rw-r--r-- | src/bltGraph.C | 4 | ||||
-rw-r--r-- | src/bltSwitch.C | 3 | ||||
-rw-r--r-- | src/bltVecCmd.C | 3 | ||||
-rw-r--r-- | src/bltVector.C | 4 |
13 files changed, 36 insertions, 36 deletions
diff --git a/src/bltConfig.C b/src/bltConfig.C index fc4a4cb..bec7b29 100644 --- a/src/bltConfig.C +++ b/src/bltConfig.C @@ -73,9 +73,10 @@ * */ -#include "bltInt.h" - +#include <assert.h> #include <stdarg.h> + +#include "bltInt.h" #include "bltFont.h" #include "bltPicture.h" #include "bltBgStyle.h" diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C index 2a4a268..34fd676 100644 --- a/src/bltGrAxis.C +++ b/src/bltGrAxis.C @@ -27,6 +27,7 @@ */ #include <math.h> +#include <assert.h> #include "bltGraph.h" #include "bltOp.h" diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index b93e232..675ac3d 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -27,9 +27,11 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <assert.h> +#include <X11/Xutil.h> + #include "bltGraph.h" #include "bltChain.h" -#include <X11/Xutil.h> #include "bltGrElem.h" #include "bltBgStyle.h" #include "bltImage.h" diff --git a/src/bltGrElemLineSpline.C b/src/bltGrElemLineSpline.C index 3f9c71c..385810b 100644 --- a/src/bltGrElemLineSpline.C +++ b/src/bltGrElemLineSpline.C @@ -1,6 +1,8 @@ +#include <assert.h> + #include "bltInt.h" #include "bltOp.h" -#include <bltVector.h> +#include "bltVector.h" typedef int (SplineProc)(Point2d origPts[], int nOrigPts, Point2d intpPts[], int nIntpPts); diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C index 1571217..458d13d 100644 --- a/src/bltGrElemOp.C +++ b/src/bltGrElemOp.C @@ -26,10 +26,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <assert.h> +#include <X11/Xutil.h> + #include "bltGraph.h" #include "bltOp.h" #include "bltChain.h" -#include <X11/Xutil.h> #include <bltDataTable.h> #define GRAPH_KEY "BLT Graph Data" diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index 11c6480..2364d86 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -26,6 +26,8 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <assert.h> + #include "bltGraph.h" #include "bltOp.h" #include "bltImage.h" diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index 2b51606..ea3cdf7 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -27,11 +27,14 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "bltGraph.h" +#include <assert.h> +#include <stdarg.h> + #include <X11/Xutil.h> + +#include "bltGraph.h" #include <bltAlloc.h> #include <bltOp.h> -#include <stdarg.h> static Blt_OptionParseProc ObjToPoint; static Blt_OptionPrintProc PointToObj; diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C index 8c6f0ae..f6959b3 100644 --- a/src/bltGrPenOp.C +++ b/src/bltGrPenOp.C @@ -26,9 +26,11 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <assert.h> +#include <X11/Xutil.h> + #include "bltGraph.h" #include "bltOp.h" -#include <X11/Xutil.h> typedef int (GraphPenProc)(Tcl_Interp *interp, Graph *graphPtr, int objc, Tcl_Obj *const *objv); diff --git a/src/bltGrText.C b/src/bltGrText.C index 56c0392..2959c88 100644 --- a/src/bltGrText.C +++ b/src/bltGrText.C @@ -1,4 +1,3 @@ - /* * bltText.c -- * @@ -26,9 +25,11 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "bltInt.h" -#include <bltHash.h> +#include <assert.h> #include <X11/Xutil.h> + +#include "bltInt.h" +#include "bltHash.h" #include "tkIntBorder.h" #include "bltImage.h" #include "bltBitmap.h" @@ -439,26 +440,6 @@ Blt_AnchorPoint( return t; } -static INLINE int -SizeOfUtfChar(const char *s) /* Buffer in which the UTF-8 representation of - * the Tcl_UniChar is stored. Buffer must be - * large enough to hold the UTF-8 character - * (at most TCL_UTF_MAX bytes). */ -{ - int byte; - - byte = *((unsigned char *)s); - if (byte < 0xC0) { - return 1; - } else if ((byte < 0xE0) && ((s[1] & 0xC0) == 0x80)) { - return 2; - } else if ((byte < 0xF0) && - ((s[1] & 0xC0) == 0x80) && ((s[2] & 0xC0) == 0x80)) { - return 3; - } - return 1; -} - /* *--------------------------------------------------------------------------- * diff --git a/src/bltGraph.C b/src/bltGraph.C index deb0679..0e44353 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -41,13 +41,15 @@ * */ +#include <assert.h> +#include <X11/Xutil.h> + #include "bltGraph.h" #include "bltOp.h" #include "bltBind.h" #include "bltGrElem.h" #include "bltGrLegd.h" #include "bltSwitch.h" -#include <X11/Xutil.h> #include "bltPicture.h" typedef int (GraphCmdProc)(Graph *graphPtr, Tcl_Interp *interp, int objc, diff --git a/src/bltSwitch.C b/src/bltSwitch.C index 6d1aa31..7dca359 100644 --- a/src/bltSwitch.C +++ b/src/bltSwitch.C @@ -27,9 +27,10 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "bltInt.h" +#include <assert.h> #include <stdarg.h> +#include "bltInt.h" #include "bltSwitch.h" static void diff --git a/src/bltVecCmd.C b/src/bltVecCmd.C index 7f018a3..d0978b1 100644 --- a/src/bltVecCmd.C +++ b/src/bltVecCmd.C @@ -1,4 +1,3 @@ - /* * bltVecCmd.c -- * @@ -45,6 +44,8 @@ * x notify reorder #1 #2 */ +#include "assert.h" + #include "bltVecInt.h" #include "bltOp.h" #include "bltNsUtil.h" diff --git a/src/bltVector.C b/src/bltVector.C index 5f2e8a5..f3ff1ac 100644 --- a/src/bltVector.C +++ b/src/bltVector.C @@ -1,4 +1,3 @@ - /* * bltVector.c -- * @@ -42,6 +41,7 @@ * x notify reorder #1 #2 */ +#include <assert.h> #include <math.h> #include <time.h> @@ -49,7 +49,7 @@ #include "bltOp.h" #include "bltNsUtil.h" #include "bltSwitch.h" -#include <bltMath.h> +#include "bltMath.h" #ifndef TCL_NAMESPACE_ONLY #define TCL_NAMESPACE_ONLY TCL_GLOBAL_ONLY |