Bug 11778: Bad color_map dims did not return an error

[scilab.git] / scilab / modules / graphics / src / c / getHandleProperty / set_color_map_property.c

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_color_map_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_color_map_property.c
index a7d602b..59ea68b 100644 (file)
--- a/scilab/modules/graphics/src/c/getHandleProperty/set_color_map_property.c
+++ b/scilab/modules/graphics/src/c/getHandleProperty/set_color_map_property.c
@@ -31,17 +31,23 @@
 #include "graphicObjectProperties.h"
 
 /*------------------------------------------------------------------------*/
-int set_color_map_property(char* pobjUID, size_t stackPointer, int valueType, int nbRow, int nbCol )
+int set_color_map_property(void* _pvCtx, char* pobjUID, size_t stackPointer, int valueType, int nbRow, int nbCol )
 {
     BOOL status = FALSE;
 
-    if ( !isParameterDoubleMatrix( valueType ) )
+    if ( !( valueType == sci_matrix ) )
     {
         Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "color_map");
         return SET_PROPERTY_ERROR ;
     }
 
-    status = setGraphicObjectProperty(pobjUID, __GO_COLORMAP__, getDoubleMatrixFromStack(stackPointer), jni_double_vector, nbRow*nbCol);
+    if (nbCol != 3)
+    {
+        Scierror(999, _("Wrong dimension for '%s' property: The number of columns must be 3.\n"), "color_map");
+        return SET_PROPERTY_ERROR ;
+    }
+
+    status = setGraphicObjectProperty(pobjUID, __GO_COLORMAP__, stk(stackPointer), jni_double_vector, nbRow * nbCol);
 
     if (status == TRUE)
     {
@@ -49,7 +55,7 @@ int set_color_map_property(char* pobjUID, size_t stackPointer, int valueType, in
     }
     else
     {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"),"color_map");
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "color_map");
         return SET_PROPERTY_ERROR;
     }
 }