github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not attempt to display jpeg2000 images

Browse source 
jp2 could be converted to jpg with "convert" from ImageMagick
but that would require some process spawning and fallback if ImageMagick is not installed...
This commit is contained in:
Philippe Teuwen 2022-02-16 16:15:09 +01:00
commit da1588f430
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/proxgui.cpp
View file

@ -68,12 +68,16 @@ extern "C" void RepaintGraphWindow(void) {
// hook up picture viewer // hook up picture viewer
extern "C" void ShowPictureWindow(char *fn) { extern "C" void ShowPictureWindow(char *fn) {
// No support for jpeg2000 in Qt Image since a while...
// https://doc.qt.io/qt-5/qtimageformats-index.html
if(strlen(fn) > 4 && !strcmp(fn + strlen(fn) - 4, ".jp2"))
return;
if (!gui) { if (!gui) {
// Show a notice if X11/XQuartz isn't available // Show a notice if X11/XQuartz isn't available
#if defined(__MACH__) && defined(__APPLE__) #if defined(__MACH__) && defined(__APPLE__)
PrintAndLogEx(WARNING, "You appear to be on a MacOS device without XQuartz.\nYou may need to install XQuartz (https://www.xquartz.org/) to make the plot work."); PrintAndLogEx(WARNING, "You appear to be on a MacOS device without XQuartz.\nYou may need to install XQuartz (https://www.xquartz.org/) to make the plot work.");
#else #else
PrintAndLogEx(WARNING, "You appear to be on an environment without an X11 server or without DISPLAY environment variable set.\nPlot may not work until you resolve these issues."); PrintAndLogEx(WARNING, "You appear to be on an environment without an X11 server or without DISPLAY environment variable set.\nPicture display may not work until you resolve these issues.");
#endif #endif
return; return;
} }