Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a memory leak (another)!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16437 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2006-02-16 20:29:30 +00:00
parent 77187226cd
commit 971af42f6f
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/kits/interface/BTextView/StyleBuffer.cpp
View File

@ -473,9 +473,8 @@ _BStyleBuffer_::operator[](int32 index) const
run.style = fNullStyle;
} else {
STEStyleRunDesc* runDesc = fStyleRunDesc[index];
const STEStyleRecord* record = fStyleRecord[runDesc->index];
run.offset = runDesc->offset;
run.style = record->style;
run.style = fStyleRecord[runDesc->index]->style;
}
return run;

26
src/kits/interface/BTextView/TextView.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2001-2005, Haiku Inc.
* Copyright 2001-2006, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -69,7 +69,7 @@ struct flattened_text_run {
uint8 green;
uint8 blue;
uint8 alpha; /* 255 == opaque */
uint16 _reserved_; /* 0 */
uint16 _reserved_; /* 0 */
};
@ -1642,24 +1642,22 @@ BTextView::SetRunArray(int32 startOffset, int32 endOffset, const text_run_array
text_run_array *
BTextView::RunArray(int32 startOffset, int32 endOffset, int32 *outSize) const
{
CALLED();
STEStyleRange* styleRange = fStyles->GetStyleRange(startOffset, endOffset - 1);
if (styleRange == NULL)
return NULL;
text_run_array *res = AllocRunArray(styleRange->count, outSize);
if (!res)
return NULL;
for (int32 i = 0; i < res->count; i++) {
res->runs[i].offset = styleRange->runs[i].offset;
res->runs[i].font = &styleRange->runs[i].style.font;
res->runs[i].color = styleRange->runs[i].style.color;
text_run_array *runArray = AllocRunArray(styleRange->count, outSize);
if (runArray != NULL) {
for (int32 i = 0; i < runArray->count; i++) {
runArray->runs[i].offset = styleRange->runs[i].offset;
runArray->runs[i].font = styleRange->runs[i].style.font;
runArray->runs[i].color = styleRange->runs[i].style.color;
}
}
return res;
free(styleRange);
return runArray;
}