From 185f6d0dcb47ca4ac01c43bddf603722f76bb68c Mon Sep 17 00:00:00 2001 From: Le Tan Date: Fri, 24 Aug 2018 20:14:38 +0800 Subject: [PATCH] fix image title constraint --- src/utils/vutils.cpp | 2 +- src/vtextblockdata.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/utils/vutils.cpp b/src/utils/vutils.cpp index 32898fd0..e7989319 100644 --- a/src/utils/vutils.cpp +++ b/src/utils/vutils.cpp @@ -47,7 +47,7 @@ const QString VUtils::c_imageLinkRegExp = QString("\\!\\[([^\\]]*)\\]\\(\\s*([^\ "(=(\\d*)x(\\d*))?\\s*" "\\)"); -const QString VUtils::c_imageTitleRegExp = QString("[\\w\\(\\)@#%\\*\\-\\+=\\?<>\\,\\.\\s]*"); +const QString VUtils::c_imageTitleRegExp = QString("[^\\[\\]]*"); const QString VUtils::c_linkRegExp = QString("\\[([^\\]]*)\\]\\(\\s*([^\\)\"'\\s]+)\\s*" "((\"[^\"\\)\\n]*\")|('[^'\\)\\n]*'))?\\s*" diff --git a/src/vtextblockdata.cpp b/src/vtextblockdata.cpp index cc5caf65..ad52af75 100644 --- a/src/vtextblockdata.cpp +++ b/src/vtextblockdata.cpp @@ -38,9 +38,7 @@ bool VTextBlockData::insertPreviewInfo(VPreviewInfo *p_info) tsUpdated = true; break; } else if (p_info->m_imageInfo.intersect(ele->m_imageInfo)) { - // The new one intersect with an old one. - // Remove the old one. - Q_ASSERT(ele->m_timeStamp < p_info->m_timeStamp); + // Two preview intersect. delete ele; it = m_previews.erase(it); } else {