mirror of
https://github.com/opencv/opencv.git
synced 2024-12-27 03:14:05 +08:00
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
|
diff --git a/3rdparty/libpng/mips/mips_init.c b/3rdparty/libpng/mips/mips_init.c
|
||
|
|
index 8dd283deef..6a061cccfa 100644
|
||
|
|
--- a/3rdparty/libpng/mips/mips_init.c
|
||
|
|
+++ b/3rdparty/libpng/mips/mips_init.c
|
||
|
|
@@ -73,7 +73,6 @@ png_init_filter_functions_msa(png_structp pp, unsigned int bpp)
|
||
|
|
* this case will fall through to the 'default' below, which just
|
||
|
|
* returns.
|
||
|
|
*/
|
||
|
|
-#endif /* PNG_MIPS_MSA_API_SUPPORTED */
|
||
|
|
#ifdef PNG_MIPS_MSA_CHECK_SUPPORTED
|
||
|
|
{
|
||
|
|
static volatile sig_atomic_t no_msa = -1; /* not checked */
|
||
|
|
@@ -84,12 +83,9 @@ png_init_filter_functions_msa(png_structp pp, unsigned int bpp)
|
||
|
|
if (no_msa)
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
-#ifdef PNG_MIPS_MSA_API_SUPPORTED
|
||
|
|
- break;
|
||
|
|
-#endif
|
||
|
|
#endif /* PNG_MIPS_MSA_CHECK_SUPPORTED */
|
||
|
|
+ break;
|
||
|
|
|
||
|
|
-#ifdef PNG_MIPS_MSA_API_SUPPORTED
|
||
|
|
default: /* OFF or INVALID */
|
||
|
|
return;
|
||
|
|
|
||
|
|
@@ -97,8 +93,6 @@ png_init_filter_functions_msa(png_structp pp, unsigned int bpp)
|
||
|
|
/* Option turned on */
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
/* IMPORTANT: any new external functions used here must be declared using
|
||
|
|
* PNG_INTERNAL_FUNCTION in ../pngpriv.h. This is required so that the
|
||
|
|
* 'prefix' option to configure works:
|
||
|
|
@@ -118,13 +112,16 @@ png_init_filter_functions_msa(png_structp pp, unsigned int bpp)
|
||
|
|
pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_msa;
|
||
|
|
pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth3_msa;
|
||
|
|
}
|
||
|
|
-
|
||
|
|
else if (bpp == 4)
|
||
|
|
{
|
||
|
|
pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_msa;
|
||
|
|
pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_msa;
|
||
|
|
pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth4_msa;
|
||
|
|
}
|
||
|
|
+#else
|
||
|
|
+ (void)pp;
|
||
|
|
+ (void)bpp;
|
||
|
|
+#endif /* PNG_MIPS_MSA_API_SUPPORTED */
|
||
|
|
}
|
||
|
|
#endif /* PNG_MIPS_MSA_OPT > 0 */
|
||
|
|
#endif /* READ */
|