Changeset 34243

Timestamp:

Jul 31, 2012, 11:39:29 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psLib

Files:

• m4/ipp_stdopts.m4 (modified) (2 diffs)
• src/imageops/psImageMapFit.c (modified) (2 diffs)
• src/sys/psThread.c (modified) (1 diff)

branches/eam_branches/ipp-20120627/psLib/m4/ipp_stdopts.m4

@@ -7 +7 @@
       [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
       [AC_MSG_RESULT(compile optimization enabled)
-       CFLAGS="-pipe -O2 -g -DPS_NO_TRACE"],
+          CFLAGS="-pipe -O2 -g -DPS_NO_TRACE"],
       [AC_MSG_RESULT([compile optimization disabled])
-        CFLAGS="-pipe -O0 -g"
+          CFLAGS="-pipe -O0 -g"
       ]
     )
@@ -22 +22 @@
         fi
       ],
-      [AC_MSG_RESULT([compile optimization disabled])
+      [AC_MSG_RESULT([debug build disabled])
         if test x"${CFLAGS}" == x; then
           CFLAGS="-Wall -Werror"

branches/eam_branches/ipp-20120627/psLib/src/imageops/psImageMapFit.c

@@ -317 +317 @@
         psFree (A);
         psFree (B);
+        psFree (Empty);
         return true;
     }
@@ -408 +409 @@
         if (!*pGoodFit) {
             psWarning ("bad fit to image map, try something else");
+            psFree(resid);
+            if (!inMask) psFree (mask);
             return true;
         }

branches/eam_branches/ipp-20120627/psLib/src/sys/psThread.c

@@ -343 +343 @@
             psThread *thread = pool->data[i];
             if (thread->fault) {
+                // we had a fault on this thread -- clear the fault and keep going, but record
+                // the fault.
                 numFaults++;
+                thread->fault = false;
             }
         }