summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/pmore_movie.txt7
-rw-r--r--mbbsd/pmore.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/docs/pmore_movie.txt b/docs/pmore_movie.txt
index ff55ac48..734412c8 100644
--- a/docs/pmore_movie.txt
+++ b/docs/pmore_movie.txt
@@ -246,13 +246,8 @@
==*[30;40m^L2.5
==*[30;40m^LP*[m
- 最後還有一種寫法與隱藏碼無關,這是由於許多動畫編輯程式會
- 自動前置 *[m ;為了方便大家所以 pmore 也加入了此類控制碼。
- 範例:
- *[m^L2.5
-
- 註: 為了效能考量,目前只開放與上面三種一字不差的寫法。
+ 註: 為了效能考量,目前只開放與上面一字不差的寫法。
也就是說, 下列寫法都是錯誤的:
*[0;30;40m^L (前面多了 0;)
*[30;40m ^L (中間多了空白)
diff --git a/mbbsd/pmore.c b/mbbsd/pmore.c
index 4d4e7140..f8dcefab 100644
--- a/mbbsd/pmore.c
+++ b/mbbsd/pmore.c
@@ -2980,10 +2980,10 @@ mf_movieFrameHeader(unsigned char *p, unsigned char *end)
// So let's go back to fixed format...
static char *patHeader = "==" ESC_STR "[30;40m^L";
static char *patHeader2= ESC_STR "[30;40m^L"; // patHeader + 2; // "=="
- static char *patHeader3= ESC_STR "[m^L";
+ // static char *patHeader3= ESC_STR "[m^L";
static size_t szPatHeader = 12; // strlen(patHeader);
static size_t szPatHeader2 = 10; // strlen(patHeader2);
- static size_t szPatHeader3 = 5; // strlen(patHeader3);
+ // static size_t szPatHeader3 = 5; // strlen(patHeader3);
size_t sz = end - p;
@@ -2997,9 +2997,12 @@ mf_movieFrameHeader(unsigned char *p, unsigned char *end)
return p+2;
// Add more frame headers
+
+ /* // *[m seems not so common, skip.
if (sz < szPatHeader3) return NULL;
if (memcmp(p, patHeader3, szPatHeader3) == 0)
return p + szPatHeader3;
+ */
if (sz < szPatHeader2) return NULL;
if (memcmp(p, patHeader2, szPatHeader2) == 0)