- Add XML GUI for frei0r.coloradj_RGB (submitted by Marko Cebokli)

svn path=/trunk/kdenlive/; revision=4681

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index 6c372813d93dc366c18af97f0f1fb5de3f67b29a..9df9cc83cdc6beb0c39d94495fb9ac7b856a7d51 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -30,6 +30,7 @@ frei0r.defish0r
 frei0r.pixeliz0r
 frei0r.glow
 frei0r.hueshift0r
+frei0r.coloradj_RGB
 
 #effects that have simplekeyframes
 vignette

diff --git a/data/kdenliveeffectscategory.rc b/data/kdenliveeffectscategory.rc
index 09f515b483496bbdc2354cf24022dd49e4acc19e..5ab85a8bccfeaf8b06917778eaf6e331cd838052 100644 (file)
--- a/data/kdenliveeffectscategory.rc
+++ b/data/kdenliveeffectscategory.rc
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <data name="effects" version="0">
-  <group list="brightness,gamma,frei0r.balanc0r,frei0r.brightness,frei0r.levels,frei0r.three_point_balance,frei0r.curves">
+  <group list="brightness,gamma,frei0r.balanc0r,frei0r.brightness,frei0r.levels,frei0r.three_point_balance,frei0r.curves,frei0r.coloradj_RGB">
     <text>Colour correction</text>
   </group>
   <group list="invert,sepia,tcolor,greyscale,frei0r.B,frei0r.G,frei0r.R,frei0r.contrast0r,frei0r.saturat0r,frei0r.tint0r,frei0r.primaries,frei0r.rgbparade,chroma_hold,frei0r.hueshift0r">

diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index 83bd14b5845eff5a0bddf9a48938c10a5e1b90e5..d79d02b33f5687001734a6dea7baceb4d0d88c15 100644 (file)
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -64,6 +64,7 @@ frei0r_defish0r.xml
 frei0r_glow.xml
 frei0r_pixeliz0r.xml
 frei0r_hueshift0r.xml
+frei0r_coloradj_rgb.xml
 gain.xml
 fade_from_black.xml
 fade_to_black.xml

diff --git a/effects/frei0r_coloradj_rgb.xml b/effects/frei0r_coloradj_rgb.xml
new file mode 100644 (file)
index 0000000..263d87d
--- /dev/null
+++ b/effects/frei0r_coloradj_rgb.xml
@@ -0,0 +1,37 @@
+<!DOCTYPE kpartgui>
+<effect tag="frei0r.coloradj_RGB" id="frei0r.coloradj_RGB">
+        <name>RGB adjustment</name>
+        <description>Simple color adjustment</description>
+        <author>Marko Cebokli</author>
+        
+        <parameter type="constant" name="R" default="500" min="0" max="1000" factor="1000">
+                <name>R</name>
+        </parameter>
+        
+        <parameter type="constant" name="G" default="500" min="0" max="1000" factor="1000">
+                <name>G</name>
+        </parameter>
+        
+        <parameter type="constant" name="B" default="500" min="0" max="1000" factor="1000">
+                <name>B</name>
+        </parameter>
+        
+        <parameter type="list" name="Action" default="0.5" paramlist="0.0,0.5,1.0"
+                   paramlistdisplay="Add constant,Change gamma,Multiply">
+                <name>Action</name>
+        </parameter>
+
+        <parameter type="bool" name="Keep luma" default="1">
+                <name>Keep luma</name>
+        </parameter>
+        
+        <parameter type="bool" name="Alpha controlled" default="0">
+                <name>Alpha controlled</name>
+        </parameter>
+        
+        <parameter type="list" name="Luma formula" default="1.0" paramlist="0.0,1.0"
+                   paramlistdisplay="rec 601,rec 709">
+                <name>Luma formula</name>
+        </parameter>
+        
+</effect>

diff --git a/src/colorpickerwidget.cpp b/src/colorpickerwidget.cpp
index 4932e61daf27b75f4035ddb34cd7f7319820e117..83bbb0414fc7981dc2cfac03fe73708d2a15a9f2 100644 (file)
--- a/src/colorpickerwidget.cpp
+++ b/src/colorpickerwidget.cpp
@@ -99,8 +99,8 @@ QColor ColorPickerWidget::averagePickedColor(const QPoint pos)
 
     // take care of loss when dividing odd sizes
     if (size % 2 != 0) {
-        ++x1;
-        ++y1;
+        if (x1 < qApp->desktop()->geometry().width()) ++x1;
+        if (y1 < qApp->desktop()->geometry().height()) ++y1;
     }
 
     int numPixel = (x1 - x0) * (y1 - y0);