Change image scaling from adaptive to box-filter

When I add QR-codes I'll need precise scaling of pizel - no bluring.
So change the scaling used.  Maybe one day this should be selectable.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/display-ncurses.c b/display-ncurses.c
index 55c21c21e1007eb994e095c05829ef176fcffc89..f402be61e39d7e5a1a5c73afec05e38547bc8ace 100644 (file)
--- a/display-ncurses.c
+++ b/display-ncurses.c
@@ -1016,7 +1016,7 @@ DEF_CB(nc_draw_image_cb)
        case 'h': /* height */
                return MagickGetImageHeight(dii->wd);
        case 's': /* scale */
-               MagickAdaptiveResizeImage(dii->wd, ci->num, ci->num2);
+               MagickResizeImage(dii->wd, ci->num, ci->num2, BoxFilter, 1.0);
                return 1;
        case 'c': /* crop or cursor */
                if (ci->key[1] != 'u') {

diff --git a/display-x11-xcb.c b/display-x11-xcb.c
index a006c94569883bff5babf3cc2943c60d71481920..1d21e5907f2f85ae9051ee5747066aeae11e5fa8 100644 (file)
--- a/display-x11-xcb.c
+++ b/display-x11-xcb.c
@@ -827,7 +827,7 @@ DEF_CB(xcb_draw_image_cb)
        case 'h': /* height */
                return MagickGetImageHeight(dii->wd);
        case 's': /* scale */
-               MagickAdaptiveResizeImage(dii->wd, ci->num, ci->num2);
+               MagickResizeImage(dii->wd, ci->num, ci->num2, BoxFilter, 1.0);
                return 1;
        case 'c': /* crop or cursor */
                if (ci->key[1] != 'u') {

diff --git a/tests.d/02-presenter b/tests.d/02-presenter
index 150ede91df72da78650af87e967baf2bd05894a1..73a83d14d6a4d452eda9b407ae1ec91ef78bac5b 100644 (file)
--- a/tests.d/02-presenter
+++ b/tests.d/02-presenter
@@ -100,127 +100,127 @@ Display 80,30 F9EB31FDC2257DAEE1F57D9C29D00622 56,3
 Key "-o"
 Display 80,30 CBC152FE802C7638EB03887954356FF9 57,3
 Key "-r"
-Display 80,30 D9EC991CC93BB0DFE4A5E21DC7EC3A5B 58,3
+Display 80,30 1B39DA40CC0A9B5546B762B0CD1C9912 58,3
 Key "-:"
-Display 80,30 2738DFA43E228D6C0B202D71F8DE989B 59,3
+Display 80,30 D5670309B7DECFFB164C268110025434 59,3
 Key "-#"
-Display 80,30 5D25230A62A7A6DFAD291A7B5AE41D79 60,3
+Display 80,30 4467677D8B70114F3D4A9DEAF08AEA0B 60,3
 Key "-b"
-Display 80,30 C89644A4F78C895A87EF5671067C51AC 61,3
+Display 80,30 F3B9F8C6DF5434B3E00594DCA930A772 61,3
 Key "-8"
-Display 80,30 03C433E4ECB929066141FBF9E883F706 62,3
+Display 80,30 092BAC82D9AC24AEB5416BB254DD0A1E 62,3
 Key "-c"
-Display 80,30 E67EE7DCECA9C9A98D1D4B35E4D6E786 63,3
+Display 80,30 2E900A4EB691FA2D97E7D5B6F8899098 63,3
 Key "-5"
-Display 80,30 65AFF008F9A10D500AB24AB97CC94101 64,3
+Display 80,30 9D0A5D25B2FDB019A3E7D49B440AC1E4 64,3
 Key "-c"
-Display 80,30 31468F0C58021C18E389C33CBA6BA098 65,3
+Display 80,30 8FA42EFEC52036D9315BB1342A45C42D 65,3
 Key "-d"
-Display 80,30 04D459A563BBACD66DBEB5ABD52C7B06 66,3
+Display 80,30 B22BEA686100EB9090B52CBDE3DEDC37 66,3
 Key "-,"
-Display 80,30 EF35D2F75C6C8722986C72D84B5B423A 67,3
+Display 80,30 C03B80C15A155C079B1C3D812EBC23F9 67,3
 Key ":C-D"
-Display 80,30 F21CDD1776483058384947A5A2C67581 67,3
+Display 80,30 303322DA327C3933B9A8DB578FB8738B 67,3
 Key ":A-<"
-Display 80,30 BFD6AC8031DA8E1249252B3534439648 41,0
+Display 80,30 EFBF806A591E67F5FEC92ECD7B6CC478 41,0
 Key ":C-X"
-Display 80,30 CCD9D115B338052A87EC792B4A7DF9AA 41,0
+Display 80,30 EEABAE25F6B32912DA569A82EA53F41A 41,0
 Key ":C-S"
-Display 80,30 32AAA2452953CA412B6C501C049F17A9 41,0
+Display 80,30 582FD05FDBD57A7977BAFFA480402D15 41,0
 Key ":C-V"
-Display 80,30 EDAF305E1201F1CEA222CE692A096833 41,14
+Display 80,30 02D7B8C22E635DD68B0FA798951B698C 41,14
 Key ":C-V"
-Display 80,30 24B378D77925D238A39E20FF8409DC58 41,23
+Display 80,30 4716B8586174AACE17DAA2B21445CDC1 41,23
 Key ":C-V"
-Display 80,30 A9C2CE554971E61FCCBA577E0FAA2E51 41,23
+Display 80,30 376518E951DB82176763BF8EA6C34B63 41,23
 Key ":C-V"
-Display 80,30 80BFE9BD891136C6DA2F6E86C634C7A6 41,19
+Display 80,30 A5989B9FD66689376DB1048E6741488F 41,19
 Key ":C-V"
-Display 80,30 5A34BD9963F7220D335814D0CF4CF6F0 41,25
+Display 80,30 2ABF9808371572B4C73B42F2ACEE4795 41,25
 Key ":C-V"
-Display 80,30 CD6FDF42EA8E3F33F2C724ABFE29BCD9 41,19
+Display 80,30 0A13650CA82A7D957F63316E2315200B 41,19
 Key ":C-V"
-Display 80,30 44B8E6837CEE52F8B5A39204CC7A0EA8 41,25
+Display 80,30 8C093647082CF7E358F04167FD53C3B3 41,25
 Key ":C-V"
-Display 80,30 A10016532503907B42F429D381E2D554 41,22
+Display 80,30 E7FD560CF5F8BF666C43B6E85AF4232A 41,22
 Key ":C-V"
-Display 80,30 0F2D596198D3188EED67E6B0EFF4E860 41,20
+Display 80,30 1533CC53BCF8C884A5C6E2DBB84549D7 41,20
 Key ":C-V"
-Display 80,30 9994CA0D1995DEB50903586F8911FEC3 41,27
+Display 80,30 0D2B6354241E11CEE83E1FB7B3DC320C 41,27
 Key ":A-v"
-Display 80,30 A92659CC1C8F76FF3D7838FEC045B638 41,19
+Display 80,30 B6C857DA1C63729B2840E3A6F0CC090E 41,19
 Key ":A-v"
-Display 80,30 079832D06081B6AFAA6C1A50B088A02A 41,4
+Display 80,30 AAEEA9C34B206931EFE0E5985A17C83B 41,4
 Key ":A-v"
-Display 80,30 65A04A615A574E7A7D9CC550E20DC769 41,2
+Display 80,30 1D765CA6FFB8137F539489558C8D311B 41,2
 Key ":A-v"
-Display 80,30 308C19E289DE5E8F094FAB37B4D80861 41,5
+Display 80,30 C1F9C435C0146EABC4C3F3B696AA4E7F 41,5
 Key ":C-X"
-Display 80,30 FA340030449E00D248815C79F8A5CA8C 41,5
+Display 80,30 41F2ECBDA49EF38143649842830DF824 41,5
 Key "-o"
-Display 80,30 308C19E289DE5E8F094FAB37B4D80861 41,5
+Display 80,30 C1F9C435C0146EABC4C3F3B696AA4E7F 41,5
 Key "- "
-Display 80,30 EF77D170B48154461AB517006E36C128 41,5
+Display 80,30 A604BB2A02A295B4863B4DE09819DE14 41,5
 Key "- "
-Display 80,30 D05FA5555E5753EF7C63130BFCC5F298 41,5
+Display 80,30 7A1A6C26CCB50FCFCACB1DA434893059 41,5
 Key ":Backspace"
-Display 80,30 18512898A7A2054C3E506AA0412A8871 41,5
+Display 80,30 CD5A9DA4054898349544C66D08DB1C2B 41,5
 Key ":Backspace"
-Display 80,30 EB57713F78EB85789B0CAE8B35B59A6D 41,5
+Display 80,30 9BC6BCC03A4826119BD3D4D932CB1F86 41,5
 Key ":C-X"
-Display 80,30 086A5FA98E85A5FF79CDEB45477C300A 41,5
+Display 80,30 EFC183A703AE52DC5EE8D92221D02542 41,5
 Key "-o"
-Display 80,30 EB57713F78EB85789B0CAE8B35B59A6D 41,5
+Display 80,30 9BC6BCC03A4826119BD3D4D932CB1F86 41,5
 Key ":A-<"
-Display 80,30 FA86716DAC8F2E24B38E71C82185A6F6 41,0
+Display 80,30 A067F7AD6CA154C5404898F83C26AA8B 41,0
 Key ":C-V"
-Display 80,30 E95B1E8C501DBCB5CD04B4D94417CFE7 41,14
+Display 80,30 6D1C9E8C7C3B98559D00E2E8CE0ACF3C 41,14
 Key ":C-V"
-Display 80,30 493C5A6D6986B8FF8616ACA771B1F12B 41,23
+Display 80,30 E03FF9E7C0165E5E5A017F1D212BD905 41,23
 Key ":C-S"
-Display 80,30 F0633C4ED34235C5B1D1B2AF0795ECE4 70,0
+Display 80,30 1DAD1CA066745BBCD70414B21BC596FF 70,0
 Key "-e"
-Display 80,30 93F4C2ED181D80340B035CABA8C22F47 71,0
-Display 80,30 4EF4BFB068CFD0B574F4B469CD1F8804 71,0
+Display 80,30 1BCBD8F6E1DE2DB0CE377E4739CA75DC 71,0
+Display 80,30 9F38A2E0FFA0E91A32EF1BFD632CB567 71,0
 Key "-m"
-Display 80,30 FD535E0CA62186FE60D9791A859A3866 72,0
+Display 80,30 E4C96B0D6128E2566249B85811231AA3 72,0
 Key "-p"
-Display 80,30 41C3E4217288B4D8D4EC07031CC74AE5 73,0
-Display 80,30 A0E51F3255FA21B7ECE798CFEACD4960 73,0
+Display 80,30 8974DF1DEF7FE01C3919F877AD5D8790 73,0
+Display 80,30 D63393FA9349F641CA362162EF38A52E 73,0
 Key ":Enter"
-Display 80,30 E80738A12817CC5CFDC4A1BFD34D8B2D 52,13
+Display 80,30 99BE5CBEAC0AFAEB84E3478D0C711E70 52,13
 Key ":C-L"
-Display 80,30 F683653F333FB5995F3F06E1973434BD 52,13
+Display 80,30 F6CACFC7A808367226A41ED13AA3307F 52,13
 Key ":C-S"
-Display 80,30 BE6AA179DA2B5B277A025D8B15FC34B0 70,0
+Display 80,30 95E5C39397E35337D242066CDB43BD55 70,0
 Key ":C-S"
-Display 80,30 AFFACF34F3D48EEBE73A69FA87D24D5D 73,0
-Display 80,30 0D7BAB2BC9AF139F12C0CC87DB1F27AD 73,0
+Display 80,30 CBE68C3032E40AAD0E6F50978F71C249 73,0
+Display 80,30 8F1986D813440C20BB316942F16DD895 73,0
 Key ":C-S"
-Display 80,30 A7A665D627FDC7D40FD3874DB5D9243D 72,0
-Display 80,30 D18D81F1F64602644D0A38A1767923D4 72,0
+Display 80,30 97EBE64E552E6DC06352864C05A77089 72,0
+Display 80,30 A72B3461100CBBEA2AB5634960806BFF 72,0
 Key ":Enter"
-Display 80,30 60607FF8A4916C216A7EB7739678B955 52,21
+Display 80,30 ACB7062CB0EF3EC274CBC0C0F9863003 52,21
 Key ":C-V"
-Display 80,30 5E2E4C433D958D3FCD42B6071B24E6B4 41,25
+Display 80,30 4FB8914A1BD27E9711D921B1793F3EDA 41,25
 Key ":C-V"
-Display 80,30 90A6DF6667023AAFC1FC320CE20C1851 41,20
+Display 80,30 5E9DCC9597E87228AEB48389B9B7B312 41,20
 Key ":A->"
-Display 80,30 B05B0348F107EF3BE08D7575533E6770 41,25
+Display 80,30 008F5CB31467C78E5A1828891CAC62E8 41,25
 Key ":C-L"
-Display 80,30 A7CEE1C61B820EF14D46357143BA129A 41,25
+Display 80,30 964347D7F53736BCBC7F5834D498C338 41,25
 Key ":A-v"
-Display 80,30 5D217FF4217F1717B9E919DB2C5BEC7E 41,2
+Display 80,30 BB10656C9AB3B2CBF7C409B9FFF8B4DE 41,2
 Key ":C-P"
-Display 80,30 68D8686C0F71538F45F1EF4BAEDA7A67 41,1
+Display 80,30 5362FFEBF3292536E0F90FC2EEC53B7D 41,1
 Key ":C-P"
-Display 80,30 5DDD76F10A4D8C5409B75F911EF7AA31 41,0
+Display 80,30 557F0B7D5CB0B05A9DD885292965605E 41,0
 Key ":C-P"
-Display 80,30 41B2C4D968001928B98A83AE4D7592F2 41,0
+Display 80,30 CF5F047AB914CB39D2A7208C8A1CB7DC 41,0
 Key ":C-L"
-Display 80,30 3C298771A728873DA2E195D55629863E 41,13
+Display 80,30 8EC661C6D45BE798B8AD514478DCF3D8 41,13
 Key ":C-X"
-Display 80,30 136AE3FD2089F71E23116BE983A85809 41,13
+Display 80,30 9617694DC7B82ACE2A326CA02D71550F 41,13
 Key ":C-C"
-Display 80,30 4C8C49A4BE2FC772B2C13E69D8E443FF 41,13
+Display 80,30 F3021B8030C2064C93575E34BB22B006 41,13
 Close 1444