$OpenBSD: patch-core_libs_rawengine_libraw_src_decoders_fp_dng_cpp,v 1.1 2021/03/23 10:37:35 rsadowski Exp $

Rename to avoid conflicts

Index: core/libs/rawengine/libraw/src/decoders/fp_dng.cpp
--- core/libs/rawengine/libraw/src/decoders/fp_dng.cpp.orig
+++ core/libs/rawengine/libraw/src/decoders/fp_dng.cpp
@@ -549,7 +549,7 @@ _forceinline
 #else
 inline
 #endif
-void swap24(uchar *data, int len)
+void _swap24(uchar *data, int len)
 {
     for (int i = 0; i < len - 2; i += 3)
     {
@@ -565,7 +565,7 @@ _forceinline
 #else
 inline
 #endif
-void swap32(uchar *data, int len)
+void _swap32(uchar *data, int len)
 {
     unsigned *d = (unsigned*)data;
     for (int i = 0; i < len / 4; i++)
@@ -630,9 +630,9 @@ void LibRaw::uncompressed_fp_dng_load_raw()
                 if (bytesps == 2 && difford)
                     swab((char *)dst, (char *)dst, fullrowbytes);
                 else if (bytesps == 3 && (libraw_internal_data.unpacker_data.order == 0x4949)) // II-16bit
-                    swap24(dst, fullrowbytes);
+                    _swap24(dst, fullrowbytes);
                 if (bytesps == 4 && difford)
-                    swap32(dst, fullrowbytes);
+                    _swap32(dst, fullrowbytes);
 
                 float lmax = expandFloats(
                     dst,
