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 73fc6b7..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
@@ -4,11 +4,12 @@
  * Copyright (C) 2006 - INRIA - Allan Cornet
  * Copyright (C) 2006 - INRIA - Jean-Baptiste Silvy
  * Copyright (C) 2009 - DIGITEO - Pierre Lando
- * 
+ * Copyright (C) 2010 - DIGITEO - Manuel Juliachs
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
@@ -26,15 +27,36 @@
 #include "localization.h"
 #include "SetPropertyStatus.h"
 
+#include "setGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
 /*------------------------------------------------------------------------*/
-int set_color_map_property( sciPointObj * pobj, 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 )
 {
-  if ( !isParameterDoubleMatrix( valueType ) )
-  {
-    Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "color_map");
-    return SET_PROPERTY_ERROR ;
-  }
+    BOOL status = FALSE;
+
+    if ( !( valueType == sci_matrix ) )
+    {
+        Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "color_map");
+        return SET_PROPERTY_ERROR ;
+    }
+
+    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);
 
-  return sciSetColormap( pobj, getDoubleMatrixFromStack( stackPointer), nbRow, nbCol ) ;
+    if (status == TRUE)
+    {
+        return SET_PROPERTY_SUCCEED;
+    }
+    else
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "color_map");
+        return SET_PROPERTY_ERROR;
+    }
 }
 /*------------------------------------------------------------------------*/