|
Lines 1-6
Link Here
|
| 1 |
diff -cr ../Ipe-5.0/Ipe/Makefile Ipe/Makefile |
1 |
diff -cr ../Ipe-5.0/Ipe/Makefile Ipe/Makefile |
| 2 |
*** ../Ipe-5.0/Ipe/Makefile Thu Nov 27 16:09:18 1997 |
2 |
*** ../Ipe-5.0/Ipe/Makefile Thu Nov 27 16:09:18 1997 |
| 3 |
--- Ipe/Makefile Thu Oct 26 14:57:59 2000 |
3 |
--- Ipe/Makefile Sun Nov 5 14:51:33 2000 |
| 4 |
*************** |
4 |
*************** |
| 5 |
*** 26,42 **** |
5 |
*** 26,42 **** |
| 6 |
|
6 |
|
|
Lines 24-30
Link Here
|
| 24 |
|
24 |
|
| 25 |
# define GFLAGS if you use g++ |
25 |
# define GFLAGS if you use g++ |
| 26 |
#GFLAGS = |
26 |
#GFLAGS = |
| 27 |
! GFLAGS = -fno-for-scope -g |
27 |
! GFLAGS = -fno-for-scope |
| 28 |
|
28 |
|
| 29 |
# Need to find X and Motif |
29 |
# Need to find X and Motif |
| 30 |
! INCLUDE_DIRS = -I../Plageo -I/usr/X11R6/include |
30 |
! INCLUDE_DIRS = -I../Plageo -I/usr/X11R6/include |
|
Lines 111-117
Link Here
|
| 111 |
IpeCallback callback DefaultsTo(NIL)); |
111 |
IpeCallback callback DefaultsTo(NIL)); |
| 112 |
diff -cr ../Ipe-5.0/Ipe/colors.C Ipe/colors.C |
112 |
diff -cr ../Ipe-5.0/Ipe/colors.C Ipe/colors.C |
| 113 |
*** ../Ipe-5.0/Ipe/colors.C Tue May 9 04:36:03 1995 |
113 |
*** ../Ipe-5.0/Ipe/colors.C Tue May 9 04:36:03 1995 |
| 114 |
--- Ipe/colors.C Wed Oct 25 15:19:03 2000 |
114 |
--- Ipe/colors.C Thu Nov 2 15:31:19 2000 |
| 115 |
*************** |
115 |
*************** |
| 116 |
*** 123,129 **** |
116 |
*** 123,129 **** |
| 117 |
// COLOR I/O |
117 |
// COLOR I/O |
|
Lines 129-134
Link Here
|
| 129 |
// save color in file |
129 |
// save color in file |
| 130 |
{ |
130 |
{ |
| 131 |
if (!col) |
131 |
if (!col) |
|
|
132 |
*************** |
| 133 |
*** 409,414 **** |
| 134 |
--- 409,420 ---- |
| 135 |
|
| 136 |
// if less than 6 bits, give up and use b&w |
| 137 |
|
| 138 |
+ if (!bestv[PseudoColor]){ |
| 139 |
+ cerr << "No PseudoColor visuals found\n"; |
| 140 |
+ monochrome=true; |
| 141 |
+ return; |
| 142 |
+ } |
| 143 |
+ |
| 144 |
if (bestv[PseudoColor]->depth < 6) { |
| 145 |
monochrome = TRUE; |
| 146 |
return; |
| 132 |
diff -cr ../Ipe-5.0/Ipe/configuration.C Ipe/configuration.C |
147 |
diff -cr ../Ipe-5.0/Ipe/configuration.C Ipe/configuration.C |
| 133 |
*** ../Ipe-5.0/Ipe/configuration.C Tue May 9 04:36:04 1995 |
148 |
*** ../Ipe-5.0/Ipe/configuration.C Tue May 9 04:36:04 1995 |
| 134 |
--- Ipe/configuration.C Wed Oct 25 15:24:38 2000 |
149 |
--- Ipe/configuration.C Wed Oct 25 15:24:38 2000 |
|
Lines 213-220
Link Here
|
| 213 |
// popup an (error) message window with one or two lines of text |
228 |
// popup an (error) message window with one or two lines of text |
| 214 |
// window stays, and is removed by its OK button |
229 |
// window stays, and is removed by its OK button |
| 215 |
{ |
230 |
{ |
| 216 |
Only in ../Ipe-5.0/Ipe: ipe |
|
|
| 217 |
Only in Ipe: ipe.core |
| 218 |
diff -cr ../Ipe-5.0/Ipe/itypes.h Ipe/itypes.h |
231 |
diff -cr ../Ipe-5.0/Ipe/itypes.h Ipe/itypes.h |
| 219 |
*** ../Ipe-5.0/Ipe/itypes.h Tue May 9 04:36:00 1995 |
232 |
*** ../Ipe-5.0/Ipe/itypes.h Tue May 9 04:36:00 1995 |
| 220 |
--- Ipe/itypes.h Wed Oct 25 11:32:14 2000 |
233 |
--- Ipe/itypes.h Wed Oct 25 11:32:14 2000 |