Skip to content

Commit faf4e66

Browse files
Update license, config and docs.
1 parent f0bd74a commit faf4e66

223 files changed

Lines changed: 700 additions & 1122 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: "Commercial License : Bug Report"
3+
about: |
4+
Create a report to help us improve the project. For Commercial License holders only.
5+
Please contact help@sixlabors.com for issues requiring private support.
6+
labels: commercial, needs triage
7+
8+
---
9+
10+
11+
### Prerequisites
12+
13+
- [ ] I have written a descriptive issue title
14+
- [ ] I have verified that I am running the latest version of ImageSharp.Drawing
15+
- [ ] I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
16+
- [ ] I have searched [open](https://github.com/SixLabors/ImageSharp.Drawing/issues) and [closed](https://github.com/SixLabors/ImageSharp.Drawing/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
17+
18+
### Description
19+
<!-- A description of the bug or feature -->
20+
21+
### Steps to Reproduce
22+
<!-- List of steps, sample code, failing test or link to a project that reproduces the behavior -->
23+
24+
### System Configuration
25+
<!-- Tell us about the environment where you are experiencing the bug -->
26+
27+
- ImageSharp.Drawing version:
28+
- Other ImageSharp packages and versions:
29+
- Environment (Operating system, version and so on):
30+
- .NET Framework version:
31+
- Additional information:
32+
33+
<!-- Thanks for reporting the issue to ImageSharp.Drawing! -->
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
---
2-
name: Bug Report
2+
name: "OSS : Bug Report"
33
about: Create a report to help us improve the project.
4+
labels: needs triage
45

56
---
67

78
### Prerequisites
89

910
- [ ] I have written a descriptive issue title
10-
- [ ] I have verified that I am running the latest version of ImageSharp
11+
- [ ] I have verified that I am running the latest version of ImageSharp.Drawing
1112
- [ ] I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
1213
- [ ] I have searched [open](https://github.com/SixLabors/ImageSharp.Drawing/issues) and [closed](https://github.com/SixLabors/ImageSharp.Drawing/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
1314

@@ -26,4 +27,4 @@ about: Create a report to help us improve the project.
2627
- .NET Framework version:
2728
- Additional information:
2829

29-
<!-- Thanks for reporting the issue to ImageSharp.Dawing! -->
30+
<!-- Thanks for reporting the issue to ImageSharp.Drawing! -->

Directory.Build.props

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
<LangVersion>8.0</LangVersion>
8383
<NeutralLanguage>en</NeutralLanguage>
8484
<OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
85-
<PackageIcon>icon.png</PackageIcon>
86-
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
85+
<PackageIcon>sixlabors.imagesharp.drawing.128.png</PackageIcon>
86+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
8787
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
8888
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
8989
<RepositoryType>git</RepositoryType>
@@ -104,8 +104,7 @@
104104
<!--<PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true" />-->
105105
<AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
106106
<!--NuGet package icon source-->
107-
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="\icon.png" />
108-
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\NUGETLICENSE.md" Pack="true" PackagePath="LICENSE.md" />
107+
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="" />
109108
</ItemGroup>
110109

111110
</Project>

ImageSharp.Drawing.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1799
2828
EndProject
2929
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{FBE8C1AD-5AEC-4514-9B64-091D8E145865}"
3030
ProjectSection(SolutionItems) = preProject
31-
.github\ISSUE_TEMPLATE\ask-question.md = .github\ISSUE_TEMPLATE\ask-question.md
32-
.github\ISSUE_TEMPLATE\bug-report.md = .github\ISSUE_TEMPLATE\bug-report.md
33-
.github\ISSUE_TEMPLATE\feature-request.md = .github\ISSUE_TEMPLATE\feature-request.md
31+
.github\ISSUE_TEMPLATE\commercial-bug-report.md = .github\ISSUE_TEMPLATE\commercial-bug-report.md
32+
.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
33+
.github\ISSUE_TEMPLATE\oss-bug-report.md = .github\ISSUE_TEMPLATE\oss-bug-report.md
3434
EndProjectSection
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"

LICENSE

Lines changed: 201 additions & 661 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SixLabors.ImageSharp.Drawing
88

99
<div align="center">
1010

11-
[![License: AGPL v3](https://img.shields.io/badge/license-AGPL%20v3-blue.svg)](https://raw.githubusercontent.com/SixLabors/ImageSharp.Drawing/master/LICENSE)
11+
[![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
1212
[![Code coverage](https://codecov.io/gh/SixLabors/ImageSharp.Drawing/branch/master/graph/badge.svg)](https://codecov.io/gh/SixLabors/ImageSharp.Drawing)
1313
[![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=flat&logo=twitter)](https://twitter.com/intent/tweet?hashtags=imagesharp,dotnet,oss&text=ImageSharp.+A+new+cross-platform+2D+graphics+API+in+C%23&url=https%3a%2f%2fgithub.com%2fSixLabors%2fImageSharp&via=sixlabors)
1414
[![OpenCollective](https://opencollective.com/imagesharp/backers/badge.svg)](#backers)
@@ -21,19 +21,8 @@ SixLabors.ImageSharp.Drawing
2121
Designed to democratize image processing, ImageSharp.Drawing brings you an incredibly powerful yet beautifully simple API.
2222

2323
Built against .NET Standard 1.3, ImageSharp.Drawing can be used in device, cloud, and embedded/IoT scenarios.
24-
25-
### Documentation
26-
For all SixLabors projects, including ImageSharp.Drawing:
27-
https://sixlabors.github.io/docs/
28-
29-
### Installation
30-
31-
Install stable releases via Nuget; development releases are available via MyGet.
32-
33-
| Package Name | Release (NuGet) | Nightly (MyGet) |
34-
|--------------------------------|-----------------|-----------------|
35-
| `SixLabors.ImageSharp.Drawing` | [![NuGet](https://img.shields.io/nuget/v/SixLabors.ImageSharp.Drawing.svg)](https://www.nuget.org/packages/SixLabors.ImageSharp.Drawing/) | [![MyGet](https://img.shields.io/myget/sixlabors/v/SixLabors.ImageSharp.Drawing.svg)](https://www.myget.org/feed/sixlabors/package/nuget/SixLabors.ImageSharp.Drawing) |
36-
24+
25+
Features Include:
3726
- Point in Polygon
3827
- Line Intersections
3928
- Complex Polygons
@@ -52,7 +41,26 @@ Install stable releases via Nuget; development releases are available via MyGet.
5241
- Drawing
5342
- Brushes and various drawing algorithms, including drawing images
5443
- Various vector drawing methods for drawing paths, polygons etc.
55-
- Text drawing
44+
- Text drawing
45+
46+
## License
47+
48+
- ImageSharp.Drawing is licensed under the [Apache License, Version 2.0](https://opensource.org/licenses/Apache-2.0)
49+
- An alternative Commercial License can be purchased for projects and applications requiring support.
50+
Please visit https://sixlabors.com/pricing for details.
51+
52+
## Documentation
53+
54+
- [Detailed documentation](https://sixlabors.github.io/docs/) for the ImageSharp.Drawing API is available. This includes additional conceptual documentation to help you get started.
55+
- Our [Samples Repository](https://github.com/SixLabors/Samples/tree/master/ImageSharp) is also available containing buildable code samples demonstrating common activities.
56+
57+
### Installation
58+
59+
Install stable releases via Nuget; development releases are available via MyGet.
60+
61+
| Package Name | Release (NuGet) | Nightly (MyGet) |
62+
|--------------------------------|-----------------|-----------------|
63+
| `SixLabors.ImageSharp.Drawing` | [![NuGet](https://img.shields.io/nuget/v/SixLabors.ImageSharp.Drawing.svg)](https://www.nuget.org/packages/SixLabors.ImageSharp.Drawing/) | [![MyGet](https://img.shields.io/myget/sixlabors/v/SixLabors.ImageSharp.Drawing.svg)](https://www.myget.org/feed/sixlabors/package/nuget/SixLabors.ImageSharp.Drawing) |
5664

5765
### Build Status
5866

@@ -108,10 +116,7 @@ Please... Spread the word, contribute algorithms, submit performance improvement
108116

109117
### The ImageSharp Team
110118

111-
Lead
112119
- [Scott Williams](https://github.com/tocsoft)
113-
114-
Core Team
115120
- [James Jackson-South](https://github.com/jimbobsquarepants)
116121
- [Dirk Lemstra](https://github.com/dlemstra)
117122
- [Anton Firsov](https://github.com/antonfirsov)

src/ImageSharp.Drawing/Common/Extensions/GraphicsOptionsExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Six Labors and contributors.
2-
// Licensed under the GNU Affero General Public License, Version 3.
1+
// Copyright (c) Six Labors.
2+
// Licensed under the Apache License, Version 2.0.
33

44
using System.Numerics;
55
using SixLabors.ImageSharp.Drawing.Processing;

src/ImageSharp.Drawing/Primitives/Region.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Six Labors and contributors.
2-
// Licensed under the GNU Affero General Public License, Version 3.
1+
// Copyright (c) Six Labors.
2+
// Licensed under the Apache License, Version 2.0.
33

44
using System;
55

src/ImageSharp.Drawing/Primitives/ShapePath.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Six Labors and contributors.
2-
// Licensed under the GNU Affero General Public License, Version 3.
1+
// Copyright (c) Six Labors.
2+
// Licensed under the Apache License, Version 2.0.
33

44
using SixLabors.ImageSharp.Drawing.Processing;
55

0 commit comments

Comments
 (0)