diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 08:16:25 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 08:16:25 (GMT) |
| commit | 22105c9952630b45fd6b50b0e3349880940a83f5 (patch) | |
| tree | fa2231279cc2c4a5a79d206861cd7fbac285c1c7 /src/3rdparty | |
| parent | 8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190 (diff) | |
| parent | 2cbc5ee1bc89be2f174566f35eb89b493ba75c69 (diff) | |
| download | Qt-22105c9952630b45fd6b50b0e3349880940a83f5.zip Qt-22105c9952630b45fd6b50b0e3349880940a83f5.tar.gz Qt-22105c9952630b45fd6b50b0e3349880940a83f5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libmng/libmng_object_prc.c | 12 | ||||
| -rw-r--r-- | src/3rdparty/libmng/libmng_prop_xs.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/3rdparty/libmng/libmng_object_prc.c b/src/3rdparty/libmng/libmng_object_prc.c index f6691ff..e1724b4 100644 --- a/src/3rdparty/libmng/libmng_object_prc.c +++ b/src/3rdparty/libmng/libmng_object_prc.c @@ -2876,7 +2876,6 @@ mng_retcode mng_create_ani_chrm (mng_datap pData, mng_chunkp pChunk) #endif { - mng_ptr pTemp; mng_ani_chrmp pCHRM; #ifdef MNG_SUPPORT_TRACE @@ -2886,6 +2885,7 @@ mng_retcode mng_create_ani_chrm (mng_datap pData, if (pData->bCacheplayback) /* caching playback info ? */ { #ifdef MNG_OPTIMIZE_OBJCLEANUP + mng_ptr pTemp; mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_chrm), mng_free_obj_general, mng_process_ani_chrm, @@ -3115,7 +3115,6 @@ mng_retcode mng_create_ani_iccp (mng_datap pData, mng_chunkp pChunk) #endif { - mng_ptr pTemp; mng_ani_iccpp pICCP; #ifdef MNG_SUPPORT_TRACE @@ -3125,6 +3124,7 @@ mng_retcode mng_create_ani_iccp (mng_datap pData, if (pData->bCacheplayback) /* caching playback info ? */ { #ifdef MNG_OPTIMIZE_OBJCLEANUP + mng_ptr pTemp; mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_iccp), mng_free_ani_iccp, mng_process_ani_iccp, @@ -3252,7 +3252,6 @@ mng_retcode mng_create_ani_bkgd (mng_datap pData, mng_retcode mng_create_ani_bkgd (mng_datap pData) #endif { - mng_ptr pTemp; mng_ani_bkgdp pBKGD; #ifdef MNG_SUPPORT_TRACE @@ -3262,6 +3261,7 @@ mng_retcode mng_create_ani_bkgd (mng_datap pData) if (pData->bCacheplayback) /* caching playback info ? */ { #ifdef MNG_OPTIMIZE_OBJCLEANUP + mng_ptr pTemp; mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_bkgd), mng_free_obj_general, mng_process_ani_bkgd, @@ -4918,7 +4918,6 @@ mng_retcode mng_process_ani_term (mng_datap pData, #ifndef MNG_SKIPCHUNK_SAVE mng_retcode mng_create_ani_save (mng_datap pData) { - mng_ptr pTemp; mng_ani_savep pSAVE; #ifdef MNG_SUPPORT_TRACE @@ -4928,6 +4927,7 @@ mng_retcode mng_create_ani_save (mng_datap pData) if (pData->bCacheplayback) /* caching playback info ? */ { #ifdef MNG_OPTIMIZE_OBJCLEANUP + mng_ptr pTemp; mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_save), mng_free_obj_general, mng_process_ani_save, @@ -5009,7 +5009,6 @@ mng_retcode mng_create_ani_seek (mng_datap pData, mng_chunkp pChunk) #endif { - mng_ptr pTemp; mng_ani_seekp pSEEK; #ifdef MNG_SUPPORT_TRACE @@ -5019,6 +5018,7 @@ mng_retcode mng_create_ani_seek (mng_datap pData, if (pData->bCacheplayback) /* caching playback info ? */ { #ifdef MNG_OPTIMIZE_OBJCLEANUP + mng_ptr pTemp; mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_seek), mng_free_ani_seek, mng_process_ani_seek, @@ -6106,7 +6106,7 @@ mng_retcode mng_create_ani_disc (mng_datap pData, #endif { mng_ani_discp pDISC; - mng_retcode iRetcode; + mng_retcode iRetcode; #ifdef MNG_SUPPORT_TRACE MNG_TRACE (pData, MNG_FN_CREATE_ANI_DISC, MNG_LC_START); diff --git a/src/3rdparty/libmng/libmng_prop_xs.c b/src/3rdparty/libmng/libmng_prop_xs.c index 88e416d..3849d51 100644 --- a/src/3rdparty/libmng/libmng_prop_xs.c +++ b/src/3rdparty/libmng/libmng_prop_xs.c @@ -1033,7 +1033,7 @@ mng_retcode MNG_DECL mng_set_jpeg_dctmethod (mng_handle hHandle, return MNG_NOERROR; } -#endif MNG_SUPPORT_WRITE +#endif /* MNG_SUPPORT_WRITE */ #endif /* MNG_ACCESS_JPEG */ #endif /* MNG_INCLUDE_JNG */ |