Skip to content

Commit dd13c65

Browse files
yuanmingzexlz
authored andcommitted
Add logger.h and logging.h declaration to CMakeLists.txt
Remove LOG_* in external code in viewer.h to fix link error Add return to logging.cpp's stopTiming function to fix compile error
1 parent 76367d9 commit dd13c65

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

examples/protonect/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ SET(SOURCES
7070
include/libfreenect2/usb/event_loop.h
7171
include/libfreenect2/usb/transfer_pool.h
7272

73+
include/libfreenect2/logger.h
74+
include/libfreenect2/logging.h
75+
7376
include/libfreenect2/async_packet_processor.h
7477
include/libfreenect2/depth_packet_processor.h
7578
include/libfreenect2/depth_packet_stream_parser.h

examples/protonect/src/logging.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ void WithPerfLogging::startTiming()
256256

257257
std::ostream &WithPerfLogging::stopTiming(std::ostream &stream)
258258
{
259-
impl_->stop(stream);
259+
return impl_->stop(stream);
260260
}
261261

262262
std::string getShortName(const char *func)

examples/protonect/viewer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <libfreenect2/config.h>
55
#include <libfreenect2/frame_listener.hpp>
6-
#include <libfreenect2/logging.h>
6+
#include <iostream>
77
#include <string>
88
#include <map>
99

@@ -189,7 +189,7 @@ struct ShaderProgram : public WithOpenGLBindings
189189
{
190190
gl()->glGetShaderInfoLog(vertex_shader, sizeof(error_buffer), NULL, error_buffer);
191191

192-
LOG_ERROR << "failed to compile vertex shader!" << std::endl << error_buffer;
192+
std::cerr << "failed to compile vertex shader!" << std::endl << error_buffer << std::endl;
193193
}
194194

195195
gl()->glCompileShader(fragment_shader);
@@ -199,7 +199,7 @@ struct ShaderProgram : public WithOpenGLBindings
199199
{
200200
gl()->glGetShaderInfoLog(fragment_shader, sizeof(error_buffer), NULL, error_buffer);
201201

202-
LOG_ERROR << "failed to compile fragment shader!" << std::endl << error_buffer;
202+
std::cerr << "failed to compile fragment shader!" << std::endl << error_buffer << std::endl;
203203
}
204204

205205
program = gl()->glCreateProgram();
@@ -213,7 +213,7 @@ struct ShaderProgram : public WithOpenGLBindings
213213
if (status != GL_TRUE)
214214
{
215215
gl()->glGetProgramInfoLog(program, sizeof(error_buffer), NULL, error_buffer);
216-
LOG_ERROR << "failed to link shader program!" << std::endl << error_buffer;
216+
std::cerr << "failed to link shader program!" << std::endl << error_buffer << std::endl;
217217
}
218218
}
219219

0 commit comments

Comments
 (0)