wok view inkscape/stuff/patches/0004-Fix_FTBFS_on_gcc-4.8.patch @ rev 17707
Up marlin: edit last patch (again)
| author | Yuri Pourre <yuripourre@gmail.com> |
|---|---|
| date | Mon Mar 02 11:31:13 2015 -0300 (2015-03-02) |
| parents | |
| children |
line source
1 From: Mattia Rizzolo <mattia@mapreri.org>
2 Date: Tue, 8 Jul 2014 12:33:57 +0200
3 Subject: Fix_FTBFS_on_gcc-4.8
5 Last-Update: 2014-07-02
7 Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com>
8 ---
9 src/libavoid/vpsc.cpp | 2 +-
10 src/libcola/straightener.cpp | 6 +++---
11 src/libcroco/cr-parser.c | 2 +-
12 src/libvpsc/block.cpp | 2 +-
13 4 files changed, 6 insertions(+), 6 deletions(-)
15 diff --git a/src/libavoid/vpsc.cpp b/src/libavoid/vpsc.cpp
16 index 19d3603..1646dda 100644
17 --- a/src/libavoid/vpsc.cpp
18 +++ b/src/libavoid/vpsc.cpp
19 @@ -422,7 +422,7 @@ Constraint* IncSolver::mostViolated(Constraints &l) {
20 // downwards. There is always at least 1 element in the
21 // vector because of search.
22 // TODO check this logic and add parens:
23 - if((deletePoint != end) && ((minSlack < ZERO_UPPERBOUND) && !v->active || v->equality)) {
24 + if((deletePoint != end) && (((minSlack < ZERO_UPPERBOUND) && !v->active) || v->equality)) {
25 *deletePoint = l[l.size()-1];
26 l.resize(l.size()-1);
27 }
28 diff --git a/src/libcola/straightener.cpp b/src/libcola/straightener.cpp
29 index e237c03..7c73cb9 100644
30 --- a/src/libcola/straightener.cpp
31 +++ b/src/libcola/straightener.cpp
32 @@ -108,7 +108,7 @@ namespace straightener {
33 int compare_events(const void *a, const void *b) {
34 Event *ea=*(Event**)a;
35 Event *eb=*(Event**)b;
36 - if(ea->v!=NULL&&ea->v==eb->v||ea->e!=NULL&&ea->e==eb->e) {
37 + if((ea->v!=NULL&&ea->v==eb->v)||(ea->e!=NULL&&ea->e==eb->e)) {
38 // when comparing opening and closing from object
39 // open must come first
40 if(ea->type==Open) return -1;
41 @@ -263,8 +263,8 @@ namespace straightener {
42 // node is on an edge
43 Edge *edge=(*i)->edge;
44 if(!edge->isEnd(v->id)
45 - &&(l!=NULL&&!edge->isEnd(l->id)||l==NULL)
46 - &&(r!=NULL&&!edge->isEnd(r->id)||r==NULL)) {
47 + &&((l!=NULL&&!edge->isEnd(l->id))||l==NULL)
48 + &&((r!=NULL&&!edge->isEnd(r->id))||r==NULL)) {
49 if(lastNode!=NULL) {
50 //printf(" Rule A: Constraint: v%d +g <= v%d\n",lastNode->id,(*i)->id);
51 cs.push_back(createConstraint(lastNode,*i,dim));
52 diff --git a/src/libcroco/cr-parser.c b/src/libcroco/cr-parser.c
53 index 5b0a56f..a8e2de5 100644
54 --- a/src/libcroco/cr-parser.c
55 +++ b/src/libcroco/cr-parser.c
56 @@ -2408,7 +2408,7 @@ cr_parser_parse_stylesheet (CRParser * a_this)
57 import_string,
58 NULL, &location) ;
60 - if ((PRIVATE (a_this)->sac_handler->resolve_import == TRUE)) {
61 + if (PRIVATE (a_this)->sac_handler->resolve_import == TRUE) {
62 /*
63 *TODO: resolve the
64 *import rule.
65 diff --git a/src/libvpsc/block.cpp b/src/libvpsc/block.cpp
66 index 221df53..0bd662f 100644
67 --- a/src/libvpsc/block.cpp
68 +++ b/src/libvpsc/block.cpp
69 @@ -72,7 +72,7 @@ void Block::setUpConstraintHeap(PairingHeap<Constraint*>* &h,bool in) {
70 for (Cit j=cs->begin();j!=cs->end();++j) {
71 Constraint *c=*j;
72 c->timeStamp=blockTimeCtr;
73 - if (c->left->block != this && in || c->right->block != this && !in) {
74 + if ((c->left->block != this && in) || (c->right->block != this && !in)) {
75 h->insert(c);
76 }
77 }