mirror of
https://github.com/martravi/wiiqt6.git
synced 2024-11-25 14:17:00 +01:00
* fix aligned searching. it should find a few more matches now
git-svn-id: http://wiiqt.googlecode.com/svn/trunk@110 389f4c8b-5dfe-645f-db0e-df882bc27289
This commit is contained in:
parent
830e1bdb4a
commit
d886066446
@ -165,12 +165,12 @@ int AlignedBASearch( const QByteArray &needle, const QByteArray &haystack, qint6
|
|||||||
qint64 hSize = haystack.size();
|
qint64 hSize = haystack.size();
|
||||||
qint64 nSize = needle.size();
|
qint64 nSize = needle.size();
|
||||||
|
|
||||||
if( start % 4 || start > hSize )
|
if( start % 4 || start >= hSize )
|
||||||
{
|
{
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
qint64 end = hSize - nSize;
|
qint64 end = hSize - nSize;
|
||||||
for( ; start < end; start += 8 )
|
for( ; start < end; start += 4 )
|
||||||
{
|
{
|
||||||
qint64 j;
|
qint64 j;
|
||||||
for( j = 0; j < nSize; j++ )
|
for( j = 0; j < nSize; j++ )
|
||||||
@ -322,7 +322,7 @@ int PatternSearch( const QString &needle, const QString &haystack, qint64 start
|
|||||||
qint64 hSize = haystack.size();
|
qint64 hSize = haystack.size();
|
||||||
qint64 nSize = needle.size();
|
qint64 nSize = needle.size();
|
||||||
|
|
||||||
if( start % 8 || start > hSize )
|
if( start % 8 || start >= hSize )
|
||||||
{
|
{
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@ -388,7 +388,7 @@ bool PattenMatches( const QString &needle, const QString &haystack, qint64 offse
|
|||||||
qint64 hSize = haystack.size();
|
qint64 hSize = haystack.size();
|
||||||
qint64 nSize = needle.size();
|
qint64 nSize = needle.size();
|
||||||
|
|
||||||
if( nSize > hSize || offset > hSize )
|
if( nSize > hSize || offset >= hSize )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user