Merge pull request opencv#8924 from tomoaki0705:fixWarningResize

alalek · alalek · commit b21b6944447c · 2017-06-15T16:11:18.000Z
diff --git a/modules/imgproc/src/imgwarp.cpp b/modules/imgproc/src/imgwarp.cpp
@@ -428,7 +428,9 @@ class resizeNNInvokerAVX4 :
     {
     }
 
+#if defined(__INTEL_COMPILER)
 #pragma optimization_parameter target_arch=AVX
+#endif
     virtual void operator() (const Range& range) const
     {
         Size ssize = src.size(), dsize = dst.size();
@@ -504,7 +506,9 @@ class resizeNNInvokerAVX2 :
     {
     }
 
+#if defined(__INTEL_COMPILER)
 #pragma optimization_parameter target_arch=AVX
+#endif
     virtual void operator() (const Range& range) const
     {
         Size ssize = src.size(), dsize = dst.size();
@@ -605,11 +609,13 @@ class resizeNNInvokerSSE2 :
     {
     }
 
+#if defined(__INTEL_COMPILER)
 #pragma optimization_parameter target_arch=SSE4.2
+#endif
     virtual void operator() (const Range& range) const
     {
         Size ssize = src.size(), dsize = dst.size();
-        int y, x, pix_size = (int)src.elemSize();
+        int y, x;
         int width = dsize.width;
         int sseWidth = width - (width & 0x7);
         for(y = range.start; y < range.end; y++)
@@ -666,11 +672,13 @@ class resizeNNInvokerSSE4 :
         ify(_ify)
     {
     }
+#if defined(__INTEL_COMPILER)
 #pragma optimization_parameter target_arch=SSE4.2
+#endif
     virtual void operator() (const Range& range) const
     {
         Size ssize = src.size(), dsize = dst.size();
-        int y, x, pix_size = (int)src.elemSize();
+        int y, x;
         int width = dsize.width;
         int sseWidth = width - (width & 0x3);
         for(y = range.start; y < range.end; y++)

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,9 @@ class resizeNNInvokerAVX4 :`
`428`	`428`	`{`
`429`	`429`	`}`
`430`	`430`
	`431`	`+#if defined(__INTEL_COMPILER)`
`431`	`432`	`#pragma optimization_parameter target_arch=AVX`
	`433`	`+#endif`
`432`	`434`	`virtual void operator() (const Range& range) const`
`433`	`435`	`{`
`434`	`436`	`Size ssize = src.size(), dsize = dst.size();`
`@@ -504,7 +506,9 @@ class resizeNNInvokerAVX2 :`
`504`	`506`	`{`
`505`	`507`	`}`
`506`	`508`
	`509`	`+#if defined(__INTEL_COMPILER)`
`507`	`510`	`#pragma optimization_parameter target_arch=AVX`
	`511`	`+#endif`
`508`	`512`	`virtual void operator() (const Range& range) const`
`509`	`513`	`{`
`510`	`514`	`Size ssize = src.size(), dsize = dst.size();`
`@@ -605,11 +609,13 @@ class resizeNNInvokerSSE2 :`
`605`	`609`	`{`
`606`	`610`	`}`
`607`	`611`
	`612`	`+#if defined(__INTEL_COMPILER)`
`608`	`613`	`#pragma optimization_parameter target_arch=SSE4.2`
	`614`	`+#endif`
`609`	`615`	`virtual void operator() (const Range& range) const`
`610`	`616`	`{`
`611`	`617`	`Size ssize = src.size(), dsize = dst.size();`
`612`		`- int y, x, pix_size = (int)src.elemSize();`
	`618`	`+ int y, x;`
`613`	`619`	`int width = dsize.width;`
`614`	`620`	`int sseWidth = width - (width & 0x7);`
`615`	`621`	`for(y = range.start; y < range.end; y++)`
`@@ -666,11 +672,13 @@ class resizeNNInvokerSSE4 :`
`666`	`672`	`ify(_ify)`
`667`	`673`	`{`
`668`	`674`	`}`
	`675`	`+#if defined(__INTEL_COMPILER)`
`669`	`676`	`#pragma optimization_parameter target_arch=SSE4.2`
	`677`	`+#endif`
`670`	`678`	`virtual void operator() (const Range& range) const`
`671`	`679`	`{`
`672`	`680`	`Size ssize = src.size(), dsize = dst.size();`
`673`		`- int y, x, pix_size = (int)src.elemSize();`
	`681`	`+ int y, x;`
`674`	`682`	`int width = dsize.width;`
`675`	`683`	`int sseWidth = width - (width & 0x3);`
`676`	`684`	`for(y = range.start; y < range.end; y++)`