ivtools-patch Mailing List for ivtools (Page 3)
Brought to you by:
johnston
Menu
▾
▴
ivtools-patch
You can subscribe to this list here.
| 1999 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2000 |
Jan
(17) |
Feb
(14) |
Mar
(7) |
Apr
(7) |
May
(20) |
Jun
(18) |
Jul
(5) |
Aug
(9) |
Sep
(4) |
Oct
(2) |
Nov
(2) |
Dec
(1) |
| 2001 |
Jan
(3) |
Feb
(2) |
Mar
(5) |
Apr
(7) |
May
(9) |
Jun
(15) |
Jul
(10) |
Aug
(2) |
Sep
(10) |
Oct
(15) |
Nov
(14) |
Dec
(2) |
| 2002 |
Jan
(8) |
Feb
(13) |
Mar
(10) |
Apr
(3) |
May
(2) |
Jun
(7) |
Jul
(5) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(10) |
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2004 |
Jan
(2) |
Feb
(6) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(4) |
Nov
(1) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
(2) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2010 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ivt...@li...> - 2002-03-22 00:20:17
|
Patch: ivtools-020321-johnston-043
For: ivtools-1.0.3
Author: joh...@us...
Subject: matrix transpose command (xpose)
Requires:
This is an intermediate patch to ivtools-1.0.3. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- new matrix transpose command (xpose), which takes a 2d list of numbers
(i.e. a matrix), and transposes them. Examples:
xpose(1,2,3)
{{1,2,3}}
xpose((1,2),(3,4))
{{1,3},{2,4}}
xpose((1,2,3),(11,12,13),(21,22,23))
{{1,11,21},{2,12,22},{3,13,23}}
Index: ComTerp/comterp.c
diff -c ComTerp/comterp.c:1.4 ComTerp/comterp.c:1.5
*** ComTerp/comterp.c:1.4 Thu Mar 21 09:00:52 2002
--- src/ComTerp/comterp.c Thu Mar 21 16:14:54 2002
***************
*** 1029,1034 ****
--- 1029,1035 ----
add_command("xform", new XformFunc(this));
add_command("invert", new InvertXformFunc(this));
+ add_command("xpose", new XposeFunc(this));
add_command("cond", new CondFunc(this));
add_command("seq", new SeqFunc(this));
Index: ComTerp/listfunc.c
diff -c ComTerp/listfunc.c:1.2 ComTerp/listfunc.c:1.3
*** ComTerp/listfunc.c:1.2 Wed Mar 20 11:45:54 2002
--- src/ComTerp/listfunc.c Thu Mar 21 16:14:54 2002
***************
*** 76,82 ****
return;
}
! }
}
Resource::ref(avl);
ComValue retval(avl);
--- 76,83 ----
return;
}
! } else
! avl->Append(new AttributeValue(listv));
}
Resource::ref(avl);
ComValue retval(avl);
Index: ComTerp/listfunc.h
diff -c ComTerp/listfunc.h:1.2 ComTerp/listfunc.h:1.3
*** ComTerp/listfunc.h:1.2 Fri Nov 30 05:52:48 2001
--- src/ComTerp/listfunc.h Thu Mar 21 16:14:54 2002
***************
*** 36,42 ****
class ComValue;
//: create list command for ComTerp.
! // lst=list([olst|strm] :strmlst) -- create list, copy list, or convert stream
class ListFunc : public ComFunc {
public:
ListFunc(ComTerp*);
--- 36,42 ----
class ComValue;
//: create list command for ComTerp.
! // lst=list([olst|strm|val] :strmlst) -- create list, copy list, or convert stream
class ListFunc : public ComFunc {
public:
ListFunc(ComTerp*);
***************
*** 44,50 ****
virtual void execute();
virtual boolean post_eval() { return true; }
virtual const char* docstring() {
! return "lst=%s([olst|strm] :strmlst) -- create list, copy list, or convert stream"; }
};
//: list member command for ComTerp.
--- 44,50 ----
virtual void execute();
virtual boolean post_eval() { return true; }
virtual const char* docstring() {
! return "lst=%s([olst|strm|val] :strmlst) -- create list, copy list, or convert stream"; }
};
//: list member command for ComTerp.
Index: ComTerp/xformfunc.c
diff -c ComTerp/xformfunc.c:1.1 ComTerp/xformfunc.c:1.2
*** ComTerp/xformfunc.c:1.1 Fri Nov 2 13:04:49 2001
--- src/ComTerp/xformfunc.c Thu Mar 21 16:14:54 2002
***************
*** 30,35 ****
--- 30,36 ----
#include <Attribute/attribute.h>
#include <Unidraw/iterator.h>
#include <InterViews/transformer.h>
+ #include <OS/math.h>
#define TITLE "XformFunc"
***************
*** 129,134 ****
--- 130,192 ----
} else
push_stack(ComValue::nullval());
+ } else
+ push_stack(ComValue::nullval());
+ }
+
+ /*****************************************************************************/
+
+ XposeFunc::XposeFunc(ComTerp* comterp) : ComFunc(comterp) {
+ }
+
+ void XposeFunc::execute() {
+ ComValue listv(stack_arg(0));
+ reset_stack();
+
+ if (listv.is_array()) {
+ int imax = 0;
+ int jmax = 0;
+ Iterator it;
+ listv.array_val()->First(it);
+ while (!listv.array_val()->Done(it)) {
+ imax++;
+ AttributeValue* av = listv.array_val()->GetAttrVal(it);
+ if (av->is_array())
+ jmax = Math::max(jmax, av->array_val()->Number());
+ listv.array_val()->Next(it);
+ }
+
+ /* construct tranposed matrix */
+ jmax += jmax ? 0 : 1;
+ AttributeValueList* new_matrix = new AttributeValueList();
+ for(int j=0; j<jmax; j++)
+ new_matrix->Append(new AttributeValue(new AttributeValueList()));
+
+ /* save pointer to first new column */
+ Iterator jt;
+ new_matrix->First(jt);
+ AttributeValue* jv = new_matrix->GetAttrVal(jt);
+
+ /* populate new matrix */
+ listv.array_val()->First(it);
+ while (!listv.array_val()->Done(it)) {
+ AttributeValue* av = listv.array_val()->GetAttrVal(it);
+ if (av->is_array()) {
+ Iterator at;
+ av->array_val()->First(at);
+ Iterator nt;
+ new_matrix->First(nt);
+ while (!av->array_val()->Done(at)) {
+ new_matrix->GetAttrVal(nt)->array_val()->Append(new AttributeValue(av->array_val()->GetAttrVal(at)));
+ av->array_val()->Next(at);
+ new_matrix->Next(nt);
+ }
+ } else
+ jv->array_val()->Append(new AttributeValue(av));
+ listv.array_val()->Next(it);
+ }
+ ComValue retval(new_matrix);
+ push_stack(retval);
} else
push_stack(ComValue::nullval());
}
Index: ComTerp/xformfunc.h
diff -c ComTerp/xformfunc.h:1.1 ComTerp/xformfunc.h:1.2
*** ComTerp/xformfunc.h:1.1 Fri Nov 2 13:04:49 2001
--- src/ComTerp/xformfunc.h Thu Mar 21 16:14:54 2002
***************
*** 56,59 ****
--- 56,71 ----
};
+ //: ComTerp command to transpose a matrix
+ // matrix=xpose(matrix) -- transpose an arbitrary matrix
+ class XposeFunc : public ComFunc {
+ public:
+ XposeFunc(ComTerp*);
+
+ virtual void execute();
+ virtual const char* docstring() {
+ return "matrix=%s(matrix) -- transpose an arbitrary matrix"; }
+
+ };
+
#endif /* !defined(_xformfunc_h) */
Index: comterp/README
diff -c comterp/README:1.3 comterp/README:1.4
*** comterp/README:1.3 Thu Mar 21 09:00:53 2002
--- src/comterp_/README Thu Mar 21 16:14:56 2002
***************
*** 158,169 ****
num=round(num) -- return closest integer value
! AFFINE TRANSFORM COMMANDS:
point=xform(x,y a00,a01,a10,a11,a20,a21) -- affine transform of x,y coordinates
affine=invert(a00,a01,a10,a11,a20,a21) -- invert affine transform
STATISTICAL/RANDOM COMMANDS:
val=sum(val1[,val2[,...,valn]]) -- return sum of values
--- 158,171 ----
num=round(num) -- return closest integer value
! AFFINE TRANSFORM AND MATRIX COMMANDS:
point=xform(x,y a00,a01,a10,a11,a20,a21) -- affine transform of x,y coordinates
affine=invert(a00,a01,a10,a11,a20,a21) -- invert affine transform
+ matrix=xpose(matrix) -- transpose an arbitrary matrix
+
STATISTICAL/RANDOM COMMANDS:
val=sum(val1[,val2[,...,valn]]) -- return sum of values
***************
*** 180,186 ****
LIST COMMANDS:
! lst=list([olst|strm] :strmlst) -- create list, copy list, or convert stream
val=at(list|attrlist n :set val ) -- return (or set) nth item in a list
--- 182,188 ----
LIST COMMANDS:
! lst=list([olst|strm|val] :strmlst) -- create list, copy list, or convert stream
val=at(list|attrlist n :set val ) -- return (or set) nth item in a list
Index: man1_ivtools/comterp.1
diff -c man1_ivtools/comterp.1:1.3 man1_ivtools/comterp.1:1.4
*** man1_ivtools/comterp.1:1.3 Thu Mar 21 09:01:10 2002
--- src/man/man1/comterp.1 Thu Mar 21 16:15:20 2002
***************
*** 169,180 ****
num=round(num) -- return closest integer value
! .SH AFFINE TRANSFORM COMMANDS:
point=xform(x,y a00,a01,a10,a11,a20,a21) -- affine transform of x,y coordinates
affine=invert(a00,a01,a10,a11,a20,a21) -- invert affine transform
.SH STATISTICAL/RANDOM COMMANDS:
sum(val1[,val2[,...,valn]]) -- return sum of values
--- 169,182 ----
num=round(num) -- return closest integer value
! .SH AFFINE TRANSFORM AND MATRIX COMMANDS:
point=xform(x,y a00,a01,a10,a11,a20,a21) -- affine transform of x,y coordinates
affine=invert(a00,a01,a10,a11,a20,a21) -- invert affine transform
+ matrix=xpose(matrix) -- transpose an arbitrary matrix
+
.SH STATISTICAL/RANDOM COMMANDS:
sum(val1[,val2[,...,valn]]) -- return sum of values
***************
*** 191,197 ****
.SH LIST COMMANDS:
! lst=list([olst|strm] :strmlst) -- create list, copy list, or convert stream
val=at(list|attrlist n :set val) -- return (or set) nth item in a list
--- 193,199 ----
.SH LIST COMMANDS:
! lst=list([olst|strm|val] :strmlst) -- create list, copy list, or convert stream
val=at(list|attrlist n :set val) -- return (or set) nth item in a list
*** /dev/null Thu Mar 21 16:15:25 PST 2002
--- patches/ivtools-020321-johnston-043
*************** patches/ivtools-020321-johnston-043
*** 0 ****
--- 1 ----
+ ivtools-020321-johnston-043
|
|
From: <ivt...@li...> - 2002-03-21 17:05:00
|
Patch: ivtools-020321-johnston-042
For: ivtools-1.0.3
Author: joh...@us...
Subject: add pi, radtodeg, and degtorad commands
Requires:
This is an intermediate patch to ivtools-1.0.3. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- add comterp commands for the value of PI (pi), converting radians to
degrees (radtodeg), and converting degrees to radians (degtorad).
Index: ComTerp/comterp.c
diff -c ComTerp/comterp.c:1.3 ComTerp/comterp.c:1.4
*** ComTerp/comterp.c:1.3 Wed Mar 20 11:45:54 2002
--- src/ComTerp/comterp.c Thu Mar 21 09:00:52 2002
***************
*** 1019,1024 ****
--- 1019,1027 ----
add_command("sin", new SinFunc(this));
add_command("tan", new TanFunc(this));
add_command("sqrt", new SqrtFunc(this));
+ add_command("pi", new PiFunc(this));
+ add_command("radtodeg", new RadToDegFunc(this));
+ add_command("degtorad", new DegToRadFunc(this));
add_command("floor", new FloorFunc(this));
add_command("ceil", new CeilFunc(this));
Index: ComTerp/mathfunc.c
diff -c ComTerp/mathfunc.c:1.1 ComTerp/mathfunc.c:1.2
*** ComTerp/mathfunc.c:1.1 Fri Nov 2 13:04:49 2001
--- src/ComTerp/mathfunc.c Thu Mar 21 09:00:52 2002
***************
*** 200,202 ****
--- 200,240 ----
ComValue result(sqrt(operandx.double_val()));
push_stack(result);
}
+
+ PiFunc::PiFunc(ComTerp* comterp) : ComFunc(comterp) {
+ }
+
+ void PiFunc::execute() {
+ reset_stack();
+ ComValue result((double)3.1415926535897932270E0);
+ push_stack(result);
+ }
+
+ RadToDegFunc::RadToDegFunc(ComTerp* comterp) : ComFunc(comterp) {
+ }
+
+ void RadToDegFunc::execute() {
+ ComValue operandx = stack_arg(0);
+ reset_stack();
+ if (operandx.is_nil()) {
+ push_stack(ComValue::nullval());
+ return;
+ }
+ ComValue result(operandx.double_val()*360.0/(2*3.1415926535897932270E0));
+ push_stack(result);
+ }
+
+ DegToRadFunc::DegToRadFunc(ComTerp* comterp) : ComFunc(comterp) {
+ }
+
+ void DegToRadFunc::execute() {
+ ComValue operandx = stack_arg(0);
+ reset_stack();
+ if (operandx.is_nil()) {
+ push_stack(ComValue::nullval());
+ return;
+ }
+ ComValue result(operandx.double_val()*2*3.1415926535897932270E0/360.);
+ push_stack(result);
+ }
+
Index: ComTerp/mathfunc.h
diff -c ComTerp/mathfunc.h:1.1 ComTerp/mathfunc.h:1.2
*** ComTerp/mathfunc.h:1.1 Fri Nov 2 13:04:49 2001
--- src/ComTerp/mathfunc.h Thu Mar 21 09:00:52 2002
***************
*** 175,178 ****
--- 175,214 ----
};
+ //: Pi command for ComTerp.
+ // dbl=pi() -- returns the value of pi.
+ class PiFunc : public ComFunc {
+ public:
+ PiFunc(ComTerp*);
+
+ virtual void execute();
+ virtual const char* docstring() {
+ return "dbl=%s(x) -- returns the value of pi"; }
+
+ };
+
+ //: radians to degrees command for ComTerp.
+ // dbl=radtodeg(dbl) -- convert radians to degrees
+ class RadToDegFunc : public ComFunc {
+ public:
+ RadToDegFunc(ComTerp*);
+
+ virtual void execute();
+ virtual const char* docstring() {
+ return "dbl=%s(x) -- convert radians to degrees"; }
+
+ };
+
+ //: degrees to radianscommand for ComTerp.
+ // dbl=degtorad(dbl) -- convert degrees to radians
+ class DegToRadFunc : public ComFunc {
+ public:
+ DegToRadFunc(ComTerp*);
+
+ virtual void execute();
+ virtual const char* docstring() {
+ return "dbl=%s(x) -- convert radians to degrees"; }
+
+ };
+
#endif /* !defined(_mathfunc_h) */
Index: comterp/README
diff -c comterp/README:1.2 comterp/README:1.3
*** comterp/README:1.2 Fri Nov 30 05:52:50 2001
--- src/comterp_/README Thu Mar 21 09:00:53 2002
***************
*** 146,151 ****
--- 146,157 ----
dbl=sqrt(x) -- returns square root of x
+ dbl=pi() -- returns the value of pi
+
+ dbl=radtodeg(dbl) -- convert radians to degrees
+
+ dbl=degtorad(dbl) -- convert degrees to radians
+
num=floor(num) -- return closest integer value less than or equal to argument
num=ceil(num) -- return closest integer value greater than or equal to argument
Index: man1_ivtools/comterp.1
diff -c man1_ivtools/comterp.1:1.2 man1_ivtools/comterp.1:1.3
*** man1_ivtools/comterp.1:1.2 Fri Nov 30 05:53:29 2001
--- src/man/man1/comterp.1 Thu Mar 21 09:01:10 2002
***************
*** 157,162 ****
--- 157,168 ----
dbl=sqrt(x) -- returns square root of x
+ dbl=pi() -- returns the value of pi
+
+ dbl=radtodeg(dbl) -- convert radians to degrees
+
+ dbl=degtorad(dbl) -- convert degrees to radians
+
num=floor(num) -- return closest integer value less than or equal to argument
num=ceil(num) -- return closest integer value greater than or equal to argument
*** /dev/null Thu Mar 21 09:01:12 PST 2002
--- patches/ivtools-020321-johnston-042
*************** patches/ivtools-020321-johnston-042
*** 0 ****
--- 1 ----
+ ivtools-020321-johnston-042
|
|
From: <ivt...@li...> - 2002-03-20 19:54:52
|
Patch: ivtools-020320-johnston-041
For: ivtools-1.0.3
Author: joh...@us...
Subject: (1,2),(3,4) yields {{1,2},{3,4}}, fix for ACE access
Requires:
This is an intermediate patch to ivtools-1.0.3. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- give special meaning to a set of parentheses that proceed the
tuple operator ",", by adding an extra level of nesting to the
resultant list. Before the expression "(1,2),(3,4)" yielded
"{1,2,{3,4}}". Now it yields "{{1,2},{3,4}}" as one might expect.
This anomaly stemmed from the fact the tuple operator "," works
by concatenating its right-hand argument to its left-hand argument
if the left-hand argument is already a list (that's how the
interpreter concatenates a compound tuple-expression, i.e. "1,2,3,4").
- fix unitialized variable used when reading from sockets that would
cause a hang.
Index: Attribute/attrlist.c
diff -c Attribute/attrlist.c:1.1 Attribute/attrlist.c:1.2
*** Attribute/attrlist.c:1.1 Fri Nov 2 13:04:42 2001
--- src/Attribute/attrlist.c Wed Mar 20 11:45:52 2002
***************
*** 307,312 ****
--- 307,313 ----
Append(new AttributeValue(s->GetAttrVal(i)));
}
}
+ _nested_insert = false;
}
AttributeValueList::~AttributeValueList () {
Index: Attribute/attrlist.h
diff -c Attribute/attrlist.h:1.1 Attribute/attrlist.h:1.2
*** Attribute/attrlist.h:1.1 Fri Nov 2 13:04:42 2001
--- src/Attribute/attrlist.h Wed Mar 20 11:45:52 2002
***************
*** 216,221 ****
--- 216,227 ----
void clear();
// empty AttributeValueList, deleting all AttributeValue's.
+ void nested_insert(boolean flag) { _nested_insert = flag; }
+ // set flag to insert in a nested fashion
+
+ boolean nested_insert() { return _nested_insert; }
+ // get flag to insert in a nested fashion
+
protected:
void Remove(ALIterator&);
// remove AttributeValue pointed to by iterator from the list,
***************
*** 224,229 ****
--- 230,236 ----
AList* _alist;
unsigned int _count;
+ boolean _nested_insert;
};
#endif
Index: ComTerp/comhandler.c
diff -c ComTerp/comhandler.c:1.2 ComTerp/comhandler.c:1.3
*** ComTerp/comhandler.c:1.2 Tue Feb 19 16:17:46 2002
--- src/ComTerp/comhandler.c Wed Mar 20 11:45:54 2002
***************
*** 174,180 ****
if (!_rdfptr) _rdfptr = fdopen(fd, "r");
ch = '\0';
! int status;
while (ch != '\n' && status>0) {
status = read(fd, &ch, 1);
if (status == 1 && ch != '\n') inv.push_back(ch);
--- 174,180 ----
if (!_rdfptr) _rdfptr = fdopen(fd, "r");
ch = '\0';
! int status=1;
while (ch != '\n' && status>0) {
status = read(fd, &ch, 1);
if (status == 1 && ch != '\n') inv.push_back(ch);
Index: ComTerp/comterp.c
diff -c ComTerp/comterp.c:1.2 ComTerp/comterp.c:1.3
*** ComTerp/comterp.c:1.2 Fri Nov 16 10:25:13 2001
--- src/ComTerp/comterp.c Wed Mar 20 11:45:54 2002
***************
*** 348,355 ****
push_stack(*((Attribute*)sv.obj_val())->Value());
} else if (sv.type() == ComValue::BlankType) {
!
! /* ignore it */
eval_expr_internals(pedepth);
} else { /* everything else*/
--- 348,354 ----
push_stack(*((Attribute*)sv.obj_val())->Value());
} else if (sv.type() == ComValue::BlankType) {
!
eval_expr_internals(pedepth);
} else { /* everything else*/
***************
*** 401,408 ****
push_stack(argoffval);
}
}
! if (!_pfcomvals[_pfoff].is_blank())
push_stack(_pfcomvals[_pfoff]);
_pfoff++;
if (stack_top().type() == ComValue::CommandType &&
!_pfcomvals[_pfoff-1].pedepth()) break;
--- 400,416 ----
push_stack(argoffval);
}
}
! if (!_pfcomvals[_pfoff].is_blank()) {
push_stack(_pfcomvals[_pfoff]);
+ } else {
+ /* to handle a list as the 1st operand of the tuple operator */
+ if (stack_top(0).is_array()) {
+ stack_top(0).array_val()->nested_insert(true);
+ } else if (stack_top(0).is_symbol()) {
+ AttributeValue* av = lookup_symval(&stack_top(0));
+ if (av->is_array()) av->array_val()->nested_insert(true);
+ }
+ }
_pfoff++;
if (stack_top().type() == ComValue::CommandType &&
!_pfcomvals[_pfoff-1].pedepth()) break;
***************
*** 471,478 ****
push_stack(argoffval);
}
}
! if (!_pfcomvals[offset].is_blank())
push_stack(_pfcomvals[offset]);
}
tokcnt--;
offset++;
--- 479,495 ----
push_stack(argoffval);
}
}
! if (!_pfcomvals[offset].is_blank()) {
push_stack(_pfcomvals[offset]);
+ } else {
+ /* to handle a list as the 1st operand of the tuple operator */
+ if (stack_top(0).is_array()) {
+ stack_top(0).array_val()->nested_insert(true);
+ } else if (stack_top(0).is_symbol()) {
+ AttributeValue* av = lookup_symval(&stack_top(0));
+ if (av->is_array()) av->array_val()->nested_insert(true);
+ }
+ }
}
tokcnt--;
offset++;
Index: ComTerp/listfunc.c
diff -c ComTerp/listfunc.c:1.1 ComTerp/listfunc.c:1.2
*** ComTerp/listfunc.c:1.1 Fri Nov 2 13:04:49 2001
--- src/ComTerp/listfunc.c Wed Mar 20 11:45:54 2002
***************
*** 172,188 ****
ComValue* operand2 = new ComValue(stack_arg(1));
reset_stack();
! if (!operand1->is_type(ComValue::ArrayType)) {
AttributeValueList* avl = new AttributeValueList();
avl->Append(operand1);
avl->Append(operand2);
ComValue retval(avl);
push_stack(retval);
} else {
AttributeValueList* avl = operand1->array_val();
avl->Append(operand2);
push_stack(*operand1);
delete operand1;
}
}
--- 172,194 ----
ComValue* operand2 = new ComValue(stack_arg(1));
reset_stack();
! if (!operand1->is_array() ||
! operand1->array_val()->nested_insert()) {
AttributeValueList* avl = new AttributeValueList();
avl->Append(operand1);
avl->Append(operand2);
ComValue retval(avl);
push_stack(retval);
+ if( operand1->is_array())
+ operand1->array_val()->nested_insert(false);
} else {
AttributeValueList* avl = operand1->array_val();
avl->Append(operand2);
push_stack(*operand1);
delete operand1;
}
+
+ if (operand2->is_array())
+ operand2->array_val()->nested_insert(false);
}
*** /dev/null Wed Mar 20 11:46:08 PST 2002
--- patches/ivtools-020320-johnston-041
*************** patches/ivtools-020320-johnston-041
*** 0 ****
--- 1 ----
+ ivtools-020320-johnston-041
|
|
From: <ivt...@li...> - 2002-03-11 20:08:32
|
Patch: ivtools-020311-johnston-040
For: ivtools-1.0.2
Author: joh...@us...
Subject: final patch for 1.0.3
Requires:
This is an intermediate patch to ivtools-1.0.2. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- final patch for 1.0.3 -- quick turnaround to fix problem with Darwin build.
Index: top_ivtools/CHANGES
diff -c top_ivtools/CHANGES:1.4 top_ivtools/CHANGES:1.5
*** top_ivtools/CHANGES:1.4 Fri Mar 1 16:01:55 2002
--- ./CHANGES Mon Mar 11 12:03:47 2002
***************
*** 1,3 ****
--- 1,11 ----
+ March 11th, 2002 ivtools-1.0.3
+
+ - add missing src/include/ivstd/stdlib.h to MANIFEST. This was
+ needed to get socklen_t defined for Dispatch/rpc*.c on Darwin.
+
+ - recognize files that start with plain "%!PS" as PostScript files.
+
+
March 1st, 2002 ivtools-1.0.2
- add -stdin_off argument to comdraw/flipbook/graphdraw/drawserv to
Index: top_ivtools/INSTALL
diff -c top_ivtools/INSTALL:1.5 top_ivtools/INSTALL:1.6
*** top_ivtools/INSTALL:1.5 Mon Mar 11 11:56:37 2002
--- ./INSTALL Mon Mar 11 12:03:47 2002
***************
*** 1,7 ****
INSTALL for ivtools-1.0
! Instructions for building ivtools-1.0.2 from source, the short version:
./configure
make
--- 1,7 ----
INSTALL for ivtools-1.0
! Instructions for building ivtools-1.0.3 from source, the short version:
./configure
make
***************
*** 10,16 ****
And if that doesn't work...
! Instructions for building ivtools-1.0.2 from source, the long version:
0. Compilation Environment
--- 10,16 ----
And if that doesn't work...
! Instructions for building ivtools-1.0.3 from source, the long version:
0. Compilation Environment
Index: top_ivtools/README
diff -c top_ivtools/README:1.4 top_ivtools/README:1.5
*** top_ivtools/README:1.4 Fri Mar 1 16:01:55 2002
--- ./README Mon Mar 11 12:03:47 2002
***************
*** 2,8 ****
README for ivtools 1.0
! This directory contains a release of ivtools 1.0.2. You should read
the rest of this file for information on what ivtools is and the
INSTALL file for instructions on how to build it.
--- 2,8 ----
README for ivtools 1.0
! This directory contains a release of ivtools 1.0.3. You should read
the rest of this file for information on what ivtools is and the
INSTALL file for instructions on how to build it.
Index: top_ivtools/VERSION
diff -c top_ivtools/VERSION:1.3 top_ivtools/VERSION:1.4
*** top_ivtools/VERSION:1.3 Fri Mar 1 16:01:55 2002
--- ./VERSION Mon Mar 11 12:03:47 2002
***************
*** 1 ****
! Release 1.0.2
--- 1 ----
! Release 1.0.3
Index: include_std/version.h
diff -c include_std/version.h:1.3 include_std/version.h:1.4
*** include_std/version.h:1.3 Fri Mar 1 16:02:52 2002
--- src/include/ivstd/version.h Mon Mar 11 12:04:28 2002
***************
*** 1,3 ****
! #define IvtoolsVersion 1.0.2
! #define VersionString "1.0.2"
! #define ReleaseString "ivtools-1.0.2"
--- 1,3 ----
! #define IvtoolsVersion 1.0.3
! #define VersionString "1.0.3"
! #define ReleaseString "ivtools-1.0.3"
Index: config_ivtools/params.def
diff -c config_ivtools/params.def:1.4 config_ivtools/params.def:1.5
*** config_ivtools/params.def:1.4 Fri Mar 1 16:03:02 2002
--- config/params.def Mon Mar 11 12:04:35 2002
***************
*** 27,33 ****
* Name of the software release
*/
#ifndef Release
! #define Release ivtools-1.0.2
#endif
RELEASE = Release
--- 27,33 ----
* Name of the software release
*/
#ifndef Release
! #define Release ivtools-1.0.3
#endif
RELEASE = Release
***************
*** 36,42 ****
* VersionNumber
*/
#ifndef Version
! #define Version 1.0.2
#endif
VERSION = Version
--- 36,42 ----
* VersionNumber
*/
#ifndef Version
! #define Version 1.0.3
#endif
VERSION = Version
*** /dev/null Mon Mar 11 12:04:37 PST 2002
--- patches/ivtools-020311-johnston-040
*************** patches/ivtools-020311-johnston-040
*** 0 ****
--- 1 ----
+ ivtools-020311-johnston-040
|
|
From: <ivt...@li...> - 2002-03-11 20:08:08
|
Patch: ivtools-020311-johnston-039
For: ivtools-1.0.2
Author: joh...@us...
Subject: forgotten file for Darwin build, improved PostScript detection
Requires:
This is an intermediate patch to ivtools-1.0.2. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- add missing src/include/ivstd/stdlib.h to MANIFEST. This was
needed to get socklen_t defined for Dispatch/rpc*.c on Darwin.
- recognize files that start with plain "%!PS" as PostScript files.
Index: top_ivtools/INSTALL
diff -c top_ivtools/INSTALL:1.4 top_ivtools/INSTALL:1.5
*** top_ivtools/INSTALL:1.4 Fri Mar 1 16:01:55 2002
--- ./INSTALL Mon Mar 11 11:56:37 2002
***************
*** 10,16 ****
And if that doesn't work...
! Instructions for building ivtools-1.0.1 from source, the long version:
0. Compilation Environment
--- 10,16 ----
And if that doesn't work...
! Instructions for building ivtools-1.0.2 from source, the long version:
0. Compilation Environment
***************
*** 37,43 ****
/usr/local/include/g++ will fix the problem.
0.d. An installed copy of X11R6 as distributed by the Open Group, or
! an equivalent (XFree86 for Linux, or X11R5 from MIT). If you use a
vendor's X11 product, the product should be based on X11R4 or later
and the product should include imake and the config files.
--- 37,43 ----
/usr/local/include/g++ will fix the problem.
0.d. An installed copy of X11R6 as distributed by the Open Group, or
! an equivalent (XFree86 for Linux/BSD/MacOS-X, or X11R5 from MIT). If you use a
vendor's X11 product, the product should be based on X11R4 or later
and the product should include imake and the config files.
Index: top_ivtools/MANIFEST
diff -c top_ivtools/MANIFEST:1.6 top_ivtools/MANIFEST:1.7
*** top_ivtools/MANIFEST:1.6 Mon Mar 4 12:51:42 2002
--- ./MANIFEST Mon Mar 11 11:56:37 2002
***************
*** 67,73 ****
ivtools-1.0/config/config.mk
ivtools-1.0/config/config.null.mk
ivtools-1.0/config/darwin-gcc.mk
- ivtools-1.0/config/darwin-gcc.mk
ivtools-1.0/config/default-gcc.mk
ivtools-1.0/config/freebsd-gcc.mk
ivtools-1.0/config/freebsd2.1-gcc.mk
--- 67,72 ----
***************
*** 1553,1558 ****
--- 1552,1558 ----
ivtools-1.0/src/include/ivstd/osfcn.h
ivtools-1.0/src/include/ivstd/signal.h
ivtools-1.0/src/include/ivstd/stdio.h
+ ivtools-1.0/src/include/ivstd/stdlib.h
ivtools-1.0/src/include/ivstd/stream.h
ivtools-1.0/src/include/ivstd/string.h
ivtools-1.0/src/include/ivstd/version.h
Index: OverlayUnidraw/ovimport.c
diff -c OverlayUnidraw/ovimport.c:1.5 OverlayUnidraw/ovimport.c:1.6
*** OverlayUnidraw/ovimport.c:1.5 Fri Mar 1 14:10:41 2002
--- src/OverlayUnidraw/ovimport.c Mon Mar 11 11:57:09 2002
***************
*** 970,975 ****
--- 970,981 ----
strcpy(creator, "idraw");
if (ftype==UnknownFile) ftype = OvImportCmd::PostScriptFile;
}
+
+ /* other PostScript files */
+ if (!*creator && strncmp(line, "%!PS", 4)==0) {
+ ftype = OvImportCmd::PostScriptFile;
+ strcpy(creator, "PostScript");
+ }
/* fullup idraw format */
if (!*creator && line[0] == '%' && line[1] == '!' ) {
*** /dev/null Mon Mar 11 11:57:30 PST 2002
--- patches/ivtools-020311-johnston-039
*************** patches/ivtools-020311-johnston-039
*** 0 ****
--- 1 ----
+ ivtools-020311-johnston-039
|
|
From: <ivt...@li...> - 2002-03-04 20:54:57
|
Patch: ivtools-020304-johnston-038 For: ivtools-1.0.1 Author: joh...@us... Subject: sort MANIFEST Requires: This is an intermediate patch to ivtools-1.0.1. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: - sort MANIFEST (last patch for ivtools-1.0.2) Index: top_ivtools/MANIFEST diff -c top_ivtools/MANIFEST:1.5 top_ivtools/MANIFEST:1.6 *** top_ivtools/MANIFEST:1.5 Mon Mar 4 12:49:18 2002 --- ./MANIFEST Mon Mar 4 12:51:42 2002 *************** *** 1,7 **** - ivtools-1.0/src/include/ivstd/malloc.h - ivtools-1.0/config/site.def.DARWIN - ivtools-1.0/config/darwin-gcc.mk - ivtools-1.0/config/InterViews/iv-darwin.cf ivtools-1.0/CHANGES ivtools-1.0/CHANGES-0.4 ivtools-1.0/CHANGES-0.5 --- 1,3 ---- *************** *** 39,44 **** --- 35,41 ---- ivtools-1.0/config/InterViews/iv-convex.cf ivtools-1.0/config/InterViews/iv-cray.cf ivtools-1.0/config/InterViews/iv-cygwin.cf + ivtools-1.0/config/InterViews/iv-darwin.cf ivtools-1.0/config/InterViews/iv-freebsd.cf ivtools-1.0/config/InterViews/iv-generic.cf ivtools-1.0/config/InterViews/iv-hp.cf *************** *** 70,75 **** --- 67,73 ---- ivtools-1.0/config/config.mk ivtools-1.0/config/config.null.mk ivtools-1.0/config/darwin-gcc.mk + ivtools-1.0/config/darwin-gcc.mk ivtools-1.0/config/default-gcc.mk ivtools-1.0/config/freebsd-gcc.mk ivtools-1.0/config/freebsd2.1-gcc.mk *************** *** 89,94 **** --- 87,93 ---- ivtools-1.0/config/sco3.2.4-gcc.mk ivtools-1.0/config/site.def.ALPHA ivtools-1.0/config/site.def.CYGWIN + ivtools-1.0/config/site.def.DARWIN ivtools-1.0/config/site.def.FREEBSD ivtools-1.0/config/site.def.HP800 ivtools-1.0/config/site.def.LINUX *************** *** 1548,1553 **** --- 1547,1553 ---- ivtools-1.0/src/include/ivstd/fstream.h ivtools-1.0/src/include/ivstd/iosfwd ivtools-1.0/src/include/ivstd/iostream.h + ivtools-1.0/src/include/ivstd/malloc.h ivtools-1.0/src/include/ivstd/math.h ivtools-1.0/src/include/ivstd/nan.h ivtools-1.0/src/include/ivstd/osfcn.h *************** *** 1771,1776 **** --- 1771,1777 ---- ivtools-1.0/src/utils/http.cc ivtools-1.0/src/utils/http.h ivtools-1.0/src/utils/ivdl.cc + ivtools-1.0/src/utils/ivtmpnam.c ivtools-1.0/src/utils/parse.h ivtools-1.0/src/utils/readwrite.h ivtools-1.0/src/utils/sockets.cc *************** *** 1778,1781 **** ivtools-1.0/src/utils/stdcmapppm.c ivtools-1.0/src/utils/thrower.cc ivtools-1.0/src/utils/thrower.h - ivtools-1.0/src/utils/ivtmpnam.c --- 1779,1781 ---- *** /dev/null Mon Mar 4 12:52:30 PST 2002 --- patches/ivtools-020304-johnston-038 *************** patches/ivtools-020304-johnston-038 *** 0 **** --- 1 ---- + ivtools-020304-johnston-038 |
|
From: <ivt...@li...> - 2002-03-04 20:54:52
|
Patch: ivtools-020304-johnston-037 For: ivtools-1.0.1 Author: joh...@us... Subject: missing MANIFEST entries for DARWIN Requires: This is an intermediate patch to ivtools-1.0.1. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: - missing MANIFEST entries for DARWIN Index: top_ivtools/MANIFEST diff -c top_ivtools/MANIFEST:1.4 top_ivtools/MANIFEST:1.5 *** top_ivtools/MANIFEST:1.4 Wed Feb 20 12:32:04 2002 --- ./MANIFEST Mon Mar 4 12:49:18 2002 *************** *** 1,3 **** --- 1,7 ---- + ivtools-1.0/src/include/ivstd/malloc.h + ivtools-1.0/config/site.def.DARWIN + ivtools-1.0/config/darwin-gcc.mk + ivtools-1.0/config/InterViews/iv-darwin.cf ivtools-1.0/CHANGES ivtools-1.0/CHANGES-0.4 ivtools-1.0/CHANGES-0.5 *** /dev/null Mon Mar 4 12:50:52 PST 2002 --- patches/ivtools-020304-johnston-037 *************** patches/ivtools-020304-johnston-037 *** 0 **** --- 1 ---- + ivtools-020304-johnston-037 |
|
From: <ivt...@li...> - 2002-03-02 00:05:21
|
Patch: ivtools-020301-johnston-036 For: ivtools-1.0.1 Author: joh...@us... Subject: first attempt at final patch for 1.0.2 release Requires: This is an intermediate patch to ivtools-1.0.1. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: - first attempt at final patch for 1.0.2 release Index: top_ivtools/CHANGES diff -c top_ivtools/CHANGES:1.3 top_ivtools/CHANGES:1.4 *** top_ivtools/CHANGES:1.3 Thu Jan 10 16:13:47 2002 --- ./CHANGES Fri Mar 1 16:01:55 2002 *************** *** 1,3 **** --- 1,70 ---- + March 1st, 2002 ivtools-1.0.2 + + - add -stdin_off argument to comdraw/flipbook/graphdraw/drawserv to + disable a comterp interpreter on stdin. + + - changes required to get things compiling with Cygwin under Windows 2K + + - try -gdwarf-2 as a compilation option for debugging with gdb-5.1 and + gcc-3.0.*. Not sure if there was an improvement. Maybe this is already + the default. + + - fix bug in GraphicLoc tool, where the text wasn't refreshed on subsequent + uses after the dialog box had been unmapped. + + - make the "Show Prev Frame" command of flipbook take effect + immediately (same for "Hide Prev Frame"). Needed to call + FrameEditor::UpdateFrame as well as Unidraw::Update. + + - fix submitted by E.J. Neafsey (Loyola University) for drawing + multi-point graphics with shift key pressed to make all the lines + either completely horizontal or vertical. The shift key always + worked, yet the origin used (for limiting motion to the horizontal or + vertical) was never updated to the last vertex as the new points were + added. + + - added alpha-transparency to raster display. It works, but there is + no save/restore of the alpha value, or user interface to set or view + the value. However, you can use OverlayRasterRect::alphaval() to + set/get the constant (one per raster). No PostScript output yet as + well. + + - propogated "None" background color to all drawing editor's BgColor + menu. + + - add an alpha command to comdraw, to set/get the alpha value of a raster + graphic: + + alpha(compview [alphaval]) -- set/get alpha transparency value + + a command line like the following will spin a raster forward as it + appears (assume g is a variable pointing to a RasterComp, and the + current selection): + + for(x=0 x<10 x++ alpha(g float(x)/10);rotate(30);scale(1/.9 1/.9);update) + + - partial changes for HPUX compilation. There might be other problems + with the HP linker's desire to fully link a shared library when it is + built, and problems with parameters like ExtraCCFlags that might need + commenting out for reasons I don't understand (note -- it seems + this might be avoided by using "ld -r" instead of "gcc -shared"). + + - further work on comdraw whiteboard capability. Setting up for a + distributed drawing environment by ensuring that all graphics can be + constructed via command line instead of directly. + + - instituted (then disabled) a transparent pixel capability. Needs an + API in comdraw or drawtool first. + + - fix problem with hanging on stdin when comdraw/graphdraw/flipbook is + launched as a helper app from a web browser. + + - all the changes necessary to bring up ivtools under Mac OS X (Darwin). + + - fix rewind() vulnerability in early libstdc++-v3 iostreams. Better + to close/reopen the file than rewind. + + January 9th, 2002 ivtools-1.0.1 - add comdraw funcs to poke (grey-level) pixel values into a raster, Index: top_ivtools/INSTALL diff -c top_ivtools/INSTALL:1.3 top_ivtools/INSTALL:1.4 *** top_ivtools/INSTALL:1.3 Wed Jan 9 16:35:40 2002 --- ./INSTALL Fri Mar 1 16:01:55 2002 *************** *** 1,7 **** INSTALL for ivtools-1.0 ! Instructions for building ivtools-1.0.1 from source, the short version: ./configure make --- 1,7 ---- INSTALL for ivtools-1.0 ! Instructions for building ivtools-1.0.2 from source, the short version: ./configure make *************** *** 18,24 **** 0.a. a Unix machine (for Windows see README.cygwin). We know it has been built on Linux, NetBSD, FreeBSD, Solaris, Irix, Dec Alpha, HPUX, ! and SunOS. 0.b GNU make. Test to make sure this is the version you are using with "make -v" --- 18,25 ---- 0.a. a Unix machine (for Windows see README.cygwin). We know it has been built on Linux, NetBSD, FreeBSD, Solaris, Irix, Dec Alpha, HPUX, ! and SunOS. It also builds on Mac OS X (Darwin) which is a ! BSD-derivative OS. 0.b GNU make. Test to make sure this is the version you are using with "make -v" Index: top_ivtools/README diff -c top_ivtools/README:1.3 top_ivtools/README:1.4 *** top_ivtools/README:1.3 Wed Jan 9 16:35:40 2002 --- ./README Fri Mar 1 16:01:55 2002 *************** *** 2,8 **** README for ivtools 1.0 ! This directory contains a release of ivtools 1.0.1. You should read the rest of this file for information on what ivtools is and the INSTALL file for instructions on how to build it. --- 2,8 ---- README for ivtools 1.0 ! This directory contains a release of ivtools 1.0.2. You should read the rest of this file for information on what ivtools is and the INSTALL file for instructions on how to build it. *************** *** 122,129 **** gcc-2.8.1, >= egcs-1.0.1, gcc-3.0.1) and on a variety of Unix'es: SunOS 4.1 (MIT's X11R5), Solaris 2.6 (X11R6), Irix 5.2 (SGI's X11R5), Linux 1.2 (Slackware 3.0, XFree86 3.1), Linux 2.* (RedHat 4.0 thru ! 6.0, Debian 2.*), NetBSD, and FreeBSD. There are contributed configs ! that are out of date for HPUX and Dec Alpha. It has been built on Windows NT 4.0 using Cygwin from Cygnus Solutions (see README.cygwin). You can find links to available binaries on the ivtools web page (http://www.ivtools.org) and ivtools download page --- 122,130 ---- gcc-2.8.1, >= egcs-1.0.1, gcc-3.0.1) and on a variety of Unix'es: SunOS 4.1 (MIT's X11R5), Solaris 2.6 (X11R6), Irix 5.2 (SGI's X11R5), Linux 1.2 (Slackware 3.0, XFree86 3.1), Linux 2.* (RedHat 4.0 thru ! 6.0, Debian 2.*), NetBSD, FreeBSD, and Darwin (Mac OS X). There are ! contributed configs that are out of date for HPUX and Dec Alpha ! (though the HPUX contrib might almost have it right). It has been built on Windows NT 4.0 using Cygwin from Cygnus Solutions (see README.cygwin). You can find links to available binaries on the ivtools web page (http://www.ivtools.org) and ivtools download page Index: top_ivtools/VERSION diff -c top_ivtools/VERSION:1.2 top_ivtools/VERSION:1.3 *** top_ivtools/VERSION:1.2 Wed Jan 9 16:35:40 2002 --- ./VERSION Fri Mar 1 16:01:55 2002 *************** *** 1 **** ! Release 1.0.1 --- 1 ---- ! Release 1.0.2 Index: include_std/version.h diff -c include_std/version.h:1.2 include_std/version.h:1.3 *** include_std/version.h:1.2 Wed Jan 9 16:36:12 2002 --- src/include/ivstd/version.h Fri Mar 1 16:02:52 2002 *************** *** 1,3 **** ! #define IvtoolsVersion 1.0.1 ! #define VersionString "1.0.1" ! #define ReleaseString "ivtools-1.0.1" --- 1,3 ---- ! #define IvtoolsVersion 1.0.2 ! #define VersionString "1.0.2" ! #define ReleaseString "ivtools-1.0.2" Index: config_ivtools/makevars.def diff -c config_ivtools/makevars.def:1.2 config_ivtools/makevars.def:1.3 *** config_ivtools/makevars.def:1.2 Wed Feb 20 11:54:28 2002 --- config/makevars.def Fri Mar 1 16:03:02 2002 *************** *** 41,47 **** #undef depvar #if HasDynamicSharedLibraries ! #if 0 #ifndef UseInstalled #define depvar(ULIBNAME, PCKGSRC, llibname, liblibname, libver) \ ULIBNAME = $(PCKGSRC)/llibname/$(CPU)/liblibname.SO.libver --- 41,47 ---- #undef depvar #if HasDynamicSharedLibraries ! #if !defined(DarwinArchitecture) #ifndef UseInstalled #define depvar(ULIBNAME, PCKGSRC, llibname, liblibname, libver) \ ULIBNAME = $(PCKGSRC)/llibname/$(CPU)/liblibname.SO.libver Index: config_ivtools/params.def diff -c config_ivtools/params.def:1.3 config_ivtools/params.def:1.4 *** config_ivtools/params.def:1.3 Tue Jan 15 15:08:05 2002 --- config/params.def Fri Mar 1 16:03:02 2002 *************** *** 27,33 **** * Name of the software release */ #ifndef Release ! #define Release ivtools-1.0.1 #endif RELEASE = Release --- 27,33 ---- * Name of the software release */ #ifndef Release ! #define Release ivtools-1.0.2 #endif RELEASE = Release *************** *** 36,42 **** * VersionNumber */ #ifndef Version ! #define Version 1.0.1 #endif VERSION = Version --- 36,42 ---- * VersionNumber */ #ifndef Version ! #define Version 1.0.2 #endif VERSION = Version *** /dev/null Fri Mar 1 16:03:06 PST 2002 --- patches/ivtools-020301-johnston-036 *************** patches/ivtools-020301-johnston-036 *** 0 **** --- 1 ---- + ivtools-020301-johnston-036 |
|
From: <ivt...@li...> - 2002-03-01 23:36:18
|
Patch: ivtools-020301-johnston-035
For: ivtools-1.0.1
Author: joh...@us...
Subject: fix rewind() vulnerability in early libstdc++-v3 iostreams
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- fix rewind() vulnerability in early libstdc++-v3 iostreams. Better
to close/reopen the file than rewind.
- other fixes related to Darwin port.
Index: src_os/string.c
diff -c src_os/string.c:1.2 src_os/string.c:1.3
*** src_os/string.c:1.2 Wed Feb 20 11:53:30 2002
--- src/OS/string.c Fri Mar 1 14:10:09 2002
***************
*** 33,43 ****
--- 33,52 ----
*/
extern "C" {
+ #ifdef __APPLE__
#ifndef tolower
extern wchar_t tolower(wchar_t);
#endif
#ifndef toupper
extern wchar_t toupper(wchar_t);
+ #endif
+ #else
+ #ifndef tolower
+ extern int tolower(int);
+ #endif
+ #ifndef toupper
+ extern int toupper(int);
+ #endif
#endif
extern long int strtol(const char*, char**, int);
extern double strtod(const char*, char**);
Index: src_dispatch/dispatcher.c
diff -c src_dispatch/dispatcher.c:1.2 src_dispatch/dispatcher.c:1.3
*** src_dispatch/dispatcher.c:1.2 Wed Feb 20 11:53:32 2002
--- src/Dispatch/dispatcher.c Fri Mar 1 14:10:11 2002
***************
*** 653,661 ****
--- 653,667 ----
sv.sa_flags = SV_INTERRUPT;
sigaction(SIGCLD, &sv, &osv);
#else
+ #ifdef __APPLE__
sv.sv_handler = (void (*)()) fxSIGVECHANDLER(&Dispatcher::sigCLD);
sv.sv_flags = SV_INTERRUPT;
sigvec(SIGCLD, &sv, &osv);
+ #else
+ sv.sv_handler = (void (*)(int)) fxSIGVECHANDLER(&Dispatcher::sigCLD);
+ sv.sv_flags = SV_INTERRUPT;
+ sigvec(SIGCLD, &sv, &osv);
+ #endif
#endif
#else
#ifdef SA_NOCLDSTOP /* POSIX */
Index: Unidraw/import.c
diff -c Unidraw/import.c:1.1 Unidraw/import.c:1.2
*** Unidraw/import.c:1.1 Fri Nov 2 13:06:49 2001
--- src/Unidraw/import.c Fri Mar 1 14:10:38 2002
***************
*** 91,97 ****
compressed = true;
} else {
! rewind (file);
compressed = false;
}
--- 91,98 ----
compressed = true;
} else {
! fclose (file);
! file = fopen(filename, "r");
compressed = false;
}
Index: OverlayUnidraw/ovimport.c
diff -c OverlayUnidraw/ovimport.c:1.4 OverlayUnidraw/ovimport.c:1.5
*** OverlayUnidraw/ovimport.c:1.4 Wed Feb 20 11:54:04 2002
--- src/OverlayUnidraw/ovimport.c Fri Mar 1 14:10:41 2002
***************
*** 744,750 ****
compressed = true;
} else {
! rewind (file);
compressed = false;
}
--- 744,751 ----
compressed = true;
} else {
! fclose (file);
! file = fopen(pathname, "r");
compressed = false;
}
Index: FrameUnidraw/framecatalog.c
diff -c FrameUnidraw/framecatalog.c:1.1 FrameUnidraw/framecatalog.c:1.2
*** FrameUnidraw/framecatalog.c:1.1 Fri Nov 2 13:07:10 2001
--- src/FrameUnidraw/framecatalog.c Fri Mar 1 14:10:46 2002
***************
*** 37,45 ****
#include <stream.h>
#include <string.h>
#include <ctype.h>
- #if __GNUG__>=3
#include <fstream.h>
- #endif
/*****************************************************************************/
--- 37,43 ----
*** /dev/null Fri Mar 1 14:11:11 PST 2002
--- patches/ivtools-020301-johnston-035
*************** patches/ivtools-020301-johnston-035
*** 0 ****
--- 1 ----
+ ivtools-020301-johnston-035
|
|
From: <ivt...@li...> - 2002-02-20 21:37:44
|
Patch: ivtools-020220-johnston-034
For: ivtools-1.0.1
Author: joh...@us...
Subject: more missing Darwin stuff
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- more missing Darwin stuff
Index: examples3.1_ips/idraw.c
diff -c examples3.1_ips/idraw.c:1.2 examples3.1_ips/idraw.c:1.3
*** examples3.1_ips/idraw.c:1.2 Mon Jan 14 16:28:29 2002
--- src/glyphs/examples3.1/ips/idraw.c Wed Feb 20 13:35:50 2002
***************
*** 444,452 ****
NullTerminatedString psname_nt(psname);
float pointsize;
read(pointsize);
! if (PSFont_31::exists(psname_nt.string())) {
NullTerminatedString s_nt(s);
! return new PSFont_31(psname_nt.string(), pointsize, s_nt.string(), 1.0);
}
String default_font("fixed");
Session::instance()->style()->find_attribute("font", default_font);
--- 444,452 ----
NullTerminatedString psname_nt(psname);
float pointsize;
read(pointsize);
! if (PSFont31::exists(psname_nt.string())) {
NullTerminatedString s_nt(s);
! return new PSFont31(psname_nt.string(), pointsize, s_nt.string(), 1.0);
}
String default_font("fixed");
Session::instance()->style()->find_attribute("font", default_font);
*** /dev/null Wed Feb 20 13:36:24 PST 2002
--- patches/ivtools-020220-johnston-034
*************** patches/ivtools-020220-johnston-034
*** 0 ****
--- 1 ----
+ ivtools-020220-johnston-034
|
|
From: <ivt...@li...> - 2002-02-20 21:26:09
|
Patch: ivtools-020220-johnston-033 For: ivtools-1.0.1 Author: joh...@us... Subject: another Darwin-required change that slipped through the cracks Requires: This is an intermediate patch to ivtools-1.0.1. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: - another Darwin-required change that slipped through the cracks Index: src_tiff/tif_compat.c diff -c src_tiff/tif_compat.c:1.1 src_tiff/tif_compat.c:1.2 *** src_tiff/tif_compat.c:1.1 Fri Nov 2 13:05:16 2001 --- src/TIFF/tif_compat.c Wed Feb 20 13:23:58 2002 *************** *** 27,33 **** */ #include "tiffioP.h" ! #if defined(unix) || defined(__unix) || defined(MSDOS) || defined(VMS) || defined(AIXV3) || defined(__CYGWIN__) || defined(__NetBSD__) #include <sys/stat.h> long --- 27,33 ---- */ #include "tiffioP.h" ! #if defined(unix) || defined(__unix) || defined(MSDOS) || defined(VMS) || defined(AIXV3) || defined(__CYGWIN__) || defined(__NetBSD__) || defined(__APPLE__) #include <sys/stat.h> long *** /dev/null Wed Feb 20 13:24:27 PST 2002 --- patches/ivtools-020220-johnston-033 *************** patches/ivtools-020220-johnston-033 *** 0 **** --- 1 ---- + ivtools-020220-johnston-033 |
|
From: <ivt...@li...> - 2002-02-20 20:35:05
|
Patch: ivtools-020220-johnston-032 For: ivtools-1.0.1 Author: joh...@us... Subject: Requires: This is an intermediate patch to ivtools-1.0.1. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: Index: top_ivtools/MANIFEST diff -c top_ivtools/MANIFEST:1.3 top_ivtools/MANIFEST:1.4 *** top_ivtools/MANIFEST:1.3 Wed Feb 20 12:24:07 2002 --- ./MANIFEST Wed Feb 20 12:32:04 2002 *************** *** 1549,1554 **** --- 1549,1555 ---- ivtools-1.0/src/include/ivstd/osfcn.h ivtools-1.0/src/include/ivstd/signal.h ivtools-1.0/src/include/ivstd/stdio.h + ivtools-1.0/src/include/ivstd/stream.h ivtools-1.0/src/include/ivstd/string.h ivtools-1.0/src/include/ivstd/version.h ivtools-1.0/src/iueserv_/Imakefile *** /dev/null Tue May 5 13:32:27 1998 --- ./src/include/ivstd/stream.h Wed Feb 20 12:31:36 2002 *************** *** 0 **** --- 1,2 ---- + #include <iostream.h> + *** /dev/null Wed Feb 20 12:32:36 PST 2002 --- patches/ivtools-020220-johnston-032 *************** patches/ivtools-020220-johnston-032 *** 0 **** --- 1 ---- + ivtools-020220-johnston-032 |
|
From: <ivt...@li...> - 2002-02-20 20:26:30
|
Patch: ivtools-020220-johnston-031
For: ivtools-1.0.1
Author: joh...@us...
Subject: more Darwin touchups
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- more Darwin touchups
Index: top_ivtools/MANIFEST
diff -c top_ivtools/MANIFEST:1.2 top_ivtools/MANIFEST:1.3
*** top_ivtools/MANIFEST:1.2 Tue Nov 13 10:14:25 2001
--- ./MANIFEST Wed Feb 20 12:24:07 2002
***************
*** 65,70 ****
--- 65,71 ----
ivtools-1.0/config/config.defs.in
ivtools-1.0/config/config.mk
ivtools-1.0/config/config.null.mk
+ ivtools-1.0/config/darwin-gcc.mk
ivtools-1.0/config/default-gcc.mk
ivtools-1.0/config/freebsd-gcc.mk
ivtools-1.0/config/freebsd2.1-gcc.mk
Index: top_ivtools/configure
diff -c top_ivtools/configure:1.3 top_ivtools/configure:1.4
*** top_ivtools/configure:1.3 Tue Nov 20 08:31:11 2001
--- ./configure Wed Feb 20 12:24:07 2002
***************
*** 565,570 ****
--- 565,571 ----
case "$host" in
+ *darwin* ) platform_part=darwin ;;
*freebsd2.1.* ) platform_part=freebsd2.1 ;;
*freebsd* ) platform_part=freebsd ;;
*hpux*10*20) platform_part=hpux10.20 ;;
***************
*** 808,814 ****
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:841: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 809,815 ----
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:842: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 840,846 ****
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:873: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--- 841,847 ----
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:874: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
***************
*** 851,862 ****
cat > conftest.$ac_ext << EOF
! #line 884 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
! if { (eval echo configure:889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
--- 852,863 ----
cat > conftest.$ac_ext << EOF
! #line 885 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
! if { (eval echo configure:890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
***************
*** 882,893 ****
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:915: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
! echo "configure:920: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 883,894 ----
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:916: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
! echo "configure:921: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 896,902 ****
yes;
#endif
EOF
! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
--- 897,903 ----
yes;
#endif
EOF
! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
***************
*** 915,921 ****
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
! echo "configure:948: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 916,922 ----
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
! echo "configure:949: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 950,956 ****
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:983: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 951,957 ----
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:984: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 980,986 ****
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1013: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 981,987 ----
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1014: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1031,1037 ****
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1064: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 1032,1038 ----
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1065: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1063,1069 ****
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1096: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--- 1064,1070 ----
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1097: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
***************
*** 1074,1085 ****
cat > conftest.$ac_ext << EOF
! #line 1107 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
! if { (eval echo configure:1112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
--- 1075,1086 ----
cat > conftest.$ac_ext << EOF
! #line 1108 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
! if { (eval echo configure:1113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
***************
*** 1105,1116 ****
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1138: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1143: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 1106,1117 ----
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1139: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1144: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1119,1125 ****
yes;
#endif
EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
--- 1120,1126 ----
yes;
#endif
EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
***************
*** 1138,1144 ****
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1171: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 1139,1145 ----
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1172: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1171,1177 ****
# check for CPP
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
! echo "configure:1204: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 1172,1178 ----
# check for CPP
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
! echo "configure:1205: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1184,1195 ****
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
! #line 1217 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
--- 1185,1196 ----
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
! #line 1218 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
***************
*** 1217,1223 ****
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1250: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 1218,1224 ----
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1251: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1246,1252 ****
# check for X paths
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1279: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
--- 1247,1253 ----
# check for X paths
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1280: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
***************
*** 1261,1273 ****
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
! #line 1294 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
--- 1262,1274 ----
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
! #line 1295 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
***************
*** 1278,1290 ****
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
! #line 1311 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
--- 1279,1291 ----
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
! #line 1312 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
***************
*** 1295,1307 ****
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
! #line 1328 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
--- 1296,1308 ----
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
! #line 1329 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
***************
*** 1330,1336 ****
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:1363: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
--- 1331,1337 ----
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:1364: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
***************
*** 1392,1403 ****
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
! #line 1425 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
--- 1393,1404 ----
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
! #line 1426 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
***************
*** 1466,1479 ****
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1499 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
! if { (eval echo configure:1506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
--- 1467,1480 ----
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1500 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
! if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
***************
*** 1565,1571 ****
#AC_CXX_HEADERS
echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6
! echo "configure:1598: checking for directory to install c++ include files" >&5
if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 1566,1572 ----
#AC_CXX_HEADERS
echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6
! echo "configure:1599: checking for directory to install c++ include files" >&5
if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1607,1613 ****
#AC_TWO_ARG_TIMEOFDAY
# check for libstdc++
echo $ac_n "checking for peek__7istream in -lstdc++""... $ac_c" 1>&6
! echo "configure:1640: checking for peek__7istream in -lstdc++" >&5
ac_lib_var=`echo stdc++'_'peek__7istream | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 1608,1614 ----
#AC_TWO_ARG_TIMEOFDAY
# check for libstdc++
echo $ac_n "checking for peek__7istream in -lstdc++""... $ac_c" 1>&6
! echo "configure:1641: checking for peek__7istream in -lstdc++" >&5
ac_lib_var=`echo stdc++'_'peek__7istream | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1615,1621 ****
ac_save_LIBS="$LIBS"
LIBS="-lstdc++ $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1648 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
--- 1616,1622 ----
ac_save_LIBS="$LIBS"
LIBS="-lstdc++ $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1649 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
***************
*** 1626,1632 ****
peek__7istream()
; return 0; }
EOF
! if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
--- 1627,1633 ----
peek__7istream()
; return 0; }
EOF
! if { (eval echo configure:1660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
***************
*** 1648,1654 ****
fi
echo $ac_n "checking for _ZNSi4peekEv in -lstdc++""... $ac_c" 1>&6
! echo "configure:1681: checking for _ZNSi4peekEv in -lstdc++" >&5
ac_lib_var=`echo stdc++'_'_ZNSi4peekEv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 1649,1655 ----
fi
echo $ac_n "checking for _ZNSi4peekEv in -lstdc++""... $ac_c" 1>&6
! echo "configure:1682: checking for _ZNSi4peekEv in -lstdc++" >&5
ac_lib_var=`echo stdc++'_'_ZNSi4peekEv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1656,1662 ****
ac_save_LIBS="$LIBS"
LIBS="-lstdc++ $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1689 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
--- 1657,1663 ----
ac_save_LIBS="$LIBS"
LIBS="-lstdc++ $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1690 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
***************
*** 1667,1673 ****
_ZNSi4peekEv()
; return 0; }
EOF
! if { (eval echo configure:1700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
--- 1668,1674 ----
_ZNSi4peekEv()
; return 0; }
EOF
! if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
***************
*** 1768,1780 ****
# AC_TRY_RUN(int access(); int main() { return access("/bin/bash", 1); },BIN_BASH=1,BIN_BASH=0,BIN_BASH=1)
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:1801: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1807 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
--- 1769,1781 ----
# AC_TRY_RUN(int access(); int main() { return access("/bin/bash", 1); },BIN_BASH=1,BIN_BASH=0,BIN_BASH=1)
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:1802: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1808 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
***************
*** 1782,1788 ****
socklen_t len = 42; return len;
; return 0; }
EOF
! if { (eval echo configure:1815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_socklen_t=YES
else
--- 1783,1789 ----
socklen_t len = 42; return len;
; return 0; }
EOF
! if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_socklen_t=YES
else
Index: top_ivtools/configure.in
diff -c top_ivtools/configure.in:1.3 top_ivtools/configure.in:1.4
*** top_ivtools/configure.in:1.3 Tue Nov 20 08:31:11 2001
--- ./configure.in Wed Feb 20 12:24:07 2002
***************
*** 7,12 ****
--- 7,13 ----
AC_CANONICAL_HOST
case "$host" in
+ *darwin* ) platform_part=darwin ;;
*freebsd2.1.* ) platform_part=freebsd2.1 ;;
*freebsd* ) platform_part=freebsd ;;
*hpux*10*20) platform_part=hpux10.20 ;;
*** /dev/null Wed Feb 20 12:25:03 PST 2002
--- patches/ivtools-020220-johnston-031
*************** patches/ivtools-020220-johnston-031
*** 0 ****
--- 1 ----
+ ivtools-020220-johnston-031
|
|
From: <ivt...@li...> - 2002-02-20 20:15:11
|
Patch: ivtools-020220-johnston-030 For: ivtools-1.0.1 Author: joh...@us... Subject: new files for Darwin Requires: This is an intermediate patch to ivtools-1.0.1. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: - add new files required by Darwin port Index: include_std/malloc.h diff -c /dev/null include_std/malloc.h:1.1 *** /dev/null Wed Feb 20 12:13:46 2002 --- src/include/ivstd/malloc.h Wed Feb 20 12:13:45 2002 *************** *** 0 **** --- 1 ---- + #include <stdlib.h> Index: include_std/stdlib.h diff -c /dev/null include_std/stdlib.h:1.1 *** /dev/null Wed Feb 20 12:13:46 2002 --- src/include/ivstd/stdlib.h Wed Feb 20 12:13:45 2002 *************** *** 0 **** --- 1,11 ---- + #ifndef _ivstd_stdlib + #define _ivstd_stdlib + #if defined(__cplusplus) + #include_next <stdlib.h> + #else + #include </usr/include/stdlib.h> + #endif + #if defined(__APPLE__) + typedef int socklen_t; + #endif + #endif Index: config_ivtools/site.def.DARWIN diff -c /dev/null config_ivtools/site.def.DARWIN:1.1 *** /dev/null Wed Feb 20 12:13:52 2002 --- config/site.def.DARWIN Wed Feb 20 12:13:50 2002 *************** *** 0 **** --- 1,77 ---- + /* base directory for software projects */ + #define ProjectDir /proj + + /* gcc command line with -V for version and -O for optimize */ + #define CCDriver g++ + + #undef HasDynamicSharedLibraries + #define HasDynamicSharedLibraries YES + + #undef SharedCCFlags + #define SharedCCFlags -fPIC + + #undef SharedCCLdFlags + #define SharedCCLdFlags + + #undef TroffCmd + #define TroffCmd groff + + /* + * build RPC classes -- requires iostreams & TCP sockets + */ + #undef BuildRPCClasses + #define BuildRPCClasses (YES&&!LibStdCPlusPlusV3) + #define SOMAXCONN 5 + + /* override -ansi -pedantic from xfree86.cf */ + #undef DefaultCCOptions + #define DefaultCCOptions /**/ + + /* machine-specific gcc include directory -- does not change with each new version of gcc */ + #define ToolIncludeDir /usr/local/include + + /* link libraries for the above */ + #undef ExtraCCLdLibs + #define ExtraCCLdLibs -lstdc++ -lm + + /* command to create shared libraries */ + #define SharedLibraryCmd(ldobjs,extra_flags) $(LD) -r extra_flags -o $@~ ldobjs + + #define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ + AOUT = Concat(lib,libname.rev.dylib) @@\ + SHARED_CCFLAGS = SharedCCFlags @@\ + @@\ + AllTarget(Concat(lib,libname.rev.dylib)) @@\ + @@\ + Concat(lib,libname.rev.dylib): depobjs @@\ + @echo "building $@" @@\ + $(RM) $@~ @@\ + SharedLibraryCmd(ldobjs,) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + $(LN) -f $@ Concat(lib,libname.dylib) @@\ + @@\ + clean:: @@\ + $(RM) Concat(lib,libname.rev.dylib) + /* + * Install a shared library on FreeBSD. + */ + #ifndef InstallDynamicSharedLibrary + #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ + install:: Concat(lib,libname.rev.dylib) @@\ + MakeDir(dest) @@\ + $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.rev.dylib) dest @@\ + -@$(RM) dest/Concat(lib,libname.dylib) @@\ + -@(cd dest;$(LN) Concat(lib,libname.rev.dylib) \ @@\ + Concat(lib,libname.dylib)) @@\ + @@\ + uninstall:: @@\ + $(RM) dest/Concat(lib,libname.rev.dylib) @@\ + $(RM) dest/Concat(lib,libname.dylib) + #endif + + /* file output by configure script */ + #include "config-darwin-gcc.defs" + + + Index: config_iv/iv-darwin.cf diff -c /dev/null config_iv/iv-darwin.cf:1.1 *** /dev/null Wed Feb 20 12:13:53 2002 --- config/InterViews/iv-darwin.cf Wed Feb 20 12:13:52 2002 *************** *** 0 **** --- 1,18 ---- + /* + * This is the Darwin configuration file for Interviews 3.1 + * Set up to use gcc in local.def + */ + + #if LibStdCPlusPlusV3 + #define OptimizeCCFlags -O2 + #else + #define OptimizeCCFlags -O2 + #endif + #define TIFFOptimizeCFlags -O + #define TIFFStdCDefines -DHAVE_IEEEFP + + #ifndef ExtraCCLdFlags + #define ExtraCCLdFlags /**/ + #endif + + #include <InterViews/xparams.cf> *** /dev/null Wed Feb 20 12:13:54 PST 2002 --- patches/ivtools-020220-johnston-030 *************** patches/ivtools-020220-johnston-030 *** 0 **** --- 1 ---- + ivtools-020220-johnston-030 |
|
From: <ivt...@li...> - 2002-02-20 19:57:22
|
Patch: ivtools-020220-johnston-029
For: ivtools-1.0.1
Author: joh...@us...
Subject: port to Mac OS X (Darwin)
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- all the changes necessary to bring up ivtools under Mac OS X (Darwin).
Index: src_interviews/psfont.c
diff -c src_interviews/psfont.c:1.2 src_interviews/psfont.c:1.3
*** src_interviews/psfont.c:1.2 Mon Jan 14 16:28:13 2002
--- src/InterViews/psfont.c Wed Feb 20 11:53:24 2002
***************
*** 40,46 ****
class PSFontImpl {
private:
! friend class PSFont_31;
char* name;
char* encoding;
--- 40,46 ----
class PSFontImpl {
private:
! friend class PSFont31;
char* name;
char* encoding;
***************
*** 50,56 ****
static char* psfile(const char* name);
};
! PSFont_31::PSFont_31(
const char* psname, Coord size, const char* name, float scale
) : Font(name, scale) {
PSFontImpl* p = new PSFontImpl;
--- 50,56 ----
static char* psfile(const char* name);
};
! PSFont31::PSFont31(
const char* psname, Coord size, const char* name, float scale
) : Font(name, scale) {
PSFontImpl* p = new PSFontImpl;
***************
*** 83,101 ****
delete metrics_file;
}
! PSFont_31::~PSFont_31() {
delete impl_->name;
delete impl_->encoding;
delete impl_;
}
! const char* PSFont_31::name() const { return impl_->name; }
! const char* PSFont_31::encoding() const { return impl_->encoding; }
! Coord PSFont_31::size() const { return impl_->size; }
! Coord PSFont_31::width(long c) const { return impl_->widths[c]; }
! Coord PSFont_31::width(const char* s, int n) const { return Font::width(s, n); }
! boolean PSFont_31::exists(const char* psname) {
char* metrics_file = PSFontImpl::psfile(psname);
FILE* f = fopen(metrics_file, "r");
delete metrics_file;
--- 83,101 ----
delete metrics_file;
}
! PSFont31::~PSFont31() {
delete impl_->name;
delete impl_->encoding;
delete impl_;
}
! const char* PSFont31::name() const { return impl_->name; }
! const char* PSFont31::encoding() const { return impl_->encoding; }
! Coord PSFont31::size() const { return impl_->size; }
! Coord PSFont31::width(long c) const { return impl_->widths[c]; }
! Coord PSFont31::width(const char* s, int n) const { return Font::width(s, n); }
! boolean PSFont31::exists(const char* psname) {
char* metrics_file = PSFontImpl::psfile(psname);
FILE* f = fopen(metrics_file, "r");
delete metrics_file;
Index: src_x11/xwindow.c
diff -c src_x11/xwindow.c:1.1 src_x11/xwindow.c:1.2
*** src_x11/xwindow.c:1.1 Fri Nov 2 13:05:07 2001
--- src/IV-X11/xwindow.c Wed Feb 20 11:53:28 2002
***************
*** 62,68 ****
#include <stropts.h>
#include <sys/conf.h>
#endif
! #if !defined(__NetBSD__) && !defined(__FreeBSD__)
#if !defined(__linux__) && !defined(__CYGWIN__)
/* no standard place for this */
extern "C" {
--- 62,68 ----
#include <stropts.h>
#include <sys/conf.h>
#endif
! #if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
#if !defined(__linux__) && !defined(__CYGWIN__)
/* no standard place for this */
extern "C" {
Index: src_os/string.c
diff -c src_os/string.c:1.1 src_os/string.c:1.2
*** src_os/string.c:1.1 Fri Nov 2 13:05:09 2001
--- src/OS/string.c Wed Feb 20 11:53:30 2002
***************
*** 34,43 ****
extern "C" {
#ifndef tolower
! extern int tolower(int);
#endif
#ifndef toupper
! extern int toupper(int);
#endif
extern long int strtol(const char*, char**, int);
extern double strtod(const char*, char**);
--- 34,43 ----
extern "C" {
#ifndef tolower
! extern wchar_t tolower(wchar_t);
#endif
#ifndef toupper
! extern wchar_t toupper(wchar_t);
#endif
extern long int strtol(const char*, char**, int);
extern double strtod(const char*, char**);
Index: src_dispatch/dispatcher.c
diff -c src_dispatch/dispatcher.c:1.1 src_dispatch/dispatcher.c:1.2
*** src_dispatch/dispatcher.c:1.1 Fri Nov 2 13:05:19 2001
--- src/Dispatch/dispatcher.c Wed Feb 20 11:53:32 2002
***************
*** 653,659 ****
sv.sa_flags = SV_INTERRUPT;
sigaction(SIGCLD, &sv, &osv);
#else
! sv.sv_handler = (void (*)(int)) fxSIGVECHANDLER(&Dispatcher::sigCLD);
sv.sv_flags = SV_INTERRUPT;
sigvec(SIGCLD, &sv, &osv);
#endif
--- 653,659 ----
sv.sa_flags = SV_INTERRUPT;
sigaction(SIGCLD, &sv, &osv);
#else
! sv.sv_handler = (void (*)()) fxSIGVECHANDLER(&Dispatcher::sigCLD);
sv.sv_flags = SV_INTERRUPT;
sigvec(SIGCLD, &sv, &osv);
#endif
Index: src_dispatch/rpcbuf.c
diff -c src_dispatch/rpcbuf.c:1.1 src_dispatch/rpcbuf.c:1.2
*** src_dispatch/rpcbuf.c:1.1 Fri Nov 2 13:05:19 2001
--- src/Dispatch/rpcbuf.c Wed Feb 20 11:53:32 2002
***************
*** 234,240 ****
rpcbuf* rpcbuf::accept(int& fd) {
struct sockaddr_in name;
! unsigned int name_len = sizeof(name);
if (!_opened) {
error("rpcbuf::accept: not using a file number yet");
--- 234,240 ----
rpcbuf* rpcbuf::accept(int& fd) {
struct sockaddr_in name;
! socklen_t name_len = sizeof(name);
if (!_opened) {
error("rpcbuf::accept: not using a file number yet");
Index: dclock/clocktime.c
diff -c dclock/clocktime.c:1.1 dclock/clocktime.c:1.2
*** dclock/clocktime.c:1.1 Fri Nov 2 13:05:21 2001
--- src/dclock/clocktime.c Wed Feb 20 11:53:34 2002
***************
*** 58,64 ****
#ifdef __DECCXX
local = * localtime((time_t*)&gmt.tv_sec);
#else
! local = * localtime(&gmt.tv_sec);
#endif
#endif
h = local.tm_hour;
--- 58,64 ----
#ifdef __DECCXX
local = * localtime((time_t*)&gmt.tv_sec);
#else
! local = * localtime((const time_t *)&gmt.tv_sec);
#endif
#endif
h = local.tm_hour;
Index: Time/Time.h
diff -c Time/Time.h:1.2 Time/Time.h:1.3
*** Time/Time.h:1.2 Wed Jan 9 09:06:11 2002
--- src/Time/Time.h Wed Feb 20 11:53:37 2002
***************
*** 46,52 ****
//moved from Time.c
! #if defined(BSD) || defined(__FreeBSD__) || defined(__NetBSD__)
#include <sys/time.h>
#if defined(__NetBSD__)
--- 46,52 ----
//moved from Time.c
! #if defined(BSD) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
#include <sys/time.h>
#if defined(__NetBSD__)
Index: IVGlyph/idraw.c
diff -c IVGlyph/idraw.c:1.2 IVGlyph/idraw.c:1.3
*** IVGlyph/idraw.c:1.2 Mon Jan 14 16:28:19 2002
--- src/IVGlyph/idraw.c Wed Feb 20 11:53:39 2002
***************
*** 19,25 ****
#include <OS/string.h>
#include <stdlib.h>
#include <ctype.h>
-
class BrushInfo {
public:
const Brush* brush_;
--- 19,24 ----
***************
*** 478,486 ****
NullTerminatedString psname_nt(psname);
float pointsize;
read(pointsize);
! if (PSFont_31::exists(psname_nt.string())) {
NullTerminatedString s_nt(s);
! return new PSFont_31(psname_nt.string(), pointsize, s_nt.string(), 1.0)
;
}
return WidgetKit::instance()->font();
--- 477,485 ----
NullTerminatedString psname_nt(psname);
float pointsize;
read(pointsize);
! if (PSFont31::exists(psname_nt.string())) {
NullTerminatedString s_nt(s);
! return new PSFont31(psname_nt.string(), pointsize, s_nt.string(), 1.0)
;
}
return WidgetKit::instance()->font();
Index: glyph_morpher/morpher.c
diff -c glyph_morpher/morpher.c:1.1 glyph_morpher/morpher.c:1.2
*** glyph_morpher/morpher.c:1.1 Fri Nov 2 13:05:43 2001
--- src/glyphs/morpher/morpher.c Wed Feb 20 11:53:42 2002
***************
*** 554,560 ****
}
declarePtrList(GraphicList, Graphic31);
! implementPtrList(GraphicList, Graphic31);
declarePtrList(MGraphicList, MorphGraphic);
implementPtrList(MGraphicList, MorphGraphic);
declarePtrList(MMGraphicList, MGraphicList);
--- 554,560 ----
}
declarePtrList(GraphicList, Graphic31);
! // implementPtrList(GraphicList, Graphic31);
declarePtrList(MGraphicList, MorphGraphic);
implementPtrList(MGraphicList, MorphGraphic);
declarePtrList(MMGraphicList, MGraphicList);
Index: Unidraw/catalog.c
diff -c Unidraw/catalog.c:1.2 Unidraw/catalog.c:1.3
*** Unidraw/catalog.c:1.2 Thu Nov 29 07:39:16 2001
--- src/Unidraw/catalog.c Wed Feb 20 11:54:00 2002
***************
*** 69,77 ****
#include <unistd.h>
#endif
#include <sys/file.h>
- #if __GNUG__>=3
#include <fstream.h>
- #endif
#ifdef __DECCXX
extern "C" {
--- 69,75 ----
Index: Unidraw/catcmds.c
diff -c Unidraw/catcmds.c:1.1 Unidraw/catcmds.c:1.2
*** Unidraw/catcmds.c:1.1 Fri Nov 2 13:06:49 2001
--- src/Unidraw/catcmds.c Wed Feb 20 11:54:01 2002
***************
*** 47,55 ****
#include <stdlib.h>
#include <stream.h>
#include <string.h>
- #if __GNUG__>=3
#include <fstream.h>
- #endif
/*****************************************************************************/
--- 47,53 ----
Index: OverlayUnidraw/grayraster.c
diff -c OverlayUnidraw/grayraster.c:1.1 OverlayUnidraw/grayraster.c:1.2
*** OverlayUnidraw/grayraster.c:1.1 Fri Nov 2 13:07:02 2001
--- src/OverlayUnidraw/grayraster.c Wed Feb 20 11:54:04 2002
***************
*** 698,718 ****
for(int y=0; y < h; y++) {
me->vpeek(x, h-y-1, av);
double dval = av.double_val();
- #if 0
- #if !defined(__sun) && !defined(__svr4__) && !defined(__alpha) || defined(__linux__)
- if (dval==NAN) continue;
- #else
- {
- #if defined(__sun__)
- if (isnan(dval) || isinf(dval)) continue;
- #else
- if (IsNANorINF(dval)) continue;
- #endif
- }
- #endif
- #else
if (isnanorinf(dval)) continue;
- #endif
if (dval<dmin) dmin = dval;
if (dval>dmax) dmax = dval;
}
--- 698,704 ----
Index: OverlayUnidraw/ovcatalog.c
diff -c OverlayUnidraw/ovcatalog.c:1.1 OverlayUnidraw/ovcatalog.c:1.2
*** OverlayUnidraw/ovcatalog.c:1.1 Fri Nov 2 13:07:02 2001
--- src/OverlayUnidraw/ovcatalog.c Wed Feb 20 11:54:04 2002
***************
*** 66,74 ****
#include <stdio.h>
#include <stream.h>
#include <string.h>
- #if __GNUG__>=3
#include <fstream.h>
- #endif
/*****************************************************************************/
--- 66,72 ----
Index: OverlayUnidraw/ovexport.c
diff -c OverlayUnidraw/ovexport.c:1.1 OverlayUnidraw/ovexport.c:1.2
*** OverlayUnidraw/ovexport.c:1.1 Fri Nov 2 13:07:02 2001
--- src/OverlayUnidraw/ovexport.c Wed Feb 20 11:54:04 2002
***************
*** 59,67 ****
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
- #if __GNUG__>=3
#include <fstream.h>
- #endif
/*****************************************************************************/
--- 59,65 ----
Index: OverlayUnidraw/ovimport.c
diff -c OverlayUnidraw/ovimport.c:1.3 OverlayUnidraw/ovimport.c:1.4
*** OverlayUnidraw/ovimport.c:1.3 Wed Dec 19 15:14:19 2001
--- src/OverlayUnidraw/ovimport.c Wed Feb 20 11:54:04 2002
***************
*** 83,93 ****
#include <OS/list.h>
#include <math.h>
- #if __GNUG__<3
- #include <pfstream.h>
- #else
#include <fstream.h>
- #endif
#include <stdio.h>
#include <stream.h>
#include <string.h>
--- 83,89 ----
Index: OverlayUnidraw/ovprint.c
diff -c OverlayUnidraw/ovprint.c:1.1 OverlayUnidraw/ovprint.c:1.2
*** OverlayUnidraw/ovprint.c:1.1 Fri Nov 2 13:07:02 2001
--- src/OverlayUnidraw/ovprint.c Wed Feb 20 11:54:04 2002
***************
*** 58,66 ****
#include <stdlib.h>
#include <stream.h>
#include <string.h>
- #if __GNUG__>=3
#include <fstream.h>
- #endif
/*****************************************************************************/
--- 58,64 ----
Index: include_interviews/psfont.h
diff -c include_interviews/psfont.h:1.2 include_interviews/psfont.h:1.3
*** include_interviews/psfont.h:1.2 Mon Jan 14 16:28:39 2002
--- src/include/InterViews/psfont.h Wed Feb 20 11:54:15 2002
***************
*** 35,44 ****
class PSFontImpl;
! class PSFont_31 : public Font {
public:
! PSFont_31(const char* psname, Coord size, const char* name, float scale);
! virtual ~PSFont_31();
static boolean exists(const char* psname);
--- 35,44 ----
class PSFontImpl;
! class PSFont31 : public Font {
public:
! PSFont31(const char* psname, Coord size, const char* name, float scale);
! virtual ~PSFont31();
static boolean exists(const char* psname);
Index: include_std/math.h
diff -c include_std/math.h:1.1 include_std/math.h:1.2
*** include_std/math.h:1.1 Fri Nov 2 13:07:50 2001
--- src/include/ivstd/math.h Wed Feb 20 11:54:19 2002
***************
*** 1,7 ****
--- 1,11 ----
#ifndef ivtools_math_h
#define ivtools_math_h
+ #if defined(__cplusplus)
#include_next <math.h>
+ #else
+ #include </usr/include/math.h>
+ #endif
#if defined(sun) && defined(__svr4__)
#include <nan.h>
Index: include_std/nan.h
diff -c include_std/nan.h:1.1 include_std/nan.h:1.2
*** include_std/nan.h:1.1 Fri Nov 2 13:07:50 2001
--- src/include/ivstd/nan.h Wed Feb 20 11:54:20 2002
***************
*** 3,15 ****
#if defined(__GLIBC__) && (__GLIBC__==2 && __GLIBC_MINOR__>0 || __GLIBC__>2)
#include <bits/nan.h>
! #elif !defined(__CYGWIN__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
#include_next <nan.h>
#else
#include <math.h>
#endif
! #if defined(__sun__) && defined(__svr4__) || defined(__CYGWIN__) || defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__)
#define isnanorinf(dval) (isnan(dval)||isinf(dval))
#elif defined(__alpha)
#define isnanorinf(dval) (IsNANorINF(dval))
--- 3,15 ----
#if defined(__GLIBC__) && (__GLIBC__==2 && __GLIBC_MINOR__>0 || __GLIBC__>2)
#include <bits/nan.h>
! #elif !defined(__CYGWIN__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
#include_next <nan.h>
#else
#include <math.h>
#endif
! #if defined(__sun__) && defined(__svr4__) || defined(__CYGWIN__) || defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
#define isnanorinf(dval) (isnan(dval)||isinf(dval))
#elif defined(__alpha)
#define isnanorinf(dval) (IsNANorINF(dval))
Index: include_std/signal.h
diff -c include_std/signal.h:1.1 include_std/signal.h:1.2
*** include_std/signal.h:1.1 Fri Nov 2 13:07:50 2001
--- src/include/ivstd/signal.h Wed Feb 20 11:54:20 2002
***************
*** 1,11 ****
#ifndef ivtools_signal_h
#define ivtools_signal_h
- #include_next <signal.h>
#if defined(__cplusplus)
#undef NULL
#define NULL 0
#endif
#endif
--- 1,13 ----
#ifndef ivtools_signal_h
#define ivtools_signal_h
#if defined(__cplusplus)
+ #include_next <signal.h>
#undef NULL
#define NULL 0
+ #else
+ #include </usr/include/signal.h>
#endif
#endif
Index: include_std/stdio.h
diff -c include_std/stdio.h:1.1 include_std/stdio.h:1.2
*** include_std/stdio.h:1.1 Fri Nov 2 13:07:50 2001
--- src/include/ivstd/stdio.h Wed Feb 20 11:54:20 2002
***************
*** 1,7 ****
--- 1,11 ----
#ifndef ivtools_stdio_h
#define ivtools_stdio_h
+ #if defined(__cplusplus)
#include_next <stdio.h>
+ #else
+ #include </usr/include/stdio.h>
+ #endif
#if defined(__cplusplus)
#if defined(sun) && !defined(solaris)
Index: include_std/string.h
diff -c include_std/string.h:1.1 include_std/string.h:1.2
*** include_std/string.h:1.1 Fri Nov 2 13:07:50 2001
--- src/include/ivstd/string.h Wed Feb 20 11:54:20 2002
***************
*** 24,33 ****
#endif
- #include_next <string.h>
#if defined(__cplusplus)
#undef NULL
#define NULL 0
#endif
#endif
--- 24,35 ----
#endif
#if defined(__cplusplus)
+ #include_next <string.h>
#undef NULL
#define NULL 0
+ #else
+ #include </usr/include/string.h>
#endif
#endif
Index: scripts_ivtools/config.guess
diff -c scripts_ivtools/config.guess:1.2 scripts_ivtools/config.guess:1.3
*** scripts_ivtools/config.guess:1.2 Thu Nov 29 07:39:36 2001
--- src/scripts/config.guess Wed Feb 20 11:54:21 2002
***************
*** 974,979 ****
--- 974,988 ----
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
+ *:Darwin:*:*)
+ echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ if test "${UNAME_MACHINE}" = "x86pc"; then
+ UNAME_MACHINE=pc
+ fi
+ echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+ exit 0 ;;
*:QNX:*:4*)
echo i386-qnx-qnx${UNAME_VERSION}
exit 0 ;;
Index: scripts_ivtools/config.sub
diff -c scripts_ivtools/config.sub:1.2 scripts_ivtools/config.sub:1.3
*** scripts_ivtools/config.sub:1.2 Thu Nov 29 07:39:36 2001
--- src/scripts/config.sub Wed Feb 20 11:54:22 2002
***************
*** 912,918 ****
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--- 912,918 ----
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -darwin* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
Index: config_ivtools/arch.def
diff -c config_ivtools/arch.def:1.1 config_ivtools/arch.def:1.2
*** config_ivtools/arch.def:1.1 Fri Nov 2 13:08:11 2001
--- config/arch.def Wed Feb 20 11:54:28 2002
***************
*** 474,484 ****
--- 474,496 ----
#define MacroFile InterViews/iv-freebsd.cf
#endif /* __FreeBSD__ */
+ #if defined(__APPLE__)
+ #undef APPLE
+ #undef apple
+ #define DarwinArchitecture
+ #define ArchitectureName DARWIN
+ #define architectureName darwin
+ #define SiteDefCpu <site.def.DARWIN>
+ #define MacroIncludeFile <InterViews/iv-darwin.cf>
+ #define MacroFile InterViews/iv-darwin.cf
+ #endif /* __FreeBSD__ */
+
#ifndef ArchitectureName
XCOMM WARNING: Imakefile not configured; guessing at definitions!!!
XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
#undef UNKNOWN
#undef unknown
+ #define UnknownArchitecture
#define ArchitectureName UNKNOWN
#define architectureName unknown
#define SiteDefCpu <site.def.UNKNOWN>
Index: config_ivtools/local.def
diff -c config_ivtools/local.def:1.2 config_ivtools/local.def:1.3
*** config_ivtools/local.def:1.2 Wed Dec 19 15:15:18 2001
--- config/local.def Wed Feb 20 11:54:28 2002
***************
*** 178,184 ****
--- 178,188 ----
#endif
#undef Dep_libUnidraw
#if HasDynamicSharedLibraries
+ #ifndef DarwinArchitecture
#define Dep_libUnidraw $(IVTOOLSSRC)/Unidraw/$(CPU)/libUnidraw.SO.$(VERSION)
+ #else
+ #define Dep_libUnidraw $(IVTOOLSSRC)/Unidraw/$(CPU)/libUnidraw.$(VERSION).dylib
+ #endif
#else
#define Dep_libUnidraw $(IVTOOLSSRC)/Unidraw/$(CPU)/libUnidraw.a
#endif
Index: config_ivtools/makevars.def
diff -c config_ivtools/makevars.def:1.1 config_ivtools/makevars.def:1.2
*** config_ivtools/makevars.def:1.1 Fri Nov 2 13:08:11 2001
--- config/makevars.def Wed Feb 20 11:54:28 2002
***************
*** 41,52 ****
--- 41,62 ----
#undef depvar
#if HasDynamicSharedLibraries
+ #if 0
#ifndef UseInstalled
#define depvar(ULIBNAME, PCKGSRC, llibname, liblibname, libver) \
ULIBNAME = $(PCKGSRC)/llibname/$(CPU)/liblibname.SO.libver
#else
#define depvar(ULIBNAME, PCKGSRC, llibname, liblibname, libver) \
ULIBNAME = $(LIBDIR)/liblibname.SO.libver
+ #endif
+ #else
+ #ifndef UseInstalled
+ #define depvar(ULIBNAME, PCKGSRC, llibname, liblibname, libver) \
+ ULIBNAME = $(PCKGSRC)/llibname/$(CPU)/liblibname.libver.dylib
+ #else
+ #define depvar(ULIBNAME, PCKGSRC, llibname, liblibname, libver) \
+ ULIBNAME = $(LIBDIR)/liblibname.libver.dylib
+ #endif
#endif
#else
#ifndef UseInstalled
Index: config_iv/TIFF.def
diff -c config_iv/TIFF.def:1.1 config_iv/TIFF.def:1.2
*** config_iv/TIFF.def:1.1 Fri Nov 2 13:08:13 2001
--- config/InterViews/TIFF.def Wed Feb 20 11:54:30 2002
***************
*** 147,152 ****
--- 147,157 ----
-DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
-DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
#endif
+ #if defined(UnknownArchitecture)
+ #define TIFFStdCDefines \
+ -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
+ -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
+ #endif
#ifndef TIFFExtraCDefines
#if SystemV
*** /dev/null Wed Feb 20 11:54:32 PST 2002
--- patches/ivtools-020220-johnston-029
*************** patches/ivtools-020220-johnston-029
*** 0 ****
--- 1 ----
+ ivtools-020220-johnston-029
|
|
From: <ivt...@li...> - 2002-02-20 00:26:24
|
Patch: ivtools-020219-johnston-028
For: ivtools-1.0.1
Author: joh...@us...
Subject: fix problem with stdin when launched as helper app
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- fix problem with hanging on stdin when comdraw/graphdraw/flipbook is
launched as a helper app from a web browser.
- rename comdraw's -comdraw_off to -stdin_off, and add it to flipbook
and graphdraw as well.
Index: ComTerp/comhandler.c
diff -c ComTerp/comhandler.c:1.1 ComTerp/comhandler.c:1.2
*** ComTerp/comhandler.c:1.1 Fri Nov 2 13:04:49 2001
--- src/ComTerp/comhandler.c Tue Feb 19 16:17:46 2002
***************
*** 175,181 ****
ch = '\0';
int status;
! while (ch != '\n') {
status = read(fd, &ch, 1);
if (status == 1 && ch != '\n') inv.push_back(ch);
}
--- 175,181 ----
ch = '\0';
int status;
! while (ch != '\n' && status>0) {
status = read(fd, &ch, 1);
if (status == 1 && ch != '\n') inv.push_back(ch);
}
Index: ComUnidraw/comeditor.c
diff -c ComUnidraw/comeditor.c:1.10 ComUnidraw/comeditor.c:1.11
*** ComUnidraw/comeditor.c:1.10 Wed Feb 13 09:32:55 2002
--- src/ComUnidraw/comeditor.c Tue Feb 19 16:18:19 2002
***************
*** 108,117 ****
void ComEditor::InitCommands() {
if (!_terp)
_terp = new ComTerpServ();
! const char* comdraw_off_str = unidraw->GetCatalog()->GetAttribute("comdraw_off");
#ifndef HAVE_ACE
if ((!comterplist() || comterplist()->Number()==1) &&
! (comdraw_off_str ? strcmp(comdraw_off_str, "false")==0 : true))
_terp_iohandler = new ComTerpIOHandler(_terp, stdin);
else
#endif
--- 108,117 ----
void ComEditor::InitCommands() {
if (!_terp)
_terp = new ComTerpServ();
! const char* stdin_off_str = unidraw->GetCatalog()->GetAttribute("stdin_off");
#ifndef HAVE_ACE
if ((!comterplist() || comterplist()->Number()==1) &&
! (stdin_off_str ? strcmp(stdin_off_str, "false")==0 : true))
_terp_iohandler = new ComTerpIOHandler(_terp, stdin);
else
#endif
Index: comdraw/main.c
diff -c comdraw/main.c:1.4 comdraw/main.c:1.5
*** comdraw/main.c:1.4 Wed Jan 30 14:12:12 2002
--- src/comdraw/main.c Tue Feb 19 16:18:21 2002
***************
*** 163,169 ****
{ "*zoomer_off", "false" },
{ "*opaque_off", "false" },
{ "*stripped", "false" },
! { "*comdraw_off", "false" },
#ifdef HAVE_ACE
{ "*import", "20001" },
{ "*comdraw", "20002" },
--- 163,169 ----
{ "*zoomer_off", "false" },
{ "*opaque_off", "false" },
{ "*stripped", "false" },
! { "*stdin_off", "false" },
#ifdef HAVE_ACE
{ "*import", "20001" },
{ "*comdraw", "20002" },
***************
*** 208,214 ****
{ "-opaque_off", "*opaque_off", OptionValueImplicit, "true" },
{ "-opoff", "*opaque_off", OptionValueImplicit, "true" },
{ "-stripped", "*stripped", OptionValueImplicit, "true" },
! { "-comdraw_off", "*comdraw_off", OptionValueImplicit, "true" },
#ifdef HAVE_ACE
{ "-import", "*import", OptionValueNext },
{ "-comdraw", "*comdraw", OptionValueNext },
--- 208,214 ----
{ "-opaque_off", "*opaque_off", OptionValueImplicit, "true" },
{ "-opoff", "*opaque_off", OptionValueImplicit, "true" },
{ "-stripped", "*stripped", OptionValueImplicit, "true" },
! { "-stdin_off", "*stdin_off", OptionValueImplicit, "true" },
#ifdef HAVE_ACE
{ "-import", "*import", OptionValueNext },
{ "-comdraw", "*comdraw", OptionValueNext },
***************
*** 224,245 ****
#ifdef HAVE_ACE
static char* usage =
! "Usage: comdraw [any idraw parameter] [-comdraw port] [-comdraw_off] [-color5] \n\
! [-color6] [-import portnum] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
! [-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff] \n\
! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\
! [-rampsize n ] [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-stripped]\n\
! [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n] \n\
[-wbhost host] [-wbmaster] [-wbslave] [-wbport port] [-zoomer_off|-zoff] [file]";
#else
static char* usage =
"Usage: comdraw [any idraw parameter] [-color5] [-color6] \n\
! [-comdraw_off] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
[-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff] \n\
[-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\
! [-rampsize n ] [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-stripped]\n\
! [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n] \n\
! [-zoomer_off|-zoff] [file]";
#endif
/*****************************************************************************/
--- 224,245 ----
#ifdef HAVE_ACE
static char* usage =
! "Usage: comdraw [any idraw parameter] [-comdraw port] [-color5]\n\
! [-color6] [-import portnum] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff]\n\
! [-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff]\n\
! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc]\n\
! [-rampsize n ] [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-stdin_off]\n\
! [-stripped] [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n]\n\
[-wbhost host] [-wbmaster] [-wbslave] [-wbport port] [-zoomer_off|-zoff] [file]";
#else
static char* usage =
"Usage: comdraw [any idraw parameter] [-color5] [-color6] \n\
! [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
[-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff] \n\
[-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\
! [-rampsize n ] [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-stdin_off]\n\
! [-stripped] [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile]\n\
! [-twidth|-tw n] [-zoomer_off|-zoff] [file]";
#endif
/*****************************************************************************/
***************
*** 315,322 ****
#ifdef HAVE_ACE
/* Start up one on stdin */
! const char* comdraw_off_str = unidraw->GetCatalog()->GetAttribute("comdraw_off");
! if (!comdraw_off_str || strcmp(comdraw_off_str, "false")==0) {
UnidrawComterpHandler* stdin_handler = new UnidrawComterpHandler();
#if 0
if (ACE::register_stdin_handler(stdin_handler, COMTERP_REACTOR::instance(), nil) == -1)
--- 315,322 ----
#ifdef HAVE_ACE
/* Start up one on stdin */
! const char* stdin_off_str = unidraw->GetCatalog()->GetAttribute("stdin_off");
! if (!stdin_off_str || strcmp(stdin_off_str, "false")==0) {
UnidrawComterpHandler* stdin_handler = new UnidrawComterpHandler();
#if 0
if (ACE::register_stdin_handler(stdin_handler, COMTERP_REACTOR::instance(), nil) == -1)
Index: flipbook/main.c
diff -c flipbook/main.c:1.3 flipbook/main.c:1.4
*** flipbook/main.c:1.3 Wed Jan 30 14:12:14 2002
--- src/flipbook/main.c Tue Feb 19 16:18:23 2002
***************
*** 157,162 ****
--- 157,163 ----
{ "*opaque_off", "false" },
{ "*slideshow", "0" },
{ "*stripped", "false" },
+ { "*stdin_off", "false" },
#ifdef HAVE_ACE
{ "*comdraw", "20002" },
{ "*import", "20003" },
***************
*** 198,203 ****
--- 199,205 ----
{ "-opoff", "*opaque_off", OptionValueImplicit, "true" },
{ "-slideshow", "*slideshow", OptionValueNext },
{ "-stripped", "*stripped", OptionValueImplicit, "true" },
+ { "-stdin_off", "*stdin_off", OptionValueImplicit, "true" },
#ifdef HAVE_ACE
{ "-import", "*import", OptionValueNext },
{ "-comdraw", "*comdraw", OptionValueNext },
***************
*** 209,230 ****
#ifdef HAVE_ACE
static char* usage =
! "Usage: flipbook [any idraw parameter] [-bookgeom] [-comdraw port] \n\
! [-color5] [-color6] [-import port] [-gray5] [-gray6] [-gray7] \n\
! [-opaque_off|-opoff] [-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff] \n\
! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc ] \n\
! [-scribble_pointer|-scrpt ] [-slideshow sec] [-slider_off|-soff] \n\
! [-stripped] [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n] \n\
! [-zoomer_off|-zoff] [file]";
#else
static char* usage =
! "Usage: flipbook [any idraw parameter] [-bookgeom] \n\
! [-color5] [-color6] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
! [-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff] \n\
! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc ] \n\
! [-scribble_pointer|-scrpt ] [-slideshow sec] [-slider_off|-soff] \n\
! [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n] \n\
! [-zoomer_off|-zoff] [file]";
#endif
/*****************************************************************************/
--- 211,232 ----
#ifdef HAVE_ACE
static char* usage =
! "Usage: flipbook [any idraw parameter] [-bookgeom] [-comdraw port] [-color5]\n\
! [-color6] [-import port] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff]\n\
! [-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff]\n\
! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc ]\n\
! [-scribble_pointer|-scrpt ] [-slideshow sec] [-slider_off|-soff]\n\
! [-stdin_off] [-stripped] [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile]\n\
! [-twidth|-tw n] [-zoomer_off|-zoff] [file]";
#else
static char* usage =
! "Usage: flipbook [any idraw parameter] [-bookgeom]\n\
! [-color5] [-color6] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff]\n\
! [-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff]\n\
! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc ]\n\
! [-scribble_pointer|-scrpt ] [-slideshow sec] [-slider_off|-soff]\n\
! [-stdin_off] [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile]\n\
! [-twidth|-tw n] [-zoomer_off|-zoff] [file]";
#endif
/*****************************************************************************/
Index: graphdraw/main.c
diff -c graphdraw/main.c:1.4 graphdraw/main.c:1.5
*** graphdraw/main.c:1.4 Wed Jan 30 14:12:15 2002
--- src/graphdraw/main.c Tue Feb 19 16:18:26 2002
***************
*** 150,155 ****
--- 150,156 ----
{ "*slider_off", "false" },
{ "*zoomer_off", "false" },
{ "*opaque_off", "false" },
+ { "*stdin_off", "false" },
#ifdef HAVE_ACE
{ "*comdraw", "20002" },
{ "*import", "20003" },
***************
*** 181,186 ****
--- 182,188 ----
{ "-zoff", "*zoomer_off", OptionValueImplicit, "true" },
{ "-opaque_off", "*opaque_off", OptionValueImplicit, "true" },
{ "-opoff", "*opaque_off", OptionValueImplicit, "true" },
+ { "-stdin_off", "*stdin_off", OptionValueImplicit, "true" },
#ifdef HAVE_ACE
{ "-import", "*import", OptionValueNext },
{ "-comdraw", "*comdraw", OptionValueNext },
***************
*** 193,210 ****
#ifdef HAVE_ACE
static char* usage =
! "Usage: graphdraw [any idraw parameter] [-color5] [-color6] [-comdraw port] \n\
! [-import port] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
! [-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff] \n\
! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc ] \n\
! [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-zoomer_off|-zoff] [file]";
#else
static char* usage =
! "Usage: graphdraw [any idraw parameter] [-color5] [-color6] \n\
! [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] [-pagecols|-ncols n] \n\
! [-pagerows|-nrows n] [-panner_off|-poff] \n\
[-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc ] \n\
! [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-zoomer_off|-zoff] [file]";
#endif
/*****************************************************************************/
--- 195,214 ----
#ifdef HAVE_ACE
static char* usage =
! "Usage: graphdraw [any idraw parameter] [-color5] [-color6] [-comdraw port]\n\
! [-import port] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff]\n\
! [-pagecols|-ncols n] [-pagerows|-nrows n] [-panner_off|-poff]\n\
! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc ]\n\
! [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-stdin_off]\n\
! [-zoomer_off|-zoff] [file]";
#else
static char* usage =
! "Usage: graphdraw [any idraw parameter] [-color5] [-color6]\n\
! [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] [-pagecols|-ncols n]\n\
! [-pagerows|-nrows n] [-panner_off|-poff]\n\
[-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc ] \n\
! [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-stdin_off]\n\
! [-zoomer_off|-zoff] [file]";
#endif
/*****************************************************************************/
Index: drawserv/main.c
diff -c drawserv/main.c:1.2 drawserv/main.c:1.3
*** drawserv/main.c:1.2 Wed Jan 30 14:12:18 2002
--- src/drawserv_/main.c Tue Feb 19 16:18:29 2002
***************
*** 175,180 ****
--- 175,181 ----
{ "*twidth", "512" },
{ "*theight", "512" },
{ "*opaque_off", "false" },
+ { "*stdin_off", "false" },
#ifdef HAVE_ACE
{ "*import", "20001" },
{ "*comdraw", "20002" },
***************
*** 194,199 ****
--- 195,201 ----
{ "-theight", "*theight", OptionValueNext },
{ "-opaque_off", "*opaque_off", OptionValueImplicit, "true" },
{ "-opoff", "*opaque_off", OptionValueImplicit, "true" },
+ { "-stdin_off", "*stdin_off", OptionValueImplicit, "true" },
#ifdef HAVE_ACE
{ "-import", "*import", OptionValueNext },
{ "-comdraw", "*comdraw", OptionValueNext },
*** /dev/null Tue Feb 19 16:18:47 PST 2002
--- patches/ivtools-020219-johnston-028
*************** patches/ivtools-020219-johnston-028
*** 0 ****
--- 1 ----
+ ivtools-020219-johnston-028
|
|
From: <ivt...@li...> - 2002-02-13 17:46:26
|
Patch: ivtools-020109-johnston-018
For: ivtools-1.0
Author: joh...@us...
Subject: last patch for ivtools-1.0.1
Requires:
This is an intermediate patch to ivtools-1.0. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- last patch for ivtools-1.0.1
Index: top_ivtools/CHANGES
diff -c top_ivtools/CHANGES:1.1 top_ivtools/CHANGES:1.2
*** top_ivtools/CHANGES:1.1 Fri Nov 2 13:04:33 2001
--- ./CHANGES Wed Jan 9 16:35:40 2002
***************
*** 1,3 ****
--- 1,82 ----
+ January 9th, 2001 ivtools-1.0.1
+
+ - add comdraw funcs to poke (grey-level) pixel values into a raster,
+ and return the horizontal and vertical extent of the raster:
+
+ poke(compview x y val) -- poke pixel value into raster
+ pcols(compview) -- number of columns in a raster
+ pcols(compview) -- number of rows in a raster
+
+ - sometimes you can accidentally create a polygon with zero points (or
+ a multi-line or spline). Changes to safeguard against crashing
+ whenever this happens.
+
+ - fix bug in comterp stream traversal via NextFunc::execute_impl. It
+ was leaving an extra null-value on the stack, which confused the
+ interpreter.
+
+ - add an undocumented debug comterp func, stackheight
+
+ - tweak of imake system to facilitate NetBSD packaging
+
+ - add "None" color to background color menu, exposing the hidden
+ fillbg flag (transparent background mechanism) for the first time in
+ the history of this software.
+
+ - fix drawing editor import's use of gunzip to decompress graphic
+ files.
+
+ - update config.guess and config.sub, support scripts for the
+ configure script from the autoconf package. May fix some known
+ problems with HPUX, ALPHA, and ARM.
+
+ - add a comdraw command to create white rasters initialized with a 2
+ pixel wide black border:
+
+ compview=raster(x0,y0,x1,y1) -- create an empty raster
+
+ - make equality and inequality operators work for list objects. Note
+ that the "," list concatenation operator always appends the second
+ operand to the first operand if it is already a list, as illustrated
+ by this example ("> " inserted for clarity):
+
+ > l1=1,2,3
+ {1,2,3}
+ > l2=l1,4
+ {1,2,3,4}
+ > l1==l2
+ 1
+
+ Alternately the "list" command can be used to create a distinct list:
+
+ > l1=1,2,3
+ {1,2,3}
+ > l2=list(l1),4
+ {1,2,3,4}
+ > l1==l2
+ 0
+
+ - fix up some more handling of nil by arithmetic operators. The rule
+ is nil in, nil out.
+
+ - minor fixup in comterp error message system
+
+ - pclip command for clipping of rasters via a polygonal point list:
+
+ pclip(compview x1,y1,x2,y2,x3,y3[,...,xn,yn]) -- clip raster with polygon
+
+ - dtog and gtod commands for translating to/from graphic coordinates
+ to drawing coordinates:
+
+ gx,gy=dtog(compview dx,dy) -- convert from drawing to graphic coordinates
+ dx,dy=gtod(compview gx,gy) -- convert from graphic to drawing coordinates
+
+ - migration of conditional #define's from Time.c to Time.h by Todd Gruhn.
+
+ - work on stdin handling for comdraw, flipbook, graphdraw, and drawserv
+
+
+
November 2nd, 2001 ivtools-1.0
See CHANGES-0.9 for recent major changes.
Index: top_ivtools/COPYRIGHT
diff -c top_ivtools/COPYRIGHT:1.1 top_ivtools/COPYRIGHT:1.2
*** top_ivtools/COPYRIGHT:1.1 Fri Nov 2 13:04:34 2001
--- ./COPYRIGHT Wed Jan 9 16:35:40 2002
***************
*** 1,5 ****
/*
! * Copyright (c) 2001 Scott Johnston
* Copyright (c) 2000 Vectaport Inc., IET Inc
* Copyright (c) 1999 Vectaport Inc., IET Inc, R.B. Kissh and Associates
* Copyright (c) 1998 Vectaport Inc., R.B. Kissh and Associates, Eric F. Kahler
--- 1,5 ----
/*
! * Copyright (c) 2001, 2002 Scott Johnston
* Copyright (c) 2000 Vectaport Inc., IET Inc
* Copyright (c) 1999 Vectaport Inc., IET Inc, R.B. Kissh and Associates
* Copyright (c) 1998 Vectaport Inc., R.B. Kissh and Associates, Eric F. Kahler
Index: top_ivtools/INSTALL
diff -c top_ivtools/INSTALL:1.2 top_ivtools/INSTALL:1.3
*** top_ivtools/INSTALL:1.2 Wed Dec 19 15:13:10 2001
--- ./INSTALL Wed Jan 9 16:35:40 2002
***************
*** 1,7 ****
INSTALL for ivtools-1.0
! Instructions for building ivtools-1.0 from source, the short version:
./configure
make
--- 1,7 ----
INSTALL for ivtools-1.0
! Instructions for building ivtools-1.0.1 from source, the short version:
./configure
make
***************
*** 10,16 ****
And if that doesn't work...
! Instructions for building ivtools-1.0 from source, the long version:
0. Compilation Environment
--- 10,16 ----
And if that doesn't work...
! Instructions for building ivtools-1.0.1 from source, the long version:
0. Compilation Environment
Index: top_ivtools/README
diff -c top_ivtools/README:1.2 top_ivtools/README:1.3
*** top_ivtools/README:1.2 Wed Dec 19 15:13:11 2001
--- ./README Wed Jan 9 16:35:40 2002
***************
*** 2,8 ****
README for ivtools 1.0
! This directory contains a release of ivtools 1.0. You should read
the rest of this file for information on what ivtools is and the
INSTALL file for instructions on how to build it.
--- 2,8 ----
README for ivtools 1.0
! This directory contains a release of ivtools 1.0.1. You should read
the rest of this file for information on what ivtools is and the
INSTALL file for instructions on how to build it.
Index: top_ivtools/VERSION
diff -c top_ivtools/VERSION:1.1 top_ivtools/VERSION:1.2
*** top_ivtools/VERSION:1.1 Fri Nov 2 13:04:34 2001
--- ./VERSION Wed Jan 9 16:35:40 2002
***************
*** 1 ****
! Release 1.0
--- 1 ----
! Release 1.0.1
Index: include_std/version.h
diff -c include_std/version.h:1.1 include_std/version.h:1.2
*** include_std/version.h:1.1 Fri Nov 2 13:07:50 2001
--- src/include/ivstd/version.h Wed Jan 9 16:36:12 2002
***************
*** 1,3 ****
! #define IvtoolsVersion 1.0.0
! #define VersionString "1.0"
! #define ReleaseString "ivtools-1.0"
--- 1,3 ----
! #define IvtoolsVersion 1.0.1
! #define VersionString "1.0.1"
! #define ReleaseString "ivtools-1.0.1"
Index: config_ivtools/params.def
diff -c config_ivtools/params.def:1.1 config_ivtools/params.def:1.2
*** config_ivtools/params.def:1.1 Fri Nov 2 13:08:11 2001
--- config/params.def Wed Jan 9 16:36:17 2002
***************
*** 27,33 ****
* Name of the software release
*/
#ifndef Release
! #define Release ivtools-1.0.0
#endif
RELEASE = Release
--- 27,33 ----
* Name of the software release
*/
#ifndef Release
! #define Release ivtools-1.0.1
#endif
RELEASE = Release
***************
*** 36,42 ****
* VersionNumber
*/
#ifndef Version
! #define Version 1.0.0
#endif
VERSION = Version
--- 36,42 ----
* VersionNumber
*/
#ifndef Version
! #define Version 1.0.1
#endif
VERSION = Version
*** /dev/null Wed Jan 9 16:36:20 PST 2002
--- patches/ivtools-020109-johnston-018
*************** patches/ivtools-020109-johnston-018
*** 0 ****
--- 1 ----
+ ivtools-020109-johnston-018
|
|
From: <ivt...@li...> - 2002-02-13 17:45:30
|
Patch: ivtools-011130-johnston-012
For: ivtools-1.0
Author: joh...@us...
Subject: minor fixup in comterp error message system
Requires:
This is an intermediate patch to ivtools-1.0. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- minor fixup in comterp error message system
Index: ComUtil/errsys.c
diff -c ComUtil/errsys.c:1.1 ComUtil/errsys.c:1.2
*** ComUtil/errsys.c:1.1 Fri Nov 2 13:04:39 2001
--- src/ComUtil/errsys.c Fri Nov 30 06:49:41 2001
***************
*** 612,618 ****
--- 612,620 ----
TooManyErrors = FALSE;
fclose( ErrorIOFile );
ErrorIOFile = NULL;
+ #if 0
unlink( ERROR_IO_FILE );
+ #endif
return;
}
***************
*** 712,717 ****
--- 714,720 ----
!*/
{
+ #if 0
char *errpath;
if( ErrorIOFile == NULL ) {
errpath = tmpnam(nil);
***************
*** 720,725 ****
--- 723,736 ----
KANIL1( "Unable to open error I/O file %s", errpath );
}
return ErrorIOFile;
+ #else
+ if( ErrorIOFile == NULL ) {
+ ErrorIOFile = tmpfile();
+ if( ErrorIOFile == NULL )
+ KANIL( "Unable to open error I/O file" );
+ }
+ return ErrorIOFile;
+ #endif
}
*** /dev/null Fri Nov 30 06:50:09 PST 2001
--- patches/ivtools-011130-johnston-012
*************** patches/ivtools-011130-johnston-012
*** 0 ****
--- 1 ----
+ ivtools-011130-johnston-012
|
|
From: <ivt...@li...> - 2002-02-13 17:44:54
|
Patch: ivtools-011116-johnston-005
For: ivtools-1.0
Author: joh...@us...
Subject: really fix bug in comterp stream traversal
Requires:
This is an intermediate patch to ivtools-1.0. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- fix bug the proper way for comterp stream traversal via
NextFunc::execute_impl. It was actually leaving more than an extra
null-value on the stack, which confused the interpreter.
Index: ComTerp/strmfunc.c
diff -c ComTerp/strmfunc.c:1.2 ComTerp/strmfunc.c:1.3
*** ComTerp/strmfunc.c:1.2 Fri Nov 16 08:41:11 2001
--- src/ComTerp/strmfunc.c Fri Nov 16 10:00:15 2001
***************
*** 399,407 ****
if (comterp->stack_top().is_null() &&
comterp->stack_height()>inside_stackh) {
! /* sub-stream return null, zero it, and return null for this one */
val->stream_list()->clear();
streamv.stream_list()->clear();
return;
} else if (comterp->stack_height()==inside_stackh)
comterp->push_stack(ComValue::blankval());
--- 399,409 ----
if (comterp->stack_top().is_null() &&
comterp->stack_height()>inside_stackh) {
! /* sub-stream returnnull, zero it, and return null for this one */
val->stream_list()->clear();
streamv.stream_list()->clear();
+ while (comterp->stack_height()>outside_stackh) comterp->pop_stack();
+ comterp->push_stack(ComValue::nullval());
return;
} else if (comterp->stack_height()==inside_stackh)
comterp->push_stack(ComValue::blankval());
*** /dev/null Fri Nov 16 10:01:45 PST 2001
--- patches/ivtools-011116-johnston-005
*************** patches/ivtools-011116-johnston-005
*** 0 ****
--- 1 ----
+ ivtools-011116-johnston-005
|
|
From: <ivt...@li...> - 2002-02-13 17:42:57
|
Patch: ivtools-020213-johnston-027
For: ivtools-1.0.1
Author: joh...@us...
Subject: whiteboard and transparency experiments
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- further work on comdraw whiteboard capability. Setting up for a
distributed drawing environment by ensuring that all graphics can be
constructed via command line instead of directly.
- instituted (then disabled) a transparent pixel capability. Needs an
API in comdraw or drawtool first.
Index: OverlayUnidraw/ovarrow.c
diff -c OverlayUnidraw/ovarrow.c:1.2 OverlayUnidraw/ovarrow.c:1.3
*** OverlayUnidraw/ovarrow.c:1.2 Thu Nov 29 07:39:20 2001
--- src/OverlayUnidraw/ovarrow.c Wed Feb 13 09:32:52 2002
***************
*** 765,771 ****
} else {
for (int i = 0; i < n;) {
for (int j=0; j < 10 && i < n; j++, i++) {
! out << "(" << x[i] << "," << y[i] << ")";
if (i+1 < n ) out << ",";
}
if (i+1 < n ) {
--- 765,774 ----
} else {
for (int i = 0; i < n;) {
for (int j=0; j < 10 && i < n; j++, i++) {
! if (ptlist_parens())
! out << "(" << x[i] << "," << y[i] << ")";
! else
! out << x[i] << "," << y[i];
if (i+1 < n ) out << ",";
}
if (i+1 < n ) {
***************
*** 1153,1159 ****
} else {
for (int i = 0; i < n; ) {
for (int j = 0; j < 10 && i < n; j++, i++) {
! out << "(" << x[i] << "," << y[i] << ")";
if (i+1 < n ) out << ",";
}
if (i+1 < n ) {
--- 1156,1165 ----
} else {
for (int i = 0; i < n; ) {
for (int j = 0; j < 10 && i < n; j++, i++) {
! if (ptlist_parens())
! out << "(" << x[i] << "," << y[i] << ")";
! else
! out << x[i] << "," << y[i];
if (i+1 < n ) out << ",";
}
if (i+1 < n ) {
Index: OverlayUnidraw/ovpainter.c
diff -c OverlayUnidraw/ovpainter.c:1.4 OverlayUnidraw/ovpainter.c:1.5
*** OverlayUnidraw/ovpainter.c:1.4 Wed Jan 30 14:12:08 2002
--- src/OverlayUnidraw/ovpainter.c Wed Feb 13 09:32:52 2002
***************
*** 1183,1189 ****
XSetGraphicsExposures(dpy, Rep()->fillgc, False);
int _ymin = c->pheight() - 1 - (ymin + pheight);
! if (r_r->alphaval()<1.0) {
/* WITH alpha-tranparency */
--- 1183,1191 ----
XSetGraphicsExposures(dpy, Rep()->fillgc, False);
int _ymin = c->pheight() - 1 - (ymin + pheight);
! boolean transparent_val = 0;
!
! if (r_r->alphaval()<1.0 || transparent_val) {
/* WITH alpha-tranparency */
***************
*** 1218,1230 ****
d.rep()->default_visual_->find_color(val2, xc2);
float alpha = r_r->alphaval();
float beta = 1.0 - alpha;
! short unsigned newred = (short unsigned)(xc1.red*alpha+xc2.red*beta);
! short unsigned newgreen = (short unsigned)(xc1.green*alpha+xc2.green*beta);
! short unsigned newblue = (short unsigned)(xc1.blue*alpha+xc2.blue*beta);
!
! XColor newcolor;
! d.rep()->default_visual_->find_color((short unsigned int)newred, (short unsigned int)newgreen, (short unsigned int)newblue, newcolor);
! XPutPixel(im1, i, j, newcolor.pixel);
}
}
--- 1220,1239 ----
d.rep()->default_visual_->find_color(val2, xc2);
float alpha = r_r->alphaval();
float beta = 1.0 - alpha;
! if (!(transparent_val &&
! xc1.red==0xffff &&
! xc1.green==0xffff &&
! xc1.blue==0xffff)) {
! unsigned short newred = (short unsigned)(xc1.red*alpha+xc2.red*beta);
! unsigned short newgreen = (short unsigned)(xc1.green*alpha+xc2.green*beta);
! unsigned short newblue = (short unsigned)(xc1.blue*alpha+xc2.blue*beta);
!
! XColor newcolor;
! d.rep()->default_visual_->find_color((short unsigned int)newred, (short unsigned int)newgreen, (short unsigned int)newblue, newcolor);
! XPutPixel(im1, i, j, newcolor.pixel);
! } else {
! XPutPixel(im1, i, j, xc2.pixel);
! }
}
}
Index: OverlayUnidraw/ovvertices.c
diff -c OverlayUnidraw/ovvertices.c:1.2 OverlayUnidraw/ovvertices.c:1.3
*** OverlayUnidraw/ovvertices.c:1.2 Wed Nov 14 16:41:55 2001
--- src/OverlayUnidraw/ovvertices.c Wed Feb 13 09:32:52 2002
***************
*** 215,221 ****
} else {
for (int i = 0; i < n; ) {
for (int j = 0; j < 10 && i < n; j++, i++) {
! out << "(" << x[i] << "," << y[i] << ")";
if (i+1 < n )
out << ",";
}
--- 215,224 ----
} else {
for (int i = 0; i < n; ) {
for (int j = 0; j < 10 && i < n; j++, i++) {
! if (ptlist_parens())
! out << "(" << x[i] << "," << y[i] << ")";
! else
! out << x[i] << "," << y[i];
if (i+1 < n )
out << ",";
}
Index: OverlayUnidraw/scriptview.c
diff -c OverlayUnidraw/scriptview.c:1.2 OverlayUnidraw/scriptview.c:1.3
*** OverlayUnidraw/scriptview.c:1.2 Wed Nov 14 16:41:55 2001
--- src/OverlayUnidraw/scriptview.c Wed Feb 13 09:32:52 2002
***************
*** 65,70 ****
--- 65,72 ----
/*****************************************************************************/
+ boolean OverlayScript::_ptlist_parens = true;
+
ClassId OverlayScript::GetClassId () { return OVERLAY_SCRIPT; }
boolean OverlayScript::IsA (ClassId id) {
Index: OverlayUnidraw/scriptview.h
diff -c OverlayUnidraw/scriptview.h:1.1 OverlayUnidraw/scriptview.h:1.2
*** OverlayUnidraw/scriptview.h:1.1 Fri Nov 2 13:07:03 2001
--- src/OverlayUnidraw/scriptview.h Wed Feb 13 09:32:52 2002
***************
*** 158,163 ****
--- 158,169 ----
static boolean skip_comp(istream& in);
// skip the text for the current component while de-serializing.
+ static boolean ptlist_parens() { return _ptlist_parens; }
+ // get flag that indicates putting parens around pointlist's
+
+ static void ptlist_parens(boolean flag) { _ptlist_parens = flag; }
+ // set flag that indicates putting parens around pointlist's
+
protected:
virtual void FillBg(ostream& out);
virtual void Brush(ostream& out);
***************
*** 177,182 ****
--- 183,190 ----
virtual void SetParent(ComponentView* child, ComponentView* parent);
OverlayScript* _parent;
+
+ static boolean _ptlist_parens;
};
//: composite version of OverlayScript.
Index: ComUnidraw/comeditor.c
diff -c ComUnidraw/comeditor.c:1.9 ComUnidraw/comeditor.c:1.10
*** ComUnidraw/comeditor.c:1.9 Thu Jan 31 10:20:46 2002
--- src/ComUnidraw/comeditor.c Wed Feb 13 09:32:55 2002
***************
*** 228,233 ****
--- 228,235 ----
OverlayEditor::ExecuteCmd(cmd);
else {
ostrstream sbuf;
+ boolean oldflag = OverlayScript::ptlist_parens();
+ OverlayScript::ptlist_parens(false);
switch (cmd->GetClassId()) {
case PASTE_CMD:
{
***************
*** 271,276 ****
--- 273,279 ----
}
break;
}
+ OverlayScript::ptlist_parens(oldflag);
}
}
*** /dev/null Wed Feb 13 09:33:01 PST 2002
--- patches/ivtools-020213-johnston-027
*************** patches/ivtools-020213-johnston-027
*** 0 ****
--- 1 ----
+ ivtools-020213-johnston-027
|
|
From: <ivt...@li...> - 2002-02-13 17:42:44
|
Patch: ivtools-020205-johnston-026 For: ivtools-1.0.1 Author: joh...@us... Subject: partial changes for HPUX compilation Requires: This is an intermediate patch to ivtools-1.0.1. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: - partial changes for HPUX compilation. There might be other problems with the HP linker's desire to fully link a shared library when it is built, and problems with parameters like ExtraCCFlags that might need commenting out for reasons I don't understand. Index: config_ivtools/rules.def diff -c config_ivtools/rules.def:1.4 config_ivtools/rules.def:1.5 *** config_ivtools/rules.def:1.4 Wed Dec 19 15:15:18 2001 --- config/rules.def Tue Feb 5 09:15:24 2002 *************** *** 687,693 **** #ifndef NormalDynamicSharedLibraryTarget #if defined(HPArchitecture) #define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ ! AOUT = Concat(lib,libname.so.rev) @@\ SHARED_CCFLAGS = SharedCCFlags @@\ @@\ AllTarget(Concat(lib,libname.sl.rev)) @@\ --- 687,693 ---- #ifndef NormalDynamicSharedLibraryTarget #if defined(HPArchitecture) #define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ ! AOUT = Concat(lib,libname.sl.rev) @@\ SHARED_CCFLAGS = SharedCCFlags @@\ @@\ AllTarget(Concat(lib,libname.sl.rev)) @@\ Index: config_ivtools/site.def.HP800 diff -c config_ivtools/site.def.HP800:1.1 config_ivtools/site.def.HP800:1.2 *** config_ivtools/site.def.HP800:1.1 Fri Nov 2 13:08:11 2001 --- config/site.def.HP800 Tue Feb 5 09:15:24 2002 *************** *** 38,44 **** #define ExtraCCLdLibs -lstdc++ -lm /* command to create shared libraries */ ! #define SharedLibraryCmd(ldobjs) g++ -shared -fpic -o $@ ldobjs /* Different LdPath for HP */ #define LdPath(libname) -Wl,+s -L$(LIBSRC)/libname/$(ARCH) Concat(-l,libname) --- 38,45 ---- #define ExtraCCLdLibs -lstdc++ -lm /* command to create shared libraries */ ! /* notice all dependent libraries need to be supplied */ ! #define SharedLibraryCmd(ldobjs) g++ -shared -fPIC -o $@ ldobjs $(CCLDLIBS) /* Different LdPath for HP */ #define LdPath(libname) -Wl,+s -L$(LIBSRC)/libname/$(ARCH) Concat(-l,libname) *** /dev/null Tue Feb 5 09:15:25 PST 2002 --- patches/ivtools-020205-johnston-026 *************** patches/ivtools-020205-johnston-026 *** 0 **** --- 1 ---- + ivtools-020205-johnston-026 |
|
From: <ivt...@li...> - 2002-02-01 01:01:40
|
Patch: ivtools-020130-johnston-024 For: ivtools-1.0.1 Author: joh...@us... Subject: fix for multi-point cursor lock, alpha-transparent rasters Requires: This is an intermediate patch to ivtools-1.0.1. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: - fix submitted by E.J. Neafsey (Loyola University) for drawing multi-point graphics with shift key pressed to make all the lines either completely horizontal or vertical. The shift key always worked, yet the origin used (for limiting motion to the horizontal or vertical) was never updated to the last vertex as the new points were added. - added alpha-transparency to raster display. It works, but there is no save/restore of the alpha value, or user interface to set or view the value. However, you can use OverlayRasterRect::alphaval() to set/get the constant (one per raster). No PostScript output yet as well. - propogated "None" background color to all drawing editor's BgColor menu. - took out lingering "r+" from drawserv document fopen() call. This is only needed in certain cases: http://www.ivtools.org/ivtools/fopen_rplus.patch.txt Index: Unidraw/manips.c diff -c Unidraw/manips.c:1.1 Unidraw/manips.c:1.2 *** Unidraw/manips.c:1.1 Fri Nov 2 13:06:49 2001 --- src/Unidraw/manips.c Wed Jan 30 14:12:06 2002 *************** *** 353,358 **** --- 353,360 ---- if (e.button == LEFTMOUSE) { GetGrowingVertices()->AddVertex(e.x, e.y); + _origx = e.x; + _origy = e.y; } else if (e.button == MIDDLEMOUSE) { GetGrowingVertices()->AddVertex(e.x, e.y); Index: OverlayUnidraw/ovpainter.c diff -c OverlayUnidraw/ovpainter.c:1.3 OverlayUnidraw/ovpainter.c:1.4 *** OverlayUnidraw/ovpainter.c:1.3 Wed Dec 19 15:14:19 2001 --- src/OverlayUnidraw/ovpainter.c Wed Jan 30 14:12:08 2002 *************** *** 1181,1194 **** if (xid != CanvasRep::unbound) { XSetRegion(dpy, Rep()->fillgc, rg); XSetGraphicsExposures(dpy, Rep()->fillgc, False); ! XCopyArea( ! dpy, dest, xid, Rep()->fillgc, ! 0, 0, pwidth, pheight, xmin, ! c->pheight() - 1 - (ymin + pheight) ! ); XSetGraphicsExposures(dpy, Rep()->fillgc, True); XDestroyRegion(rg); ! if (Rep()->clipped) { XSetClipRectangles( dpy, Rep()->fillgc, 0, 0, Rep()->xclip, 1, Unsorted --- 1181,1252 ---- if (xid != CanvasRep::unbound) { XSetRegion(dpy, Rep()->fillgc, rg); XSetGraphicsExposures(dpy, Rep()->fillgc, False); ! int _ymin = c->pheight() - 1 - (ymin + pheight); ! ! if (r_r->alphaval()<1.0) { ! ! /* WITH alpha-tranparency */ ! ! /* adjust pwidth and pheight, because they might be in error */ ! XWindow win_ret; ! int x_ret, y_ret; ! unsigned int w_ret, h_ret, borderw_ret, depth_ret; ! XGetGeometry(dpy, dest, &win_ret, &x_ret, &y_ret, &w_ret, &h_ret, ! &borderw_ret, &depth_ret); ! pwidth = Math::min((unsigned)pwidth, w_ret); ! pheight = Math::min((unsigned)pheight, h_ret); ! ! XImage* im1 = ! XGetImage(dpy, dest, 0, 0, ! pwidth, pheight, AllPlanes, ZPixmap); ! int xbclip = xmin < 0 ? -xmin : 0; ! int ybclip = _ymin < 0 ? -_ymin : 0; ! int xeclip = xmin + pwidth > c->pwidth() ? (pwidth + xmin) - c->pwidth() : 0; ! int yeclip = _ymin + pheight > c->pheight() ? (pheight + _ymin) - c->pheight() : 0; ! XImage* im2 = ! XGetImage(dpy, xid, ! xmin+xbclip, _ymin+ybclip, ! pwidth-xeclip-xbclip, pheight-yeclip-ybclip, ! AllPlanes, ZPixmap); ! if (im1 && im2) { ! for (int j=ybclip; j<pheight-yeclip; j++) { ! for (int i=xbclip; i<pwidth-xeclip; i++) { ! unsigned long val1 = XGetPixel(im1, i, j); ! unsigned long val2 = XGetPixel(im2, i-xbclip, j-ybclip); ! XColor xc1, xc2; ! d.rep()->default_visual_->find_color(val1, xc1); ! d.rep()->default_visual_->find_color(val2, xc2); ! float alpha = r_r->alphaval(); ! float beta = 1.0 - alpha; ! short unsigned newred = (short unsigned)(xc1.red*alpha+xc2.red*beta); ! short unsigned newgreen = (short unsigned)(xc1.green*alpha+xc2.green*beta); ! short unsigned newblue = (short unsigned)(xc1.blue*alpha+xc2.blue*beta); ! ! XColor newcolor; ! d.rep()->default_visual_->find_color((short unsigned int)newred, (short unsigned int)newgreen, (short unsigned int)newblue, newcolor); ! XPutPixel(im1, i, j, newcolor.pixel); ! } ! } ! ! XPutImage(dpy, xid, Rep()->fillgc, im1, xbclip, ybclip, xmin+xbclip, ! _ymin+ybclip, pwidth-xbclip-xeclip, pheight-ybclip-yeclip); ! XDestroyImage(im1); ! XDestroyImage(im2); ! } ! ! } else { ! ! /* WITHOUT alpha-tranparency */ ! ! XCopyArea( ! dpy, dest, xid, Rep()->fillgc, ! 0, 0, pwidth, pheight, xmin, _ymin); ! ! } ! XSetGraphicsExposures(dpy, Rep()->fillgc, True); XDestroyRegion(rg); ! if (Rep()->clipped) { XSetClipRectangles( dpy, Rep()->fillgc, 0, 0, Rep()->xclip, 1, Unsorted Index: OverlayUnidraw/ovraster.c diff -c OverlayUnidraw/ovraster.c:1.2 OverlayUnidraw/ovraster.c:1.3 *** OverlayUnidraw/ovraster.c:1.2 Wed Dec 19 15:14:19 2001 --- src/OverlayUnidraw/ovraster.c Wed Jan 30 14:12:08 2002 *************** *** 910,915 **** --- 910,916 ---- _xbeg = _xend = _ybeg = _yend = -1; _damage_done = 0; _clippts = nil; + _alphaval = 1.0; } OverlayRasterRect::~OverlayRasterRect () { Unref(_clippts);} *************** *** 940,945 **** --- 941,947 ---- new_rr->ybeg(_ybeg); new_rr->yend(_yend); new_rr->clippts(_clippts); + new_rr->alphaval(_alphaval); return new_rr; } Index: OverlayUnidraw/ovraster.h diff -c OverlayUnidraw/ovraster.h:1.2 OverlayUnidraw/ovraster.h:1.3 *** OverlayUnidraw/ovraster.h:1.2 Wed Dec 19 15:14:19 2001 --- src/OverlayUnidraw/ovraster.h Wed Jan 30 14:12:08 2002 *************** *** 218,223 **** --- 218,228 ---- MultiLineObj* clippts(); // return polygon used for additional clipping + void alphaval(float alpha) { _alphaval = alpha; } + // set alpha-transparency value, default is 1.0 + float alphaval() { return _alphaval; } + // return alpha-transparency value. + virtual Graphic* Copy(); OverlayRaster* GetOriginal() { return (OverlayRaster*)_raster; } *************** *** 282,287 **** --- 287,293 ---- IntCoord _damage_t; MultiLineObj* _clippts; + float _alphaval; friend class RasterOvComp; friend class RasterOvView; Index: drawtool/main.c diff -c drawtool/main.c:1.2 drawtool/main.c:1.3 *** drawtool/main.c:1.2 Thu Nov 29 07:39:23 2001 --- src/drawtool/main.c Wed Jan 30 14:12:10 2002 *************** *** 140,146 **** { "*bgcolor12", "DkGray 33000 33000 33000" }, { "*bgcolor13", "none" }, { "*history", "20" }, - { "*color5", "false" }, { "*color6", "true" }, { "*gray5", "false" }, --- 140,145 ---- Index: comdraw/main.c diff -c comdraw/main.c:1.3 comdraw/main.c:1.4 *** comdraw/main.c:1.3 Mon Jan 14 15:57:06 2002 --- src/comdraw/main.c Wed Jan 30 14:12:12 2002 *************** *** 142,147 **** --- 142,148 ---- { "*bgcolor10", "White" }, { "*bgcolor11", "LtGray 50000 50000 50000" }, { "*bgcolor12", "DkGray 33000 33000 33000" }, + { "*bgcolor13", "none" }, { "*history", "20" }, { "*color5", "false" }, { "*color6", "false" }, Index: flipbook/main.c diff -c flipbook/main.c:1.2 flipbook/main.c:1.3 *** flipbook/main.c:1.2 Wed Jan 9 09:06:28 2002 --- src/flipbook/main.c Wed Jan 30 14:12:14 2002 *************** *** 135,140 **** --- 135,141 ---- { "*bgcolor10", "White" }, { "*bgcolor11", "LtGray 50000 50000 50000" }, { "*bgcolor12", "DkGray 33000 33000 33000" }, + { "*bgcolor13", "none" }, { "*history", "20" }, { "*color6", "false" }, { "*color5", "false" }, Index: graphdraw/main.c diff -c graphdraw/main.c:1.3 graphdraw/main.c:1.4 *** graphdraw/main.c:1.3 Thu Jan 10 16:14:05 2002 --- src/graphdraw/main.c Wed Jan 30 14:12:15 2002 *************** *** 135,140 **** --- 135,141 ---- { "*bgcolor10", "White" }, { "*bgcolor11", "LtGray 50000 50000 50000" }, { "*bgcolor12", "DkGray 33000 33000 33000" }, + { "*bgcolor13", "none" }, { "*history", "20" }, { "*color6", "false" }, { "*color5", "false" }, Index: DrawServ/drawcatalog.c diff -c DrawServ/drawcatalog.c:1.1 DrawServ/drawcatalog.c:1.2 *** DrawServ/drawcatalog.c:1.1 Fri Nov 2 13:07:16 2001 --- src/DrawServ/drawcatalog.c Wed Jan 30 14:12:17 2002 *************** *** 73,79 **** #endif name = nil; } else { ! fptr = fopen(name, "r+"); fptr = OvImportCmd::CheckCompression(fptr, name, compressed); #if __GNUG__<3 _valid = fptr ? fbuf.attach(fileno(fptr)) != 0 : false; --- 73,79 ---- #endif name = nil; } else { ! fptr = fopen(name, "r"); fptr = OvImportCmd::CheckCompression(fptr, name, compressed); #if __GNUG__<3 _valid = fptr ? fbuf.attach(fileno(fptr)) != 0 : false; Index: drawserv/main.c diff -c drawserv/main.c:1.1 drawserv/main.c:1.2 *** drawserv/main.c:1.1 Fri Nov 2 13:07:18 2001 --- src/drawserv_/main.c Wed Jan 30 14:12:18 2002 *************** *** 164,169 **** --- 164,170 ---- { "*bgcolor10", "White" }, { "*bgcolor11", "LtGray 50000 50000 50000" }, { "*bgcolor12", "DkGray 33000 33000 33000" }, + { "*bgcolor13", "none" }, { "*history", "20" }, { "*color6", "false" }, { "*color5", "false" }, *** /dev/null Wed Jan 30 14:12:26 PST 2002 --- patches/ivtools-020130-johnston-024 *************** patches/ivtools-020130-johnston-024 *** 0 **** --- 1 ---- + ivtools-020130-johnston-024 |
|
From: <ivt...@li...> - 2002-01-31 18:31:57
|
Patch: ivtools-020131-johnston-025
For: ivtools-1.0.1
Author: joh...@us...
Subject: comdraw hooks for raster alpha-transparency
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- add an alpha command to comdraw, to set/get the alpha value of a raster
graphic:
alpha(compview [alphaval]) -- set/get alpha transparency value
a command line like the following will spin a raster forward as it
appears (assume g is a variable pointing to a RasterComp, and the
current selection):
for(x=0 x<10 x++ alpha(g float(x)/10);rotate(30);scale(1/.9 1/.9);update)
Index: OverlayUnidraw/ovraster.c
diff -c OverlayUnidraw/ovraster.c:1.3 OverlayUnidraw/ovraster.c:1.4
*** OverlayUnidraw/ovraster.c:1.3 Wed Jan 30 14:12:08 2002
--- src/OverlayUnidraw/ovraster.c Thu Jan 31 10:20:44 2002
***************
*** 1050,1055 ****
--- 1050,1057 ----
_clippts = rect._clippts;
Resource::ref(_clippts);
+ _alphaval = rect.alphaval();
+
return *this;
}
Index: ComUnidraw/comeditor.c
diff -c ComUnidraw/comeditor.c:1.8 ComUnidraw/comeditor.c:1.9
*** ComUnidraw/comeditor.c:1.8 Wed Jan 9 15:23:17 2002
--- src/ComUnidraw/comeditor.c Thu Jan 31 10:20:46 2002
***************
*** 220,225 ****
--- 220,226 ----
comterp->add_command("prows", new PixelRowsFunc(comterp, this));
comterp->add_command("pflush", new PixelFlushFunc(comterp, this));
comterp->add_command("pclip", new PixelClipFunc(comterp, this));
+ comterp->add_command("alpha", new AlphaTransFunc(comterp, this));
}
/* virtual */ void ComEditor::ExecuteCmd(Command* cmd) {
Index: ComUnidraw/pixelfunc.c
diff -c ComUnidraw/pixelfunc.c:1.2 ComUnidraw/pixelfunc.c:1.3
*** ComUnidraw/pixelfunc.c:1.2 Wed Dec 19 15:14:26 2001
--- src/ComUnidraw/pixelfunc.c Thu Jan 31 10:20:46 2002
***************
*** 165,167 ****
--- 165,194 ----
}
+ /*****************************************************************************/
+
+ AlphaTransFunc::AlphaTransFunc(ComTerp* comterp, Editor* ed) : UnidrawFunc(comterp, ed) {
+ }
+
+ void AlphaTransFunc::execute() {
+ Viewer* viewer = _ed->GetViewer();
+
+ ComValue rastcompv(stack_arg(0));
+ ComValue alphav(stack_arg(1));
+ reset_stack();
+
+ RasterOvComp* rastcomp = (RasterOvComp*) rastcompv.geta(RasterOvComp::class_symid());
+ OverlayRasterRect* rastrect = rastcomp ? rastcomp->GetOverlayRasterRect() : nil;
+
+ if (rastrect ) {
+ if (alphav.is_numeric()) {
+ rastrect->alphaval(alphav.float_val());
+ rastcomp->Notify();
+ }
+ ComValue retval(rastrect->alphaval());
+ push_stack(retval);
+ } else
+ push_stack(ComValue::nullval());
+
+ }
+
Index: ComUnidraw/pixelfunc.h
diff -c ComUnidraw/pixelfunc.h:1.2 ComUnidraw/pixelfunc.h:1.3
*** ComUnidraw/pixelfunc.h:1.2 Wed Dec 19 15:14:26 2001
--- src/ComUnidraw/pixelfunc.h Thu Jan 31 10:20:46 2002
***************
*** 75,78 ****
--- 75,88 ----
virtual const char* docstring() {
return "%s(compview x1,y1,x2,y2,x3,y3[,...,xn,yn]) -- clip raster with polygon"; }
};
+
+ //: command to set/get raster alpha transparency
+ // alpha(compview [alphaval]) -- set/get alpha transparency value
+ class AlphaTransFunc : public UnidrawFunc {
+ public:
+ AlphaTransFunc(ComTerp*,Editor*);
+ virtual void execute();
+ virtual const char* docstring() {
+ return "%s(compview [alphaval]) -- set/get alpha transparency value"; }
+ };
#endif /* !defined(_pixelfunc_h) */
Index: comdraw/README
diff -c comdraw/README:1.6 comdraw/README:1.7
*** comdraw/README:1.6 Wed Dec 19 15:25:42 2001
--- src/comdraw/README Thu Jan 31 10:20:48 2002
***************
*** 123,128 ****
--- 123,129 ----
pcols(compview) -- number of rows in a raster
pflush(compview) -- flush pixels poked into a raster
pclip(compview x1,y1,x2,y2,x3,y3[,...,xn,yn]) -- clip raster with polygon
+ alpha(compview [alphaval]) -- set/get alpha transparency
PLOTTING COMMANDS
Index: man1_ivtools/comdraw.1
diff -c man1_ivtools/comdraw.1:1.6 man1_ivtools/comdraw.1:1.7
*** man1_ivtools/comdraw.1:1.6 Wed Dec 19 15:26:04 2001
--- src/man/man1/comdraw.1 Thu Jan 31 10:20:57 2002
***************
*** 133,138 ****
--- 133,139 ----
pcols(compview) -- number of rows in a raster
pflush(compview) -- flush pixels poked into a raster
pclip(compview x1,y1,x2,y2,x3,y3[,...,xn,yn]) -- clip raster with polygon
+ alpha(compview [alphaval]) -- set/get alpha transparency
.SH PLOTTING COMMANDS
*** /dev/null Thu Jan 31 10:21:00 PST 2002
--- patches/ivtools-020131-johnston-025
*************** patches/ivtools-020131-johnston-025
*** 0 ****
--- 1 ----
+ ivtools-020131-johnston-025
|
|
From: <ivt...@li...> - 2002-01-17 19:04:44
|
Patch: ivtools-020117-johnston-023
For: ivtools-1.0.1
Author: joh...@us...
Subject: make "Show Prev Frame" take effect immediately
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- make the "Show Prev Frame" command of flipbook take effect
immediately (same for "Hide Prev Frame"). Needed to call
FrameEditor::UpdateFrame as well as Unidraw::Update.
Index: FrameUnidraw/framecmds.c
diff -c FrameUnidraw/framecmds.c:1.1 FrameUnidraw/framecmds.c:1.2
*** FrameUnidraw/framecmds.c:1.1 Fri Nov 2 13:07:10 2001
--- src/FrameUnidraw/framecmds.c Thu Jan 17 09:59:44 2002
***************
*** 779,790 ****
--- 779,792 ----
FrameEditor* ed = (FrameEditor*) GetEditor();
_old_offset = ed->OtherFrame();
ed->OtherFrame(_offset);
+ ed->UpdateFrame();
unidraw->Update();
}
void ShowOtherFrameCmd::Unexecute() {
FrameEditor* ed = (FrameEditor*) GetEditor();
ed->OtherFrame(_old_offset);
+ ed->UpdateFrame();
unidraw->Update();
}
*** /dev/null Thu Jan 17 10:00:13 PST 2002
--- patches/ivtools-020117-johnston-023
*************** patches/ivtools-020117-johnston-023
*** 0 ****
--- 1 ----
+ ivtools-020117-johnston-023
|
|
From: <ivt...@li...> - 2002-01-16 18:30:03
|
Patch: ivtools-020115-johnston-022
For: ivtools-1.0.1
Author: joh...@us...
Subject: try -gdwarf-2, fix GraphicLoc updating bug
Requires:
This is an intermediate patch to ivtools-1.0.1. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- try -gdwarf-2 as a compilation option for debugging with gdb-5.1 and
gcc-3.0.*. Not sure if there was an improvement. Maybe this is already
the default.
- fix bug in GraphicLoc tool, where the text wasn't refreshed on subsequent
uses after the dialog box had been unmapped.
Index: OverlayUnidraw/grloctool.c
diff -c OverlayUnidraw/grloctool.c:1.1 OverlayUnidraw/grloctool.c:1.2
*** OverlayUnidraw/grloctool.c:1.1 Fri Nov 2 13:07:02 2001
--- src/OverlayUnidraw/grloctool.c Tue Jan 15 15:07:48 2002
***************
*** 92,99 ****
_otext->accept();
if (!dialog()->mapped())
dialog()->map_for(v->GetEditor()->GetWindow());
! else
! _otext->notify();
}
}
Manipulator* m = nil;
--- 92,98 ----
_otext->accept();
if (!dialog()->mapped())
dialog()->map_for(v->GetEditor()->GetWindow());
! _otext->notify();
}
}
Manipulator* m = nil;
Index: config_ivtools/params.def
diff -c config_ivtools/params.def:1.2 config_ivtools/params.def:1.3
*** config_ivtools/params.def:1.2 Wed Jan 9 16:36:17 2002
--- config/params.def Tue Jan 15 15:08:05 2002
***************
*** 367,373 ****
--- 367,377 ----
#if TurnOnOptimizing && !TurnOnDebugging
#define DebugCCFlags /**/
#else
+ #if LibStdCPlusPlusV3==1
+ #define DebugCCFlags -gdwarf-2
+ #else
#define DebugCCFlags -g
+ #endif
#endif
#endif
*** /dev/null Tue Jan 15 15:08:07 PST 2002
--- patches/ivtools-020115-johnston-022
*************** patches/ivtools-020115-johnston-022
*** 0 ****
--- 1 ----
+ ivtools-020115-johnston-022
|
24 messages has been excluded from this view by a project administrator.
