Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Author: alalek

testdata/cv/qrcode/dataset_config.json

@@ -70,8 +70,8 @@
         { "image_name": "version_5_top.jpg", "x": [ 196, 424, 436, 187 ],
             "y": [ 140, 142, 374, 374 ],
             "info": "aQqdqecq%hre3?JXcDxx#PqLG_29G*R^&f?bD6C5qam+Y_MUGaSmS5&fh_Q&bCZz=8g4GB2+#7%^Tw&Wz&c3VT*h" },
-        { "image_name": "russian.jpg", "x": [ 155, 309, 519, 387 ], "y": [
-                297, 137, 239, 450 ],
+        { "image_name": "russian.jpg", "x": [ 228, 489, 503, 221 ], "y": [
+                142, 137, 410, 408 ],
             "info": "Съешь же ещё этих мягких французких булок да выпей чаю." },
         { "image_name": "kanji.jpg", "x": [ 73, 240, 300, 116 ], "y": [
                 226, 153, 386, 430 ],

testdata/cv/qrcode/russian.jpg

@@ -37,7 +37,7 @@ def getMB(r):
     def verify(self):
         if not self.sha:
             return False
-        print('  expect {}'.format(m.sha))
+        print('  expect {}'.format(self.sha))
         sha = hashlib.sha1()
         with open(self.filename, 'rb') as f:
             while True:

testdata/dnn/download_models.py

@@ -218,3 +218,7 @@ def forward(self, x):
 input = Variable(torch.randn(2, 3))
 model = Transpose()
 save_data_and_model("transpose", input, model)
+
+input = Variable(torch.randn(1, 2, 3, 4))
+pad = nn.ZeroPad2d((4,3, 2,1))  # left,right, top,bottom
+save_data_and_model("padding", input, pad)

testdata/dnn/onnx/data/input_padding.npy

@@ -644,7 +644,7 @@
       <cols>4</cols>
       <dt>"2i"</dt>
       <data>
-        155 297 309 137 519 239 387 450</data></val></corners></Perf_Objdetect_QRCode--detect---russian-jpg->
+        228 142 489 137 503 410 221 408</data></val></corners></Perf_Objdetect_QRCode--detect---russian-jpg->
 <Perf_Objdetect_QRCode--detect---kanji-jpg->
   <corners>
     <kind>196608</kind>
@@ -1006,13 +1006,13 @@
       <y>0</y>
       <val>46.</val></last>
     <rng1>
-      <x>82</x>
+      <x>38</x>
       <y>0</y>
       <val>208.</val></rng1>
     <rng2>
-      <x>25</x>
+      <x>10</x>
       <y>0</y>
-      <val>209.</val></rng2></decoded_info_uint8_t>
+      <val>32.</val></rng2></decoded_info_uint8_t>
   <straight_barcode>
     <kind>65536</kind>
     <type>5</type>
@@ -1023,13 +1023,13 @@
       <y>36</y>
       <val>0.</val></last>
     <rng1>
-      <x>30</x>
-      <y>9</y>
-      <val>255.</val></rng1>
+      <x>19</x>
+      <y>26</y>
+      <val>0.</val></rng1>
     <rng2>
-      <x>0</x>
-      <y>12</y>
-      <val>0.</val></rng2></straight_barcode></Perf_Objdetect_QRCode--decode---russian-jpg->
+      <x>26</x>
+      <y>13</y>
+      <val>255.</val></rng2></straight_barcode></Perf_Objdetect_QRCode--decode---russian-jpg->
 <Perf_Objdetect_QRCode--decode---kanji-jpg->
   <decoded_info_uint8_t>
     <kind>196608</kind>