Changeset 561 for trunk/src/3rdparty/libmng

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/libmng/libmng_object_prc.c (modified) (11 diffs)
• src/3rdparty/libmng/libmng_prop_xs.c (modified) (1 diff)

trunk/src/3rdparty/libmng/libmng_object_prc.c

@@ -2877 +2877 @@
 #endif
 {
-  mng_ptr       pTemp;
   mng_ani_chrmp pCHRM;
 
@@ -2887 +2886 @@
   {
 #ifdef MNG_OPTIMIZE_OBJCLEANUP
+    mng_ptr       pTemp;
     mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_chrm),
                                                mng_free_obj_general,
@@ -3116 +3116 @@
 #endif
 {
-  mng_ptr       pTemp;
   mng_ani_iccpp pICCP;
 
@@ -3126 +3125 @@
   {
 #ifdef MNG_OPTIMIZE_OBJCLEANUP
+    mng_ptr       pTemp;
     mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_iccp),
                                                mng_free_ani_iccp,
@@ -3253 +3253 @@
 #endif
 {
-  mng_ptr       pTemp;
   mng_ani_bkgdp pBKGD;
 
@@ -3263 +3262 @@
   {
 #ifdef MNG_OPTIMIZE_OBJCLEANUP
+    mng_ptr       pTemp;
     mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_bkgd),
                                                mng_free_obj_general,
@@ -4919 +4919 @@
 mng_retcode mng_create_ani_save (mng_datap pData)
 {
-  mng_ptr       pTemp;
   mng_ani_savep pSAVE;
 
@@ -4929 +4928 @@
   {
 #ifdef MNG_OPTIMIZE_OBJCLEANUP
+    mng_ptr       pTemp;
     mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_save),
                                                mng_free_obj_general,
@@ -5010 +5010 @@
 #endif
 {
-  mng_ptr       pTemp;
   mng_ani_seekp pSEEK;
 
@@ -5020 +5019 @@
   {
 #ifdef MNG_OPTIMIZE_OBJCLEANUP
+    mng_ptr       pTemp;
     mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_seek),
                                                mng_free_ani_seek,
@@ -6107 +6107 @@
 {
   mng_ani_discp pDISC;
-  mng_retcode   iRetcode;
+  mng_retcode   iRetcode;      
 
 #ifdef MNG_SUPPORT_TRACE

trunk/src/3rdparty/libmng/libmng_prop_xs.c

@@ -1034 +1034 @@
   return MNG_NOERROR;
 }
-#endif MNG_SUPPORT_WRITE
+#endif /* MNG_SUPPORT_WRITE */
 #endif /* MNG_ACCESS_JPEG */
 #endif /* MNG_INCLUDE_JNG */