File 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERS... of Package libpng16

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch of Package libpng16 (Revision eb1b542d20b3a73bfa7db187bcff91a4)

Currently displaying revision eb1b542d20b3a73bfa7db187bcff91a4 , Show latest

From 3f67eb68e05ae87ec985f413b97b4cdd2922533d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Fri, 14 Jul 2017 17:53:43 +0200
Subject: [PATCH] [libpng16] Revised pngpriv.h to use PNG_VERSION_INFO_ONLY
 instead of

PNG_ARM_NEON_IMPLEMENTATION == 2 to exclude some definitions that assembler
cannot recognize.

[SBruens] Cherry-picked from 54126d5c59653e744ee8af81ba61fd910ce4d295,
removed merge conflicts.
---
 pngpriv.h | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pngpriv.h b/pngpriv.h
index a062a8da1..f50de2b86 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -452,6 +452,21 @@
 #  define png_fixed_error(s1,s2) png_err(s1)
 #endif
 
+/* Some fixed point APIs are still required even if not exported because
+ * they get used by the corresponding floating point APIs.  This magic
+ * deals with this:
+ */
+#ifdef PNG_FIXED_POINT_SUPPORTED
+#  define PNGFAPI PNGAPI
+#else
+#  define PNGFAPI /* PRIVATE */
+#endif
+
+#ifndef PNG_VERSION_INFO_ONLY
+/* Other defines specific to compilers can go here.  Try to keep
+ * them inside an appropriate ifdef/endif pair for portability.
+ */
+
 /* C allows up-casts from (void*) to any pointer and (const void*) to any
  * pointer to a const object.  C++ regards this as a type error and requires an
  * explicit, static, cast and provides the static_cast<> rune to ensure that
@@ -480,20 +495,6 @@
 #  define png_aligncastconst(type, value) ((const void*)(value))
 #endif /* __cplusplus */
 
-/* Some fixed point APIs are still required even if not exported because
- * they get used by the corresponding floating point APIs.  This magic
- * deals with this:
- */
-#ifdef PNG_FIXED_POINT_SUPPORTED
-#  define PNGFAPI PNGAPI
-#else
-#  define PNGFAPI /* PRIVATE */
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-/* Other defines specific to compilers can go here.  Try to keep
- * them inside an appropriate ifdef/endif pair for portability.
- */
 #if defined(PNG_FLOATING_POINT_SUPPORTED) ||\
     defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
    /* png.c requires the following ANSI-C constants if the conversion of
-- 
2.13.2

Places

File 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch of Package libpng16 (Revision eb1b542d20b3a73bfa7db187bcff91a4)

Places