diff options
| author | D G Turner | 2019-12-11 05:37:23 +0000 | 
|---|---|---|
| committer | D G Turner | 2019-12-11 05:37:23 +0000 | 
| commit | cb06c44d279325a78b25a5ad31f9a2f998fb91c3 (patch) | |
| tree | 452cd1afba5c553e3c029c4d134a53071e5cdce6 | |
| parent | 2e91bf0eeabc539c21c205982efd06a52450ab63 (diff) | |
| download | scummvm-rg350-cb06c44d279325a78b25a5ad31f9a2f998fb91c3.tar.gz scummvm-rg350-cb06c44d279325a78b25a5ad31f9a2f998fb91c3.tar.bz2 scummvm-rg350-cb06c44d279325a78b25a5ad31f9a2f998fb91c3.zip  | |
GRAPHICS: Fix Missing Default Switch Cases in LarryScale
These are flagged by GCC if -Wswitch-default is enabled.
| -rw-r--r-- | graphics/larryScale_generated.cpp | 307 | ||||
| -rw-r--r-- | graphics/larryScale_generator.js | 4 | 
2 files changed, 155 insertions, 156 deletions
diff --git a/graphics/larryScale_generated.cpp b/graphics/larryScale_generated.cpp index b39e429478..bccf1a3934 100644 --- a/graphics/larryScale_generated.cpp +++ b/graphics/larryScale_generated.cpp @@ -33,9 +33,9 @@ inline void scalePixelTo2x2(  	const Color pixel = src.get(x, y);  	const EqualityMatrix matrix = getEqualityMatrix(src.getPointerTo(x, y), src.getStride()); -	// Note: There is a case label for every possible value, so we don't need a default label. +	// Note: There is a case label for every possible value, so we don't need a default label, but one is added to avoid any compiler warnings.  	switch (matrix) { -	case 0x00 /*⠀⠂⠀*/:	case 0x07 /*⠃⠃⠀*/:	case 0x17 /*⠃⠃⠂*/:	case 0x1c /*⠀⠃⠃*/:	case 0x1d /*⠂⠃⠃*/:	case 0x1e /*⠁⠃⠃*/:	case 0x1f /*⠃⠃⠃*/:	case 0x27 /*⠃⠃⠄*/: +	default: case 0x00 /*⠀⠂⠀*/:	case 0x07 /*⠃⠃⠀*/:	case 0x17 /*⠃⠃⠂*/:	case 0x1c /*⠀⠃⠃*/:	case 0x1d /*⠂⠃⠃*/:	case 0x1e /*⠁⠃⠃*/:	case 0x1f /*⠃⠃⠃*/:	case 0x27 /*⠃⠃⠄*/:  	case 0x2f /*⠃⠃⠅*/:	case 0x37 /*⠃⠃⠆*/:	case 0x3c /*⠀⠃⠇*/:	case 0x3d /*⠂⠃⠇*/:	case 0x3e /*⠁⠃⠇*/:	case 0x3f /*⠃⠃⠇*/:	case 0x47 /*⠃⠇⠀*/:	case 0x4f /*⠃⠇⠁*/:  	case 0x50 /*⠀⠆⠂*/:	case 0x51 /*⠂⠆⠂*/:	case 0x52 /*⠁⠆⠂*/:	case 0x54 /*⠀⠇⠂*/:	case 0x55 /*⠂⠇⠂*/:	case 0x57 /*⠃⠇⠂*/:	case 0x5c /*⠀⠇⠃*/:	case 0x5d /*⠂⠇⠃*/:  	case 0x5e /*⠁⠇⠃*/:	case 0x5f /*⠃⠇⠃*/:	case 0x67 /*⠃⠇⠄*/:	case 0x6f /*⠃⠇⠅*/:	case 0x70 /*⠀⠆⠆*/:	case 0x71 /*⠂⠆⠆*/:	case 0x72 /*⠁⠆⠆*/:	case 0x73 /*⠃⠆⠆*/: @@ -49,30 +49,30 @@ inline void scalePixelTo2x2(  	case 0xf8 /*⠄⠆⠇*/:	case 0xf9 /*⠆⠆⠇*/:	case 0xfa /*⠅⠆⠇*/:	case 0xfb /*⠇⠆⠇*/:	case 0xfc /*⠄⠇⠇*/:	case 0xfd /*⠆⠇⠇*/:	case 0xfe /*⠅⠇⠇*/:	case 0xff /*⠇⠇⠇*/:  		topLeft = topRight = bottomLeft = bottomRight = pixel;  		break; -	case 0xa4 /*⠄⠃⠄*/: -		topLeft = bottomLeft = bottomRight = pixel; -		topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +	case 0x11 /*⠂⠂⠂*/:	case 0x15 /*⠂⠃⠂*/: +		topLeft = topRight = pixel; +		bottomLeft = bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		break;  	case 0x29 /*⠂⠂⠅*/:  		topLeft = topRight = bottomRight = pixel;  		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		break; -	case 0x92 /*⠅⠂⠂*/:	case 0x94 /*⠄⠃⠂*/: -		topLeft = topRight = bottomLeft = pixel; -		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; -		break;  	case 0x44 /*⠀⠇⠀*/:	case 0x45 /*⠂⠇⠀*/:  		topLeft = bottomLeft = pixel;  		topRight = bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; -	case 0x11 /*⠂⠂⠂*/:	case 0x15 /*⠂⠃⠂*/: -		topLeft = topRight = pixel; -		bottomLeft = bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; -		break;  	case 0x49 /*⠂⠆⠁*/:	case 0x4a /*⠁⠆⠁*/:  		topLeft = topRight = bottomLeft = pixel;  		bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; +	case 0x92 /*⠅⠂⠂*/:	case 0x94 /*⠄⠃⠂*/: +		topLeft = topRight = bottomLeft = pixel; +		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +		break; +	case 0xa4 /*⠄⠃⠄*/: +		topLeft = bottomLeft = bottomRight = pixel; +		topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +		break;  	case 0x53 /*⠃⠆⠂*/:	case 0x56 /*⠁⠇⠂*/:	case 0x59 /*⠂⠆⠃*/:	case 0x5a /*⠁⠆⠃*/:	case 0x5b /*⠃⠆⠃*/:	case 0xd2 /*⠅⠆⠂*/:	case 0xd4 /*⠄⠇⠂*/:	case 0xd6 /*⠅⠇⠂*/:  	case 0xda /*⠅⠆⠃*/:  		if (linePixels.get(x, y)) { @@ -81,35 +81,27 @@ inline void scalePixelTo2x2(  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0xa8 /*⠄⠂⠅*/: -		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		topRight = bottomLeft = bottomRight = pixel; +	case 0x2a /*⠁⠂⠅*/: +		topLeft = topRight = bottomRight = pixel; +		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel;  		break;  	case 0x8a /*⠅⠂⠁*/:	case 0x8f /*⠇⠃⠁*/:  		topLeft = topRight = bottomLeft = pixel;  		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; -	case 0x2a /*⠁⠂⠅*/: -		topLeft = topRight = bottomRight = pixel; -		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		break;  	case 0xa2 /*⠅⠂⠄*/:	case 0xe3 /*⠇⠆⠄*/:  		topLeft = bottomLeft = bottomRight = pixel;  		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; +	case 0xa8 /*⠄⠂⠅*/: +		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		topRight = bottomLeft = bottomRight = pixel; +		break;  	case 0x25 /*⠂⠃⠄*/:  		topLeft = bottomRight = pixel;  		topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		break; -	case 0xa6 /*⠅⠃⠄*/:	case 0xac /*⠄⠃⠅*/:	case 0xae /*⠅⠃⠅*/: -		if (linePixels.get(x, y)) { -			topLeft = bottomLeft = bottomRight = pixel; -			topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -		} else { -			topLeft = topRight = bottomLeft = bottomRight = pixel; -		} -		break;  	case 0x13 /*⠃⠂⠂*/:	case 0x19 /*⠂⠂⠃*/:	case 0x1b /*⠃⠂⠃*/:	case 0x31 /*⠂⠂⠆*/:	case 0x33 /*⠃⠂⠆*/:	case 0x35 /*⠂⠃⠆*/:	case 0x39 /*⠂⠂⠇*/:	case 0x3b /*⠃⠂⠇*/:  	case 0x91 /*⠆⠂⠂*/:	case 0x93 /*⠇⠂⠂*/:	case 0x95 /*⠆⠃⠂*/:	case 0x99 /*⠆⠂⠃*/:	case 0x9b /*⠇⠂⠃*/:	case 0xb1 /*⠆⠂⠆*/:	case 0xb3 /*⠇⠂⠆*/:	case 0xb5 /*⠆⠃⠆*/:  	case 0xb9 /*⠆⠂⠇*/:	case 0xbb /*⠇⠂⠇*/: @@ -120,10 +112,20 @@ inline void scalePixelTo2x2(  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x96 /*⠅⠃⠂*/:	case 0x9a /*⠅⠂⠃*/:	case 0xb2 /*⠅⠂⠆*/:	case 0xb4 /*⠄⠃⠆*/:	case 0xb6 /*⠅⠃⠆*/:	case 0xba /*⠅⠂⠇*/: +	case 0x2b /*⠃⠂⠅*/:	case 0xa9 /*⠆⠂⠅*/:	case 0xab /*⠇⠂⠅*/:  		if (linePixels.get(x, y)) { -			topLeft = topRight = bottomLeft = pixel; -			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +			topLeft = topRight = bottomRight = pixel; +			bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +		} else { +			topLeft = topRight = bottomLeft = bottomRight = pixel; +		} +		break; +	case 0x46 /*⠁⠇⠀*/:	case 0x4c /*⠀⠇⠁*/:	case 0x4d /*⠂⠇⠁*/:	case 0x4e /*⠁⠇⠁*/:	case 0x64 /*⠀⠇⠄*/:	case 0x65 /*⠂⠇⠄*/:	case 0x66 /*⠁⠇⠄*/:	case 0x6c /*⠀⠇⠅*/: +	case 0x6d /*⠂⠇⠅*/:	case 0x6e /*⠁⠇⠅*/:	case 0xc4 /*⠄⠇⠀*/:	case 0xc6 /*⠅⠇⠀*/:	case 0xcc /*⠄⠇⠁*/:	case 0xce /*⠅⠇⠁*/:	case 0xe4 /*⠄⠇⠄*/:	case 0xe6 /*⠅⠇⠄*/: +	case 0xec /*⠄⠇⠅*/:	case 0xee /*⠅⠇⠅*/: +		if (linePixels.get(x, y)) { +			topLeft = bottomLeft = pixel; +			topRight = bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else {  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		} @@ -136,64 +138,62 @@ inline void scalePixelTo2x2(  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x2b /*⠃⠂⠅*/:	case 0xa9 /*⠆⠂⠅*/:	case 0xab /*⠇⠂⠅*/: +	case 0x96 /*⠅⠃⠂*/:	case 0x9a /*⠅⠂⠃*/:	case 0xb2 /*⠅⠂⠆*/:	case 0xb4 /*⠄⠃⠆*/:	case 0xb6 /*⠅⠃⠆*/:	case 0xba /*⠅⠂⠇*/:  		if (linePixels.get(x, y)) { -			topLeft = topRight = bottomRight = pixel; -			bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +			topLeft = topRight = bottomLeft = pixel; +			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		} else {  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x46 /*⠁⠇⠀*/:	case 0x4c /*⠀⠇⠁*/:	case 0x4d /*⠂⠇⠁*/:	case 0x4e /*⠁⠇⠁*/:	case 0x64 /*⠀⠇⠄*/:	case 0x65 /*⠂⠇⠄*/:	case 0x66 /*⠁⠇⠄*/:	case 0x6c /*⠀⠇⠅*/: -	case 0x6d /*⠂⠇⠅*/:	case 0x6e /*⠁⠇⠅*/:	case 0xc4 /*⠄⠇⠀*/:	case 0xc6 /*⠅⠇⠀*/:	case 0xcc /*⠄⠇⠁*/:	case 0xce /*⠅⠇⠁*/:	case 0xe4 /*⠄⠇⠄*/:	case 0xe6 /*⠅⠇⠄*/: -	case 0xec /*⠄⠇⠅*/:	case 0xee /*⠅⠇⠅*/: +	case 0xa6 /*⠅⠃⠄*/:	case 0xac /*⠄⠃⠅*/:	case 0xae /*⠅⠃⠅*/:  		if (linePixels.get(x, y)) { -			topLeft = bottomLeft = pixel; -			topRight = bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			topLeft = bottomLeft = bottomRight = pixel; +			topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else {  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x24 /*⠀⠃⠄*/: -		topLeft = !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		topRight = bottomRight = pixel; -		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +	case 0x01 /*⠂⠂⠀*/:	case 0x09 /*⠂⠂⠁*/:	case 0x0f /*⠃⠃⠁*/: +		topLeft = topRight = pixel; +		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break;  	case 0x04 /*⠀⠃⠀*/:	case 0x84 /*⠄⠃⠀*/:	case 0x87 /*⠇⠃⠀*/:  		topLeft = bottomLeft = pixel;  		topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; -	case 0x90 /*⠄⠂⠂*/: -		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : pixel; -		bottomLeft = bottomRight = pixel; +	case 0x10 /*⠀⠂⠂*/:	case 0x12 /*⠁⠂⠂*/:	case 0x14 /*⠀⠃⠂*/: +		topLeft = topRight = pixel; +		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		break;  	case 0x21 /*⠂⠂⠄*/:	case 0xe1 /*⠆⠆⠄*/:  		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : pixel;  		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		bottomLeft = bottomRight = pixel;  		break; -	case 0x48 /*⠀⠆⠁*/: -		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +	case 0x24 /*⠀⠃⠄*/: +		topLeft = !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel;  		topRight = bottomRight = pixel; -		bottomLeft = !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		break; -	case 0x01 /*⠂⠂⠀*/:	case 0x09 /*⠂⠂⠁*/:	case 0x0f /*⠃⠃⠁*/: -		topLeft = topRight = pixel; -		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; -		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -		break; -	case 0x10 /*⠀⠂⠂*/:	case 0x12 /*⠁⠂⠂*/:	case 0x14 /*⠀⠃⠂*/: -		topLeft = topRight = pixel;  		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		break;  	case 0x40 /*⠀⠆⠀*/:	case 0x41 /*⠂⠆⠀*/:	case 0x42 /*⠁⠆⠀*/:	case 0xc3 /*⠇⠆⠀*/:  		topLeft = bottomLeft = pixel;  		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; +	case 0x48 /*⠀⠆⠁*/: +		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		topRight = bottomRight = pixel; +		bottomLeft = !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		break; +	case 0x90 /*⠄⠂⠂*/: +		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : pixel; +		bottomLeft = bottomRight = pixel; +		break;  	case 0xd8 /*⠄⠆⠃*/:  		if (linePixels.get(x, y)) {  			topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; @@ -202,36 +202,36 @@ inline void scalePixelTo2x2(  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0xa0 /*⠄⠂⠄*/: -		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +	case 0x02 /*⠁⠂⠀*/:	case 0x20 /*⠀⠂⠄*/:	case 0x22 /*⠁⠂⠄*/: +		topLeft = bottomRight = pixel;  		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -		bottomLeft = bottomRight = pixel; -		break; -	case 0x0a /*⠁⠂⠁*/: -		topLeft = topRight = pixel;  		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break;  	case 0x08 /*⠀⠂⠁*/:	case 0x80 /*⠄⠂⠀*/:	case 0x88 /*⠄⠂⠁*/:  		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel;  		topRight = bottomLeft = pixel;  		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; +	case 0x0a /*⠁⠂⠁*/: +		topLeft = topRight = pixel; +		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +		break;  	case 0x28 /*⠀⠂⠅*/:  		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel;  		topRight = bottomRight = pixel;  		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel;  		break; -	case 0x02 /*⠁⠂⠀*/:	case 0x20 /*⠀⠂⠄*/:	case 0x22 /*⠁⠂⠄*/: -		topLeft = bottomRight = pixel; -		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		break;  	case 0x82 /*⠅⠂⠀*/:  		topLeft = bottomLeft = pixel;  		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; +	case 0xa0 /*⠄⠂⠄*/: +		topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +		bottomLeft = bottomRight = pixel; +		break;  	case 0x2d /*⠂⠃⠅*/:	case 0xa5 /*⠆⠃⠄*/:	case 0xad /*⠆⠃⠅*/:  		if (linePixels.get(x, y)) {  			topLeft = bottomRight = pixel; @@ -247,47 +247,38 @@ inline void scalePixelTo2x2(  		bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break; -	case 0x68 /*⠀⠆⠅*/:	case 0xc8 /*⠄⠆⠁*/:	case 0xe8 /*⠄⠆⠅*/: -		if (linePixels.get(x, y)) { -			topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -			topRight = bottomLeft = pixel; -			bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -		} else { -			topLeft = topRight = bottomLeft = bottomRight = pixel; -		} -		break; -	case 0x26 /*⠁⠃⠄*/:	case 0x2c /*⠀⠃⠅*/:	case 0x2e /*⠁⠃⠅*/: +	case 0x06 /*⠁⠃⠀*/:  		if (linePixels.get(x, y)) { -			topLeft = bottomRight = pixel; +			topLeft = bottomLeft = pixel;  			topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -			bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else {  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0xc0 /*⠄⠆⠀*/: +	case 0x18 /*⠀⠂⠃*/:	case 0x1a /*⠁⠂⠃*/:	case 0x30 /*⠀⠂⠆*/:	case 0x32 /*⠁⠂⠆*/:	case 0x36 /*⠁⠃⠆*/:	case 0x38 /*⠀⠂⠇*/:	case 0x3a /*⠁⠂⠇*/:  		if (linePixels.get(x, y)) { -			topLeft = bottomLeft = pixel; -			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -			bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			topLeft = topRight = pixel; +			bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		} else {  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x18 /*⠀⠂⠃*/:	case 0x1a /*⠁⠂⠃*/:	case 0x30 /*⠀⠂⠆*/:	case 0x32 /*⠁⠂⠆*/:	case 0x36 /*⠁⠃⠆*/:	case 0x38 /*⠀⠂⠇*/:	case 0x3a /*⠁⠂⠇*/: +	case 0x26 /*⠁⠃⠄*/:	case 0x2c /*⠀⠃⠅*/:	case 0x2e /*⠁⠃⠅*/:  		if (linePixels.get(x, y)) { -			topLeft = topRight = pixel; +			topLeft = bottomRight = pixel; +			topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  			bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		} else {  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x06 /*⠁⠃⠀*/: +	case 0x68 /*⠀⠆⠅*/:	case 0xc8 /*⠄⠆⠁*/:	case 0xe8 /*⠄⠆⠅*/:  		if (linePixels.get(x, y)) { -			topLeft = bottomLeft = pixel; -			topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +			topRight = bottomLeft = pixel; +			bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else {  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		} @@ -301,12 +292,11 @@ inline void scalePixelTo2x2(  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x58 /*⠀⠆⠃*/:	case 0xd0 /*⠄⠆⠂*/: +	case 0xc0 /*⠄⠆⠀*/:  		if (linePixels.get(x, y)) { -			topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : pixel; -			bottomLeft = !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -			bottomRight = pixel; +			topLeft = bottomLeft = pixel; +			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else {  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		} @@ -321,21 +311,21 @@ inline void scalePixelTo2x2(  			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x60 /*⠀⠆⠄*/:	case 0x62 /*⠁⠆⠄*/:	case 0x63 /*⠃⠆⠄*/:	case 0xc2 /*⠅⠆⠀*/:	case 0xe0 /*⠄⠆⠄*/:	case 0xe2 /*⠅⠆⠄*/: +	case 0x58 /*⠀⠆⠃*/:	case 0xd0 /*⠄⠆⠂*/:  		if (linePixels.get(x, y)) { -			topLeft = bottomLeft = pixel; -			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -			bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			topLeft = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : pixel; +			bottomLeft = !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +			bottomRight = pixel;  		} else { -			topLeft = bottomLeft = bottomRight = pixel; -			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			topLeft = topRight = bottomLeft = bottomRight = pixel;  		}  		break; -	case 0x23 /*⠃⠂⠄*/:	case 0xa1 /*⠆⠂⠄*/:	case 0xa3 /*⠇⠂⠄*/: +	case 0x03 /*⠃⠂⠀*/:  		if (linePixels.get(x, y)) { -			topLeft = bottomRight = pixel; -			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			topLeft = topRight = pixel;  			bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else {  			topLeft = bottomLeft = bottomRight = pixel;  			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; @@ -351,24 +341,34 @@ inline void scalePixelTo2x2(  			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		}  		break; -	case 0x03 /*⠃⠂⠀*/: +	case 0x0c /*⠀⠃⠁*/:	case 0x0e /*⠁⠃⠁*/:	case 0x86 /*⠅⠃⠀*/:	case 0x8c /*⠄⠃⠁*/:	case 0x8e /*⠅⠃⠁*/:  		if (linePixels.get(x, y)) { -			topLeft = topRight = pixel; -			bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +			topLeft = bottomLeft = pixel; +			topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else { +			topLeft = topRight = bottomLeft = pixel; +			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +		} +		break; +	case 0x23 /*⠃⠂⠄*/:	case 0xa1 /*⠆⠂⠄*/:	case 0xa3 /*⠇⠂⠄*/: +		if (linePixels.get(x, y)) { +			topLeft = bottomRight = pixel; +			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			bottomLeft = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +		} else {  			topLeft = bottomLeft = bottomRight = pixel;  			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		}  		break; -	case 0x0c /*⠀⠃⠁*/:	case 0x0e /*⠁⠃⠁*/:	case 0x86 /*⠅⠃⠀*/:	case 0x8c /*⠄⠃⠁*/:	case 0x8e /*⠅⠃⠁*/: +	case 0x60 /*⠀⠆⠄*/:	case 0x62 /*⠁⠆⠄*/:	case 0x63 /*⠃⠆⠄*/:	case 0xc2 /*⠅⠆⠀*/:	case 0xe0 /*⠄⠆⠄*/:	case 0xe2 /*⠅⠆⠄*/:  		if (linePixels.get(x, y)) {  			topLeft = bottomLeft = pixel; -			topRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			bottomRight = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else { -			topLeft = topRight = bottomLeft = pixel; -			bottomRight = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			topLeft = bottomLeft = bottomRight = pixel; +			topRight = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		}  		break;  	case 0x0d /*⠂⠃⠁*/:	case 0x85 /*⠆⠃⠀*/:	case 0x8d /*⠆⠃⠁*/: @@ -406,9 +406,9 @@ inline void scalePixelTo2x1(  	const Color pixel = src.get(x, y);  	const EqualityMatrix matrix = getEqualityMatrix(src.getPointerTo(x, y), src.getStride()); -	// Note: There is a case label for every possible value, so we don't need a default label. +	// Note: There is a case label for every possible value, so we don't need a default label, but one is added to avoid any compiler warnings.  	switch (matrix) { -	case 0x00 /*⠀⠂⠀*/:	case 0x01 /*⠂⠂⠀*/:	case 0x02 /*⠁⠂⠀*/:	case 0x07 /*⠃⠃⠀*/:	case 0x08 /*⠀⠂⠁*/:	case 0x09 /*⠂⠂⠁*/:	case 0x0a /*⠁⠂⠁*/:	case 0x0f /*⠃⠃⠁*/: +	default: case 0x00 /*⠀⠂⠀*/:	case 0x01 /*⠂⠂⠀*/:	case 0x02 /*⠁⠂⠀*/:	case 0x07 /*⠃⠃⠀*/:	case 0x08 /*⠀⠂⠁*/:	case 0x09 /*⠂⠂⠁*/:	case 0x0a /*⠁⠂⠁*/:	case 0x0f /*⠃⠃⠁*/:  	case 0x10 /*⠀⠂⠂*/:	case 0x11 /*⠂⠂⠂*/:	case 0x12 /*⠁⠂⠂*/:	case 0x14 /*⠀⠃⠂*/:	case 0x15 /*⠂⠃⠂*/:	case 0x17 /*⠃⠃⠂*/:	case 0x1c /*⠀⠃⠃*/:	case 0x1d /*⠂⠃⠃*/:  	case 0x1e /*⠁⠃⠃*/:	case 0x1f /*⠃⠃⠃*/:	case 0x20 /*⠀⠂⠄*/:	case 0x21 /*⠂⠂⠄*/:	case 0x22 /*⠁⠂⠄*/:	case 0x25 /*⠂⠃⠄*/:	case 0x27 /*⠃⠃⠄*/:	case 0x29 /*⠂⠂⠅*/:  	case 0x2a /*⠁⠂⠅*/:	case 0x2f /*⠃⠃⠅*/:	case 0x37 /*⠃⠃⠆*/:	case 0x3c /*⠀⠃⠇*/:	case 0x3d /*⠂⠃⠇*/:	case 0x3e /*⠁⠃⠇*/:	case 0x3f /*⠃⠃⠇*/:	case 0x47 /*⠃⠇⠀*/: @@ -446,21 +446,21 @@ inline void scalePixelTo2x1(  			left = right = pixel;  		}  		break; -	case 0x48 /*⠀⠆⠁*/: -		left = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		right = pixel; -		break; -	case 0x40 /*⠀⠆⠀*/:	case 0x41 /*⠂⠆⠀*/:	case 0x42 /*⠁⠆⠀*/:	case 0xc3 /*⠇⠆⠀*/: +	case 0x04 /*⠀⠃⠀*/:	case 0x05 /*⠂⠃⠀*/:	case 0x84 /*⠄⠃⠀*/:	case 0x87 /*⠇⠃⠀*/:  		left = pixel; -		right = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +		right = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		break;  	case 0x24 /*⠀⠃⠄*/:  		left = !linePixels.get(x - 1, y) ? src.get(x - 1, y) : !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		right = pixel;  		break; -	case 0x04 /*⠀⠃⠀*/:	case 0x05 /*⠂⠃⠀*/:	case 0x84 /*⠄⠃⠀*/:	case 0x87 /*⠇⠃⠀*/: +	case 0x40 /*⠀⠆⠀*/:	case 0x41 /*⠂⠆⠀*/:	case 0x42 /*⠁⠆⠀*/:	case 0xc3 /*⠇⠆⠀*/:  		left = pixel; -		right = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +		right = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +		break; +	case 0x48 /*⠀⠆⠁*/: +		left = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		right = pixel;  		break;  	case 0x46 /*⠁⠇⠀*/:	case 0x4c /*⠀⠇⠁*/:	case 0x4d /*⠂⠇⠁*/:	case 0x4e /*⠁⠇⠁*/:	case 0x64 /*⠀⠇⠄*/:	case 0x65 /*⠂⠇⠄*/:	case 0x66 /*⠁⠇⠄*/:	case 0x6c /*⠀⠇⠅*/:  	case 0x6d /*⠂⠇⠅*/:	case 0x6e /*⠁⠇⠅*/:	case 0xc4 /*⠄⠇⠀*/:	case 0xc6 /*⠅⠇⠀*/:	case 0xcc /*⠄⠇⠁*/:	case 0xce /*⠅⠇⠁*/:	case 0xe4 /*⠄⠇⠄*/:	case 0xe6 /*⠅⠇⠄*/: @@ -480,11 +480,11 @@ inline void scalePixelTo2x1(  		left = pixel;  		right = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		break; -	case 0x43 /*⠃⠆⠀*/:	case 0x60 /*⠀⠆⠄*/:	case 0x61 /*⠂⠆⠄*/:	case 0x62 /*⠁⠆⠄*/:	case 0x63 /*⠃⠆⠄*/:	case 0xc0 /*⠄⠆⠀*/:	case 0xc2 /*⠅⠆⠀*/:	case 0xe0 /*⠄⠆⠄*/: -	case 0xe2 /*⠅⠆⠄*/: +	case 0x06 /*⠁⠃⠀*/:	case 0x0c /*⠀⠃⠁*/:	case 0x0d /*⠂⠃⠁*/:	case 0x0e /*⠁⠃⠁*/:	case 0x85 /*⠆⠃⠀*/:	case 0x86 /*⠅⠃⠀*/:	case 0x8c /*⠄⠃⠁*/:	case 0x8d /*⠆⠃⠁*/: +	case 0x8e /*⠅⠃⠁*/:  		if (linePixels.get(x, y)) {  			left = pixel; -			right = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +			right = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel;  		} else {  			left = right = pixel;  		} @@ -497,11 +497,11 @@ inline void scalePixelTo2x1(  			left = right = pixel;  		}  		break; -	case 0x06 /*⠁⠃⠀*/:	case 0x0c /*⠀⠃⠁*/:	case 0x0d /*⠂⠃⠁*/:	case 0x0e /*⠁⠃⠁*/:	case 0x85 /*⠆⠃⠀*/:	case 0x86 /*⠅⠃⠀*/:	case 0x8c /*⠄⠃⠁*/:	case 0x8d /*⠆⠃⠁*/: -	case 0x8e /*⠅⠃⠁*/: +	case 0x43 /*⠃⠆⠀*/:	case 0x60 /*⠀⠆⠄*/:	case 0x61 /*⠂⠆⠄*/:	case 0x62 /*⠁⠆⠄*/:	case 0x63 /*⠃⠆⠄*/:	case 0xc0 /*⠄⠆⠀*/:	case 0xc2 /*⠅⠆⠀*/:	case 0xe0 /*⠄⠆⠄*/: +	case 0xe2 /*⠅⠆⠄*/:  		if (linePixels.get(x, y)) {  			left = pixel; -			right = !linePixels.get(x + 1, y) ? src.get(x + 1, y) : !linePixels.get(x, y + 1) ? src.get(x, y + 1) : pixel; +			right = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		} else {  			left = right = pixel;  		} @@ -527,9 +527,9 @@ inline void scalePixelTo1x2(  	const Color pixel = src.get(x, y);  	const EqualityMatrix matrix = getEqualityMatrix(src.getPointerTo(x, y), src.getStride()); -	// Note: There is a case label for every possible value, so we don't need a default label. +	// Note: There is a case label for every possible value, so we don't need a default label, but one is added to avoid any compiler warnings.  	switch (matrix) { -	case 0x00 /*⠀⠂⠀*/:	case 0x02 /*⠁⠂⠀*/:	case 0x04 /*⠀⠃⠀*/:	case 0x07 /*⠃⠃⠀*/:	case 0x08 /*⠀⠂⠁*/:	case 0x17 /*⠃⠃⠂*/:	case 0x1c /*⠀⠃⠃*/:	case 0x1d /*⠂⠃⠃*/: +	default: case 0x00 /*⠀⠂⠀*/:	case 0x02 /*⠁⠂⠀*/:	case 0x04 /*⠀⠃⠀*/:	case 0x07 /*⠃⠃⠀*/:	case 0x08 /*⠀⠂⠁*/:	case 0x17 /*⠃⠃⠂*/:	case 0x1c /*⠀⠃⠃*/:	case 0x1d /*⠂⠃⠃*/:  	case 0x1e /*⠁⠃⠃*/:	case 0x1f /*⠃⠃⠃*/:	case 0x20 /*⠀⠂⠄*/:	case 0x22 /*⠁⠂⠄*/:	case 0x24 /*⠀⠃⠄*/:	case 0x25 /*⠂⠃⠄*/:	case 0x27 /*⠃⠃⠄*/:	case 0x28 /*⠀⠂⠅*/:  	case 0x29 /*⠂⠂⠅*/:	case 0x2a /*⠁⠂⠅*/:	case 0x2f /*⠃⠃⠅*/:	case 0x37 /*⠃⠃⠆*/:	case 0x3c /*⠀⠃⠇*/:	case 0x3d /*⠂⠃⠇*/:	case 0x3e /*⠁⠃⠇*/:	case 0x3f /*⠃⠃⠇*/:  	case 0x40 /*⠀⠆⠀*/:	case 0x41 /*⠂⠆⠀*/:	case 0x42 /*⠁⠆⠀*/:	case 0x44 /*⠀⠇⠀*/:	case 0x45 /*⠂⠇⠀*/:	case 0x47 /*⠃⠇⠀*/:	case 0x48 /*⠀⠆⠁*/:	case 0x49 /*⠂⠆⠁*/: @@ -567,21 +567,21 @@ inline void scalePixelTo1x2(  			top = bottom = pixel;  		}  		break; -	case 0x90 /*⠄⠂⠂*/: -		top = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; -		bottom = pixel; -		break; -	case 0x21 /*⠂⠂⠄*/:	case 0xe1 /*⠆⠆⠄*/: -		top = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -		bottom = pixel; +	case 0x01 /*⠂⠂⠀*/:	case 0x05 /*⠂⠃⠀*/:	case 0x09 /*⠂⠂⠁*/:	case 0x0f /*⠃⠃⠁*/: +		top = pixel; +		bottom = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		break;  	case 0x10 /*⠀⠂⠂*/:	case 0x12 /*⠁⠂⠂*/:	case 0x14 /*⠀⠃⠂*/:  		top = pixel;  		bottom = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel;  		break; -	case 0x01 /*⠂⠂⠀*/:	case 0x05 /*⠂⠃⠀*/:	case 0x09 /*⠂⠂⠁*/:	case 0x0f /*⠃⠃⠁*/: -		top = pixel; -		bottom = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +	case 0x21 /*⠂⠂⠄*/:	case 0xe1 /*⠆⠆⠄*/: +		top = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +		bottom = pixel; +		break; +	case 0x90 /*⠄⠂⠂*/: +		top = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : pixel; +		bottom = pixel;  		break;  	case 0x13 /*⠃⠂⠂*/:	case 0x19 /*⠂⠂⠃*/:	case 0x1b /*⠃⠂⠃*/:	case 0x31 /*⠂⠂⠆*/:	case 0x33 /*⠃⠂⠆*/:	case 0x35 /*⠂⠃⠆*/:	case 0x39 /*⠂⠂⠇*/:	case 0x3b /*⠃⠂⠇*/:  	case 0x91 /*⠆⠂⠂*/:	case 0x93 /*⠇⠂⠂*/:	case 0x95 /*⠆⠃⠂*/:	case 0x99 /*⠆⠂⠃*/:	case 0x9b /*⠇⠂⠃*/:	case 0xb1 /*⠆⠂⠆*/:	case 0xb3 /*⠇⠂⠆*/:	case 0xb5 /*⠆⠃⠆*/: @@ -601,6 +601,15 @@ inline void scalePixelTo1x2(  		top = !linePixels.get(x, y - 1) ? src.get(x, y - 1) : !linePixels.get(x - 1, y) ? src.get(x - 1, y) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel;  		bottom = pixel;  		break; +	case 0x03 /*⠃⠂⠀*/:	case 0x0b /*⠃⠂⠁*/:	case 0x0d /*⠂⠃⠁*/:	case 0x81 /*⠆⠂⠀*/:	case 0x83 /*⠇⠂⠀*/:	case 0x85 /*⠆⠃⠀*/:	case 0x89 /*⠆⠂⠁*/:	case 0x8b /*⠇⠂⠁*/: +	case 0x8d /*⠆⠃⠁*/: +		if (linePixels.get(x, y)) { +			top = pixel; +			bottom = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; +		} else { +			top = bottom = pixel; +		} +		break;  	case 0x16 /*⠁⠃⠂*/:	case 0x18 /*⠀⠂⠃*/:	case 0x1a /*⠁⠂⠃*/:	case 0x30 /*⠀⠂⠆*/:	case 0x32 /*⠁⠂⠆*/:	case 0x34 /*⠀⠃⠆*/:	case 0x36 /*⠁⠃⠆*/:	case 0x38 /*⠀⠂⠇*/:  	case 0x3a /*⠁⠂⠇*/:  		if (linePixels.get(x, y)) { @@ -626,15 +635,5 @@ inline void scalePixelTo1x2(  			top = bottom = pixel;  		}  		break; -	case 0x03 /*⠃⠂⠀*/:	case 0x0b /*⠃⠂⠁*/:	case 0x0d /*⠂⠃⠁*/:	case 0x81 /*⠆⠂⠀*/:	case 0x83 /*⠇⠂⠀*/:	case 0x85 /*⠆⠃⠀*/:	case 0x89 /*⠆⠂⠁*/:	case 0x8b /*⠇⠂⠁*/: -	case 0x8d /*⠆⠃⠁*/: -		if (linePixels.get(x, y)) { -			top = pixel; -			bottom = !linePixels.get(x, y + 1) ? src.get(x, y + 1) : !linePixels.get(x + 1, y) ? src.get(x + 1, y) : pixel; -		} else { -			top = bottom = pixel; -		} -		break;  	}  } - diff --git a/graphics/larryScale_generator.js b/graphics/larryScale_generator.js index 8df7b01746..7f22421a93 100644 --- a/graphics/larryScale_generator.js +++ b/graphics/larryScale_generator.js @@ -159,8 +159,8 @@ function generateSwitchBlock(variableName, getCaseBody) {  	const switchStatements = orderedPairs  		.map(([body, matrixes]) => generateCaseBlock(matrixes, body))  		.join('\n'); -	const comment = '// Note: There is a case label for every possible value, so we don\'t need a default label.'; -	return `${comment}\nswitch (${variableName}) {\n${switchStatements}\n}`; +	const comment = '// Note: There is a case label for every possible value, so we don\'t need a default label, but one is added to avoid any compiler warnings.'; +	return `${comment}\nswitch (${variableName}) {\ndefault: ${switchStatements}\n}`;  }  const PixelType = {  | 
