From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 7 Feb 2013 13:27:17 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4278
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=957499f0473afc4be08e8c281b95a44375715f4c;p=imagemagick

---

diff --git a/PerlMagick/t/montage.t b/PerlMagick/t/montage.t
index 827ef32de..5c1047561 100644
--- a/PerlMagick/t/montage.t
+++ b/PerlMagick/t/montage.t
@@ -28,8 +28,8 @@ chdir 't' || die 'Cd failed';
 # 1) Test montage defaults (except no label that requires an exact font)
 #
 testMontage( q//,
-  q/background=>'#696e7e', label=>''/,
-  'bf4dd13fca96be6b3605e8cfdf65d3d09485d2c063bd88d967432836723be297');
+  q/background=>'#696e7e'/,
+  '4aac8269bd31defb14971e475d23e0774c5fc929a60babddf8c3ecbcb01bfabd');
 
 #
 # 2) Test Center gravity
@@ -37,8 +37,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'Center'/,
-  'd67f32498d2d172813a37cba59566bc6ad0cbb22813a7d94b3ccaa4f183b611a');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'Center'/,
+  'a1825dab28dcb3f3fad641a2ec688199ad4c43253f5ea3fb13fafffe49a74818');
 
 #
 # 3) Test NorthWest gravity
@@ -46,8 +46,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'NorthWest'/,
-  '9a5b3dfc243f7d9e5abb2de0043679aa95a620313f0723d3297fad569b1e65ec');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'NorthWest'/,
+  'd41d7fb9cf59ab0d8f86545b4561fd267f555c0ab434a23d9b4d52e7b55fe64b');
 
 #
 # 4) Test North gravity
@@ -55,8 +55,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'North'/,
-  'ec73186569d5d922ebd48a244172beae71c6edd4fd3bec741519650d6244b829');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'North'/,
+  '0c04c47f966d7769e99f99b0be4d8d1679e42a71543ce24efd2296afa9491073');
 
 #
 # 5) Test NorthEast gravity
@@ -64,8 +64,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'NorthEast'/,
-  '4b6de9121b3996c4b9ced91a3a4bda412456da17fc46e21e1bfa7f230df4660e');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'NorthEast'/,
+  '7110c0432bfd90f2173e547dbefe4c693757e7bf6bf731c8a97f72c71c723830');
 
 #
 # 6) Test West gravity
@@ -73,8 +73,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'West'/,
-  'f2fc5232bf3a756fd93e7ea24de0f01764d218d80da970a0479fc01297d4b07f');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'West'/,
+  '2a6f10fc376136ec74d53d7dd52c60e420edf851548377868bfb7f47d0e8a1e6');
 
 #
 # 7) Test East gravity
@@ -82,8 +82,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'East'/,
-  '2fdc1ceba82a853a02a55fc57eb1c3da9183fdf0d34cdd2deada0bd40329c1e1');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'East'/,
+  '6a1517b10841950912b5a4e9fb852559268a3c64e86d6b391024c0e3ea7cc3e3');
 
 #
 # 8) Test SouthWest gravity
@@ -91,8 +91,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'SouthWest'/,
-  '2b151fd9ed8192c326f5917f2cb9621fbb66fbac585ded776625d29a2bb1d690');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'SouthWest'/,
+  '6df59cabd0ccb84da56cf4a13516cfd8fc0bc215c438c8ee5bdbe6db82d52830');
 
 #
 # 9) Test South gravity
@@ -100,8 +100,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'South'/,
-  'afba8a6b6f06f446cff8a0c819eaa11683eaf8f16b3a2c89b33de3f388a6563f');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'South'/,
+  '227064c0fdd574d6c659a71bc24591d67fd604b4bb44c5466774446d9c7592f1');
 
 #
 # 10) Test SouthEast gravity
@@ -109,8 +109,8 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', geometry=>'90x80+5+5>', gravity=>'SouthEast'/,
-  '6440e72ddadf6d84cac94f8c722adb406bb3e41d6ae1af04707f6f61dfd5334e');
+  q/background=>'#696e7e',  geometry=>'90x80+5+5>', gravity=>'SouthEast'/,
+  '1b1eadf70f68f9ddea212b75d68d3109fcafe4e7db988cb90e148ca33be4691f');
 
 #
 # 11) Test Framed Montage
@@ -120,10 +120,10 @@ testMontage( q//,
 # Image pen color 'pen' controls label text foreground color
 ++$test;
 testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
-  q/background=>'#696e7e', label=>'', tile=>'4x4', geometry=>'90x80+3+3>', frame=>'8x10',
+  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+3+3>', frame=>'8x10',
   borderwidth=>'0', gravity=>'Center', background=>'gray'/,
-  'f303eb837e796f3ecf69bc97a8067804113d5c54420d1e3af76f5099d3808b9e',
-  'f303eb837e796f3ecf69bc97a8067804113d5c54420d1e3af76f5099d3808b9e',
+  'a2b51a92bfa701b5121930caba4c39fca5de2d5d539570667b6a14aed1a1d0bd',
+  'a2b51a92bfa701b5121930caba4c39fca5de2d5d539570667b6a14aed1a1d0bd',
   '72a7587a058c71cd62226e59b64c335190a37d7dd990d68534cf05df61084783');
 
 #
@@ -131,10 +131,10 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
 #
 ++$test;
 testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
-  q/background=>'#696e7e', label=>'', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
+  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
   borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/,
-  '8dd9e9293ea3567a6b66ace613aa53d855120369c118a490075253b870458a7f',
-  '8dd9e9293ea3567a6b66ace613aa53d855120369c118a490075253b870458a7f',
+  'e4e2f293481151f49888cca594b38beaa37e168ba1efa6a590e166521490b338',
+  'e4e2f293481151f49888cca594b38beaa37e168ba1efa6a590e166521490b338',
   '2d9b191eea778b1d1d98f9d997558f96e6f6d273a1d92787c9f70866b4382cd4');
 
 #
@@ -142,10 +142,10 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
 #
 ++$test;
 testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
-  q/background=>'#696e7e', label=>'', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
+  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
   borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/,
-  '8dd9e9293ea3567a6b66ace613aa53d855120369c118a490075253b870458a7f',
-  '8dd9e9293ea3567a6b66ace613aa53d855120369c118a490075253b870458a7f',
+  'e4e2f293481151f49888cca594b38beaa37e168ba1efa6a590e166521490b338',
+  'e4e2f293481151f49888cca594b38beaa37e168ba1efa6a590e166521490b338',
   '5210498e650a30748341b7b93da4fefe1707a900a6914d63df03cf4a309feb3d');
 
 #
@@ -153,10 +153,10 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', tile=>'4x4', geometry=>'90x80+6+6>', mode=>'Unframe',
+  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', mode=>'Unframe',
   borderwidth=>'0', gravity=>'Center', background=>'gray'/,
-  'ec51611e630b07b472f4acfbfb102892bfa79b0708356b88f59aeb7a4dc2fae5',
-  'ec51611e630b07b472f4acfbfb102892bfa79b0708356b88f59aeb7a4dc2fae5',
+  '2b108aac04c0d339dbae55161a050dd788d2fd09a35f2ad5a0810b7c546ada44',
+  '2b108aac04c0d339dbae55161a050dd788d2fd09a35f2ad5a0810b7c546ada44',
   'ab07c5591848f1aa8bfffc46c094be40cf662e18f68b19229f1f7e9d9eec4692');
 
 #
@@ -164,10 +164,10 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q/bordercolor=>'red'/, 
-  q/background=>'#696e7e', label=>'', tile=>'4x4', geometry=>'90x80+6+6>', mode=>'Unframe',
+  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', mode=>'Unframe',
   borderwidth=>'5', gravity=>'Center', background=>'gray'/,
-  'bfa74ec158d85faeb57feda41da3d5405f5b52f3a96a58942df474cafbc27415',
-  'bfa74ec158d85faeb57feda41da3d5405f5b52f3a96a58942df474cafbc27415',
+  'eb2db2e5e0558563d814da22c8ca9be993a3217744eaba53d6921b223c6e6f3f',
+  'eb2db2e5e0558563d814da22c8ca9be993a3217744eaba53d6921b223c6e6f3f',
   '65bb1cd11a0dbbd90ca46b07ce58b2ba5fcfadc0869356e5a08eda53510e0126');
 
 #
@@ -175,10 +175,10 @@ testMontage( q/bordercolor=>'red'/,
 #
 ++$test;
 testMontage( q/bordercolor=>'red'/, 
-  q/label=>'', tile=>'4x4', geometry=>'90x80+6+6>', mode=>'UnFrame',
+  q/ tile=>'4x4', geometry=>'90x80+6+6>', mode=>'UnFrame',
   borderwidth=>'5', gravity=>'Center', background=>'gray'/,
-  'bfa74ec158d85faeb57feda41da3d5405f5b52f3a96a58942df474cafbc27415',
-  'bfa74ec158d85faeb57feda41da3d5405f5b52f3a96a58942df474cafbc27415',
+  'eb2db2e5e0558563d814da22c8ca9be993a3217744eaba53d6921b223c6e6f3f',
+  'eb2db2e5e0558563d814da22c8ca9be993a3217744eaba53d6921b223c6e6f3f',
   '65bb1cd11a0dbbd90ca46b07ce58b2ba5fcfadc0869356e5a08eda53510e0126');
 
 #
@@ -186,10 +186,10 @@ testMontage( q/bordercolor=>'red'/,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', tile=>'16x1', geometry=>'90x80+0+0>', mode=>'Unframe',
+  q/background=>'#696e7e',  tile=>'16x1', geometry=>'90x80+0+0>', mode=>'Unframe',
   borderwidth=>'0', gravity=>'Center', background=>'gray'/,
-  '123c0dd02a97643fae81450adb10f5f4f1109a74e938083ce17df11f3a8e68a6',
-  '123c0dd02a97643fae81450adb10f5f4f1109a74e938083ce17df11f3a8e68a6',
+  '26ba497f978db17009459907d6634abe0084f4dc26f2edc4435e15087a5a7918',
+  '26ba497f978db17009459907d6634abe0084f4dc26f2edc4435e15087a5a7918',
   'c42d5f2bef5f30167f02d6ba85504ee82e06c16d9404bc6fc0f6e75c0f8f53e9');
 
 #
@@ -198,16 +198,16 @@ testMontage( q//,
 #
 ++$test;
 testMontage( q//,
-  q/background=>'#696e7e', label=>'', tile=>'4x4', geometry=>'90x80>', mode=>'Concatenate'/,
-  '1967a3499a09a58d27acdabb13bd5d97d0f29fee91b5cc8ee8445bdc9940f677');
+  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80>', mode=>'Concatenate'/,
+  '3f42ab1a8a19594ab6a0c7990a35a34d92d9fff2a4ed59c5202a660d27c3ef36');
 #
 # 19) Test concatenated thumbnail Montage (concatentated by setting params to zero)
 #     Thumbnails should be compacted tightly together in a grid
 #
 ++$test;
 testMontage( q//, 
-  q/background=>'#696e7e', label=>'', tile=>'4x4', geometry=>'+0+0', mode=>'Unframe', shadow=>'False',
+  q/background=>'#696e7e',  tile=>'4x4', geometry=>'+0+0', mode=>'Unframe', shadow=>'False',
   borderwidth=>'0', background=>'gray'/,
-  '1967a3499a09a58d27acdabb13bd5d97d0f29fee91b5cc8ee8445bdc9940f677',
-  '1967a3499a09a58d27acdabb13bd5d97d0f29fee91b5cc8ee8445bdc9940f677',
+  '3f42ab1a8a19594ab6a0c7990a35a34d92d9fff2a4ed59c5202a660d27c3ef36',
+  '3f42ab1a8a19594ab6a0c7990a35a34d92d9fff2a4ed59c5202a660d27c3ef36',
   '6c61a8ad7be5f8c368dcb591f766349e648b623cbc41e6699ba3ea53ef182510');