Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | TIP545: remove image photo svg option "-unit" |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | tip-545-svg-options |
| Files: | files | file ages | folders |
| SHA3-256: |
389f9b0bda6e309f7a2aafd37635d30a |
| User & Date: | oehhar 2019-05-22 20:19:56 |
Context
|
2019-06-07
| ||
| 18:26 | Implement -scaletowidth/height, output very small scale images as 1x1 images. check-in: 2a4d1f83 user: oehhar tags: tip-545-svg-options | |
|
2019-05-22
| ||
| 20:19 | TIP545: remove image photo svg option "-unit" check-in: 389f9b0b user: oehhar tags: tip-545-svg-options | |
|
2019-05-20
| ||
| 21:26 | In Aqua, make XUnmapWindow also redraw the toplevel. Edit a comment in tkTest.c check-in: bec7565d user: culler tags: trunk | |
Changes
Changes to generic/tkImgSVGnano.c.
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 ... 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 ... 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 ... 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 ... 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 |
#include "nanosvg.h"
#define NANOSVGRAST_IMPLEMENTATION
#include "nanosvgrast.h"
/* Additional parameters to nsvgRasterize() */
typedef struct {
double x;
double y;
double scale;
} RastOpts;
/*
* Per interp cache of last NSVGimage which was matched to
* be immediately rasterized after the match. This helps to
* eliminate double parsing of the SVG file/string.
................................................................................
int length,
Tcl_Obj *formatObj,
RastOpts *ropts)
{
Tcl_Obj **objv = NULL;
int objc = 0;
double dpi = 96.0;
char unit[3], *p;
char *inputCopy = NULL;
NSVGimage *nsvgImage;
static const char *const fmtOptions[] = {
"-dpi", "-scale", "-unit", NULL
};
enum fmtOptions {
OPT_DPI, OPT_SCALE, OPT_UNIT
};
/*
* The parser destroys the original input string,
* therefore first duplicate.
*/
................................................................................
memcpy(inputCopy, input, length);
inputCopy[length] = '\0';
/*
* Process elements of format specification as a list.
*/
strcpy(unit, "px");
ropts->x = ropts->y = 0.0;
ropts->scale = 1.0;
if ((formatObj != NULL) &&
Tcl_ListObjGetElements(interp, formatObj, &objc, &objv) != TCL_OK) {
goto error;
}
for (; objc > 0 ; objc--, objv++) {
int optIndex;
................................................................................
if (ropts->scale <= 0.0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-scale value must be positive", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "SVG", "BAD_SCALE",
NULL);
goto error;
}
break;
case OPT_UNIT:
p = Tcl_GetString(objv[0]);
if ((p != NULL) && (p[0])) {
strncpy(unit, p, 3);
unit[2] = '\0';
}
break;
}
}
nsvgImage = nsvgParse(inputCopy, unit, (float) dpi);
if (nsvgImage == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("cannot parse SVG image", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "SVG", "PARSE_ERROR", NULL);
goto error;
}
ckfree(inputCopy);
return nsvgImage;
................................................................................
}
imgData = attemptckalloc(w * h *4);
if (imgData == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("cannot alloc image buffer", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "SVG", "OUT_OF_MEMORY", NULL);
goto cleanRAST;
}
nsvgRasterize(rast, nsvgImage, (float) ropts->x, (float) ropts->y,
(float) ropts->scale, imgData, w, h, w * 4);
/* transfer the data to a photo block */
svgblock.pixelPtr = imgData;
svgblock.width = w;
svgblock.height = h;
svgblock.pitch = w * 4;
svgblock.pixelSize = 4;
|
< < < | | < < < < < < < < < | | |
26 27 28 29 30 31 32 33 34 35 36 37 38 39 ... 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 ... 345 346 347 348 349 350 351 352 353 354 355 356 357 358 ... 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 ... 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 |
#include "nanosvg.h"
#define NANOSVGRAST_IMPLEMENTATION
#include "nanosvgrast.h"
/* Additional parameters to nsvgRasterize() */
typedef struct {
double scale;
} RastOpts;
/*
* Per interp cache of last NSVGimage which was matched to
* be immediately rasterized after the match. This helps to
* eliminate double parsing of the SVG file/string.
................................................................................
int length,
Tcl_Obj *formatObj,
RastOpts *ropts)
{
Tcl_Obj **objv = NULL;
int objc = 0;
double dpi = 96.0;
char *inputCopy = NULL;
NSVGimage *nsvgImage;
static const char *const fmtOptions[] = {
"-dpi", "-scale", NULL
};
enum fmtOptions {
OPT_DPI, OPT_SCALE
};
/*
* The parser destroys the original input string,
* therefore first duplicate.
*/
................................................................................
memcpy(inputCopy, input, length);
inputCopy[length] = '\0';
/*
* Process elements of format specification as a list.
*/
ropts->scale = 1.0;
if ((formatObj != NULL) &&
Tcl_ListObjGetElements(interp, formatObj, &objc, &objv) != TCL_OK) {
goto error;
}
for (; objc > 0 ; objc--, objv++) {
int optIndex;
................................................................................
if (ropts->scale <= 0.0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-scale value must be positive", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "SVG", "BAD_SCALE",
NULL);
goto error;
}
break;
}
}
nsvgImage = nsvgParse(inputCopy, "px", (float) dpi);
if (nsvgImage == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("cannot parse SVG image", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "SVG", "PARSE_ERROR", NULL);
goto error;
}
ckfree(inputCopy);
return nsvgImage;
................................................................................
}
imgData = attemptckalloc(w * h *4);
if (imgData == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("cannot alloc image buffer", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "SVG", "OUT_OF_MEMORY", NULL);
goto cleanRAST;
}
nsvgRasterize(rast, nsvgImage, 0, 0,
(float) ropts->scale, imgData, w, h, w * 4);
/* transfer the data to a photo block */
svgblock.pixelPtr = imgData;
svgblock.width = w;
svgblock.height = h;
svgblock.pitch = w * 4;
svgblock.pixelSize = 4;
|
Changes to tests/imgSVGnano.test.
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
..
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
} -result {{}}
test imgSVGnano-1.4 {image options} -setup {
catch {rename foo ""}
} -body {
image create photo foo -data $data(plus)
foo configure -format {svg -scale 2}
foo configure -format {svg -unit pt}
foo configure -format {svg -unit mm}
foo configure -format {svg -unit cm}
foo configure -format {svg -unit in}
foo configure -format {svg -unit px}
foo configure -format {svg -dpi 600}
list [image width foo] [image height foo]
} -cleanup {
rename foo ""
} -result {100 100}
................................................................................
image create photo foo -data $data(plus) -format {svg -scale 0}
} -returnCodes error -result {-scale value must be positive}
test imgSVGnano-2.3 {using bad option} -body {
image create photo foo -data $data(plus)
foo configure -format {svg 1.0}
} -cleanup {
rename foo ""
} -returnCodes error -result {bad option "1.0": must be -dpi, -scale, or -unit}
};# end of namespace svgnano
namespace delete svgnano
imageFinish
cleanupTests
return
# Local Variables:
# mode: tcl
# fill-column: 78
# End:
|
<
<
<
<
<
|
|
57
58
59
60
61
62
63
64
65
66
67
68
69
70
..
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
} -result {{}}
test imgSVGnano-1.4 {image options} -setup {
catch {rename foo ""}
} -body {
image create photo foo -data $data(plus)
foo configure -format {svg -scale 2}
foo configure -format {svg -dpi 600}
list [image width foo] [image height foo]
} -cleanup {
rename foo ""
} -result {100 100}
................................................................................
image create photo foo -data $data(plus) -format {svg -scale 0}
} -returnCodes error -result {-scale value must be positive}
test imgSVGnano-2.3 {using bad option} -body {
image create photo foo -data $data(plus)
foo configure -format {svg 1.0}
} -cleanup {
rename foo ""
} -returnCodes error -result {bad option "1.0": must be -dpi or -scale}
};# end of namespace svgnano
namespace delete svgnano
imageFinish
cleanupTests
return
# Local Variables:
# mode: tcl
# fill-column: 78
# End:
|