frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

First Lighpack device version.

Browse Source 
Former-commit-id: 2133e13ed421d363fa28d3f765607e455088618b
This commit is contained in:
johan
2013-11-13 20:15:53 +01:00
parent 2bc84d63bf
commit 12c925d77f
9 changed files with 502 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/viewpng/FbWriter.h
View File

@@ -10,7 +10,8 @@
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <utils/RgbImage.h>
#include <utils/Image.h>
#include <utils/ColorRgb.h>
///
/// FbWriter allows direct access tot the FrameBuffer. It writes and image to the framebuffer,
@@ -83,7 +84,7 @@ public:
///
/// @param image The RGB Image
///
void writeImage(const RgbImage& image)
void writeImage(const Image<ColorRgb>& image)
{
std::cout << "Writing image [" << image.width() << "x" << image.height() << "]" << std::endl;

15
src/viewpng/ViewPng.cpp
View File

@@ -6,7 +6,8 @@
#include <png.h>
// Utils includes
#include <utils/RgbImage.h>
#include <utils/Image.h>
#include <utils/ColorRgb.h>
#include <utils/jsonschema/JsonFactory.h>
// Raspilight includes
@@ -15,7 +16,7 @@
// Local includes
#include "FbWriter.h"
bool read_png(std::string file_name, RgbImage*& rgbImage)
bool read_png(std::string file_name, Image<ColorRgb>*& rgbImage)
{
png_structp png_ptr;
png_infop info_ptr;
@@ -70,16 +71,16 @@ bool read_png(std::string file_name, RgbImage*& rgbImage)
png_bytepp row_pointers;
row_pointers = png_get_rows(png_ptr, info_ptr);
rgbImage = new RgbImage(width, height);
rgbImage = new Image<ColorRgb>(width, height);
for (unsigned iRow=0; iRow<height; ++iRow)
{
if (color_type == PNG_COLOR_TYPE_RGB)
{
RgbColor* rowPtr = reinterpret_cast<RgbColor*>(row_pointers[iRow]);
ColorRgb* rowPtr = reinterpret_cast<ColorRgb*>(row_pointers[iRow]);
for (unsigned iCol=0; iCol<width; ++iCol)
{
rgbImage->setPixel(iCol, iRow, rowPtr[iCol]);
(*rgbImage)(iCol, iRow) = rowPtr[iCol];
}
}
else if (color_type == PNG_COLOR_TYPE_RGBA)
@@ -88,7 +89,7 @@ bool read_png(std::string file_name, RgbImage*& rgbImage)
for (unsigned iCol=0; iCol<width; ++iCol)
{
const unsigned argbValue = rowPtr[iCol];
rgbImage->setPixel(iCol, iRow, {uint8_t((argbValue >> 16) & 0xFF), uint8_t((argbValue >> 8) & 0xFF), uint8_t((argbValue) & 0xFF)});
(*rgbImage)(iCol, iRow) = ColorRgb{uint8_t((argbValue >> 16) & 0xFF), uint8_t((argbValue >> 8) & 0xFF), uint8_t((argbValue) & 0xFF)};
}
}
else
@@ -115,7 +116,7 @@ int main(int argc, char** argv)
const std::string pngFilename = argv[1];
RgbImage* image = nullptr;
Image<ColorRgb>* image = nullptr;
if (!read_png(pngFilename, image) || image == nullptr)
{
std::cout << "Failed to load image" << std::endl;