add endian switch functions to replace macros SWITCH_INT/LONG/SHORT, with BLI_endian_switch_int32/int64/float/double...

5 files changed, 177 insertions, 24 deletions

diff --git a/source/blender/blenlib/BLI_endian_switch.h b/source/blender/blenlib/BLI_endian_switch.h
new file mode 100644
index 00000000000..19da1ff35a3
--- /dev/null
+++ b/source/blender/blenlib/BLI_endian_switch.h
@@ -0,0 +1,33 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BLI_ENDIAN_SWITCH_H__
+#define __BLI_ENDIAN_SWITCH_H__
+
+/** \file BLI_endian_switch.h
+ *  \ingroup bli
+ */
+
+#include "BLI_endian_switch_inline.h"
+
+
+#endif  /* __BLI_ENDIAN_SWITCH_H__ */
diff --git a/source/blender/blenlib/BLI_endian_switch_inline.h b/source/blender/blenlib/BLI_endian_switch_inline.h
new file mode 100644
index 00000000000..b747da3b738
--- /dev/null
+++ b/source/blender/blenlib/BLI_endian_switch_inline.h
@@ -0,0 +1,116 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/* only include from header */
+#ifndef __BLI_ENDIAN_SWITCH_H__
+#  error "this file isnt to be directly included"
+#endif
+
+#ifndef __BLI_ENDIAN_SWITCH_INLINE_H__
+#define __BLI_ENDIAN_SWITCH_INLINE_H__
+
+/** \file blender/blenlib/BLI_endian_switch_inline.h
+ *  \ingroup bli
+ */
+
+
+BLI_INLINE void BLI_endian_switch_int16(short *val)
+{
+	char *p_i = (char *)val;
+	char s_i;
+
+	s_i    = p_i[0];
+	p_i[0] = p_i[1];
+	p_i[1] = s_i;
+}
+
+BLI_INLINE void BLI_endian_switch_uint16(unsigned short *val)
+{
+	char *p_i = (char *)val;
+	char s_i;
+
+	s_i    = p_i[0];
+	p_i[0] = p_i[1];
+	p_i[1] = s_i;
+}
+
+BLI_INLINE void BLI_endian_switch_int32(int *val)
+{
+	char *p_i = (char *)val;
+	char s_i;
+
+	s_i = p_i[0]; p_i[0] = p_i[3]; p_i[3] = s_i;
+	s_i = p_i[1]; p_i[1] = p_i[2]; p_i[2] = s_i;
+}
+
+BLI_INLINE void BLI_endian_switch_uint32(unsigned int *val)
+{
+	char *p_i = (char *)val;
+	char s_i;
+
+	s_i = p_i[0]; p_i[0] = p_i[3]; p_i[3] = s_i;
+	s_i = p_i[1]; p_i[1] = p_i[2]; p_i[2] = s_i;
+}
+
+BLI_INLINE void BLI_endian_switch_float(float *val)
+{
+	char *p_i = (char *)val;
+	char s_i;
+
+	s_i = p_i[0]; p_i[0] = p_i[3]; p_i[3] = s_i;
+	s_i = p_i[1]; p_i[1] = p_i[2]; p_i[2] = s_i;
+}
+
+BLI_INLINE void BLI_endian_switch_int64(int64_t *val)
+{
+	char *p_i = (char *)val;
+	char s_i;
+
+	s_i = p_i[0]; p_i[0] = p_i[7]; p_i[7] = s_i;
+	s_i = p_i[1]; p_i[1] = p_i[6]; p_i[6] = s_i;
+	s_i = p_i[2]; p_i[2] = p_i[5]; p_i[5] = s_i;
+	s_i = p_i[3]; p_i[3] = p_i[4]; p_i[4] = s_i;
+}
+
+BLI_INLINE void BLI_endian_switch_uint64(uint64_t *val)
+{
+	char *p_i = (char *)val;
+	char s_i;
+
+	s_i = p_i[0]; p_i[0] = p_i[7]; p_i[7] = s_i;
+	s_i = p_i[1]; p_i[1] = p_i[6]; p_i[6] = s_i;
+	s_i = p_i[2]; p_i[2] = p_i[5]; p_i[5] = s_i;
+	s_i = p_i[3]; p_i[3] = p_i[4]; p_i[4] = s_i;
+}
+
+BLI_INLINE void BLI_endian_switch_double(double *val)
+{
+	char *p_i = (char *)val;
+	char s_i;
+
+	s_i = p_i[0]; p_i[0] = p_i[7]; p_i[7] = s_i;
+	s_i = p_i[1]; p_i[1] = p_i[6]; p_i[6] = s_i;
+	s_i = p_i[2]; p_i[2] = p_i[5]; p_i[5] = s_i;
+	s_i = p_i[3]; p_i[3] = p_i[4]; p_i[4] = s_i;
+}
+
+#endif  /* __BLI_ENDIAN_SWITCH_INLINE_H__ */
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index 8a459b9b07c..c11d8ed55be 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -225,30 +225,6 @@
 		(item <= ARRAY_LAST_ITEM(arr_start, arr_dtype, elem_size, tot))       \
 	)
 
-/* This one rotates the bytes in an int64, int (32) and short (16) */
-#define SWITCH_INT64(a) {                                                     \
-		char s_i, *p_i;                                                       \
-		p_i = (char *)&(a);                                                   \
-		s_i = p_i[0]; p_i[0] = p_i[7]; p_i[7] = s_i;                          \
-		s_i = p_i[1]; p_i[1] = p_i[6]; p_i[6] = s_i;                          \
-		s_i = p_i[2]; p_i[2] = p_i[5]; p_i[5] = s_i;                          \
-		s_i = p_i[3]; p_i[3] = p_i[4]; p_i[4] = s_i;                          \
-	} (void)0
-
-#define SWITCH_INT(a) {                                                       \
-		char s_i, *p_i;                                                       \
-		p_i = (char *)&(a);                                                   \
-		s_i = p_i[0]; p_i[0] = p_i[3]; p_i[3] = s_i;                          \
-		s_i = p_i[1]; p_i[1] = p_i[2]; p_i[2] = s_i;                          \
-	} (void)0
-
-#define SWITCH_SHORT(a) {                                                     \
-		char s_i, *p_i;                                                       \
-		p_i = (char *)&(a);                                                   \
-		s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i;                          \
-	} (void)0
-
-
 /* Warning-free macros for storing ints in pointers. Use these _only_
  * for storing an int in a pointer, not a pointer in an int (64bit)! */
 #define SET_INT_IN_POINTER(i)    ((void *)(intptr_t)(i))
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 0175076fab8..fd755943e70 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -55,6 +55,7 @@ set(SRC
 	intern/cpu.c
 	intern/dynlib.c
 	intern/edgehash.c
+	intern/endian_switch.c
 	intern/fileops.c
 	intern/fnmatch.c
 	intern/freetypefont.c
@@ -105,6 +106,8 @@ set(SRC
 	BLI_dynlib.h
 	BLI_dynstr.h
 	BLI_edgehash.h
+	BLI_endian_switch.h
+	BLI_endian_switch_inline.h
 	BLI_fileops.h
 	BLI_fileops_types.h
 	BLI_fnmatch.h
diff --git a/source/blender/blenlib/intern/endian_switch.c b/source/blender/blenlib/intern/endian_switch.c
new file mode 100644
index 00000000000..db4884d35b9
--- /dev/null
+++ b/source/blender/blenlib/intern/endian_switch.c
@@ -0,0 +1,25 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenlib/intern/endian_switch.c
+ *  \ingroup bli
+ */