Changeset 32634

Timestamp:

Nov 8, 2011, 2:57:34 PM (15 years ago)

Author:

eugene

Message:

merged from eam branches 20110906

Location:

trunk

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psLib/src/jpeg/psImageJpeg.c (modified) (1 diff)
• psvideophot (modified) (1 prop)

trunk/psLib/src/jpeg/psImageJpeg.c

@@ -8 +8 @@
 
 #include <kapa.h>
+#undef free
+// note: when using OHANA_MEMORY, kapa.h includes ohana.h, etc re-define free to use the
+// internal function this file does not use ohana memory management directly (ALLOCATE/free),
+// so we can undef it and allow psMemory.h to poison it
+
 #include "psMemory.h"
 #include "psImage.h"