diff --git a/examples/protonect/include/libfreenect2/resource.h b/examples/protonect/include/libfreenect2/resource.h index a8dc38262..f6398c0dd 100644 --- 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 index 62bd850d3..cc13587ab 100644 --- 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 index f3253de40..f6a88c4aa 100644 --- a/examples/protonect/src/resource.cpp +++ b/examples/protonect/src/resource.cpp @@ -25,6 +25,9 @@ */ #include +#include +#include +#include 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 */