From 414fde1d3caad7cf88baecbeb62df75eccaa1499 Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Fri, 1 Jul 2022 16:58:30 +0900 Subject: [PATCH 1/1] Fix name of glyph compression name Change-Id: I825f6ac95ef78457513b5cd984ce00d1c220a2af Signed-off-by: Eunki, Hong --- .../internal/text/rendering/atlas/text-atlas-renderer.cpp | 8 ++++---- dali-toolkit/internal/text/rendering/text-typesetter.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 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 5913134..1a1063c 100644 --- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp @@ -217,7 +217,7 @@ struct AtlasRenderer::Impl uint32_t glyphBufferSize = glyphBufferData.width * glyphBufferData.height * Pixel::GetBytesPerPixel(glyphBufferData.format); // If glyph buffer data don't have ownership, Or if we need to decompress, create new memory and replace ownership. - if(!glyphBufferData.isBufferOwned || glyphBufferData.compressType != TextAbstraction::FontClient::GlyphBufferData::CompressType::NO_COMPRESS) + if(!glyphBufferData.isBufferOwned || glyphBufferData.compressionType != TextAbstraction::FontClient::GlyphBufferData::CompressionType::NO_COMPRESSION) { uint8_t* newBuffer = (uint8_t*)malloc(glyphBufferSize); if(DALI_LIKELY(newBuffer != nullptr)) @@ -228,9 +228,9 @@ struct AtlasRenderer::Impl // Release previous buffer free(glyphBufferData.buffer); } - glyphBufferData.isBufferOwned = true; - glyphBufferData.buffer = newBuffer; - glyphBufferData.compressType = TextAbstraction::FontClient::GlyphBufferData::CompressType::NO_COMPRESS; + glyphBufferData.isBufferOwned = true; + glyphBufferData.buffer = newBuffer; + glyphBufferData.compressionType = TextAbstraction::FontClient::GlyphBufferData::CompressionType::NO_COMPRESSION; } } diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.cpp b/dali-toolkit/internal/text/rendering/text-typesetter.cpp index cad5ea3..14f3da7 100644 --- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp +++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp @@ -137,7 +137,7 @@ void TypesetGlyph(GlyphData& __restrict__ data, uint32_t glyphOffet = 0u; // Allocate scanline memory for glyph bitmap if we need. - const bool useLocalScanline = data.glyphBitmap.compressType != TextAbstraction::FontClient::GlyphBufferData::CompressType::NO_COMPRESS; + const bool useLocalScanline = data.glyphBitmap.compressionType != TextAbstraction::FontClient::GlyphBufferData::CompressionType::NO_COMPRESSION; uint8_t* __restrict__ glyphScanline = useLocalScanline ? (uint8_t*)malloc(data.glyphBitmap.width * glyphPixelSize) : data.glyphBitmap.buffer; // Precalculate input color's packed result. @@ -298,7 +298,7 @@ void TypesetGlyph(GlyphData& __restrict__ data, uint32_t glyphOffet = 0u; // Allocate scanline memory for glyph bitmap if we need. - const bool useLocalScanline = data.glyphBitmap.compressType != TextAbstraction::FontClient::GlyphBufferData::CompressType::NO_COMPRESS; + const bool useLocalScanline = data.glyphBitmap.compressionType != TextAbstraction::FontClient::GlyphBufferData::CompressionType::NO_COMPRESSION; uint8_t* __restrict__ glyphScanline = useLocalScanline ? (uint8_t*)malloc(data.glyphBitmap.width * glyphPixelSize) : data.glyphBitmap.buffer; // Skip basic line. -- 2.7.4