Commit Graph

2242 Commits

Author SHA1 Message Date
Tim Edwards 0dff05376b Update at Tue Sep 12 15:45:00 EDT 2017 by tim 2017-09-12 15:45:00 -04:00
Tim Edwards 1d3bb0d698 Corrected problems having to do with color (blue and green were swapped)
and incorrect call to cairo_set_source_rgba which is in an unused
function and has no effect except with versions of Tcl less than 8.6
where "load -lazy" is not available and unknown functions cause
immediate exit.  Cleaned up remaining references to OpenGL in the
Cairo code, and updated the copyright and acknowledged Chuan Chen, who
coded the Cairo interface.  No attempt yet to deal with memory leaks
caused by calling Cairo "create" functions without the accompanying
"destroy" functions.
2017-09-12 15:42:08 -04:00
Tim Edwards 83e609eaca Update at Wed Sep 6 13:50:36 EDT 2017 by tim 2017-09-06 13:50:36 -04:00
Tim Edwards 377bf419e0 Update at Tue Sep 5 08:50:58 EDT 2017 by tim 2017-09-05 08:50:58 -04:00
Chuan Chen 29335ca0b0 Remote changes at Mon Sep 4 23:35:07 EDT 2017 by chuan on vivaldi 2017-09-04 23:35:07 -04:00
Chuan Chen 7c69a493d5 Merge branch 'master' into work 2017-09-04 23:20:25 -04:00
Chuan Chen 683892981c Remote changes at Mon Sep 4 23:20:22 EDT 2017 by chuan on vivaldi 2017-09-04 23:20:22 -04:00
Chuan Chen 0295063fea Update at Mon Sep 4 23:20:20 EDT 2017 by chuan 2017-09-04 23:20:20 -04:00
Chuan Chen 1bda1206db Remote changes at Fri Sep 1 14:41:47 EDT 2017 by chuan on vivaldi 2017-09-01 14:41:47 -04:00
Tim Edwards 37e7b7ffeb Changed the offscreen-rendering handling in SetProjection to be
more like the Tk/X11 model than the OpenGL model, since Cairo
isn't picky about pixmaps.
2017-09-01 09:12:02 -04:00
Tim Edwards 21d558c67d Changed the definition of CPP again so that even in the absence of
the python preprocessor version, the techfiles and .magicrc file
will get the correct arguments, without affecting the use of CPP
in the configure script.
2017-09-01 08:40:58 -04:00
Tim Edwards 135889ebcb Update at Fri Sep 1 08:28:49 EDT 2017 by tim 2017-09-01 08:28:49 -04:00
Chuan Chen 2aff81a748 Remote changes at Fri Sep 1 00:39:19 EDT 2017 by chuan on vivaldi 2017-09-01 00:39:19 -04:00
Chuan Chen b397adadef Remote changes at Thu Aug 31 23:54:11 EDT 2017 by chuan on vivaldi 2017-08-31 23:54:11 -04:00
Chuan Chen be9ff45f99 Merge branch 'master' into work 2017-08-31 14:11:19 -04:00
Chuan Chen bf471d26ef Remote changes at Thu Aug 31 14:11:17 EDT 2017 by chuan on vivaldi 2017-08-31 14:11:17 -04:00
Tim Edwards d302382036 Update at Thu Aug 31 08:10:52 EDT 2017 by tim 2017-08-31 08:10:52 -04:00
Chuan Chen 41df1d0ed7 Merge branch 'master' into work 2017-08-30 16:34:46 -04:00
Chuan Chen a40c1f21a7 Remote changes at Wed Aug 30 16:34:42 EDT 2017 by chuan on vivaldi 2017-08-30 16:34:42 -04:00
Chuan Chen 33b075beae Update at Wed Aug 30 16:34:41 EDT 2017 by chuan 2017-08-30 16:34:41 -04:00
Chuan Chen 432777a5b1 Remote changes at Tue Aug 29 12:55:06 EDT 2017 by chuan on vivaldi 2017-08-29 12:55:06 -04:00
Chuan Chen a323ab4d23 Merge branch 'master' into work 2017-08-29 12:53:00 -04:00
Chuan Chen 2cf9f82447 Remote changes at Tue Aug 29 12:52:57 EDT 2017 by chuan on vivaldi 2017-08-29 12:52:57 -04:00
Tim Edwards 02a9720865 Update at Tue Aug 29 08:58:04 EDT 2017 by tim 2017-08-29 08:58:04 -04:00
Chuan Chen 083d595347 Remote changes at Fri Aug 25 15:06:31 EDT 2017 by chuan on vivaldi 2017-08-25 15:06:31 -04:00
Chuan Chen 405738d27a Merge branch 'master' into work
Conflicts:
	defs.mak
	scripts/config.log
	scripts/config.status
	scripts/defs.mak

Merged using local version (ours)
2017-08-25 14:23:08 -04:00
Chuan Chen 2aaa1667ac Remote changes at Fri Aug 25 14:23:05 EDT 2017 by chuan on vivaldi 2017-08-25 14:23:05 -04:00
Tim Edwards 228e32b5f3 Merge branch 'work' into tomerge 2017-08-25 14:14:53 -04:00
Tim Edwards 7aebad285d Corrected the configure.in and defs.mak.in file so that the
python3 preprocessor is captured in the variable MCPP, not CPP,
since CPP is meaningful to the make process.  Also, the
MAGICDIR variable in the name needed to be escaped so that the
variable is not evaluated within the configure script.
2017-08-25 14:13:30 -04:00
Chuan Chen 87aaa13bfd Merge branch 'master' into work 2017-08-25 12:47:41 -04:00
Chuan Chen 42e41555d9 Update at Fri Aug 25 12:47:39 EDT 2017 by chuan 2017-08-25 12:47:39 -04:00
Chuan Chen 72854afb8f Remote changes at Thu Aug 24 17:52:02 EDT 2017 by chuan on vivaldi 2017-08-24 17:52:02 -04:00
Chuan Chen 7dbf773613 Merge branch 'master' into work
Conflicts:
	defs.mak
	scripts/config.log
	scripts/config.status
	scripts/defs.mak

Merged using local version (ours)
2017-08-24 17:51:00 -04:00
Chuan Chen e4b6825b95 Remote changes at Thu Aug 24 17:50:54 EDT 2017 by chuan on vivaldi 2017-08-24 17:50:54 -04:00
Chuan Chen 77da51d416 Remote changes at Thu Aug 24 17:24:48 EDT 2017 by chuan on vivaldi 2017-08-24 17:24:48 -04:00
Tim Edwards 8a334aa861 Didn't make clean before git push; these files should be in the
gitignore file. . .
2017-08-24 16:52:46 -04:00
Tim Edwards a55adf128f Updated configure to add both m4 and python3, then corrected the
python preprocessor script to execute "env python3" instead of
the hard-coded non-existent directory that was on the shebang
line.
2017-08-24 16:51:45 -04:00
Tim Edwards 9de99f8e1c Merge branch 'work' into tomerge 2017-08-24 16:47:28 -04:00
Tim Edwards 2261799137 Update at Thu Aug 24 16:47:27 EDT 2017 by tim 2017-08-24 16:47:27 -04:00
Tim Edwards 0704882ac2 Changes that should have been ignored by .gitignore. 2017-08-23 16:00:39 -04:00
Tim Edwards 38dfe61dbb Corrected .gitignore to ignore files from configuration (defs.mak,
config.log, etc.).  Not sure that is working properly with gitocd
since "defs.mak" was already in the .gitignore file but it queued
for commit.
2017-08-23 13:55:40 -04:00
Tim Edwards ae3b76dfd6 Update at Wed Aug 23 07:27:58 EDT 2017 by tim 2017-08-23 07:27:58 -04:00
Chuan Chen 87a88be5d6 Remote changes at Fri Aug 18 14:42:55 EDT 2017 by chuan on vivaldi 2017-08-18 14:42:55 -04:00
Chuan Chen 78dd126686 Merge branch 'master' into work 2017-08-18 14:15:15 -04:00
Chuan Chen 902ae0c7d4 Remote changes at Fri Aug 18 14:15:12 EDT 2017 by chuan on vivaldi 2017-08-18 14:15:12 -04:00
Chuan Chen f739da5e10 Update at Fri Aug 18 14:15:11 EDT 2017 by chuan 2017-08-18 14:15:11 -04:00
Chuan Chen 17e387bfa2 Remote changes at Thu Aug 17 15:42:31 EDT 2017 by chuan on vivaldi 2017-08-17 15:42:31 -04:00
Chuan Chen 40d9a5a9c8 Merge branch 'master' into work 2017-08-17 13:47:40 -04:00
Chuan Chen cb55befc20 Remote changes at Thu Aug 17 13:47:38 EDT 2017 by chuan on vivaldi 2017-08-17 13:47:38 -04:00
Chuan Chen d21ae209c9 Update at Thu Aug 17 13:47:37 EDT 2017 by chuan 2017-08-17 13:47:37 -04:00