diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-04 21:39:50 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-04 21:39:50 +0000 |
| commit | 4ebaee0f40e30c4da671a9351676e1c9051abbef (patch) | |
| tree | 6dc61d71ffef25d3ce48fc7e700d86eb1c4da06e /src | |
| parent | c97fe2e58ff32c58fa0cc417c1cb78ec579e39fe (diff) | |
Reorganize nanosvg bundled library.
Rename altsvgrast.h to its original name nanosvg.h and use a new
GitHub fork of nanosvg to maintain FLTK specific patches.
https://github.com/fltk/nanosvg
The diff files (altsvgrast.diff and nanosvg.diff) are no longer necessary
and have been removed. For more information see README.bundled-libs.txt.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12646 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_SVG_Image.cxx | 4 | ||||
| -rw-r--r-- | src/makedepend | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx index fd941d49a..2e5904a21 100644 --- a/src/Fl_SVG_Image.cxx +++ b/src/Fl_SVG_Image.cxx @@ -41,7 +41,7 @@ static double strtoll(const char *str, char **endptr, int base) { #include "../nanosvg/nanosvg.h" #define NANOSVGRAST_IMPLEMENTATION // Expands implementation -#include "../nanosvg/altsvgrast.h" +#include "../nanosvg/nanosvgrast.h" /** The constructor loads the SVG image from the given .svg/.svgz filename or in-memory data. @@ -184,7 +184,7 @@ void Fl_SVG_Image::rasterize_(int W, int H) { fy = (double)H / counted_svg_image_->svg_image->height; } array = new uchar[W*H*4]; - nsvgAltRasterize(rasterizer, counted_svg_image_->svg_image, 0, 0, fx, fy, (uchar* )array, W, H, W*4); + nsvgRasterizeXY(rasterizer, counted_svg_image_->svg_image, 0, 0, fx, fy, (uchar* )array, W, H, W*4); alloc_array = 1; data((const char * const *)&array, 1); d(4); diff --git a/src/makedepend b/src/makedepend index 8038d1dcd..e40226a67 100644 --- a/src/makedepend +++ b/src/makedepend @@ -2000,7 +2000,7 @@ Fl_SVG_Image.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H Fl_SVG_Image.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H Fl_SVG_Image.o: ../FL/Fl_Rect.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H Fl_SVG_Image.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H -Fl_SVG_Image.o: ../nanosvg/nanosvg.h ../nanosvg/altsvgrast.h +Fl_SVG_Image.o: ../nanosvg/nanosvg.h ../nanosvg/nanosvgrast.h flstring.o: flstring.h ../FL/Fl_Export.H ../config.h numericsort.o: ../FL/platform_types.h ../FL/filename.H ../FL/Fl_Export.H vsnprintf.o: flstring.h ../FL/Fl_Export.H ../config.h |