Merge branch devel

2017-09-23 02:15:29 +01:00
parent ed075fcbd3
commit eb31fc0287
16 changed files with 231 additions and 205 deletions
@@ -896,10 +896,10 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
      guidePos = d->colorGuide.blue();
      break;

-        //     case HistogramWidget::LumaHistogram:
-        //       guidePos = qMax( qMax( d->colorGuide.red(), d->colorGuide.green()
-        //       ), d->colorGuide.blue() );
-        //       break;
+      //     case HistogramWidget::LumaHistogram:
+      //       guidePos = qMax( qMax( d->colorGuide.red(), d->colorGuide.green()
+      //       ), d->colorGuide.blue() );
+      //       break;

    default:  // Alpha.
      guidePos = -1;