Skip to content

Updated error reporting messages #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 13, 2015
Merged

Updated error reporting messages #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1426f13
Actualized error reporting messages in the rgb_packet_stream_parser.c…
laborer2008 May 8, 2015
f8cfa03
Merge branch 'master' of https://github.com/laborer2008/libfreenect2
laborer2008 May 8, 2015
3bb5931
Correct function name for more error messages
laborer2008 May 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions examples/protonect/src/depth_packet_stream_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
{
if((in_length - in_offset) < sizeof(DepthSubPacketFooter))
{
std::cerr << "[DepthPacketStreamParser::handleNewData] incomplete footer detected!" << std::endl;
std::cerr << "[DepthPacketStreamParser::onDataReceived] incomplete footer detected!" << std::endl;
}
else if(footer->length > wb.length)
{
std::cerr << "[DepthPacketStreamParser::handleNewData] image data too short!" << std::endl;
std::cerr << "[DepthPacketStreamParser::onDataReceived] image data too short!" << std::endl;
}
else
{
Expand All @@ -123,7 +123,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
}
else
{
std::cerr << "[DepthPacketStreamParser::handleNewData] not all subsequences received " << current_subsequence_ << std::endl;
std::cerr << "[DepthPacketStreamParser::onDataReceived] not all subsequences received " << current_subsequence_ << std::endl;
}

current_sequence_ = footer->sequence;
Expand All @@ -137,7 +137,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le

if(footer->subsequence * footer->length > fb.length)
{
std::cerr << "[DepthPacketStreamParser::handleNewData] front buffer too short! subsequence number is " << footer->subsequence << std::endl;
std::cerr << "[DepthPacketStreamParser::onDataReceived] front buffer too short! subsequence number is " << footer->subsequence << std::endl;
}
else
{
Expand All @@ -154,15 +154,15 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
{
if((wb.length + 8) >= wb.capacity)
{
std::cerr << "[DepthPacketStreamParser::handleNewData] working buffer full, resetting it!" << std::endl;
std::cerr << "[DepthPacketStreamParser::onDataReceived] working buffer full, resetting it!" << std::endl;
wb.length = 0;
ptr_out = wb.data;
}

// copy remaining 8 bytes
if((in_length - in_offset) != 8)
{
std::cerr << "[DepthPacketStreamParser::handleNewData] remaining data should be 8 bytes, but is " << (in_length - in_offset) << std::endl;
std::cerr << "[DepthPacketStreamParser::onDataReceived] remaining data should be 8 bytes, but is " << (in_length - in_offset) << std::endl;
}

for(; in_offset < in_length; ++in_offset)
Expand Down
2 changes: 1 addition & 1 deletion examples/protonect/src/opengl_depth_packet_processor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ std::string loadShaderSource(const std::string& filename)

if(!loadResource(filename, &data, &length))
{
std::cerr << "failed to load shader source!" << std::endl;
std::cerr << "[loadShaderSource] failed to load shader source!" << std::endl;
return "";
}

Expand Down
4 changes: 2 additions & 2 deletions examples/protonect/src/rgb_packet_stream_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void RgbPacketStreamParser::onDataReceived(unsigned char* buffer, size_t length)
}
else
{
std::cerr << "[RgbPacketStreamParser::handleNewData] buffer overflow!" << std::endl;
std::cerr << "[RgbPacketStreamParser::onDataReceived] buffer overflow!" << std::endl;
}

// not full transfer buffer and we already have some data -> signals end of rgb image packet
Expand All @@ -94,7 +94,7 @@ void RgbPacketStreamParser::onDataReceived(unsigned char* buffer, size_t length)
}
else
{
std::cerr << "[RgbPacketStreamParser::handleNewData] skipping rgb packet!" << std::endl;
std::cerr << "[RgbPacketStreamParser::onDataReceived] skipping rgb packet!" << std::endl;
}

// reset front buffer
Expand Down
4 changes: 2 additions & 2 deletions examples/protonect/src/turbo_jpeg_rgb_packet_processor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class TurboJpegRgbPacketProcessorImpl
decompressor = tjInitDecompress();
if(decompressor == 0)
{
std::cerr << "[TurboJpegRgbPacketProcessor] Failed to initialize TurboJPEG decompressor! TurboJPEG error: '" << tjGetErrorStr() << "'" << std::endl;
std::cerr << "[TurboJpegRgbPacketProcessorImpl] Failed to initialize TurboJPEG decompressor! TurboJPEG error: '" << tjGetErrorStr() << "'" << std::endl;
}

newFrame();
Expand All @@ -66,7 +66,7 @@ class TurboJpegRgbPacketProcessorImpl
{
if(tjDestroy(decompressor) == -1)
{
std::cerr << "[TurboJpegRgbPacketProcessor] Failed to destroy TurboJPEG decompressor! TurboJPEG error: '" << tjGetErrorStr() << "'" << std::endl;
std::cerr << "[~TurboJpegRgbPacketProcessorImpl] Failed to destroy TurboJPEG decompressor! TurboJPEG error: '" << tjGetErrorStr() << "'" << std::endl;
}
}
}
Expand Down