From owner-freebsd-ports@FreeBSD.ORG  Sat Oct 19 06:13:36 2013
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2318FFD5;
 Sat, 19 Oct 2013 06:13:36 +0000 (UTC) (envelope-from bsam@passap.ru)
Received: from forward6l.mail.yandex.net (forward6l.mail.yandex.net
 [IPv6:2a02:6b8:0:1819::6])
 by mx1.freebsd.org (Postfix) with ESMTP id DBB5D2856;
 Sat, 19 Oct 2013 06:13:35 +0000 (UTC)
Received: from smtp3h.mail.yandex.net (smtp3h.mail.yandex.net [84.201.186.20])
 by forward6l.mail.yandex.net (Yandex) with ESMTP id 83EDE14E0C6E;
 Sat, 19 Oct 2013 10:13:33 +0400 (MSK)
Received: from smtp3h.mail.yandex.net (localhost [127.0.0.1])
 by smtp3h.mail.yandex.net (Yandex) with ESMTP id 0A4221B41C8B;
 Sat, 19 Oct 2013 10:13:32 +0400 (MSK)
Received: from 46.38.32.182.tel.ru (46.38.32.182.tel.ru [46.38.32.182])
 by smtp3h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7NwlAdSBZ5-DW38GvX0;
 Sat, 19 Oct 2013 10:13:32 +0400
Message-ID: <5262230C.3060400@passap.ru>
Date: Sat, 19 Oct 2013 10:13:32 +0400
From: Boris Samorodov <bsam@passap.ru>
Organization: =?UTF-8?B?0JfQkNCeICLQktCQ0KDQoiI=?=
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130806 Thunderbird/17.0.7
MIME-Version: 1.0
To: Tomasz Sowa <t.sowa@ttmath.org>
Subject: Re: graphics/inkscape commit r330754
References: <52617B3C.9070608@ttmath.org>
In-Reply-To: <52617B3C.9070608@ttmath.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Koop Mast <kwm@FreeBSD.org>, 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 06:13:36 -0000

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.

-- 
WBR, Boris Samorodov (bsam)
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve