diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/3rdparty/patches/libmng-1.0.10-endless-loop.patch | |
parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/3rdparty/patches/libmng-1.0.10-endless-loop.patch')
-rw-r--r-- | src/3rdparty/patches/libmng-1.0.10-endless-loop.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/src/3rdparty/patches/libmng-1.0.10-endless-loop.patch b/src/3rdparty/patches/libmng-1.0.10-endless-loop.patch deleted file mode 100644 index 31f0474e6b..0000000000 --- a/src/3rdparty/patches/libmng-1.0.10-endless-loop.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- libmng_data.h.orig 2007-04-20 10:41:58.000000000 +0200 -+++ libmng_data.h 2007-07-14 00:00:00.000000000 +0200 -@@ -658,6 +658,9 @@ - mng_int32 iFrameclipb; - - mng_uint32 iNextdelay; /* delay *after* next image */ -+ -+ mng_bool bForcedelay; -+ mng_uint32 iAccumdelay; - #endif - - #ifndef MNG_SKIPCHUNK_SHOW ---- libmng_display.c.orig 2007-04-20 10:41:58.000000000 +0200 -+++ libmng_display.c 2007-07-14 00:00:00.000000000 +0200 -@@ -384,8 +384,9 @@ - - { - #ifndef MNG_SKIPCHUNK_FRAM -- if (pData->iFramedelay > 0) /* real delay ? */ -+ if (pData->iFramedelay > 0 || pData->bForcedelay) /* real delay ? */ - { /* let the app refresh first ? */ -+ pData->bForcedelay = MNG_FALSE; - if ((pData->bRunning) && (!pData->bSkipping) && - (pData->iUpdatetop < pData->iUpdatebottom) && (pData->iUpdateleft < pData->iUpdateright)) - if (!pData->fRefresh (((mng_handle)pData), -@@ -455,6 +456,7 @@ - pData->iFrametime = pData->iFrametime + iWaitfor; - /* setup for next delay */ - pData->iFramedelay = pData->iNextdelay; -+ pData->iAccumdelay += pData->iFramedelay; - #endif - } - -@@ -3340,6 +3342,9 @@ - MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MEND, MNG_LC_START); - #endif - -+ pData->bForcedelay = pData->iAccumdelay ? MNG_FALSE : MNG_TRUE; -+ pData->iAccumdelay = 0; -+ - #ifdef MNG_SUPPORT_DYNAMICMNG - if (pData->bStopafterseek) /* need to stop after this ? */ - { ---- libmng_hlapi.c.orig 2007-07-06 18:23:04.000000000 +0200 -+++ libmng_hlapi.c 2007-07-14 00:00:00.000000000 +0200 -@@ -446,6 +446,9 @@ - pData->iFrameclipb = 0; - - pData->iNextdelay = 1; -+ -+ pData->bForcedelay = MNG_FALSE; -+ pData->iAccumdelay = 0; - #endif - - #ifndef MNG_SKIPCHUNK_SHOW -@@ -1737,6 +1740,9 @@ - pData->iFrameclipb = 0; - - pData->iNextdelay = 1; -+ -+ pData->bForcedelay = MNG_FALSE; -+ pData->iAccumdelay = 0; - #endif - - #ifndef MNG_SKIPCHUNK_SHOW |