anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-21 07:12:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mathed25.diff

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1531 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-02-19 10:18:21 +00:00
parent 29d6854e98
commit 8e37c67ee7
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mathed/ChangeLog
View File

@ -1,3 +1,9 @@
2001-02-14 André Pönitz <poenitz@htwm.de>
* array.[Ch]: remove constructor and enums ARRAY_MIN_SIZE and ARRAY_STEP
* math_iter.C: default-construct and resize array
2001-02-17 Lars Gullik Bjønnes <larsbj@lyx.org>
* math_xiter.h: move ipush and ipop to public, add _ on private
@ -7,7 +13,7 @@
remove default arg val. Call the public methods of xiter instead
of private variables.
* changes to several files beacuse of the above.
* changes to several files because of the above.
2001-02-14 André Pönitz <poenitz@htwm.de>

16
src/mathed/array.C
View File

@ -18,12 +18,9 @@ void * my_memcpy(void * ps_in, void const * pt_in, size_t n)
}
MathedArray::MathedArray(int size)
: last_(0)
{
int const newsize = (size < ARRAY_MIN_SIZE) ? ARRAY_MIN_SIZE : size;
bf_.resize(newsize);
}
MathedArray::MathedArray()
: bf_(1, 0), last_(0)
{}
MathedArray::iterator MathedArray::begin()
@ -77,10 +74,9 @@ void MathedArray::need_size(int needed)
void MathedArray::resize(int newsize)
{
if (newsize < ARRAY_MIN_SIZE)
newsize = ARRAY_MIN_SIZE;
newsize += ARRAY_STEP - (newsize % ARRAY_STEP);
bf_.resize(newsize);
// still a bit smelly...
++newsize;
bf_.resize(newsize + 1);
if (last_ >= newsize)
last_ = newsize - 1;
bf_[last_] = 0;

11
src/mathed/array.h
View File

@ -46,16 +46,7 @@ public:
typedef buffer_type::const_iterator const_iterator;
///
enum {
///
ARRAY_STEP = 16,
///
ARRAY_MIN_SIZE = 4
};
///
explicit
MathedArray(int size = ARRAY_STEP);
MathedArray();
///
iterator begin();

3
src/mathed/math_iter.C
View File

@ -411,7 +411,8 @@ MathedArray * MathedIter::Copy(int pos1, int pos2)
--pos2;
int dx = pos2 - pos1;
a = new MathedArray(dx + MathedArray::ARRAY_MIN_SIZE);
a = new MathedArray;
a->resize(dx + 1);
// lyxerr << "VA " << pos2 << " " << pos2 << " " << dx << endl;
array->strange_copy(a, (fc) ? 1 : 0, pos1, dx);
if (fc) {