nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Remove dead code

Browse Source
This commit is contained in:
Dušan Poizl
2023-11-15 10:02:16 +01:00
parent 544e4abf92
commit 8e3c1b35db
4 changed files with 1 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imagescrollareagl.cpp
+1 -40
View File
@@ -91,7 +91,6 @@ void ImageWidget::setImage(std::shared_ptr<RawImage> image, int index)
m_imgWidth = image->width();
m_imgHeight = image->height();
m_currentImg = index;
m_whiteBalance[0] = m_whiteBalance[1] = m_whiteBalance[2] = 1.0f;
if(!m_image)return;
@@ -114,30 +113,7 @@ void ImageWidget::setImage(std::shared_ptr<RawImage> image, int index)
m_image->generateMipMaps();
qDebug() << "setImage" << timer.elapsed();
/*QElapsedTimer timer;
RawImage xxx(8192, 8192, 4, RawImage::UINT32);
uint32_t *p = (uint32_t*)xxx.data();
for(int i=0; i<8192*8192*4; i++)
p[i] = rand();
auto test = [&](QOpenGLTexture::PixelFormat format)
{
timer.start();
m_image->destroy();
//m_image->setAutoMipMapGenerationEnabled(false);
m_image->setFormat(QOpenGLTexture::TextureFormat::RGBA8_UNorm);
m_image->setSize(8192, 8192);
//m_image->setMipLevels([&](){ int c = 0; int s = std::min(m_imgWidth, m_imgHeight); while(s>>=1)c++; return c; }());
m_image->allocateStorage();
m_image->setMinMagFilters(QOpenGLTexture::LinearMipMapLinear, QOpenGLTexture::Linear);
m_image->setWrapMode(QOpenGLTexture::ClampToEdge);
m_image->setBorderColor(0, 0, 0, 0);
m_image->setData(0, format, QOpenGLTexture::UInt8, (const void*)p, m_transferOptions.get());
qDebug() << format << timer.elapsed();
};
test(QOpenGLTexture::PixelFormat::BGR);
test(QOpenGLTexture::PixelFormat::RGB);
test(QOpenGLTexture::PixelFormat::BGRA);
test(QOpenGLTexture::PixelFormat::RGBA);*/
if(m_debayerTex)
{
@@ -391,8 +367,6 @@ void ImageWidget::paintGL()
m_program->setUniformValue("bw", m_bwImg && !m_superpixel);
m_program->setUniformValue("false_color", m_falseColor && m_bwImg);
m_program->setUniformValue("invert", m_invert);
if(m_superpixel)m_program->setUniformValue("whiteBalance", m_whiteBalance[0], m_whiteBalance[1], m_whiteBalance[2]);
else m_program->setUniformValue("whiteBalance", 1.0f, 1.0f, 1.0f);
#ifdef COLOR_MANAGMENT
m_program->setUniformValue("srgb", m_srgb);
#endif
@@ -704,19 +678,6 @@ void ImageWidget::debayer()
f->glGenerateMipmap(GL_TEXTURE_2D);
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
int size = std::max(m_imgWidth, m_imgHeight);
int level = 0;
while(size >>= 1)level++;
int w,h;
f3->glGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_WIDTH, &w);
f3->glGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_HEIGHT, &h);
uint16_t pixel[w*h*4];
f3->glGetTexImage(GL_TEXTURE_2D, level, GL_RGBA, GL_UNSIGNED_SHORT, pixel);
float maxRGB = std::max(std::max(pixel[0], pixel[1]), pixel[2]);
m_whiteBalance[0] = maxRGB / pixel[0];
m_whiteBalance[1] = maxRGB / pixel[1];
m_whiteBalance[2] = maxRGB / pixel[2];
}
void ImageWidget::updateScrollBars()