summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2023-12-02 23:42:16 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2023-12-02 23:42:16 +0100
commita6927779c34f654da91dd559be2b42b00409b1d8 (patch)
tree1fb5bd3d283d49ee032db7aeb6f0a4ce081f7a62
parent384b546dc68d5767c0862f364d66e297500848c6 (diff)
Update nanosvg/README.txt to reflect recent changes
-rw-r--r--nanosvg/README.txt44
1 files changed, 10 insertions, 34 deletions
diff --git a/nanosvg/README.txt b/nanosvg/README.txt
index 31ac6b9b0..732ef5079 100644
--- a/nanosvg/README.txt
+++ b/nanosvg/README.txt
@@ -16,21 +16,22 @@ The modified library was forked and can be found here:
https://github.com/fltk/nanosvg
-For more information see README.bundled-libs.txt in FLTK's root directory.
+For more information see documentation/src/bundled-libs.dox.
Changes in the FLTK fork, branch 'fltk':
-----------------------------------------
-$ git show --no-patch fltk_2022-12-22
-tag fltk_2022-12-22
-Tagger: Albrecht Schlosser <albrechts.fltk@online.de>
-Date: Thu Dec 22 00:44:33 2022 +0100
+See current branch 'fltk' and tag 'fltk_2023-12-02' in FLTK's
+nanosvg fork (link above).
-Latest nanosvg changes as of Dec 22, 2022:
+FLTK specific commits can be found with git similar to the following
+command. Note that Git hashes will change over time whenever the
+FLTK specific changes are rebased on top of 'upstream/master'.
-$ git log -3 fltk
-commit abcd277ea45e9098bed752cf9c6875b533c0892f (HEAD -> fltk)
+
+$ git log upstream/master..fltk
+commit 7aeda550a84c15680f7e55867896c3906299dffb (HEAD -> fltk, tag: fltk_2023-12-02, origin/fltk, origin/HEAD)
Author: AlbrechtS <AlbrechtS.svn@fltk.example.org>
Date: Sun Feb 4 23:47:38 2018 +0100
@@ -39,7 +40,7 @@ Date: Sun Feb 4 23:47:38 2018 +0100
Add new function nsvgRasterizeXY() similar to nsvgRasterize() but with
separate scaling factors for x-axis and y-axis.
-commit 6ea21790604e7f0e84b2260fed34173ed475365e
+commit b9a21ceb59590e0325acbf290598cbdf490501d6
Author: AlbrechtS <AlbrechtS.svn@fltk.example.org>
Date: Sun Feb 4 23:43:30 2018 +0100
@@ -47,28 +48,3 @@ Date: Sun Feb 4 23:43:30 2018 +0100
Change 'long long intPart' to 'double intPart' and replace
strtoll() with _strtoi64() when built with Visual Studio.
-
-commit 9da543e8329fdd81b64eb48742d8ccb09377aed1 (upstream/master)
-Merge: c886e50 0ce2e2b
-Author: Mikko Mononen <memononen@gmail.com>
-Date: Sun Dec 4 17:46:22 2022 +0200
-
- Merge pull request #236 from sezero/signed-char
-
- change struct NSVGpaint:type to signed char
-
-----
-
-Commits abcd277ea4 and 6ea2179060 are FLTK specific,
-commit 9da543e832 is the latest upstream commit
-
----- End of tag ----
-
-commit abcd277ea45e9098bed752cf9c6875b533c0892f (HEAD -> fltk, tag: fltk_2022-12-22)
-Author: AlbrechtS <AlbrechtS.svn@fltk.example.org>
-Date: Sun Feb 4 23:47:38 2018 +0100
-
- Modify rasterizer to support non-square X,Y axes scaling.
-
- Add new function nsvgRasterizeXY() similar to nsvgRasterize() but with
- separate scaling factors for x-axis and y-axis.