Fixed compiler warnings

davisking · davisking · commit 71f78c1ee63d · 2017-08-27T09:23:49.000-04:00
diff --git a/dlib/image_transforms/image_pyramid.h b/dlib/image_transforms/image_pyramid.h
@@ -1045,7 +1045,7 @@ namespace dlib
 
         long y = outer_padding;
         size_t i = 0;
-        while(y < height+outer_padding)
+        while(y < height+(long)outer_padding)
         {
             rectangle rect = translate_rect(get_rect(pyramid[i]),point(outer_padding,y));
             DLIB_ASSERT(get_rect(out_img).contains(rect));
diff --git a/dlib/image_transforms/interpolation.h b/dlib/image_transforms/interpolation.h
@@ -1306,7 +1306,8 @@ namespace dlib
         pyramid_type pyr;
         for (unsigned long i = 0; i < images.size(); ++i)
         {
-            if (images[i].size() <= max_image_size)
+            const unsigned long img_size = num_rows(images[i])*num_columns(images[i]);
+            if (img_size <= max_image_size)
             {
                 pyramid_up(images[i], temp, pyr);
                 swap(temp, images[i]);
@@ -1340,7 +1341,8 @@ namespace dlib
         pyramid_type pyr;
         for (unsigned long i = 0; i < images.size(); ++i)
         {
-            if (images[i].size() <= max_image_size)
+            const unsigned long img_size = num_rows(images[i])*num_columns(images[i]);
+            if (img_size <= max_image_size)
             {
                 pyramid_up(images[i], temp, pyr);
                 swap(temp, images[i]);
@@ -1377,7 +1379,8 @@ namespace dlib
         pyramid_type pyr;
         for (unsigned long i = 0; i < images.size(); ++i)
         {
-            if (images[i].size() <= max_image_size)
+            const unsigned long img_size = num_rows(images[i])*num_columns(images[i]);
+            if (img_size <= max_image_size)
             {
                 pyramid_up(images[i], temp, pyr);
                 swap(temp, images[i]);

Original file line number	Diff line number	Diff line change
`@@ -1045,7 +1045,7 @@ namespace dlib`
`1045`	`1045`
`1046`	`1046`	`long y = outer_padding;`
`1047`	`1047`	`size_t i = 0;`
`1048`		`- while(y < height+outer_padding)`
	`1048`	`+ while(y < height+(long)outer_padding)`
`1049`	`1049`	`{`
`1050`	`1050`	`rectangle rect = translate_rect(get_rect(pyramid[i]),point(outer_padding,y));`
`1051`	`1051`	`DLIB_ASSERT(get_rect(out_img).contains(rect));`
Original file line number	Diff line number	Diff line change
`@@ -1306,7 +1306,8 @@ namespace dlib`
`1306`	`1306`	`pyramid_type pyr;`
`1307`	`1307`	`for (unsigned long i = 0; i < images.size(); ++i)`
`1308`	`1308`	`{`
`1309`		`- if (images[i].size() <= max_image_size)`
	`1309`	`+ const unsigned long img_size = num_rows(images[i])*num_columns(images[i]);`
	`1310`	`+ if (img_size <= max_image_size)`
`1310`	`1311`	`{`
`1311`	`1312`	`pyramid_up(images[i], temp, pyr);`
`1312`	`1313`	`swap(temp, images[i]);`
`@@ -1340,7 +1341,8 @@ namespace dlib`
`1340`	`1341`	`pyramid_type pyr;`
`1341`	`1342`	`for (unsigned long i = 0; i < images.size(); ++i)`
`1342`	`1343`	`{`
`1343`		`- if (images[i].size() <= max_image_size)`
	`1344`	`+ const unsigned long img_size = num_rows(images[i])*num_columns(images[i]);`
	`1345`	`+ if (img_size <= max_image_size)`
`1344`	`1346`	`{`
`1345`	`1347`	`pyramid_up(images[i], temp, pyr);`
`1346`	`1348`	`swap(temp, images[i]);`
`@@ -1377,7 +1379,8 @@ namespace dlib`
`1377`	`1379`	`pyramid_type pyr;`
`1378`	`1380`	`for (unsigned long i = 0; i < images.size(); ++i)`
`1379`	`1381`	`{`
`1380`		`- if (images[i].size() <= max_image_size)`
	`1382`	`+ const unsigned long img_size = num_rows(images[i])*num_columns(images[i]);`
	`1383`	`+ if (img_size <= max_image_size)`
`1381`	`1384`	`{`
`1382`	`1385`	`pyramid_up(images[i], temp, pyr);`
`1383`	`1386`	`swap(temp, images[i]);`