1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
Description: Difference between original tk8.5.8 and the version included
in saods9. Command:
diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\)' tk8.5.8 ds9/tk8.5.8/
--- tk8.5.8/generic/tkArgv.c 2008-10-05 13:34:46.000000000 +0200
+++ ds9/tk8.5.8//generic/tkArgv.c 2010-06-03 17:47:44.000000000 +0200
@@ -21,8 +21,8 @@
*/
static Tk_ArgvInfo defaultTable[] = {
- {"-help", TK_ARGV_HELP, NULL, NULL,
- "Print summary of command-line options and abort"},
+ /* {"-help", TK_ARGV_HELP, NULL, NULL,
+ "Print summary of command-line options and abort"},*/
{NULL, TK_ARGV_END, NULL, NULL, NULL}
};
--- tk8.5.8/generic/tkCanvPs.c 2009-04-10 13:07:32.000000000 +0200
+++ ds9/tk8.5.8//generic/tkCanvPs.c 2010-06-03 17:47:45.000000000 +0200
@@ -18,6 +18,10 @@
#include "tkCanvas.h"
#include "tkFont.h"
+/*** waj ***/
+float psScale =1;
+/*** waj ***/
+
/*
* See tkCanvas.h for key data structures used to implement canvases.
*/
@@ -506,6 +510,21 @@
Tcl_AppendResult(interp, string,
" lineto closepath clip newpath\n", NULL);
}
+
+ /*** waj ***/
+ sprintf(string, "%g %g translate\n",
+ (Tk_PostscriptY((double) psInfo.x, (Tk_PostscriptInfo) &psInfo) -
+ Tk_PostscriptY((double) psInfo.x2, (Tk_PostscriptInfo) &psInfo))
+ *(1.-psScale)/2.,
+ (Tk_PostscriptY((double) psInfo.y, (Tk_PostscriptInfo) &psInfo) -
+ Tk_PostscriptY((double) psInfo.y2, (Tk_PostscriptInfo) &psInfo))
+ *(1.-psScale)/2.);
+ Tcl_AppendResult(interp, string, (char *) NULL);
+
+ sprintf(string, "%.4g %.4g scale\n", psScale, psScale);
+ Tcl_AppendResult(interp, string, (char *) NULL);
+ /*** waj ***/
+
if (psInfo.chan != NULL) {
Tcl_Write(psInfo.chan, Tcl_GetStringResult(interp), -1);
Tcl_ResetResult(canvasPtr->interp);
--- tk8.5.8/macosx/tkMacOSXDraw.c 2008-02-27 01:12:33.000000000 +0100
+++ ds9/tk8.5.8//macosx/tkMacOSXDraw.c 2010-06-11 20:55:56.000000000 +0200
@@ -842,12 +842,12 @@
void
XDrawRectangles(
Display *display,
- Drawable drawable,
+ Drawable d,
GC gc,
XRectangle *rectArr,
int nRects)
{
- MacDrawable *macWin = (MacDrawable *) drawable;
+ MacDrawable *macWin = (MacDrawable *) d;
TkMacOSXDrawingContext dc;
XRectangle * rectPtr;
int i, lw = gc->line_width;
--- tk8.5.8/unix/configure 2009-11-13 19:38:48.000000000 +0100
+++ ds9/tk8.5.8//unix/configure 2010-06-11 20:41:28.000000000 +0200
@@ -6175,6 +6175,7 @@
cat >>confdefs.h <<\_ACEOF
#define MAC_OSX_TCL 1
+#define TK_MACOSXDRAW_UNUSED 1
_ACEOF
PLAT_OBJS='${MAC_OSX_OBJS}'
--- tk8.5.8/win/configure 2009-11-13 19:38:48.000000000 +0100
+++ ds9/tk8.5.8//win/configure 2010-06-07 22:15:56.000000000 +0200
@@ -2982,15 +2982,15 @@
fi
echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5
echo "${ECHO_T}$ac_cv_cygwin" >&6
-if test "$ac_cv_cygwin" = "yes" ; then
- { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported.
-A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
-file for information about building with Mingw." >&5
-echo "$as_me: error: Compiling under Cygwin is not currently supported.
-A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
-file for information about building with Mingw." >&2;}
- { (exit 1); exit 1; }; }
-fi
+#if test "$ac_cv_cygwin" = "yes" ; then
+# { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported.
+#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
+#file for information about building with Mingw." >&5
+#echo "$as_me: error: Compiling under Cygwin is not currently supported.
+#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
+#file for information about building with Mingw." >&2;}
+# { (exit 1); exit 1; }; }
+#fi
#--------------------------------------------------------------------
# Determines the correct binary file extension (.o, .obj, .exe etc.)
--- tk8.5.8/win/tkWinPort.h 2005-09-28 20:31:57.000000000 +0200
+++ ds9/tk8.5.8//win/tkWinPort.h 2010-06-07 22:18:39.000000000 +0200
@@ -123,7 +123,7 @@
* Define timezone for gettimeofday.
*/
-struct timezone {
+struct timezonee {
int tz_minuteswest;
int tz_dsttime;
};
|
