Skip to content

Commit 4bb6edf

Browse files
103yiranalalek
authored andcommitted
Merge pull request opencv#14117 from 103yiran:103yiran-patch-dnn
* Postpone variable definitions * dnn: reduce scope of 'Mat image' variable
1 parent d4a96b6 commit 4bb6edf

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

modules/dnn/src/dnn.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ void blobFromImages(InputArrayOfArrays images_, OutputArray blob_, double scalef
247247
std::vector<Mat> images;
248248
images_.getMatVector(images);
249249
CV_Assert(!images.empty());
250-
for (int i = 0; i < images.size(); i++)
250+
for (size_t i = 0; i < images.size(); i++)
251251
{
252252
Size imgSize = images[i].size();
253253
if (size == Size())
@@ -277,21 +277,20 @@ void blobFromImages(InputArrayOfArrays images_, OutputArray blob_, double scalef
277277
images[i] *= scalefactor;
278278
}
279279

280-
size_t i, nimages = images.size();
280+
size_t nimages = images.size();
281281
Mat image0 = images[0];
282282
int nch = image0.channels();
283283
CV_Assert(image0.dims == 2);
284-
Mat image;
285284
if (nch == 3 || nch == 4)
286285
{
287286
int sz[] = { (int)nimages, nch, image0.rows, image0.cols };
288287
blob_.create(4, sz, ddepth);
289288
Mat blob = blob_.getMat();
290289
Mat ch[4];
291290

292-
for( i = 0; i < nimages; i++ )
291+
for(size_t i = 0; i < nimages; i++ )
293292
{
294-
image = images[i];
293+
const Mat& image = images[i];
295294
CV_Assert(image.depth() == blob_.depth());
296295
nch = image.channels();
297296
CV_Assert(image.dims == 2 && (nch == 3 || nch == 4));
@@ -311,9 +310,9 @@ void blobFromImages(InputArrayOfArrays images_, OutputArray blob_, double scalef
311310
blob_.create(4, sz, ddepth);
312311
Mat blob = blob_.getMat();
313312

314-
for( i = 0; i < nimages; i++ )
313+
for(size_t i = 0; i < nimages; i++ )
315314
{
316-
Mat image = images[i];
315+
const Mat& image = images[i];
317316
CV_Assert(image.depth() == blob_.depth());
318317
nch = image.channels();
319318
CV_Assert(image.dims == 2 && (nch == 1));

0 commit comments

Comments
 (0)