frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

add ability to convert an image to RGB color order

Browse Source 
forwarder: add flag to detect if forwarding is enabled

Former-commit-id: c814651ec4973fe3b2bfca7c0370a0bac752f025
This commit is contained in:
redpanther 2016-02-19 13:31:08 +01:00
parent 736d841567
commit ec67caf24e
4 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/hyperion/MessageForwarder.h
View File

@ -27,7 +27,8 @@ public:
void addJsonSlave(std::string slave); void addJsonSlave(std::string slave);
void addProtoSlave(std::string slave); void addProtoSlave(std::string slave);
bool protoForwardingEnabled();
QStringList getProtoSlaves(); QStringList getProtoSlaves();
QList<MessageForwarder::JsonSlaveAddress> getJsonSlaves(); QList<MessageForwarder::JsonSlaveAddress> getJsonSlaves();

21
include/utils/Image.h
View File

@ -5,6 +5,8 @@
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include <algorithm> #include <algorithm>
#include <utils/ColorRgb.h>
template <typename Pixel_T> template <typename Pixel_T>
class Image class Image
@ -183,6 +185,25 @@ public:
{ {
return _pixels; return _pixels;
} }
///
/// Convert image of any color order to a RGB image.
///
/// @param[out] image The image that buffers the output
///
void toRgb(Image<ColorRgb>& image)
{
image.resize(_width, _height);
const unsigned imageSize = _width * _height;
for (unsigned idx=0; idx<imageSize; idx++)
{
const Pixel_T color = memptr()[idx];
image.memptr()[idx] = ColorRgb{color.red, color.green, color.blue};
}
}
private: private:
/// ///

5
libsrc/hyperion/MessageForwarder.cpp
View File

@ -44,3 +44,8 @@ QList<MessageForwarder::JsonSlaveAddress> MessageForwarder::getJsonSlaves()
{ {
return _jsonSlaves; return _jsonSlaves;
} }
bool MessageForwarder::protoForwardingEnabled()
{
return ! _protoSlaves.empty();
}

32
test/TestRgbImage.cpp
View File

@ -4,22 +4,42 @@
// Utils includes // Utils includes
#include <utils/Image.h> #include <utils/Image.h>
#include <utils/ColorRgba.h>
#include <utils/ColorRgb.h> #include <utils/ColorRgb.h>
#include <utils/ColorBgr.h>
#include <hyperion/ImageProcessor.h>
int main() int main()
{ {
std::cout << "Constructing image" << std::endl; std::cout << "Constructing image" << std::endl;
Image<ColorRgb> image(64, 64, ColorRgb::BLACK); int width = 64;
int height = 64;
Image<ColorRgb> image_rgb(width, height, ColorRgb::BLACK);
Image<ColorBgr> image_bgr(image_rgb.width(), image_rgb.height(), ColorBgr::BLACK);
std::cout << "Writing image" << std::endl; std::cout << "Writing image" << std::endl;
for (unsigned y=0; y<64; ++y) unsigned l = width * height;
// BGR
for (unsigned i=0; i<l; ++i)
image_bgr.memptr()[i] = ColorBgr{0,128,255};
// to RGB
image_bgr.toRgb(image_rgb);
// test
for (unsigned i=0; i<l; ++i)
{ {
for (unsigned x=0; x<64; ++x) const ColorRgb rgb = image_rgb.memptr()[i];
{ if ( rgb.red != 255 || rgb.green != 128 || rgb.blue != 0 )
image(x,y) = ColorRgb::RED; std::cout << "RGB error idx " << i << " " << rgb << std::endl;
}
} }
std::cout << "Finished (destruction will be performed)" << std::endl; std::cout << "Finished (destruction will be performed)" << std::endl;
return 0; return 0;