From owner-freebsd-ports@FreeBSD.ORG  Sat Oct 19 08:00:37 2013
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3595A6F6
 for <freebsd-ports@freebsd.org>; Sat, 19 Oct 2013 08:00:37 +0000 (UTC)
 (envelope-from kwm@rainbow-runner.nl)
Received: from fep20.mx.upcmail.net (fep20.mx.upcmail.net [62.179.121.40])
 by mx1.freebsd.org (Postfix) with ESMTP id 739342CC0
 for <freebsd-ports@freebsd.org>; Sat, 19 Oct 2013 08:00:36 +0000 (UTC)
Received: from edge03.upcmail.net ([192.168.13.238]) by viefep20-int.chello.at
 (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP
 id <20131019080028.XXGI22126.viefep20-int.chello.at@edge03.upcmail.net>;
 Sat, 19 Oct 2013 10:00:28 +0200
Received: from [127.0.0.1] ([178.84.134.112]) by edge03.upcmail.net with edge
 id ew0P1m05U2Rg3Ey03w0Qnp; Sat, 19 Oct 2013 10:00:28 +0200
X-SourceIP: 178.84.134.112
Message-ID: <52623C14.2090401@rainbow-runner.nl>
Date: Sat, 19 Oct 2013 10:00:20 +0200
From: Koop Mast <kwm@rainbow-runner.nl>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:24.0) Gecko/20100101 Thunderbird/24.0.1
MIME-Version: 1.0
To: Boris Samorodov <bsam@passap.ru>, Tomasz Sowa <t.sowa@ttmath.org>
Subject: Re: graphics/inkscape commit r330754
References: <52617B3C.9070608@ttmath.org> <5262230C.3060400@passap.ru>
In-Reply-To: <5262230C.3060400@passap.ru>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-Antivirus: avast! (VPS 131018-1, 18-10-2013), Outbound message
X-Antivirus-Status: Clean
Cc: FreeBSD Ports ML <freebsd-ports@freebsd.org>
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Oct 2013 08:00:37 -0000

On 19-10-2013 8:13, Boris Samorodov wrote:
> 18.10.2013 22:17, Tomasz Sowa пишет:
>> Hi
>>
>> Thank you for the update for compiling with clang. I have got a question
>> about one function:
>> void sp_item_rm_unsatisfied_cns(SPItem &item)
>> from src/sp-item-rm-unsatisfied-cns.cpp
>>
>> before patching it is:
>> void sp_item_rm_unsatisfied_cns(SPItem &item)
>> {
>>      if (item.constraints.empty()) {
>>          return;
>>      }
>>      std::vector<Inkscape::SnapCandidatePoint> snappoints;
>>      sp_item_snappoints(&item, snappoints, NULL);
>>      for (unsigned i = item.constraints.size(); i--;) {
>>          g_assert( i < item.constraints.size() );
>>          SPGuideConstraint const &cn = item.constraints[i];
>>          int const snappoint_ix = cn.snappoint_ix;
>>          g_assert( snappoint_ix < int(snappoints.size()) );
>>          if (!approx_equal( sp_guide_distance_from_pt(cn.g,
>> snappoints[snappoint_ix].getPoint()), 0) ) {
>>              remove_last(cn.g->attached_items, SPGuideAttachment(&item,
>> cn.snappoint_ix));
>>              g_assert( i < item.constraints.size() );
>>              vector<SPGuideConstraint>::iterator const
>> ei(&item.constraints[i]);
>>              item.constraints.erase(ei);
>>          }
>>      }
>> }
>>
>> but after patching the last erase() is changed to:
>> item.constraints.erase(item.constraints.begin() + 1);
>>
>> and this is not the same, it propably should be:
>> item.constraints.erase(item.constraints.begin() + i);
> Yep, that seems to be a typo.
>
Fix thanks for the report, it took me a while to see that the but 
actually was :)

-Koop