mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-01-26 09:34:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed option

Browse Source
This commit is contained in:
AlexandreRouma 2021-12-19 02:35:40 +01:00
parent ef01205fb6
commit fe0b63a275
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/gui/widgets/image.cpp
View File

@ -1,10 +1,9 @@
#include <gui/widgets/image.h> #include <gui/widgets/image.h>
namespace ImGui { namespace ImGui {
ImageDisplay::ImageDisplay(int width, int height, GLenum format) { ImageDisplay::ImageDisplay(int width, int height) {
_width = width; _width = width;
_height = height; _height = height;
_format = format;
buffer = malloc(_width * _height * 4); buffer = malloc(_width * _height * 4);
activeBuffer = malloc(_width * _height * 4); activeBuffer = malloc(_width * _height * 4);
memset(buffer, 0, _width * _height * 4); memset(buffer, 0, _width * _height * 4);
@ -61,6 +60,7 @@ namespace ImGui {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _width, _height, 0, _format, GL_UNSIGNED_BYTE, activeBuffer); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _width, _height, 0, GL_RGBA, GL_UNSIGNED_BYTE, activeBuffer);
} }
} }

3
core/src/gui/widgets/image.h
View File

@ -9,7 +9,7 @@
namespace ImGui { namespace ImGui {
class ImageDisplay { class ImageDisplay {
public: public:
ImageDisplay(int width, int height, GLenum format); ImageDisplay(int width, int height);
~ImageDisplay(); ~ImageDisplay();
void draw(const ImVec2& size_arg = ImVec2(0, 0)); void draw(const ImVec2& size_arg = ImVec2(0, 0));
void swap(); void swap();
@ -24,7 +24,6 @@ namespace ImGui {
int _width; int _width;
int _height; int _height;
GLenum _format;
GLuint textureId; GLuint textureId;