Menu
▾
▴
[panotools-cvs] SF.net SVN: panotools: [717] branches/pano12/ptfilter
|
From: <jim...@us...> - 2007-07-16 05:54:58
|
Revision: 717
http://svn.sourceforge.net/panotools/?rev=717&view=rev
Author: jim0watters
Date: 2007-07-15 22:54:57 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Fix memory bug. Check for others.
Modified Paths:
--------------
branches/pano12/ptfilter/PTAdjust/PTAdjust.rc
branches/pano12/ptfilter/PTCorrect/PTCorrect.rc
branches/pano12/ptfilter/PTPerspect/PTPerspect.rc
branches/pano12/ptfilter/PTRemap/PTRemap.rc
branches/pano12/ptfilter/cpy.cmd
branches/pano12/ptfilter/cpyBuf.cpp
branches/pano12/ptfilter/main.cpp
branches/pano12/ptfilter/memAlloc.cpp
Modified: branches/pano12/ptfilter/PTAdjust/PTAdjust.rc
===================================================================
--- branches/pano12/ptfilter/PTAdjust/PTAdjust.rc 2007-07-16 01:22:33 UTC (rev 716)
+++ branches/pano12/ptfilter/PTAdjust/PTAdjust.rc 2007-07-16 05:54:57 UTC (rev 717)
@@ -7,10 +7,9 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-
//VS2005Express Version
-#include "MFC\winres.h"
-//#include "afxres.h"
+//#include "MFC\winres.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -55,7 +54,7 @@
// Dialog
//
-ABOUT DIALOGEX 0, 0, 200, 80
+ABOUT DIALOGEX 0, 0, 200, 80
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
@@ -93,8 +92,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,2,2,0
+ PRODUCTVERSION 2,2,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -111,12 +110,12 @@
BEGIN
VALUE "CompanyName", "Panorama Tools"
VALUE "FileDescription", "Panorama Tools Adjust Plug-in"
- VALUE "FileVersion", "2, 2, 1, 0"
+ VALUE "FileVersion", "2, 2, 2, 0"
VALUE "InternalName", "PTAdjust"
VALUE "LegalCopyright", "Copyright \xA9 2007"
VALUE "OriginalFilename", "PTAdjust.8BF"
VALUE "ProductName", "PTAdjust"
- VALUE "ProductVersion", "2, 2, 1, 0"
+ VALUE "ProductVersion", "2, 2, 2, 0"
END
END
BLOCK "VarFileInfo"
Modified: branches/pano12/ptfilter/PTCorrect/PTCorrect.rc
===================================================================
--- branches/pano12/ptfilter/PTCorrect/PTCorrect.rc 2007-07-16 01:22:33 UTC (rev 716)
+++ branches/pano12/ptfilter/PTCorrect/PTCorrect.rc 2007-07-16 05:54:57 UTC (rev 717)
@@ -8,8 +8,8 @@
// Generated from the TEXTINCLUDE 2 resource.
//
//VS2005Express Version
-#include "MFC\winres.h"
-// #include "afxres.h"
+//#include "MFC\winres.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -54,7 +54,7 @@
// Dialog
//
-ABOUT DIALOGEX 0, 0, 200, 80
+ABOUT DIALOGEX 0, 0, 200, 80
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
@@ -91,8 +91,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,2,2,0
+ PRODUCTVERSION 2,2,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -109,12 +109,12 @@
BEGIN
VALUE "CompanyName", "Panorama Tools"
VALUE "FileDescription", "Panorama Tools Correct Plug-in"
- VALUE "FileVersion", "2, 2, 1, 0"
+ VALUE "FileVersion", "2, 2, 2, 0"
VALUE "InternalName", "PTCorrect"
VALUE "LegalCopyright", "Copyright \xA9 2007"
VALUE "OriginalFilename", "PTCorrect.8BF"
VALUE "ProductName", "PTCorrect"
- VALUE "ProductVersion", "2, 2, 1, 0"
+ VALUE "ProductVersion", "2, 2, 2, 0"
END
END
BLOCK "VarFileInfo"
Modified: branches/pano12/ptfilter/PTPerspect/PTPerspect.rc
===================================================================
--- branches/pano12/ptfilter/PTPerspect/PTPerspect.rc 2007-07-16 01:22:33 UTC (rev 716)
+++ branches/pano12/ptfilter/PTPerspect/PTPerspect.rc 2007-07-16 05:54:57 UTC (rev 717)
@@ -8,8 +8,8 @@
// Generated from the TEXTINCLUDE 2 resource.
//
//VS2005Express Version
-#include "MFC\winres.h"
-// #include "afxres.h"
+//#include "MFC\winres.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -54,9 +54,9 @@
// Dialog
//
-ABOUT DIALOGEX 0, 0, 200, 80
+ABOUT DIALOGEX 0, 0, 200, 80
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CTEXT "PTPerspective, Version 2.2.1",IDC_STATIC,8,10,190,10
CTEXT "A 16-bit version of the Panorama Tools Perspective plug-in",
@@ -92,8 +92,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,2,2,0
+ PRODUCTVERSION 2,2,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -110,12 +110,12 @@
BEGIN
VALUE "CompanyName", "Panorama Tools"
VALUE "FileDescription", "Panorama Tools Perspective Plug-in"
- VALUE "FileVersion", "2, 2, 1, 0"
+ VALUE "FileVersion", "2, 2, 2, 0"
VALUE "InternalName", "PTPerspective"
VALUE "LegalCopyright", "Copyright \xA9 2007"
VALUE "OriginalFilename", "PTPerspective.8BF"
VALUE "ProductName", "PTPerspective"
- VALUE "ProductVersion", "2, 2, 1, 0"
+ VALUE "ProductVersion", "2, 2, 2, 0"
END
END
BLOCK "VarFileInfo"
Modified: branches/pano12/ptfilter/PTRemap/PTRemap.rc
===================================================================
--- branches/pano12/ptfilter/PTRemap/PTRemap.rc 2007-07-16 01:22:33 UTC (rev 716)
+++ branches/pano12/ptfilter/PTRemap/PTRemap.rc 2007-07-16 05:54:57 UTC (rev 717)
@@ -8,8 +8,8 @@
// Generated from the TEXTINCLUDE 2 resource.
//
//VS2005Express Version
-#include "MFC\winres.h"
-// #include "afxres.h"
+//#include "MFC\winres.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -54,9 +54,9 @@
// Dialog
//
-ABOUT DIALOGEX 0, 0, 200, 80
+ABOUT DIALOGEX 0, 0, 200, 80
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CTEXT "PTRemap, Version 2.2.1",IDC_STATIC,8,10,190,10
CTEXT "A 16-bit version of the Panorama Tools Remap plug-in",
@@ -92,8 +92,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,2,2,0
+ PRODUCTVERSION 2,2,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -110,12 +110,12 @@
BEGIN
VALUE "CompanyName", "Panorama Tools"
VALUE "FileDescription", "Panorama Tools Remap Plug-in"
- VALUE "FileVersion", "2, 2, 1, 0"
+ VALUE "FileVersion", "2, 2, 2, 0"
VALUE "InternalName", "PTRemap"
VALUE "LegalCopyright", "Copyright \xA9 2007"
VALUE "OriginalFilename", "PTRemap.8BF"
VALUE "ProductName", "PTRemap"
- VALUE "ProductVersion", "2, 2, 1, 0"
+ VALUE "ProductVersion", "2, 2, 2, 0"
END
END
BLOCK "VarFileInfo"
Modified: branches/pano12/ptfilter/cpy.cmd
===================================================================
--- branches/pano12/ptfilter/cpy.cmd 2007-07-16 01:22:33 UTC (rev 716)
+++ branches/pano12/ptfilter/cpy.cmd 2007-07-16 05:54:57 UTC (rev 717)
@@ -1,2 +1,2 @@
-md "C:\Program Files\Adobe\Adobe Photoshop CS2\Plug-Ins\\Panorama Tools"
-copy %1 "c:\Program Files\Adobe\Adobe Photoshop CS2\Plug-Ins\\Panorama Tools" /y
+md "C:\Program Files\Adobe\Adobe Photoshop CS2\Plug-Ins\Panorama Tools"
+copy %1 "c:\Program Files\Adobe\Adobe Photoshop CS2\Plug-Ins\Panorama Tools" /y
Modified: branches/pano12/ptfilter/cpyBuf.cpp
===================================================================
--- branches/pano12/ptfilter/cpyBuf.cpp 2007-07-16 01:22:33 UTC (rev 716)
+++ branches/pano12/ptfilter/cpyBuf.cpp 2007-07-16 05:54:57 UTC (rev 717)
@@ -185,7 +185,9 @@
// update the gFr with our latest request
*gResult = gFr->advanceState();
if (*gResult != noErr)
+ {
return display("cpyPsToBuf: advanceState");
+ }
// copy one channel at a time
if (imageDepth == 8)
Modified: branches/pano12/ptfilter/main.cpp
===================================================================
--- branches/pano12/ptfilter/main.cpp 2007-07-16 01:22:33 UTC (rev 716)
+++ branches/pano12/ptfilter/main.cpp 2007-07-16 05:54:57 UTC (rev 717)
@@ -94,6 +94,7 @@
if (bufferProcs->allocateProc(sizeof(StaticData), &h))
{
*gResult = memFullErr;
+ display("lockData: allocateProc");
return;
}
@@ -105,6 +106,7 @@
if (gData == NULL)
{
*gResult = memFullErr;
+ display("lockData: lockProc");
return;
}
@@ -145,6 +147,7 @@
if (bufferProcs->allocateProc(sizeof(ParamData), &h))
{
*gResult = memFullErr;
+ display("lockParameters: allocateProc");
return;
}
@@ -157,6 +160,7 @@
if (gParam == NULL)
{
*gResult = memFullErr;
+ display("lockParameters: lockProc");
return;
}
Modified: branches/pano12/ptfilter/memAlloc.cpp
===================================================================
--- branches/pano12/ptfilter/memAlloc.cpp 2007-07-16 01:22:33 UTC (rev 716)
+++ branches/pano12/ptfilter/memAlloc.cpp 2007-07-16 05:54:57 UTC (rev 717)
@@ -123,6 +123,7 @@
BufferProcs *bufferProcs = gFr->bufferProcs;
if (bufferProcs->allocateProc(size, &MEM[k].stack[MEM[k].tos].id))
{
+ MEM[k].tos--;
*gResult = memFullErr;
display("memAlloc(2): out of memory");
return NULL;
@@ -131,6 +132,7 @@
MEM[k].stack[MEM[k].tos].mem = bufferProcs->lockProc(MEM[k].stack[MEM[k].tos].id, true);
if (MEM[k].stack[MEM[k].tos].mem == NULL)
{
+ MEM[k].tos--;
*gResult = memFullErr;
display("memAlloc(3): out of memory");
return NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|