Bug 12232 fixed: fix several memleaks in various filler

[scilab.git] / scilab / modules / graphic_objects / src / cpp / MatPlotDecomposer.cpp

diff --git a/scilab/modules/graphic_objects/src/cpp/MatPlotDecomposer.cpp b/scilab/modules/graphic_objects/src/cpp/MatPlotDecomposer.cpp
index 4172cf0..0d224de 100644 (file)
--- a/scilab/modules/graphic_objects/src/cpp/MatPlotDecomposer.cpp
+++ b/scilab/modules/graphic_objects/src/cpp/MatPlotDecomposer.cpp
@@ -23,88 +23,93 @@ extern "C" {
 
 int MatPlotDecomposer::getTextureWidth(char* id)
 {
-  int width = 0;
-  int* piWidth = &width;
-  getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_X__, jni_int, (void**) &piWidth);
-  return width - 1;
+    int width = 0;
+    int* piWidth = &width;
+    getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_X__, jni_int, (void**) &piWidth);
+    return width - 1;
 }
 
 
 int MatPlotDecomposer::getTextureHeight(char* id)
 {
-  int height = 0;
-  int* piHeight = &height;
-  getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_Y__, jni_int, (void**) &piHeight);
-  return height - 1;
+    int height = 0;
+    int* piHeight = &height;
+    getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_Y__, jni_int, (void**) &piHeight);
+    return height - 1;
 }
 
 
 int MatPlotDecomposer::fillTextureData(char* id, unsigned char* buffer, int bufferLength)
 {
-  double* value = NULL;
-  getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &value);
-  int textureWidth = getTextureWidth(id);
-  int textureHeight = getTextureHeight(id);
-  int dataSize = textureWidth * textureHeight;
-  if (dataSize * 4 == bufferLength)
-  {
-
-    char* parentFigure = NULL;
-    double* colormap = NULL;
-    int colormapSize = 0;
-    int* piColormapSize = &colormapSize;
-
-    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_string, (void**) &parentFigure);
-    getGraphicObjectProperty(parentFigure, __GO_COLORMAP__, jni_double_vector, (void**) &colormap);
-    getGraphicObjectProperty(parentFigure, __GO_COLORMAP_SIZE__, jni_int, (void**) &piColormapSize);
-
-    for (int i = 0 ; i < textureWidth ; i++)
+    double* value = NULL;
+    getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &value);
+    int textureWidth = getTextureWidth(id);
+    int textureHeight = getTextureHeight(id);
+    int dataSize = textureWidth * textureHeight;
+    if (dataSize * 4 == bufferLength)
     {
-      for (int j = 0 ; j < textureHeight ; j++)
-      {
-        ColorComputer::getDirectByteColor(value[j + i * textureHeight] - 1, colormap, colormapSize, &buffer[4 * (i + j * textureWidth)]);
-        buffer[4 * (i + j * textureWidth) + 3] = 255;
-      }
-    }
 
-    return bufferLength;
-  }
-  else
-  {
-    return 0;
-  }
+        char* parentFigure = NULL;
+        double* colormap = NULL;
+        int colormapSize = 0;
+        int* piColormapSize = &colormapSize;
+
+        getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_string, (void**) &parentFigure);
+        getGraphicObjectProperty(parentFigure, __GO_COLORMAP__, jni_double_vector, (void**) &colormap);
+        getGraphicObjectProperty(parentFigure, __GO_COLORMAP_SIZE__, jni_int, (void**) &piColormapSize);
+
+        for (int i = 0 ; i < textureWidth ; i++)
+        {
+            for (int j = 0 ; j < textureHeight ; j++)
+            {
+                ColorComputer::getDirectByteColor(value[j + i * textureHeight] - 1, colormap, colormapSize, &buffer[4 * (i + j * textureWidth)], false);
+            }
+        }
+
+        releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize);
+
+        return bufferLength;
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 
 int MatPlotDecomposer::fillTextureData(char* id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height)
 {
-  double* value = NULL;
-  getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &value);
-  if (width * height * 4 == bufferLength)
-  {
-    char* parentFigure = NULL;
-    double* colormap = NULL;
-    int colormapSize = 0;
-    int* piColormapSize = &colormapSize;
-    getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_string, (void**) &parentFigure);
-    getGraphicObjectProperty(parentFigure, __GO_COLORMAP__, jni_double_vector, (void**) &colormap);
-    getGraphicObjectProperty(parentFigure, __GO_COLORMAP_SIZE__, jni_int, (void**) &piColormapSize);
-    int textureHeight = getTextureHeight(id);
-    int k = 0;
-    for (int j = y ; j < y + height ; j++)
+    double* value = NULL;
+    getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &value);
+    if (width * height * 4 == bufferLength)
     {
-      for (int i = x ; i < x + width ; i++)
-      {
-        ColorComputer::getDirectByteColor(value[j + i * textureHeight] - 1, colormap, colormapSize, &buffer[k]);
-        buffer[k + 3] = 255;
-        k += 4;
-      }
+        char* parentFigure = NULL;
+        double* colormap = NULL;
+        int colormapSize = 0;
+        int* piColormapSize = &colormapSize;
+        getGraphicObjectProperty(id, __GO_PARENT_FIGURE__, jni_string, (void**) &parentFigure);
+        getGraphicObjectProperty(parentFigure, __GO_COLORMAP__, jni_double_vector, (void**) &colormap);
+        getGraphicObjectProperty(parentFigure, __GO_COLORMAP_SIZE__, jni_int, (void**) &piColormapSize);
+        int textureHeight = getTextureHeight(id);
+        int k = 0;
+        for (int j = y ; j < y + height ; j++)
+        {
+            for (int i = x ; i < x + width ; i++)
+            {
+                ColorComputer::getDirectByteColor(value[j + i * textureHeight] - 1, colormap, colormapSize, &buffer[k]);
+                buffer[k + 3] = 255;
+                k += 4;
+            }
+        }
+
+        releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize);
+
+        return bufferLength;
+    }
+    else
+    {
+        return 0;
     }
-    return bufferLength;
-  }
-  else
-  {
-    return 0;
-  }
 }
 
+