Merge pull request #278 from xlz/refactor-opencl

Move loadBufferFromResources() to resource.h from OpenCL depth processor
OpenKinect · Jun 9, 2015 · d919b85 · d919b85
2 parents f11841a + 0f80e61
commit d919b85
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/examples/protonect/include/libfreenect2/resource.h b/examples/protonect/include/libfreenect2/resource.h
@@ -33,6 +33,7 @@ namespace libfreenect2
 {
 
 bool loadResource(const std::string &name, unsigned char const**data, size_t *length);
+bool loadBufferFromResources(const std::string &filename, unsigned char *buffer, const size_t n);
 
 } /* namespace libfreenect2 */
 #endif /* RESOURCE_H_ */
diff --git a/examples/protonect/src/opencl_depth_packet_processor.cpp b/examples/protonect/src/opencl_depth_packet_processor.cpp
@@ -57,27 +57,6 @@
 namespace libfreenect2
 {
 
-bool loadBufferFromResources(const std::string &filename, unsigned char *buffer, const size_t n)
-{
-  size_t length = 0;
-  const unsigned char *data = NULL;
-
-  if(!loadResource(filename, &data, &length))
-  {
-    std::cerr << OUT_NAME("loadBufferFromResources") "failed to load resource: " << filename << std::endl;
-    return false;
-  }
-
-  if(length != n)
-  {
-    std::cerr << OUT_NAME("loadBufferFromResources") "wrong size of resource: " << filename << std::endl;
-    return false;
-  }
-
-  memcpy(buffer, data, length);
-  return true;
-}
-
 std::string loadCLSource(const std::string &filename)
 {
   const unsigned char *data;

diff --git a/examples/protonect/src/resource.cpp b/examples/protonect/src/resource.cpp
@@ -25,6 +25,9 @@
  */
 
 #include <libfreenect2/resource.h>
+#include <string>
+#include <cstring>
+#include <iostream>
 
 namespace libfreenect2
 {
@@ -59,4 +62,25 @@ bool loadResource(const std::string &name, unsigned char const**data, size_t *le
   return result;
 }
 
+bool loadBufferFromResources(const std::string &filename, unsigned char *buffer, const size_t n)
+{
+  size_t length = 0;
+  const unsigned char *data = NULL;
+
+  if(!loadResource(filename, &data, &length))
+  {
+    std::cerr << "loadBufferFromResources: failed to load resource: " << filename << std::endl;
+    return false;
+  }
+
+  if(length != n)
+  {
+    std::cerr << "loadBufferFromResources: wrong size of resource: " << filename << std::endl;
+    return false;
+  }
+
+  memcpy(buffer, data, length);
+  return true;
+}
+
 } /* namespace libfreenect2 */