Graphics: fix bug after uid refactoring

Change-Id: I05b965aec37591ad2c36ec1959c7731943da131a

diff --git a/scilab/modules/graphics/src/c/Format.c b/scilab/modules/graphics/src/c/Format.c
index 3090668..c7b06e8 100644 (file)
--- a/scilab/modules/graphics/src/c/Format.c
+++ b/scilab/modules/graphics/src/c/Format.c
@@ -168,7 +168,7 @@ static int Fsepare(char *fmt, int dec, int *l, double xmin, double xmax, double
     /**  we don't use %.*f format if numbers are two big **/
     if (strcmp("%.*f", fmt) == 0 && (Abs(xmax) > 1.e+10 || Abs(xmin) > 1.e+10))
     {
-        return(0);
+        return (0);
     }
     sprintf(buf1, fmt, dec, xmin);
     while (x < xmax)
@@ -179,10 +179,10 @@ static int Fsepare(char *fmt, int dec, int *l, double xmin, double xmax, double
         *l = (((int)strlen(buf1) >= *l) ? (int) strlen(buf1) : *l);
         if (strcmp(buf1, buf2) == 0)
         {
-            return(0);
+            return (0);
         }
     }
-    return(1);
+    return (1);
 }
 
 void ChoixFormatE1(char *fmt, double *xx, int nx)
@@ -262,7 +262,7 @@ static int Fsepare1(char *fmt, int dec, int *l, double *xx, int nx)
     /**  we don't use %.*f format if numbers are two big **/
     if (strcmp("%.*f", fmt) == 0 && (Abs(xx[nx - 1]) > 1.e+10 || Abs(xx[0]) > 1.e+10))
     {
-        return(0);
+        return (0);
     }
     sprintf(buf1, fmt, dec, xx[0]);
     for (i = 1 ; i < nx ; i++)
@@ -272,10 +272,10 @@ static int Fsepare1(char *fmt, int dec, int *l, double *xx, int nx)
         *l = (((int)strlen(buf1) >= *l) ? (int) strlen(buf1) : *l);
         if (strcmp(buf1, buf2) == 0)
         {
-            return(0);
+            return (0);
         }
     }
-    return(1);
+    return (1);
 }
 
 /*----------------------------------------------------
@@ -309,7 +309,7 @@ int C2F(graduate)(double *xmi, double *xma, double *xi, double *xa, int *np1, in
     {
         graduate1(xmi, xma, xi, xa, np1, np2, kminr, kmaxr, ar, 0);
     }
-    return(0);
+    return (0);
 }
 
 static void graduate1(double *xmi, double *xma, double *xi, double *xa, int *np1, int *np2, int *kminr, int *kmaxr, int *ar, int count)
@@ -841,7 +841,8 @@ int ComputeC_format(int iObjUID, char * c_format)
     int iType = -1;
     int *piType = &iType;
     int  xpassed = 0, ypassed = 0, Nx = 0, Ny = 0, x3, y3;
-    char* parentAxesID = NULL;
+    int parentAxesID;
+    int * piParentAxesID = &parentAxesID;
     int logFlag = 0;
     int* piLogFlag = &logFlag;
 
@@ -853,7 +854,7 @@ int ComputeC_format(int iObjUID, char * c_format)
         return -1;
     }
 
-    getGraphicObjectProperty(iObjUID, __GO_PARENT_AXES__, jni_string, (void **)&parentAxesID);
+    getGraphicObjectProperty(iObjUID, __GO_PARENT_AXES__, jni_int, (void **)&piParentAxesID);
 
     getGraphicObjectProperty(iObjUID, __GO_TICKS_DIRECTION__, jni_int, (void **)&piPos);
     getGraphicObjectProperty(iObjUID, __GO_TICKS_STYLE__, jni_int, (void **)&piXy_type);
@@ -1321,6 +1322,6 @@ static char FPF[32] = {'\0'};
 
 char * getFPF(void)
 {
-    return(FPF);
+    return (FPF);
 }
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/graphics/src/c/axesScale.c b/scilab/modules/graphics/src/c/axesScale.c
index 86a110d..938ae30 100644 (file)
--- a/scilab/modules/graphics/src/c/axesScale.c
+++ b/scilab/modules/graphics/src/c/axesScale.c
@@ -139,7 +139,7 @@ int sciFigureZoom2D(int iFigureUID, const double zoomRect[4])
 
     if ((pChildrenCount != NULL) && (childrenCount > 0))
     {
-        getGraphicObjectProperty(iFigureUID, __GO_CHILDREN__, jni_string_vector, (void **) &piChildren);
+        getGraphicObjectProperty(iFigureUID, __GO_CHILDREN__, jni_int_vector, (void **) &piChildren);
         for (i = 0; i < childrenCount; i++)
         {
             sciZoomRect(piChildren[i], zoomRect);

diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_links_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_links_property.c
index ef9610a..bf71cda 100644 (file)
--- a/scilab/modules/graphics/src/c/getHandleProperty/set_links_property.c
+++ b/scilab/modules/graphics/src/c/getHandleProperty/set_links_property.c
@@ -113,7 +113,7 @@ int set_links_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType,
         return SET_PROPERTY_ERROR;
     }
 
-    status = setGraphicObjectProperty(iObjUID, __GO_LINKS__, links, jni_string_vector, iLinksCount);
+    status = setGraphicObjectProperty(iObjUID, __GO_LINKS__, links, jni_int_vector, iLinksCount);
 
     FREE(links);