From 7008ea12306b251a506e2ebbf0d85b6a47f1be3d Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Wed, 8 Jun 2022 13:55:40 +0900 Subject: [PATCH] Free GlyphData buffer We make GlyphData's buffer as malloc. So, we need to change the release method as free. Change-Id: Id3c1b7ed9f6b8683b05440edc1c6f52fca5fb6c1 Signed-off-by: Eunki, Hong --- dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp | 2 +- dali-toolkit/internal/text/rendering/text-typesetter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp index e30564e..d408450 100644 --- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp @@ -221,7 +221,7 @@ struct AtlasRenderer::Impl glyphBufferData.width, glyphBufferData.height, glyphBufferData.format, - PixelData::DELETE_ARRAY); + PixelData::FREE); if(bitmap) { diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.cpp b/dali-toolkit/internal/text/rendering/text-typesetter.cpp index 2689ffb..da397ac 100644 --- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp +++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp @@ -1307,8 +1307,8 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const uint32_t& bufferWidth, co glyphData.verticalOffset += glyphData.glyphBitmap.outlineOffsetY; } - // delete the glyphBitmap.buffer as it is now copied into glyphData.bitmapBuffer - delete[] glyphData.glyphBitmap.buffer; + // free the glyphBitmap.buffer as it is now copied into glyphData.bitmapBuffer + free(glyphData.glyphBitmap.buffer); glyphData.glyphBitmap.buffer = NULL; } -- 2.7.4