Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix [0d93f2e628]: misleading error message on missed svg option |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
dfc8b8e77d76dfee8caf1c54d484a1a9 |
| User & Date: | fvogel 2019-05-18 15:48:30 |
Context
|
2019-05-19
| ||
| 08:17 | General cleanup of frame.test check-in: 5b36e643 user: dkf tags: trunk | |
| 07:33 | merge trunk check-in: f79e06d6 user: dkf tags: tip-262 | |
|
2019-05-18
| ||
| 15:48 | Fix [0d93f2e628]: misleading error message on missed svg option check-in: dfc8b8e7 user: fvogel tags: trunk | |
| 15:45 | Fix [eb29967e88]: Add horizontal scrolling support for Windows. Patch from Christopher Chavez. check-in: 93f1a8a2 user: fvogel tags: trunk | |
|
2019-05-11
| ||
| 07:30 | Better fix. Concatenation of error messages is sometimes not adequate Closed-Leaf check-in: b0685fac user: fvogel tags: bug-0d93f2e628 | |
Changes
Changes to generic/tkImgPhoto.c.
2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 |
} else if ((formatObj != NULL) && !matched) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"image format \"%s\" is not supported", formatString));
Tcl_SetErrorCode(interp, "TK", "LOOKUP", "PHOTO_FORMAT",
formatString, NULL);
return TCL_ERROR;
} else {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"couldn't recognize image data", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
"UNRECOGNIZED_DATA", NULL);
return TCL_ERROR;
}
}
*imageFormatPtr = formatPtr;
*oldformat = useoldformat;
|
> > > > > > > > | | | | > |
2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 |
} else if ((formatObj != NULL) && !matched) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"image format \"%s\" is not supported", formatString));
Tcl_SetErrorCode(interp, "TK", "LOOKUP", "PHOTO_FORMAT",
formatString, NULL);
return TCL_ERROR;
} else {
/*
* Some lower level routine (stringMatchProc) may have already set
* a specific error message, so just return this. Otherwise return
* a generic image data error.
*/
if (Tcl_GetString(Tcl_GetObjResult(interp))[0] == '\0') {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"couldn't recognize image data", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
"UNRECOGNIZED_DATA", NULL);
}
return TCL_ERROR;
}
}
*imageFormatPtr = formatPtr;
*oldformat = useoldformat;
|
Changes to tests/imgListFormat.test.
135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 |
iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCA
YAAAEFsT2yAAAABGdBTUEAAYagMeiWXwAA
ABdJREFUCJkFwQEBAAAAgiD6P9pACRoqDk
fUBvt1wUFKAAAAAElFTkSuQmCC
} -format default
} -cleanup {
imageCleanup
} -returnCodes error -result {couldn't recognize image data}
test imgListFormat-3.5 {StringMatchDef: valid data} -setup {
image create photo photo1
} -body {
photo1 put {{blue green}
{yellow magenta}
{#000000 #FFFFFFFF}}
list [image width photo1] [image height photo1] \
|
| |
135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 |
iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCA
YAAAEFsT2yAAAABGdBTUEAAYagMeiWXwAA
ABdJREFUCJkFwQEBAAAAgiD6P9pACRoqDk
fUBvt1wUFKAAAAAElFTkSuQmCC
} -format default
} -cleanup {
imageCleanup
} -returnCodes error -result {invalid color name "iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCA"}
test imgListFormat-3.5 {StringMatchDef: valid data} -setup {
image create photo photo1
} -body {
photo1 put {{blue green}
{yellow magenta}
{#000000 #FFFFFFFF}}
list [image width photo1] [image height photo1] \
|
Changes to tests/imgPhoto.test.
538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 .... 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 .... 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 |
} -result {wrong # args: should be "photo1 put data ?-option value ...?"}
test imgPhoto-4.27 {ImgPhotoCmd procedure: put option} -setup {
image create photo photo1
} -body {
photo1 put {{white} {white white}}
} -returnCodes error -cleanup {
image delete photo1
} -result {couldn't recognize image data}
test imgPhoto-4.28 {ImgPhotoCmd procedure: put option} -setup {
image create photo photo1
} -body {
photo1 put {{blahgle}}
} -cleanup {
image delete photo1
} -returnCodes error -result {couldn't recognize image data}
test imgPhoto-4.29 {ImgPhotoCmd procedure: put option} -setup {
image create photo photo1
} -body {
# SB: odd thing - this test passed with tk 8.6.6, even if the data
# is in the wrong position:
#photo1 put -to 10 10 20 20 {{white}}
................................................................................
test imgPhoto-4.95 {ImgPhotoCmd put: default fmt, invalid data} -setup {
image create photo photo1
} -body {
photo1 put {{red green blue} {red " blue}}
#"
} -cleanup {
imageCleanup
} -returnCodes error -result {couldn't recognize image data}
test imgPhoto-4.96 {ImgPhotoCmd put: "default" handler is selected} -setup {
image create photo photo1
image create photo photo2
set imgData {{{1 2 3 4} {5 6 7 8} {9 10 11 12}}
{{13 14 15 15} {17 18 19 20} {21 22 23 24}}}
} -body {
photo1 put $imgData
................................................................................
} -returnCodes error -result {image format "bogus" is not supported}
test imgPhoto-19.6 {MatchStringFormat: invalid data for default} -setup {
image create photo photo1
} -body {
photo1 put bogus
} -cleanup {
imageCleanup
} -returnCodes error -result {couldn't recognize image data}
test imgPhoto-19.7 {MatchStringFormat: invalid data for default} -setup {
image create photo photo1
} -body {
photo1 put bogus -format dEFault
} -cleanup {
imageCleanup
} -returnCodes error -result {couldn't recognize image data}
test imgPhoto-19.8 {MatchStirngFormat: invalid data for gif} -setup {
image create photo photo1
} -body {
photo1 put bogus -format giF
} -cleanup {
imageCleanup
} -returnCodes error -result {couldn't recognize image data}
|
| | | | | |
538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 .... 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 .... 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 |
} -result {wrong # args: should be "photo1 put data ?-option value ...?"}
test imgPhoto-4.27 {ImgPhotoCmd procedure: put option} -setup {
image create photo photo1
} -body {
photo1 put {{white} {white white}}
} -returnCodes error -cleanup {
image delete photo1
} -result {invalid row # 1: all rows must have the same number of elements}
test imgPhoto-4.28 {ImgPhotoCmd procedure: put option} -setup {
image create photo photo1
} -body {
photo1 put {{blahgle}}
} -cleanup {
image delete photo1
} -returnCodes error -result {invalid color name "blahgle"}
test imgPhoto-4.29 {ImgPhotoCmd procedure: put option} -setup {
image create photo photo1
} -body {
# SB: odd thing - this test passed with tk 8.6.6, even if the data
# is in the wrong position:
#photo1 put -to 10 10 20 20 {{white}}
................................................................................
test imgPhoto-4.95 {ImgPhotoCmd put: default fmt, invalid data} -setup {
image create photo photo1
} -body {
photo1 put {{red green blue} {red " blue}}
#"
} -cleanup {
imageCleanup
} -returnCodes error -result {unmatched open quote in list}
test imgPhoto-4.96 {ImgPhotoCmd put: "default" handler is selected} -setup {
image create photo photo1
image create photo photo2
set imgData {{{1 2 3 4} {5 6 7 8} {9 10 11 12}}
{{13 14 15 15} {17 18 19 20} {21 22 23 24}}}
} -body {
photo1 put $imgData
................................................................................
} -returnCodes error -result {image format "bogus" is not supported}
test imgPhoto-19.6 {MatchStringFormat: invalid data for default} -setup {
image create photo photo1
} -body {
photo1 put bogus
} -cleanup {
imageCleanup
} -returnCodes error -result {invalid color name "bogus"}
test imgPhoto-19.7 {MatchStringFormat: invalid data for default} -setup {
image create photo photo1
} -body {
photo1 put bogus -format dEFault
} -cleanup {
imageCleanup
} -returnCodes error -result {invalid color name "bogus"}
test imgPhoto-19.8 {MatchStirngFormat: invalid data for gif} -setup {
image create photo photo1
} -body {
photo1 put bogus -format giF
} -cleanup {
imageCleanup
} -returnCodes error -result {couldn't recognize image data}
|
Changes to tests/imgSVGnano.test.
73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 |
} -result {100 100}
test imgSVGnano-2.1 {reading a bad image} -body {
image create photo foo -format svg -data $data(bad)
} -returnCodes error -result {couldn't recognize image data}
test imgSVGnano-2.2 {using bad option} -body {
image create photo -data $data(plus) -format {svg -scale 0}
} -returnCodes error -result {couldn't recognize image data}
};# end of namespace svgnano
namespace delete svgnano
imageFinish
cleanupTests
return
# Local Variables:
# mode: tcl
# fill-column: 78
# End:
|
| | > > > > > > |
73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 |
} -result {100 100}
test imgSVGnano-2.1 {reading a bad image} -body {
image create photo foo -format svg -data $data(bad)
} -returnCodes error -result {couldn't recognize image data}
test imgSVGnano-2.2 {using bad option} -body {
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:
|