aloadimage: update to 0.6.1

This commit is contained in:
bjornstahl 2021-11-22 20:20:57 +00:00 committed by Piraty
parent 6c6e1cad41
commit b86507c397
2 changed files with 39 additions and 2 deletions

View File

@ -0,0 +1,37 @@
diff --git a/src/tools/aloadimage/nanosvg.h b/src/tools/aloadimage/nanosvg.h
index f5058b17..716adea5 100644
--- a/src/tools/aloadimage/nanosvg.h
+++ b/src/tools/aloadimage/nanosvg.h
@@ -163,7 +163,7 @@ typedef struct NSVGimage
} NSVGimage;
// Parses SVG file from a file, returns SVG image as paths.
-NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi);
+NSVGimage* nsvgParseFromFile(FILE* fp, const char* units, float dpi);
// Parses SVG file from a null terminated string, returns SVG image as paths.
// Important note: changes the string.
@@ -200,7 +200,6 @@ void nsvgDelete(NSVGimage* image);
#define NSVG_ALIGN_SLICE 2
#define NSVG_NOTUSED(v) do { (void)(1 ? (void)0 : ( (void)(v) ) ); } while(0)
-#define NSVG_RGB(r, g, b) (((unsigned int)r) | ((unsigned int)g << 8) | ((unsigned int)b << 16))
#ifdef _MSC_VER
#pragma warning (disable: 4996) // Switch off security warnings
@@ -2930,14 +2929,12 @@ NSVGimage* nsvgParse(char* input, const char* units, float dpi)
return ret;
}
-NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
+NSVGimage* nsvgParseFromFile(FILE* fp, const char* units, float dpi)
{
- FILE* fp = NULL;
size_t size;
char* data = NULL;
NSVGimage* image = NULL;
- fp = fopen(filename, "rb");
if (!fp) goto error;
fseek(fp, 0, SEEK_END);
size = ftell(fp);

View File

@ -1,7 +1,7 @@
# Template file for 'aloadimage'
# !! keep synced with arcan
pkgname=aloadimage
version=0.6.0.1
version=0.6.1
revision=1
wrksrc="arcan-${version}"
build_wrksrc=src/tools/aloadimage
@ -13,7 +13,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://arcan-fe.com/"
distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551
post_install() {
vlicense ../../../COPYING