Skip to content

Commit

Permalink
Merge branch 'fix-closing-point'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbostock committed Mar 24, 2013
2 parents 91d35b4 + f598ed5 commit e1bbecd
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "d3",
"version": "3.1.3",
"version": "3.1.4",
"main": "./d3.js"
}
6 changes: 3 additions & 3 deletions d3.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
d3 = function() {
var d3 = {
version: "3.1.3"
version: "3.1.4"
};
if (!Date.now) Date.now = function() {
return +new Date();
Expand Down Expand Up @@ -2253,8 +2253,8 @@ d3 = function() {
function d3_geo_clipPolygon(segments, compare, inside, interpolate, listener) {
var subject = [], clip = [];
segments.forEach(function(segment) {
if ((n = segment.length) <= 1) return;
var n, p0 = segment[0], p1 = segment[n - 1];
if ((n = segment.length - 1) <= 0) return;
var n, p0 = segment[0], p1 = segment[n];
if (d3_geo_sphericalEqual(p0, p1)) {
listener.lineStart();
for (var i = 0; i < n; ++i) listener.point((p0 = segment[i])[0], p0[1]);
Expand Down
4 changes: 2 additions & 2 deletions d3.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "d3",
"version": "3.1.3",
"version": "3.1.4",
"description": "A small, free JavaScript library for manipulating documents based on data.",
"keywords": [
"dom",
Expand Down
4 changes: 2 additions & 2 deletions src/geo/clip-polygon.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ function d3_geo_clipPolygon(segments, compare, inside, interpolate, listener) {
clip = [];

segments.forEach(function(segment) {
if ((n = segment.length) <= 1) return;
var n, p0 = segment[0], p1 = segment[n - 1];
if ((n = segment.length - 1) <= 0) return;
var n, p0 = segment[0], p1 = segment[n];

// If the first and last points of a segment are coincident, then treat as
// a closed ring.
Expand Down
2 changes: 1 addition & 1 deletion src/start.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
d3 = (function(){
var d3 = {version: "3.1.3"}; // semver
var d3 = {version: "3.1.4"}; // semver

0 comments on commit e1bbecd

Please sign in to comment.