mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2026-05-12 11:18:11 -07:00
Use GDlib in Waveshare ePapers command
This commit is contained in:
Marcos Del Sol Vives
+27
-1
@@ -332,6 +332,17 @@ endif
|
||||
LDLIBS += $(QTLDLIBS)
|
||||
CXXINCLUDES += $(QTINCLUDES)
|
||||
|
||||
## GD (optional)
|
||||
ifneq ($(SKIPGD),1)
|
||||
GDINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags gdlib 2>/dev/null)
|
||||
GDLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs gdlib 2>/dev/null)
|
||||
ifneq ($(GDLDLIBS),)
|
||||
LDLIBS += $(GDLDLIBS)
|
||||
PM3INCLUDES += $(GDINCLUDES)
|
||||
GD_FOUND = 1
|
||||
endif
|
||||
endif
|
||||
|
||||
## Readline
|
||||
ifneq ($(SKIPREADLINE),1)
|
||||
ifeq ($(USE_BREW),1)
|
||||
@@ -510,6 +521,16 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(SKIPGD),1)
|
||||
$(info GD library: skipped)
|
||||
else
|
||||
ifeq ($(GD_FOUND),1)
|
||||
$(info GD library: GD v$(shell $(PKG_CONFIG_ENV) pkg-config --modversion gdlib) found, enabled)
|
||||
else
|
||||
$(info GD library: GD not found, disabled)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(SKIPREADLINE),1)
|
||||
$(info Readline library: skipped)
|
||||
else
|
||||
@@ -605,7 +626,6 @@ SRCS = mifare/aiddesfire.c \
|
||||
cmdhftopaz.c \
|
||||
cmdhftexkom.c \
|
||||
cmdhfvas.c \
|
||||
cmdhfwaveshare.c \
|
||||
cmdhfxerox.c \
|
||||
cmdhw.c \
|
||||
cmdlf.c \
|
||||
@@ -738,6 +758,12 @@ SRCS += bucketsort.c \
|
||||
lfdemod.c \
|
||||
util_posix.c
|
||||
|
||||
ifeq ($(GD_FOUND),1)
|
||||
# electronic shelf labels
|
||||
SRCS += imgutils.c \
|
||||
cmdhfwaveshare.c
|
||||
endif
|
||||
|
||||
# swig
|
||||
|
||||
SWIGSRCS =
|
||||
|
||||
+82
-508
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,156 @@
|
||||
|
||||
#include <assert.h>
|
||||
#include "imgutils.h"
|
||||
|
||||
struct ycbcr_t {
|
||||
int y;
|
||||
int cb;
|
||||
int cr;
|
||||
};
|
||||
|
||||
static void rgb_to_ycbcr(int rgb, struct ycbcr_t * ycbcr) {
|
||||
int r = gdTrueColorGetRed(rgb);
|
||||
int g = gdTrueColorGetGreen(rgb);
|
||||
int b = gdTrueColorGetBlue(rgb);
|
||||
|
||||
/*
|
||||
* Below is a fixed-point version of the following code:
|
||||
* ycbcr->y = r * 0.29900 + g * 0.58700 + b * 0.11400;
|
||||
* ycbcr->cb = r * -0.16874 + g * -0.33126 + b * 0.50000 + 128;
|
||||
* ycbcr->cr = r * 0.50000 + g * -0.41869 + b * -0.08131 + 128;
|
||||
*/
|
||||
|
||||
ycbcr->y = (r * 19595 + g * 38470 + b * 7471) / 65536;
|
||||
ycbcr->cb = (r * -11059 + g * -21709 + b * 32768) / 65536 + 128;
|
||||
ycbcr->cr = (r * 32768 + g * -27439 + b * -5329) / 65536 + 128;
|
||||
}
|
||||
|
||||
static inline void cap_comp(int * x) {
|
||||
if (*x < 0) {
|
||||
*x = 0;
|
||||
} else if (*x > 255) {
|
||||
*x = 255;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* The following function implements a Floyd-Steinberg in YCbCr color space.
|
||||
*
|
||||
* Using this colorspace, the Euclidean distance between colors is closer to human perception than
|
||||
* in sRGB, which results in a more accurate color rendering.
|
||||
*
|
||||
* A comparison can be found at https://twitter.com/Socram4x8/status/1733157380097995205/photo/1.
|
||||
*/
|
||||
gdImagePtr img_palettize(gdImagePtr rgb, int * palette, int palette_size) {
|
||||
assert(rgb != NULL);
|
||||
assert(palette != NULL);
|
||||
assert(palette_size >= 2 && palette_size < 256);
|
||||
|
||||
// Create paletized image
|
||||
gdImagePtr res = gdImageCreate(gdImageSX(rgb), gdImageSY(rgb));
|
||||
if (!res) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Allocate space for palette in YCbCr
|
||||
struct ycbcr_t * pal_ycbcr = malloc(palette_size * sizeof(struct ycbcr_t));
|
||||
if (!pal_ycbcr) {
|
||||
gdImageDestroy(res);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialize the column's error array.
|
||||
*
|
||||
* Note that we are storing two extra values so we don't have to do boundary checking at
|
||||
* the left and right edges of the image.
|
||||
*/
|
||||
struct ycbcr_t * forward = malloc((gdImageSX(rgb) + 2) * sizeof(struct ycbcr_t));
|
||||
if (!forward) {
|
||||
free(pal_ycbcr);
|
||||
gdImageDestroy(res);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Convert palette to YCbCr and allocate in image
|
||||
for (int i = 0; i < palette_size; i++) {
|
||||
int c = palette[i];
|
||||
rgb_to_ycbcr(c, pal_ycbcr + i);
|
||||
gdImageColorAllocate(res, gdTrueColorGetRed(c), gdTrueColorGetGreen(c), gdTrueColorGetBlue(c));
|
||||
}
|
||||
|
||||
for (int y = 0; y < gdImageSY(rgb); y++) {
|
||||
// Load current row error and reset its storage
|
||||
struct ycbcr_t row_err = forward[1];
|
||||
forward[1].y = forward[1].cb = forward[1].cr = 0;
|
||||
|
||||
for (int x = 0; x < gdImageSX(rgb); x++) {
|
||||
struct ycbcr_t pix;
|
||||
rgb_to_ycbcr(gdImageGetTrueColorPixel(rgb, x, y), &pix);
|
||||
|
||||
// Add error for current pixel
|
||||
pix.y += row_err.y;
|
||||
pix.cb += row_err.cb;
|
||||
pix.cr += row_err.cr;
|
||||
|
||||
// Cap in case it went to imaginary color territory
|
||||
cap_comp(&pix.y);
|
||||
cap_comp(&pix.cb);
|
||||
cap_comp(&pix.cr);
|
||||
|
||||
/*
|
||||
* Iterate through all candidate colors and find the nearest one using the
|
||||
* squared Euclidean distance.
|
||||
*/
|
||||
int best_idx = 0;
|
||||
struct ycbcr_t best_err = { 0 };
|
||||
int best_score = 0x7FFFFFFF;
|
||||
for (int can_idx = 0; can_idx < palette_size; can_idx++) {
|
||||
struct ycbcr_t can_err = {
|
||||
.y = pix.y - pal_ycbcr[can_idx].y,
|
||||
.cb = pix.cb - pal_ycbcr[can_idx].cb,
|
||||
.cr = pix.cr - pal_ycbcr[can_idx].cr,
|
||||
};
|
||||
|
||||
int can_score = (
|
||||
can_err.y * can_err.y +
|
||||
can_err.cb * can_err.cb +
|
||||
can_err.cr * can_err.cr
|
||||
);
|
||||
|
||||
if (can_score < best_score) {
|
||||
best_idx = can_idx;
|
||||
best_score = can_score;
|
||||
best_err = can_err;
|
||||
}
|
||||
}
|
||||
|
||||
// Set current pixel
|
||||
gdImageSetPixel(res, x, y, best_idx);
|
||||
|
||||
// Propagate error within the current row, to the pixel to the right
|
||||
row_err.y = best_err.y * 7 / 16 + forward[x + 2].y;
|
||||
row_err.cb = best_err.cb * 7 / 16 + forward[x + 2].cb;
|
||||
row_err.cr = best_err.cr * 7 / 16 + forward[x + 2].cr;
|
||||
|
||||
// Add error to bottom left
|
||||
forward[x + 0].y += best_err.y * 3 / 16;
|
||||
forward[x + 0].cb += best_err.cb * 3 / 16;
|
||||
forward[x + 0].cr += best_err.cr * 3 / 16;
|
||||
|
||||
// Add error to bottom center
|
||||
forward[x + 1].y += best_err.y * 5 / 16;
|
||||
forward[x + 1].cb += best_err.cb * 5 / 16;
|
||||
forward[x + 1].cr += best_err.cr * 5 / 16;
|
||||
|
||||
// Set error to bottom right
|
||||
forward[x + 2].y = best_err.y * 1 / 16;
|
||||
forward[x + 2].cb = best_err.cb * 1 / 16;
|
||||
forward[x + 2].cr = best_err.cr * 1 / 16;
|
||||
}
|
||||
}
|
||||
|
||||
free(forward);
|
||||
free(pal_ycbcr);
|
||||
return res;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// See LICENSE.txt for the text of the license.
|
||||
//-----------------------------------------------------------------------------
|
||||
// Image utilities
|
||||
//-----------------------------------------------------------------------------
|
||||
#ifndef IMGUTILS_H__
|
||||
#define IMGUTILS_H__
|
||||
|
||||
#include <gd.h>
|
||||
|
||||
gdImagePtr img_palettize(gdImagePtr rgb, int * palette, int palette_size);
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user