| -rw-r--r-- | libopie2/opiemm/oimagescrollview.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp index 58a9748..10da823 100644 --- a/libopie2/opiemm/oimagescrollview.cpp +++ b/libopie2/opiemm/oimagescrollview.cpp @@ -107,3 +107,2 @@ void OImageScrollView::loadJpeg(bool interncall) param = QString( "Fast Shrink( 3 ) Scale( %1, %2, ScaleMin)" ).arg( wid ).arg( hei ); - odebug << "Load jpeg scaled \"" << param << "\"" << oendl; iio.setParameters(param.latin1()); @@ -116,3 +115,2 @@ void OImageScrollView::loadJpeg(bool interncall) if (ImageScaledLoaded()||!interncall) { - odebug << "Load jpeg unscaled" << oendl; real_load = true; @@ -127,3 +125,2 @@ void OImageScrollView::loadJpeg(bool interncall) void OImageScrollView::setImage( const QString& path ) { - odebug << "load new image " << oendl; if (m_lastName == path) return; @@ -133,3 +130,2 @@ void OImageScrollView::setImage( const QString& path ) { QString itype = QImage::imageFormat(m_lastName); - odebug << "Image type = " << itype << oendl; if (itype == "JPEG") { @@ -153,4 +149,2 @@ void OImageScrollView::init() { - odebug << "init " << oendl; - /* @@ -353,2 +347,3 @@ void OImageScrollView::rotate_into_data(Rotation r) +// yes - sorry - it is NOT gamma it is just BRIGHTNESS. Alwin void OImageScrollView::apply_gamma(int aValue) @@ -356,10 +351,16 @@ void OImageScrollView::apply_gamma(int aValue) if (!_image_data.size().isValid()) return; - float percent = ((float)aValue/100); - odebug << "Apply gamma " << percent << oendl; - int pixels = _image_data.depth()>8?_image_data.width()*_image_data.height() : _image_data.numColors(); + float percent = ((float)aValue/100.0); + int segColors = _image_data.depth() > 8 ? 256 : _image_data.numColors(); + /* must be - otherwise it displays some ... strange colors */ + if (segColors<256) segColors=256; + unsigned char *segTbl = new unsigned char[segColors]; + int pixels = _image_data.depth()>8?_image_data.width()*_image_data.height() : _image_data.numColors(); + + bool brighten = (percent >= 0); - if ( percent < 0 ) + if ( percent < 0 ) { percent = -percent; + } @@ -368,2 +369,3 @@ void OImageScrollView::apply_gamma(int aValue) + int tmp = 0; @@ -372,3 +374,3 @@ void OImageScrollView::apply_gamma(int aValue) { - int tmp = (int)(i*percent); + tmp = (int)(i*percent); if ( tmp > 255 ) @@ -380,3 +382,3 @@ void OImageScrollView::apply_gamma(int aValue) { - int tmp = (int)(i*percent); + tmp = (int)(i*percent); if ( tmp < 0 ) @@ -460,6 +462,4 @@ void OImageScrollView::generateImage() int twidth,theight; - odebug << " r = " << r << oendl; if (AutoScale() && (_original_data.width()>width() || _original_data.height() > height()) ) { if (!_image_data.size().isValid()||width()>_image_data.width()||height()>_image_data.height()) { - odebug << "Rescaling data" << oendl; if (r==Rotate0) { @@ -516,3 +516,2 @@ void OImageScrollView::resizeEvent(QResizeEvent * e) { - odebug << "OImageScrollView resizeEvent (" << e->size() << " - " << e->oldSize() << oendl; QScrollView::resizeEvent(e); @@ -597,3 +596,2 @@ void OImageScrollView::contentsMousePressEvent ( QMouseEvent * e) { - odebug << " X and Y " << e->x() << " " << e->y() << oendl; /* this marks the beginning of a possible mouse move. Due internal reasons of QT |