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