Skip to content

Commit 0f80e61

Browse files
committed
Move loadBufferFromResources() to resource.h
CUDA depth processor will also use this function.
1 parent c7e2042 commit 0f80e61

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

examples/protonect/include/libfreenect2/resource.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ namespace libfreenect2
3333
{
3434

3535
bool loadResource(const std::string &name, unsigned char const**data, size_t *length);
36+
bool loadBufferFromResources(const std::string &filename, unsigned char *buffer, const size_t n);
3637

3738
} /* namespace libfreenect2 */
3839
#endif /* RESOURCE_H_ */

examples/protonect/src/opencl_depth_packet_processor.cpp

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,6 @@
5757
namespace libfreenect2
5858
{
5959

60-
bool loadBufferFromResources(const std::string &filename, unsigned char *buffer, const size_t n)
61-
{
62-
size_t length = 0;
63-
const unsigned char *data = NULL;
64-
65-
if(!loadResource(filename, &data, &length))
66-
{
67-
std::cerr << OUT_NAME("loadBufferFromResources") "failed to load resource: " << filename << std::endl;
68-
return false;
69-
}
70-
71-
if(length != n)
72-
{
73-
std::cerr << OUT_NAME("loadBufferFromResources") "wrong size of resource: " << filename << std::endl;
74-
return false;
75-
}
76-
77-
memcpy(buffer, data, length);
78-
return true;
79-
}
80-
8160
std::string loadCLSource(const std::string &filename)
8261
{
8362
const unsigned char *data;

examples/protonect/src/resource.cpp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
*/
2626

2727
#include <libfreenect2/resource.h>
28+
#include <string>
29+
#include <cstring>
30+
#include <iostream>
2831

2932
namespace libfreenect2
3033
{
@@ -59,4 +62,25 @@ bool loadResource(const std::string &name, unsigned char const**data, size_t *le
5962
return result;
6063
}
6164

65+
bool loadBufferFromResources(const std::string &filename, unsigned char *buffer, const size_t n)
66+
{
67+
size_t length = 0;
68+
const unsigned char *data = NULL;
69+
70+
if(!loadResource(filename, &data, &length))
71+
{
72+
std::cerr << "loadBufferFromResources: failed to load resource: " << filename << std::endl;
73+
return false;
74+
}
75+
76+
if(length != n)
77+
{
78+
std::cerr << "loadBufferFromResources: wrong size of resource: " << filename << std::endl;
79+
return false;
80+
}
81+
82+
memcpy(buffer, data, length);
83+
return true;
84+
}
85+
6286
} /* namespace libfreenect2 */

0 commit comments

Comments
 (0)