From 4276e74d3e2e06e9081388d3bc40ea6fd06f84e1 Mon Sep 17 00:00:00 2001
From: Paul Melis <paul.melis@surfsara.nl>
Date: Tue, 20 Aug 2019 14:39:30 +0200
Subject: [PATCH] Turn module code into C (which it almost was already) to work
 around the issue of using both C and C++ sources of building a Python
 extension

---
 readply.cpp => readply.c | 22 +++++++++++-----------
 setup.py                 |  3 +--
 2 files changed, 12 insertions(+), 13 deletions(-)
 rename readply.cpp => readply.c (97%)

diff --git a/readply.cpp b/readply.c
similarity index 97%
rename from readply.cpp
rename to readply.c
index 47eacc0..a53de68 100644
--- a/readply.cpp
+++ b/readply.c
@@ -16,8 +16,8 @@
 #include <Python.h>
 #include <numpy/arrayobject.h>
 #include <rply.h>
-#include <cstdio>
-#include <cassert>
+#include <stdio.h>
+#include <assert.h>
 
 #ifdef _MSC_VER
 typedef __int32 int32_t;
@@ -25,7 +25,7 @@ typedef unsigned __int32 uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #else
-#include <cstdint>
+#include <stdint.h>
 #endif
 
 //#define DEBUG
@@ -206,7 +206,7 @@ face_cb(p_ply_argument argument)
     
     if (next_face_element_index == face_indices_size)
     {
-        face_indices_size = int(face_indices_size * 1.1);
+        face_indices_size = (int)(face_indices_size * 1.1);
         faces = (uint32_t*) realloc(faces, face_indices_size*sizeof(uint32_t));
         if (faces == NULL)
         {
@@ -288,9 +288,9 @@ readply(PyObject* self, PyObject* args, PyObject *kwds)
 
     // Set optional per-vertex callbacks
 
-    bool            have_vertex_colors = false;
-    bool            have_vertex_normals = false;
-    bool            have_vertex_texcoords = false;      // Either s,t or u,v sets will be used, but not both
+    int have_vertex_colors = 0;
+    int have_vertex_normals = 0;
+    int have_vertex_texcoords = 0;      // Either s,t or u,v sets will be used, but not both
 
     p_ply_property  prop;
     e_ply_type      ptype, plength_type, pvalue_type;
@@ -308,7 +308,7 @@ readply(PyObject* self, PyObject* args, PyObject *kwds)
         {
             // Assumes green and blue properties are also available
             // XXX is there ever an alpha value?
-            have_vertex_colors = true;
+            have_vertex_colors = 1;
 
             if (ptype == PLY_UCHAR)
                 vertex_color_scale_factor = 1.0f / 255;
@@ -324,7 +324,7 @@ readply(PyObject* self, PyObject* args, PyObject *kwds)
         else if (strcmp(name, "nx") == 0)
         {
             // Assumes ny and nz properties are also available
-            have_vertex_normals = true;
+            have_vertex_normals = 1;
 
             ply_set_read_cb(ply, "vertex", "nx", vertex_normal_cb, NULL, 0);
             ply_set_read_cb(ply, "vertex", "ny", vertex_normal_cb, NULL, 0);
@@ -333,7 +333,7 @@ readply(PyObject* self, PyObject* args, PyObject *kwds)
         else if (strcmp(name, "s") == 0 && !have_vertex_texcoords)
         {
             // Assumes t property is also available
-            have_vertex_texcoords = true;
+            have_vertex_texcoords = 1;
 
             ply_set_read_cb(ply, "vertex", "s", vertex_texcoord_cb, NULL, 0);
             ply_set_read_cb(ply, "vertex", "t", vertex_texcoord_cb, NULL, 1);
@@ -341,7 +341,7 @@ readply(PyObject* self, PyObject* args, PyObject *kwds)
         else if (strcmp(name, "u") == 0 && !have_vertex_texcoords)
         {
             // Assumes v property is also available
-            have_vertex_texcoords = true;
+            have_vertex_texcoords = 1;
 
             ply_set_read_cb(ply, "vertex", "u", vertex_texcoord_cb, NULL, 0);
             ply_set_read_cb(ply, "vertex", "v", vertex_texcoord_cb, NULL, 1);
diff --git a/setup.py b/setup.py
index e0627ba..4fdd0be 100644
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,7 @@
 
 module1 = Extension('readply', 
     include_dirs = ['./rply', numpy.get_include()],
-    sources = ['readply.cpp', 'rply/rply.c'],
-    extra_compile_args = ['-std=c++11']
+    sources = ['readply.c', 'rply/rply.c']
 )
 
 setup(