Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_colordialog.c
Log Message:
Parameter checks from Colin Pitrat.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colordialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_colordialog.c 20 Jun 2005 02:55:00 -0000 1.5
+++ ewl_colordialog.c 20 Jun 2005 03:02:59 -0000 1.6
@@ -207,7 +207,10 @@
DCHECK_PARAM_PTR("user_data", user_data);
cd = user_data;
- col.r = strtol(ev_data, NULL, 10);
+ if (ev_data)
+ col.r = strtol(ev_data, NULL, 10);
+ else
+ col.r = 0;
col.g = cd->selected.g;
col.b = cd->selected.b;
@@ -236,7 +239,10 @@
cd = user_data;
col.r = cd->selected.r;
- col.g = strtol(ev_data, NULL, 10);
+ if (ev_data)
+ col.g = strtol(ev_data, NULL, 10);
+ else
+ col.g = 0;
col.b = cd->selected.b;
if(col.g > 255) col.g = 255;
@@ -264,7 +270,10 @@
cd = user_data;
col.r = cd->selected.r;
col.g = cd->selected.g;
- col.b = strtol(ev_data, NULL, 10);
+ if (ev_data)
+ col.b = strtol(ev_data, NULL, 10);
+ else
+ col.b = 0;
if(col.b > 255) col.b = 255;
if(col.b < 0) col.b = 0;
@@ -291,7 +300,10 @@
cd = user_data;
ewl_spectrum_rgb_to_hsv(cd->selected.r, cd->selected.g, cd->selected.b,
&h, &s, &v);
- h = strtod(ev_data, NULL);
+ if (ev_data)
+ h = strtod(ev_data, NULL);
+ else
+ h = 0;
if(h > 360) h = 360;
if(h < 0) h = 0;
ewl_spectrum_hsv_to_rgb(h, s, v, &col.r, &col.g, &col.b);
@@ -315,7 +327,10 @@
cd = user_data;
ewl_spectrum_rgb_to_hsv(cd->selected.r, cd->selected.g, cd->selected.b,
&h, &s, &v);
- s = strtod(ev_data, NULL);
+ if (ev_data)
+ s = strtod(ev_data, NULL);
+ else
+ s = 0;
if(s > 1) s = 1;
if(s < 0) s = 0;
ewl_spectrum_hsv_to_rgb(h, s, v, &col.r, &col.g, &col.b);
@@ -339,7 +354,10 @@
cd = user_data;
ewl_spectrum_rgb_to_hsv(cd->selected.r, cd->selected.g, cd->selected.b,
&h, &s, &v);
- v = strtod(ev_data, NULL);
+ if (ev_data)
+ v = strtod(ev_data, NULL);
+ else
+ v = 0;
if(v > 1) v = 1;
if(v < 0) v = 0;
ewl_spectrum_hsv_to_rgb(h, s, v, &col.r, &col.g, &col.b);
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
