Skip to content

Commit

Permalink
Merge pull request #135 from SixLabors/sw/beta10
Browse files Browse the repository at this point in the history
Update license to AGPL3
  • Loading branch information
tocsoft authored May 8, 2020
2 parents 1e0d0ac + 18722c3 commit 84c4300
Show file tree
Hide file tree
Showing 88 changed files with 750 additions and 288 deletions.
862 changes: 661 additions & 201 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SixLabors.Fonts

[![Build Status](https://img.shields.io/github/workflow/status/SixLabors/Fonts/Build/master)](https://github.com/SixLabors/Fonts/actions)
[![codecov](https://codecov.io/gh/SixLabors/Fonts/branch/master/graph/badge.svg)](https://codecov.io/gh/SixLabors/Fonts)
[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/SixLabors/Fonts/master/LICENSE)
[![License: AGPL v3](https://img.shields.io/badge/license-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)

[![Join the chat at https://gitter.im/SixLabors/Shapes](https://badges.gitter.im/SixLabors/Fonts.svg)](https://gitter.im/SixLabors/Fonts?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![GitHub issues](https://img.shields.io/github/issues/SixLabors/Fonts.svg)](https://github.com/SixLabors/Fonts/issues)
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/AppliedFontStyle.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/BinaryReader.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Buffers.Binary;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Bounds.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Numerics;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/ColorFontSupport.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Exceptions/FontException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

namespace SixLabors.Fonts.Exceptions
{
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Exceptions/FontsThrowHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Diagnostics;
using System.Runtime.CompilerServices;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Exceptions/GlyphMissingException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Exceptions/InvalidFontFileException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

namespace SixLabors.Fonts.Exceptions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

namespace SixLabors.Fonts.Exceptions
{
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/FileFontInstance.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Font.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using SixLabors.Fonts.Exceptions;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/FontCollection.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/FontDescription.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Collections.Generic;
using System.Globalization;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/FontFamily.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/FontFamilyCollectionExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

namespace SixLabors.Fonts
{
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/FontInstance.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/FontReader.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
3 changes: 2 additions & 1 deletion src/SixLabors.Fonts/FontRectangle.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
using System.ComponentModel;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/FontStyle.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/GlobalSuppressions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

// This file is used by Code Analysis to maintain SuppressMessage
// attributes that are applied to this project.
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Glyph.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Numerics;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/GlyphInstance.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Buffers;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/GlyphLayout.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Numerics;
using System.Text;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/GlyphMetric.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/GlyphRendererParameters.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Numerics;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/GlyphType.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

namespace SixLabors.Fonts
{
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/HorizontalAlignment.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

namespace SixLabors.Fonts
{
Expand Down
3 changes: 2 additions & 1 deletion src/SixLabors.Fonts/IColorGlyphRenderer.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;

namespace SixLabors.Fonts
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/IFontCollection.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.IO;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/IFontInstance.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Numerics;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/IGlyphRenderer.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Numerics;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/IGlyphRendererExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/IO/ZlibInflateStream.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/IReadonlyFontCollection.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/IReadonlyFontCollectionExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Globalization;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/RendererOptions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/StringComparerHelpers.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/SystemFontCollection.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/SystemFonts.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/CMap/CMapSubTable.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using SixLabors.Fonts.WellKnownIds;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/CMap/EncodingRecord.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using SixLabors.Fonts.WellKnownIds;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/CMap/Format0SubTable.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Collections.Generic;
using SixLabors.Fonts.WellKnownIds;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Collections.Generic;
using SixLabors.Fonts.WellKnownIds;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/CMap/Format4SubTable.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Collections.Generic;
using SixLabors.Fonts.WellKnownIds;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/CMapTable.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/Colr/BaseGlyphRecord.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/ColrTable.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/CpalTable.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/GlyphTable.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using SixLabors.Fonts.Tables.General.Glyphs;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Numerics;

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/Glyphs/GlyphLoader.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

namespace SixLabors.Fonts.Tables.General.Glyphs
{
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/General/Glyphs/GlyphVector.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// Licensed under the GNU Affero General Public License, Version 3.

using System.Numerics;

Expand Down
Loading

0 comments on commit 84c4300

Please sign in to comment.