From: <jim...@us...> - 2007-02-03 05:40:19
|
Revision: 663 http://svn.sourceforge.net/panotools/?rev=663&view=rev Author: jim0watters Date: 2007-02-02 21:40:18 -0800 (Fri, 02 Feb 2007) Log Message: ----------- Updated PTpano12 to PTTrace12 Updated project Useful tool to determine what functions of pano12.dll are being called, with what, and when. It was useful for analizing PTStitcher. And will be useful in reproducing the other helper tools of PanoTools. See readme for more details. Added Paths: ----------- branches/pano12/PTTrace/ branches/pano12/PTTrace/PTTrace12.cpp branches/pano12/PTTrace/PTTrace12.def branches/pano12/PTTrace/PTTrace12.dsp branches/pano12/PTTrace/PTTrace12.h branches/pano12/PTTrace/PTTrace12.sln branches/pano12/PTTrace/PTTrace12.suo branches/pano12/PTTrace/PTTrace12.vcproj branches/pano12/PTTrace/PTTrace12_readme.txt Copied: branches/pano12/PTTrace/PTTrace12.cpp (from rev 662, branches/pano12/libpano/tools/PTTrace12.cpp) =================================================================== --- branches/pano12/PTTrace/PTTrace12.cpp (rev 0) +++ branches/pano12/PTTrace/PTTrace12.cpp 2007-02-03 05:40:18 UTC (rev 663) @@ -0,0 +1,1490 @@ +/* Panorama_Tools - Generate, Edit and Convert Panoramic Images + Copyright (C) 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +/*------------------------------------------------------------*/ + +#include "PTTrace12.h" + +#define DETAILS 0 +#define TRACECOUNTLIMIT 2 +#define BUFFERSIZE 100 + +#define CASE(x) case x: strcpy_s(buf, BUFFERSIZE, #x); break + +#define SETFUNC(x)\ + x ## _func = (x ## _proc)getAddr(hinstLib, #x);\ + if (x ## _func == NULL) return FALSE + +#define EXPORT extern "C" __declspec(dllexport) +typedef void (*dllEntry)(); + + +#if(0) // prototype + +THE_FUNCTION_NAME + +typedef int (*THE_FUNCTION_NAME_proc)(); +THE_FUNCTION_NAME_proc THE_FUNCTION_NAME_func; +EXPORT int THE_FUNCTION_NAME() +{ + display(">> THE_FUNCTION_NAME"); + int rc = THE_FUNCTION_NAME_func(); + return rc; +} + SETFUNC(THE_FUNCTION_NAME); + +// ToDo: The following funtions are not implimented yet +DispPrg +InfoPrg +Java_pteditor_CExtract +Java_pteditor_CGetImageHeight +Java_pteditor_CGetImageRow +Java_pteditor_CGetImageWidth +Java_pteditor_CInsert +Java_pteditor_CLoadImage +Java_pteditor_CSaveImage +Java_pteditor_CSetImageHeight +Java_pteditor_CSetImageRow +Java_pteditor_CSetImageWidth +Java_ptutils_CAlignPoint +Java_ptutils_CCallOptimizer +Java_ptutils_CCreateProject +Java_ptutils_CGetCP_1n +Java_ptutils_CGetCP_1t +Java_ptutils_CGetCP_1x +Java_ptutils_CGetCP_1y +Java_ptutils_CGetControlPointCount +Java_ptutils_CGetHfov +Java_ptutils_CGetImageCount +Java_ptutils_CGetImageFormat +Java_ptutils_CGetImageHeight +Java_ptutils_CGetImageName +Java_ptutils_CGetImageRow +Java_ptutils_CGetImageWidth +Java_ptutils_CGetIndex +Java_ptutils_CGetPitch +Java_ptutils_CGetRoll +Java_ptutils_CGetTR_1i +Java_ptutils_CGetTR_1v +Java_ptutils_CGetTriangleCount +Java_ptutils_CGetYaw +Java_ptutils_CLaunchAndSendScript +Java_ptutils_CLoadImage +Java_ptutils_CLoadProject +Java_ptutils_CReduce +Java_ptutils_CSaveProject +Java_ptutils_CSetCP +Java_ptutils_CSetControlPointCount +Java_ptutils_CSetImageName +Java_ptutils_CSetTR +Java_ptutils_CSetTriangleCount +Java_ptutils_CShowScript +Java_ptutils_CTriangulate +SetAdPrefs +SetCPrefs +SetCrOpt +SetCutOpt +SetFrPrefs +SetHorOpt +SetIntp +SetLumOpt +SetPanOpt +SetPerspPrefs +SetRadOpt +SetRem +SetScOpt +SetShOpt +SetSiz +SetVerOpt + +#endif // (0) + +typedef void (*ConvFileName_proc)(fullPath *fname,char *string); +typedef void (*CopyImageData_proc)(Image *dest, Image *src); +typedef void (*FourToThreeBPP_proc)(Image *im); +typedef void (*PrintError_proc)(char* fmt, ...); +typedef void (*SetAdjustDefaults_proc)(aPrefs *p); +typedef void (*SetImageDefaults_proc)(Image *im); +typedef void (*SetWindowOwner_proc)(HWND owner); +typedef int (*addLayerToFile_proc)(Image *im, fullPath* sfile, fullPath* dfile, stBuf *sB); +typedef void (*filter_main_proc)(TrformStr *TrPtr, struct size_Prefs *spref); +typedef void (*myfree_proc)(void **hdl); +typedef void** (*mymalloc_proc)(long numBytes); +typedef int (*readPrefs_proc)(char* p, int selector ); +typedef int (*writePSD_proc)(Image *im, fullPath* fname); +typedef int (*writePSDwithLayer_proc)(Image *im, fullPath *fname); +typedef int (*writeTIFF_proc)(Image *im, fullPath* fname); +typedef void (*ARGBtoRGBA_proc)(UCHAR* buf, int width, int bitsPerPixel); +typedef void (*RGBAtoARGB_proc)(UCHAR* buf, int width, int bitsPerPixel); +typedef void (*CopyPosition_proc)(Image *to, Image *from); +typedef int (*CropImage_proc)(Image *im, PTRect *r); +typedef void (*DisposeAlignInfo_proc)(AlignInfo *g); +typedef int (*GetFullPath_proc)(fullPath *path, char *filename); +typedef int (*IsTextFile_proc)(char* fname); +typedef char* (*LoadScript_proc)(fullPath* scriptFile); +typedef enum {p12FeatureUnknown=0,p12FeatureInt=1,p12FeatureDouble=2,p12FeatureString=3} Tp12FeatureType; +typedef int (*queryFeatureCount_proc)(); +typedef void (*queryFeatures_proc)(int index,char** name,Tp12FeatureType* type); +typedef int (*queryFeatureInt_proc)(const char *name, int *result); +typedef int (*queryFeatureDouble_proc)(const char *name, double *result); +typedef int (*queryFeatureString_proc)(const char *name,char *result, const int bufsize); +typedef void (*MakePano_proc)(TrformStr *TrPtr, aPrefs *aP); +typedef void (*MyMakePano_proc)(TrformStr *TrPtr, aPrefs *aP, int imageNum); +typedef int (*ParseScript_proc)(char* script, AlignInfo *gl); +typedef int (*Progress_proc)(int command, char* argument); +typedef int (*infoDlg_proc)(int command, char* argument); +typedef int (*SaveFileAs_proc)(fullPath *fname, char *prompt, char *name); +typedef void (*SetSizeDefaults_proc)(sPrefs *pref); +typedef int (*SetCorrectDefaults_proc)(cPrefs *p); +typedef void (*SetVRPanoOptionsDefaults_proc)(VRPanoOptions *v); +typedef void (*SetOptDefaults_proc)(optVars *opt); +typedef void (*SettMatrixDefaults_proc)(tMatrix *t); +typedef void (*SetStitchDefaults_proc)(stBuf *sbuf); +typedef int (*SetAlignParams_proc)(double *x); +typedef int (*SetLMParams_proc)(double *x); +typedef void (*SetGlobalPtr_proc)(AlignInfo *p); +typedef int (*StringtoFullPath_proc)(fullPath *path, char *filename); +typedef struct tiff TIFF; +typedef unsigned int ttag_t; /* directory tag */ +typedef unsigned short tdir_t; /* directory index */ +typedef unsigned short tsample_t; /* sample number */ +typedef unsigned int tstrip_t; /* strip number */ +typedef unsigned int ttile_t; /* tile number */ +typedef int tsize_t; /* i/o size in bytes */ +typedef void* tdata_t; /* image data ref */ +typedef unsigned int toff_t; /* file offset */ +typedef int (*readTIFF_proc)(Image *im, fullPath *sfile); +typedef int (*readtif_proc)(Image *im, TIFF* tif); +typedef void (*TIFFClose_proc)(TIFF* t); +typedef TIFF* (*TIFFOpen_proc)(const char* a, const char* b); +typedef int (*TIFFGetField_proc)(TIFF* pT, ttag_t tt, ...); +typedef int (*TIFFSetField_proc)(TIFF* pT, ttag_t tt, ...); +typedef int (*TIFFReadDirectory_proc)(TIFF* pT); +typedef int (*TIFFSetDirectory_proc)(TIFF* pT, tdir_t td); +typedef int (*TIFFReadScanline_proc)(TIFF* pT, tdata_t td, unsigned int un, tsample_t ts); +typedef int (*TIFFWriteDirectory_proc)(TIFF * pT); +typedef int (*TIFFWriteScanline_proc)(TIFF* pT, tdata_t td, unsigned int un, tsample_t ts); +typedef tsize_t (*TIFFScanlineSize_proc)(TIFF* pT); +typedef void (*TwoToOneByte_proc)(Image *im); +typedef void (*WriteResults_proc)(char* script, fullPath *sfile, AlignInfo *g, double ds( int i) , int launch); +typedef void (*nextWord_proc)(register char* word, char** ch ); +typedef void (*nextLine_proc)(register char* line, char** ch); +typedef int (*numLines_proc)(char* script, char first); +typedef int (*getVRPanoOptions_proc)(VRPanoOptions *v, char *line); +typedef void (*showScript_proc)(fullPath* scriptFile); +typedef int (*makePathToHost_proc)(fullPath *path); +typedef int (*readPSDMultiLayerImage_proc)(MultiLayerImage *mim, fullPath* sfile); +typedef int (*writeImage_proc)(Image *im, fullPath *sfile); +typedef int (*writeJPEG_proc)(Image *im, fullPath *sfile, int quality, int progressive); +typedef int (*makeTempPath_proc)(fullPath *path); +typedef int (*readPositions_proc)(char* script, transformCoord *tP); +typedef int (*readImage_proc)(Image *im, fullPath *sfile); +typedef int (*writePNG_proc)(Image *im, fullPath *sfile); +typedef aPrefs* (*readAdjustLine_proc)(fullPath *theScript); +typedef void (*pano_sphere_tp_proc)(double x_dest,double y_dest, double* x_src, double* y_src, void* params); +typedef void (*execute_stack_proc)(double x_dest,double y_dest, double* x_src, double* y_src, void* params); +typedef int (*normalToTriangle_proc)(CoordInfo *n, CoordInfo *v, triangle *t); +typedef int (*ReduceTriangles_proc)(AlignInfo *g, int nIm); +typedef int (*TriangulatePoints_proc)(AlignInfo *g, int nIm); +typedef void (*fwiener_proc)(TrformStr *TrPtr, Image *nf, Image *psf, double gamma, double frame); +typedef void (*noisefilter_proc)(Image *dest, Image *src); +typedef void (*doCoordinateTransform_proc)(CoordInfo *c, tMatrix *t); +typedef int (*fcnPano_proc)(int m, int n, double x[], double fvec[], int *iflag); +typedef double (*distSquared_proc)(int num); +typedef double (*OverlapRMS_proc)(MultiLayerImage *mim); +typedef void (*RunBROptimizer_proc)(OptInfo *g, double minStepWidth); +typedef void (*RunLMOptimizer_proc)(OptInfo *g); +typedef void (*DisposeMultiLayerImage_proc)(MultiLayerImage *mim); +typedef int (*SetDestImage_proc)(TrformStr *TrPtr, int width, int height); +typedef void (*DoColorCorrection_proc)(Image *im1, Image *im2, int mode); +typedef void (*SetInvMakeParams_proc)(struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color); +typedef void (*SetMakeParams_proc)(struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color); +typedef int (*InterpolateImageFile_proc)(fullPath *sfile, fullPath *dfile, AlignInfo *g,int nIm); +typedef int (*blendImages_proc)(fullPath *f0, fullPath *f1, fullPath *result, double s); +typedef int (*MorphImageFile_proc)(fullPath *sfile, fullPath *dfile, AlignInfo *g,int nIm); +typedef int (*PositionCmp_proc)(Image *im1, Image *im2); +typedef int (*cutTheFrame_proc)(Image *dest, Image *src, int width, int height, int showprogress); +typedef int (*SetUpGamma_proc)(double pgamma, unsigned int psize); +typedef void (*ThreeToFourBPP_proc)(Image *im); +typedef int (*HaveEqualSize_proc)(Image *im1, Image *im2); +typedef int (*merge_proc)(Image *dst, Image *src, int feather, int showprogress, int seam); +typedef void (*addAlpha_proc)(Image *im); +typedef int (*FindFile_proc)(fullPath *fname); +typedef int (*readPSD_proc)(Image *im, fullPath* fname, int mode); +typedef int (*SaveBufImage_proc)(Image *image, char *fname); +typedef int (*LoadBufImage_proc)(Image *image, char *fname, int mode); +typedef void (*writePrefs_proc)(char* p, int selector); +typedef int (*CheckParams_proc)(AlignInfo *g); + +ConvFileName_proc ConvFileName_func; +CopyImageData_proc CopyImageData_func; +FourToThreeBPP_proc FourToThreeBPP_func; +PrintError_proc PrintError_func; +SetAdjustDefaults_proc SetAdjustDefaults_func; +SetImageDefaults_proc SetImageDefaults_func; +SetWindowOwner_proc SetWindowOwner_func; +addLayerToFile_proc addLayerToFile_func; +filter_main_proc filter_main_func; +myfree_proc myfree_func; +mymalloc_proc mymalloc_func; +readPrefs_proc readPrefs_func; +writePSD_proc writePSD_func; +writePSDwithLayer_proc writePSDwithLayer_func; +writeTIFF_proc writeTIFF_func; +ARGBtoRGBA_proc ARGBtoRGBA_func; +RGBAtoARGB_proc RGBAtoARGB_func; +CopyPosition_proc CopyPosition_func; +CropImage_proc CropImage_func; +DisposeAlignInfo_proc DisposeAlignInfo_func; +GetFullPath_proc GetFullPath_func; +IsTextFile_proc IsTextFile_func; +LoadScript_proc LoadScript_func; +queryFeatureCount_proc queryFeatureCount_func; +queryFeatures_proc queryFeatures_func; +queryFeatureInt_proc queryFeatureInt_func; +queryFeatureDouble_proc queryFeatureDouble_func; +queryFeatureString_proc queryFeatureString_func; +MakePano_proc MakePano_func; +MyMakePano_proc MyMakePano_func; +ParseScript_proc ParseScript_func; +Progress_proc Progress_func; +infoDlg_proc infoDlg_func; +SaveFileAs_proc SaveFileAs_func; +SetSizeDefaults_proc SetSizeDefaults_func; +SetCorrectDefaults_proc SetCorrectDefaults_func; +SetVRPanoOptionsDefaults_proc SetVRPanoOptionsDefaults_func; +SetOptDefaults_proc SetOptDefaults_func; +SettMatrixDefaults_proc SettMatrixDefaults_func; +SetStitchDefaults_proc SetStitchDefaults_func; +SetAlignParams_proc SetAlignParams_func; +SetLMParams_proc SetLMParams_func; +SetGlobalPtr_proc SetGlobalPtr_func; +StringtoFullPath_proc StringtoFullPath_func; +readTIFF_proc readTIFF_func; +readtif_proc readtif_func; +TIFFClose_proc TIFFClose_func; +TIFFOpen_proc TIFFOpen_func; +TIFFGetField_proc TIFFGetField_func; +TIFFSetField_proc TIFFSetField_func; +TIFFReadDirectory_proc TIFFReadDirectory_func; +TIFFSetDirectory_proc TIFFSetDirectory_func; +TIFFReadScanline_proc TIFFReadScanline_func; +TIFFWriteDirectory_proc TIFFWriteDirectory_func; +TIFFWriteScanline_proc TIFFWriteScanline_func; +TIFFScanlineSize_proc TIFFScanlineSize_func; +TwoToOneByte_proc TwoToOneByte_func; +WriteResults_proc WriteResults_func; +nextWord_proc nextWord_func; +nextLine_proc nextLine_func; +numLines_proc numLines_func; +getVRPanoOptions_proc getVRPanoOptions_func; +showScript_proc showScript_func; +makePathToHost_proc makePathToHost_func; +readPSDMultiLayerImage_proc readPSDMultiLayerImage_func; +writeImage_proc writeImage_func; +writeJPEG_proc writeJPEG_func; +makeTempPath_proc makeTempPath_func; +readPositions_proc readPositions_func; +readImage_proc readImage_func; +writePNG_proc writePNG_func; +readAdjustLine_proc readAdjustLine_func; +pano_sphere_tp_proc pano_sphere_tp_func; +execute_stack_proc execute_stack_func; +normalToTriangle_proc normalToTriangle_func; +ReduceTriangles_proc ReduceTriangles_func; +TriangulatePoints_proc TriangulatePoints_func; +fwiener_proc fwiener_func; +noisefilter_proc noisefilter_func; +doCoordinateTransform_proc doCoordinateTransform_func; +fcnPano_proc fcnPano_func; +distSquared_proc distSquared_func; +OverlapRMS_proc OverlapRMS_func; +RunBROptimizer_proc RunBROptimizer_func; +RunLMOptimizer_proc RunLMOptimizer_func; +DisposeMultiLayerImage_proc DisposeMultiLayerImage_func; +SetDestImage_proc SetDestImage_func; +DoColorCorrection_proc DoColorCorrection_func; +SetInvMakeParams_proc SetInvMakeParams_func; +SetMakeParams_proc SetMakeParams_func; +InterpolateImageFile_proc InterpolateImageFile_func; +blendImages_proc blendImages_func; +MorphImageFile_proc MorphImageFile_func; +PositionCmp_proc PositionCmp_func; +cutTheFrame_proc cutTheFrame_func; +SetUpGamma_proc SetUpGamma_func; +ThreeToFourBPP_proc ThreeToFourBPP_func; +HaveEqualSize_proc HaveEqualSize_func; +merge_proc merge_func; +addAlpha_proc addAlpha_func; +FindFile_proc FindFile_func; +readPSD_proc readPSD_func; +SaveBufImage_proc SaveBufImage_func; +LoadBufImage_proc LoadBufImage_func; +writePrefs_proc writePrefs_func; +CheckParams_proc CheckParams_func; + +void display(const char *fmt, ...) +{ + static char LastBuf[BUFFERSIZE]; + static int nCount = 0; + bool bPrint = true; + + char buf[BUFFERSIZE]; + va_list ap; + FILE *fp; + + fopen_s(&fp, "c:\\PT_Trace.txt", "a+"); + + va_start(ap, fmt); + vsprintf_s(buf, BUFFERSIZE, fmt, ap); + strcat_s(buf, BUFFERSIZE, "\n"); + + if( 0 == strcmp(LastBuf, buf) ) + { + nCount++; + } + else + { + if( nCount == TRACECOUNTLIMIT+1 ) + { + fwrite(LastBuf, 1, strlen(LastBuf), fp); + } + else if( nCount > TRACECOUNTLIMIT ) + { + char buf2[BUFFERSIZE]; + + sprintf_s(buf2, BUFFERSIZE, "(last message repeated %d more times, but not printed.)\n", nCount - TRACECOUNTLIMIT); + fwrite(buf2, 1, strlen(buf2), fp); + } + nCount = 1; + } + + if(nCount <= TRACECOUNTLIMIT) + { + fwrite(buf, 1, strlen(buf), fp); + + if(nCount == 1) + { + strcpy_s(LastBuf, BUFFERSIZE, buf); + } + } + + fclose(fp); + + va_end(ap); +} + +void display_PTRect(char *msg, PTRect *selection) +{ + #if DETAILS + display("PTRect (%s):", msg); + display(" top: %d", selection->top); + display(" bottom: %d", selection->bottom); + display(" left: %d", selection->left); + display(" right: %d", selection->right); + #endif +} + +void display_cPrefs(char *msg, panoPrefs *prefs) +{ + #if DETAILS + display("cPrefs (%s):", msg); + + cPrefs *cP = &prefs->cP; + + display(" magic: %d", cP->magic); + display(" radial: %d", cP->radial); + if (cP->radial) + for (int i = 0; i < 3; i++) + display(" %g\t%g\t%g\t%g\t%g", + cP->radial_params[i][0], + cP->radial_params[i][1], + cP->radial_params[i][2], + cP->radial_params[i][3], + cP->radial_params[i][4]); + + display(" vertical: %d", cP->vertical); + if (cP->vertical) + display(" %g\t%g\t%g", + cP->vertical_params[0], + cP->vertical_params[1], + cP->vertical_params[2]); + + display(" horizontal: %d", cP->horizontal); + if (cP->horizontal) + display(" %g\t%g\t%g", + cP->horizontal_params[0], + cP->horizontal_params[1], + cP->horizontal_params[2]); + + display(" shear: %d", cP->shear); + display(" resize: %d", cP->resize); + display(" width: %d", cP->width); + display(" height: %d", cP->height); + + display(" luminance: %d", cP->luminance); + if (cP->luminance) + display(" %g\t%g\t%g", + cP->lum_params[0], + cP->lum_params[1], + cP->lum_params[2]); + + display(" correction_mode: %d", cP->correction_mode); + display(" cutFrame: %d", cP->cutFrame); + display(" fwidth: %d", cP->fwidth); + display(" fheight: %d", cP->fheight); + display(" frame: %d", cP->frame); + display(" fourier: %d", cP->fourier); + #endif +} + +void display_Image(char *msg, Image *im) +{ + #if DETAILS + display("Image (%s):", msg); + display(" width: %d", im->width); + display(" height: %d", im->height); + display(" bytesPerLine: %d", im->bytesPerLine); + display(" bitsPerPixel: %d", im->bitsPerPixel); + display(" dataSize: %d", im->dataSize); + display(" dataformat: %d", im->dataformat); + display(" format: %d", im->format); + display(" hfov: %f", im->hfov); + display(" yaw: %f", im->yaw); + display(" pitch: %f", im->pitch); + display(" roll: %f", im->roll); + display(" data: %p", im->data); +// display_cPrefs("Image.cP", &im->cP); + display_PTRect("Image.selection", &im->selection); + #endif +} + +void display_stBuf(char *msg, stBuf *sB) +{ + #if DETAILS + + #endif +} + +char *mode(char *buf, int mode) +{ + *buf = 0; + if (mode > _wrapX || mode < 0) + { + strcat_s(buf, BUFFERSIZE, "invalid"); + return buf; + } + + switch(mode & 7) + { + CASE(_interactive); + CASE(_useprefs); + CASE(_setprefs); + CASE(_usedata); + } + + if (mode & _honor_valid) strcat_s(buf, BUFFERSIZE, " _honor_valid"); + if (mode & _show_progress) strcat_s(buf, BUFFERSIZE, " _show_progress"); + if (mode & _hostCanResize) strcat_s(buf, BUFFERSIZE, " _hostCanResize"); + if (mode & _destSupplied) strcat_s(buf, BUFFERSIZE, " _destSupplied"); + if (mode & _wrapX) strcat_s(buf, BUFFERSIZE, " _wrapX"); + return buf; +} + + +char *interpolator(char *buf, int interpolator) +{ + switch(interpolator) + { + CASE(_poly3); + CASE(_spline16); + CASE(_spline36); + CASE(_sinc256); + CASE(_spline64); + CASE(_bilinear); + CASE(_nn); + CASE(_sinc1024); + default: strcpy_s(buf, BUFFERSIZE, "invalid"); + } + return buf; +} + +char *tool(char *buf, int tool) +{ + switch(tool) + { + CASE(_perspective); + CASE(_correct); + CASE(_remap); + CASE(_adjust); + CASE(_interpolate); + CASE(_sizep); + CASE(_version); + CASE(_panright); + CASE(_panleft); + CASE(_panup); + CASE(_pandown); + CASE(_zoomin); + CASE(_zoomout); + CASE(_apply); + CASE(_getPano); + CASE(_increment); + default: strcpy_s(buf, BUFFERSIZE, "invalid"); + } + return buf; +} + +void display_TrformStr(char *msg, TrformStr *tr) +{ + #if DETAILS + char buf[BUFFERSIZE]; + display("TrformStr (%s):", msg); + display(" success: %d", tr->success); + display(" tool: %s", tool(buf, tr->tool)); + display(" mode: %s", mode(buf, tr->mode)); + display(" interpolator: %s", interpolator(buf, tr->interpolator)); + display(" gamma: %g", tr->gamma); + display(" data: %p", tr->data); + display_Image("Tr src", tr->src); + display_Image("Tr dest", tr->dest); + switch(tr->tool) + { + case _correct: + display_cPrefs("TR cprefs", (panoPrefs *)tr->data); + break; + case _adjust: + break; + } + #endif +} + +void display_size_Prefs(char *msg, size_Prefs *sprefs) +{ + #if DETAILS + char buf[BUFFERSIZE]; + display("size_Prefs (%s):", msg); + if (!sprefs) return; + display(" saveFile: %d", sprefs->saveFile); + display(" launchApp: %d", sprefs->launchApp); + display(" interpolator: %s", interpolator(buf, sprefs->interpolator)); + display(" gamma: %g", sprefs->gamma); + display(" noAlpha: %d", sprefs->noAlpha); + display(" optCreatePano %d", sprefs->optCreatePano); + #endif +} + +void display_prefs(char *msg, int tool, panoPrefs *prefs) +{ + #if DETAILS + display("prefs (%s):", msg); + switch(tool) + { + case _adjust: + display(" mode: %d", prefs->aP.mode); + display_Image("aP.image", &prefs->aP.im); + display_Image("aP.pano", &prefs->aP.pano); + break; + case _correct: + break; + } + #endif +} + + +EXPORT void ConvFileName(fullPath *fname, char *string) +{ + display(">> ConvFileName (%s)", string); + ConvFileName_func(fname, string); +} + + +EXPORT void CopyImageData(Image *dest, Image *src) +{ + display(">> CopyImageData"); + display_Image(" src", src); + display_Image(" dest", dest); + CopyImageData_func(dest, src); +} + +EXPORT void FourToThreeBPP(Image *im) +{ + display(">> FourToThreeBPP"); + display_Image(" before", im); + FourToThreeBPP_func(im); + display_Image(" after", im); +} + +EXPORT void PrintError(char* fmt, ...) +{ + char buf[BUFFERSIZE]; + va_list ap; + + va_start(ap, fmt); + vsprintf_s(buf, BUFFERSIZE, fmt, ap); + MessageBox(NULL, buf, "Info", MB_OK); + va_end(ap); +} + +EXPORT void SetAdjustDefaults(aPrefs *p) +{ + display(">> SetAdjustDefaults"); + SetAdjustDefaults_func(p); +} + +EXPORT void SetImageDefaults(Image *im) +{ + display(">> SetImageDefaults"); + SetImageDefaults_func(im); +} + +EXPORT void SetWindowOwner(HWND owner) +{ + display(">> SetWindowOwner"); + SetWindowOwner_func(owner); +} + +EXPORT int addLayerToFile(Image *im, fullPath* sfile, fullPath* dfile, stBuf *sB) +{ + display(">> addLayerToFile"); + display(" sfile=%d", sfile); + display(" dfile=%d", dfile); + display_Image("", im); + display_stBuf("", sB); + int rc = addLayerToFile_func(im, sfile, dfile, sB); + return rc; +} + +EXPORT void filter_main(TrformStr *TrPtr, struct size_Prefs *spref) +{ + display(">> filter_main"); + display_TrformStr("before filter_main", TrPtr); + display_size_Prefs("before filter_main", spref); + filter_main_func(TrPtr, spref); + display_TrformStr("after filter_main", TrPtr); + display_size_Prefs("after filter_main", spref); +} + +EXPORT void myfree(void **hdl) +{ + display(">> myfree (%p)", hdl); + myfree_func(hdl); +} + +EXPORT void** mymalloc(long numBytes) +{ + display(">> mymalloc (%d)", numBytes); + void **rc = mymalloc_func(numBytes); + return rc; +} + +EXPORT int readPrefs(char* p, int selector) +{ + char buf[BUFFERSIZE]; + display(">> readPrefs (%s)", tool(buf, selector)); + int rc = readPrefs_func(p, selector); + return rc; +} + +EXPORT int writePSD(Image *im, fullPath* fname) +{ + display(">> writePSD (%s)", fname->name); + display_Image(" ", im); + int rc = writePSD_func(im, fname); + return rc; +} + +EXPORT int writePSDwithLayer(Image *im, fullPath *fname) +{ + display(">> writePSDwithLayer (%s)", fname->name); + int rc = writePSDwithLayer_func(im, fname); + return rc; +} + +EXPORT int writeTIFF(Image *im, fullPath* fname) +{ + display(">> writeTIFF (%s)", fname->name); + int rc = writeTIFF_func(im, fname); + return rc; +} + +EXPORT void ARGBtoRGBA(UCHAR* buf, int width, int bitsPerPixel) +{ + display(">> ARGBtoRGBA"); + ARGBtoRGBA_func(buf, width, bitsPerPixel); +} + +EXPORT void RGBAtoARGB(UCHAR* buf, int width, int bitsPerPixel) +{ + display(">> RGBAtoARGB"); + RGBAtoARGB_func(buf, width, bitsPerPixel); +} + +EXPORT void CopyPosition(Image *to, Image *from) +{ + display(">> CopyPosition"); + #if DETAILS + display_Image(" to", to); + display_Image(" from", from); + #endif + CopyPosition_func(to, from); +} + +EXPORT int CropImage(Image *im, PTRect *r) +{ + display(">> CropImage"); + display_Image(" ", im); + int rc = CropImage_func(im, r); + return rc; +} + +EXPORT void DisposeAlignInfo(AlignInfo *g) +{ + display(">> DisposeAlignInfo"); + DisposeAlignInfo_func(g); +} + +EXPORT int GetFullPath(fullPath *path, char *filename) +{ + display(">> GetFullPath (%s)", filename); + int rc = GetFullPath_func(path, filename); + return rc; +} + +EXPORT int IsTextFile(char* fname) +{ + display(">> IsTextFile (%s)", fname); + int rc = IsTextFile_func(fname); + return rc; +} + +EXPORT char* LoadScript(fullPath* scriptFile) +{ + display(">> LoadScript (%s)", scriptFile->name); + char* rc = LoadScript_func(scriptFile); + return rc; +} + + +EXPORT int queryFeatureCount() +{ + display(">> queryFeatureCount"); + int rc = queryFeatureCount_func(); + return rc; +} + +EXPORT void queryFeatures(int index,char** name,Tp12FeatureType* type) +{ + display(">> queryFeatures"); + queryFeatures_func(index, name, type); +} + +EXPORT int queryFeatureInt(const char *name, int *result) +{ + display(">> queryFeatureInt"); + int rc = queryFeatureInt_func(name, result); + return rc; +} + +EXPORT int queryFeatureDouble(const char *name, double *result) +{ + display(">> queryFeatureDouble"); + int rc = queryFeatureDouble_func(name, result); + return rc; +} + +EXPORT int queryFeatureString(const char *name,char *result, const int bufsize) +{ + display(">> queryFeatureString"); + int rc = queryFeatureString_func(name, result, bufsize); + return rc; +} + +EXPORT void MyMakePano(TrformStr *TrPtr, aPrefs *aP, int imageNum) +{ + display(">> MyMakePano"); + MyMakePano_func(TrPtr, aP, imageNum); +} + +EXPORT void MakePano(TrformStr *TrPtr, aPrefs *aP) +{ + display(">> MakePano"); + MakePano_func(TrPtr , aP); +} + +EXPORT int ParseScript(char* script, AlignInfo *gl) +{ + display(">> ParseScript"); + int rc = ParseScript_func(script, gl); + return rc; +} + +EXPORT int Progress(int command, char* argument) +{ + display(">> Progress (%s)", argument); + int rc = Progress_func(command, argument); + return rc; +} + +EXPORT int infoDlg(int command, char* argument) +{ + display(">> infoDlg (%s)", argument); + int rc = infoDlg_func(command, argument); + return rc; +} + +EXPORT int SaveFileAs(fullPath *fname, char *prompt, char *name) +{ + display(">> SaveFileAs (%s)", name); + int rc = SaveFileAs_func(fname, prompt, name); + return rc; +} + +EXPORT void SetSizeDefaults(sPrefs *pref) +{ + display(">> SetSizeDefaults"); + SetSizeDefaults_func(pref); +} + +EXPORT int SetCorrectDefaults(cPrefs *p) +{ + display(">> SetCorrectDefaults"); + int rc = SetCorrectDefaults_func(p); + return rc; +} + +EXPORT void SetVRPanoOptionsDefaults(VRPanoOptions *v) +{ + display(">> SetVRPanoOptionsDefaults"); + SetVRPanoOptionsDefaults_func(v); +} + +EXPORT void SetOptDefaults(optVars *opt) +{ + display(">> SetOptDefaults"); + SetOptDefaults_func(opt); +} + +EXPORT void SettMatrixDefaults(tMatrix *t) +{ + display(">> SettMatrixDefaults"); + SettMatrixDefaults_func(t); +} + +EXPORT void SetStitchDefaults(stBuf *sbuf) +{ + display(">> SetStitchDefaults"); + SetStitchDefaults_func(sbuf); +} + +EXPORT int SetAlignParams(double *x) +{ + display(">> SetAlignParams"); + int rc = SetAlignParams_func(x); + return rc; +} + +EXPORT int SetLMParams(double *x) +{ + display(">> SetLMParams"); + int rc = SetLMParams_func(x); + return rc; +} + +EXPORT void SetGlobalPtr(AlignInfo *p) +{ + display(">> SetGlobalPtr"); + SetGlobalPtr_func(p); +} + +EXPORT int StringtoFullPath(fullPath *path, char *filename) +{ + display(">> StringtoFullPath (%s)", filename); + int rc = StringtoFullPath_func(path, filename); + return rc; +} + +EXPORT int readTIFF(Image *im, fullPath *sfile) +{ + display(">> readTIFF"); + int rc = readTIFF_func(im, sfile); + return rc; +} + +EXPORT int readtif(Image *im, TIFF* tif) +{ + display(">> readtif"); + int rc = readtif_func(im, tif); + return rc; +} + +EXPORT void TIFFClose(TIFF* t) +{ + display(">> TIFFClose"); + TIFFClose_func(t); +} + +EXPORT TIFF* TIFFOpen(const char* a, const char* b) +{ + display(">> TIFFOpen, (%s)(%s)", a, b); + TIFF* rc = TIFFOpen_func(a, b); + return rc; +} + +// Not sure if this one is done right +// from ... to va_list +EXPORT int TIFFGetField(TIFF* pT, ttag_t tt, va_list v) +{ + display(">> TIFFGetField"); + int rc = TIFFGetField_func(pT, tt, v); + return rc; +} + +EXPORT int TIFFSetField(TIFF* pT, ttag_t tt, va_list v) +{ + display(">> TIFFSetField"); + int rc = TIFFSetField_func(pT, tt, v); + return rc; +} + +EXPORT int TIFFReadDirectory(TIFF* pT) +{ + display(">> TIFFReadDirectory"); + int rc = TIFFReadDirectory_func(pT); + return rc; +} + +EXPORT int TIFFSetDirectory(TIFF* pT, tdir_t td) +{ + display(">> TIFFSetDirectory"); + int rc = TIFFSetDirectory_func(pT, td); + return rc; +} + +EXPORT int TIFFReadScanline(TIFF* pT, tdata_t td, unsigned int un, tsample_t ts) +{ + display(">> TIFFReadScanline"); + int rc = TIFFReadScanline_func(pT, td, un, ts); + return rc; +} + +EXPORT int TIFFWriteDirectory(TIFF * pT) +{ + display(">> TIFFWriteDirectory"); + int rc = TIFFWriteDirectory_func(pT); + return rc; +} + +EXPORT int TIFFWriteScanline(TIFF* pT, tdata_t td, unsigned int un, tsample_t ts) +{ + display(">> TIFFWriteScanline"); + int rc = TIFFWriteScanline_func(pT, td, un, ts); + return rc; +} + +EXPORT tsize_t TIFFScanlineSize(TIFF* pT) +{ + tsize_t rc = TIFFScanlineSize_func(pT); + display(">> %d = TIFFScanlineSize", rc); + return rc; +} + +EXPORT void TwoToOneByte(Image *im) +{ + display(">> TwoToOneByte"); + TwoToOneByte_func(im); +} + +EXPORT void WriteResults(char* script, fullPath *sfile, AlignInfo *g, double ds( int i) , int launch) +{ + display(">> WriteResults"); + WriteResults_func(script, sfile, g, ds,launch); +} + +EXPORT void nextWord(register char* word, char** ch ) +{ + display(">> nextWord"); + nextWord_func(word, ch ); +} + +EXPORT void nextLine(register char* line, char** ch) +{ + display(">> nextLine"); + nextLine_func(line, ch); +} + +EXPORT int numLines(char* script, char first) +{ + display(">> numLines"); + int rc = numLines_func(script, first); + return rc; +} + +EXPORT int getVRPanoOptions(VRPanoOptions *v, char *line) +{ + display(">> getVRPanoOptions"); + int rc = getVRPanoOptions_func(v, line); + return rc; +} + +EXPORT void showScript(fullPath* scriptFile) +{ + display(">> showScript"); + showScript_func(scriptFile); +} + +EXPORT int makePathToHost(fullPath *path) +{ + display(">> makePathToHost"); + int rc = makePathToHost_func(path); + return rc; +} + +EXPORT int readPSDMultiLayerImage(MultiLayerImage *mim, fullPath* sfile) +{ + display(">> readPSDMultiLayerImage"); + int rc = readPSDMultiLayerImage_func(mim, sfile); + return rc; +} + +EXPORT int writeImage(Image *im, fullPath *sfile) +{ + display(">> writeImage"); + int rc = writeImage_func(im, sfile); + return rc; +} + +EXPORT int writeJPEG(Image *im, fullPath *sfile, int quality, int progressive) +{ + display(">> writeJPEG"); + int rc = writeJPEG_func(im, sfile, quality, progressive); + return rc; +} + +EXPORT int makeTempPath(fullPath *path) +{ + fullPath fp; + memcpy( &fp, path, sizeof(fullPath) ); + int rc = makeTempPath_func(path); + display(">> makeTempPath (%s) to (%s)",&fp, path); + return rc; +} + +EXPORT int readPositions(char* script, transformCoord *tP) +{ + display(">> readPositions"); + int rc = readPositions_func(script, tP); + return rc; +} + +EXPORT int readImage(Image *im, fullPath *sfile) +{ + display(">> readImage (%s)", sfile); + int rc = readImage_func(im, sfile); + return rc; +} + +EXPORT int writePNG(Image *im, fullPath *sfile) +{ + display(">> writePNG"); + int rc = writePNG_func(im, sfile); + return rc; +} + +EXPORT aPrefs* readAdjustLine(fullPath *theScript) +{ + display(">> readAdjustLine (%s)", theScript ); + aPrefs* rc = readAdjustLine_func(theScript); + return rc; +} + +EXPORT void pano_sphere_tp(double x_dest,double y_dest, double* x_src, double* y_src, void* params) +{ + display(">> pano_sphere_tp"); + pano_sphere_tp_func(x_dest, y_dest, x_src, y_src, params); + return; +} + +EXPORT void execute_stack(double x_dest,double y_dest, double* x_src, double* y_src, void* params) +{ + display(">> execute_stack"); + execute_stack_func(x_dest, y_dest, x_src, y_src, params); + return; +} +EXPORT int normalToTriangle(CoordInfo *n, CoordInfo *v, triangle *t) +{ + display(">> normalToTriangle"); + int rc = normalToTriangle_func(n, v, t); + return rc; +} + +EXPORT int ReduceTriangles(AlignInfo *g, int nIm) +{ + display(">> ReduceTriangles"); + int rc = ReduceTriangles_func(g, nIm); + return rc; +} + +EXPORT int TriangulatePoints(AlignInfo *g, int nIm) +{ + display(">> TriangulatePoints"); + int rc = TriangulatePoints_func(g, nIm); + return rc; +} + +EXPORT void fwiener(TrformStr *TrPtr, Image *nf, Image *psf, double gamma, double frame) +{ + display(">> fwiener"); + fwiener_func(TrPtr, nf, psf, gamma, frame); + return; +} + +EXPORT void noisefilter(Image *dest, Image *src) +{ + display(">> noisefilter"); + noisefilter_func(dest, src); + return; +} + +EXPORT void doCoordinateTransform(CoordInfo *c, tMatrix *t) +{ + display(">> doCoordinateTransform"); + doCoordinateTransform_func(c, t); + return; +} + +EXPORT int fcnPano(int m, int n, double x[], double fvec[], int *iflag) +{ + display(">> fcnPano"); + int rc = fcnPano_func(m, n, x, fvec, iflag); + return rc; +} + +EXPORT double distSquared(int num) +{ + display(">> distSquared"); + double rc = distSquared_func(num); + return rc; +} + +EXPORT double OverlapRMS(MultiLayerImage *mim) +{ + display(">> OverlapRMS"); + double rc = OverlapRMS_func(mim); + return rc; +} + +EXPORT void RunBROptimizer(OptInfo *g, double minStepWidth) +{ + display(">> RunBROptimizer"); + RunBROptimizer_func(g, minStepWidth); + return; +} + +EXPORT void RunLMOptimizer(OptInfo *g) +{ + display(">> RunLMOptimizer"); + RunLMOptimizer_func(g); + return; +} + +EXPORT void DisposeMultiLayerImage(MultiLayerImage *mim) +{ + display(">> DisposeMultiLayerImage"); + DisposeMultiLayerImage_func(mim); + return; +} + +EXPORT int SetDestImage(TrformStr *TrPtr, int width, int height) +{ + display(">> SetDestImage"); + int rc = SetDestImage_func(TrPtr, width, height); + return rc; +} + +EXPORT void DoColorCorrection(Image *im1, Image *im2, int mode) +{ + display(">> DoColorCorrection"); + DoColorCorrection_func(im1, im2, mode); + return; +} + +EXPORT void SetInvMakeParams(struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color) +{ + display(">> SetInvMakeParams"); + SetInvMakeParams_func(stack, mp, im , pn, color); + return; +} + +EXPORT void SetMakeParams(struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color) +{ + display(">> SetMakeParams"); + SetMakeParams_func(stack, mp, im , pn, color); + return; +} + +EXPORT int InterpolateImageFile(fullPath *sfile, fullPath *dfile, AlignInfo *g,int nIm) +{ + display(">> InterpolateImageFile"); + int rc = InterpolateImageFile_func(sfile, dfile, g, nIm); + return rc; +} + +EXPORT int blendImages(fullPath *f0, fullPath *f1, fullPath *result, double s) +{ + display(">> blendImages"); + int rc = blendImages_func(f0, f1, result, s); + return rc; +} + +EXPORT int MorphImageFile(fullPath *sfile, fullPath *dfile, AlignInfo *g,int nIm) +{ + display(">> MorphImageFile"); + int rc = MorphImageFile_func(sfile, dfile, g, nIm); + return rc; +} + +EXPORT int PositionCmp(Image *im1, Image *im2) +{ + display(">> PositionCmp"); + int rc = PositionCmp_func(im1, im2); + return rc; +} + +EXPORT int cutTheFrame(Image *dest, Image *src, int width, int height, int showprogress) +{ + display(">> cutTheFrame"); + int rc = cutTheFrame_func(dest, src, width, height, showprogress); + return rc; +} + +EXPORT int SetUpGamma(double pgamma, unsigned int psize) +{ + display(">> SetUpGamma"); + int rc = SetUpGamma_func(pgamma, psize); + return rc; +} + +EXPORT void ThreeToFourBPP(Image *im) +{ + display(">> ThreeToFourBPP"); + ThreeToFourBPP_func(im); + return; +} + +EXPORT int HaveEqualSize(Image *im1, Image *im2) +{ + display(">> HaveEqualSize"); + int rc = HaveEqualSize_func(im1, im2); + return rc; +} + +EXPORT int merge(Image *dst, Image *src, int feather, int showprogress, int seam) +{ + display(">> merge"); + int rc = merge_func(dst, src, feather, showprogress, seam); + return rc; +} + +EXPORT void addAlpha(Image *im) +{ + display(">> addAlpha"); + addAlpha_func(im); + return; +} + +EXPORT int FindFile(fullPath *fname) +{ + display(">> FindFile"); + int rc = FindFile_func(fname); + return rc; +} + +EXPORT int readPSD(Image *im, fullPath* fname, int mode) +{ + display(">> readPSD"); + int rc = readPSD_func(im, fname, mode); + return rc; +} + +EXPORT int SaveBufImage(Image *image, char *fname) +{ + display(">> SaveBufImage"); + int rc = SaveBufImage_func(image, fname); + return rc; +} + +EXPORT int LoadBufImage(Image *image, char *fname, int mode) +{ + display(">> LoadBufImage"); + int rc = LoadBufImage_func(image, fname, mode); + return rc; +} + +EXPORT void writePrefs(char* p, int selector) +{ + display(">> writePrefs"); + writePrefs_func(p, selector); + return; +} + +EXPORT int CheckParams(AlignInfo *g) +{ + display(">> CheckParams"); + int rc = CheckParams_func(g); + return rc; +} +dllEntry getAddr(HINSTANCE hinstLib, char *func) +{ + dllEntry addr = (dllEntry) GetProcAddress(hinstLib, func); + if (addr == NULL) + { + FreeLibrary(hinstLib); + display("Pano12Org.dll is invalid missign function, (%s).", func); + } + return addr; +} + +int WINAPI DllMain (HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved) +{ + static HINSTANCE hinstLib; + + if (fdwReason == DLL_PROCESS_ATTACH) + { + // Get a handle to the DLL module. + hinstLib = LoadLibrary("pano12Org.dll"); + if (hinstLib == NULL) + { + display("Missing C:\\WINDOWS\\system\\pano12Org.dll"); + return FALSE; + } + DWORD CallingProdID = GetCurrentThreadId(); + display("** Aplication ID[%d] calling pano12.dll **", CallingProdID); + + // initialize all function pointers + SETFUNC(ConvFileName); + SETFUNC(CopyImageData); + SETFUNC(FourToThreeBPP); + SETFUNC(PrintError); + SETFUNC(SetAdjustDefaults); + SETFUNC(SetImageDefaults); + SETFUNC(SetWindowOwner); + SETFUNC(addLayerToFile); + SETFUNC(filter_main); + SETFUNC(myfree); + SETFUNC(mymalloc); + SETFUNC(readPrefs); + SETFUNC(writePSD); + SETFUNC(writePSDwithLayer); + SETFUNC(writeTIFF); + SETFUNC(ARGBtoRGBA); + SETFUNC(RGBAtoARGB); + SETFUNC(CopyPosition); + SETFUNC(CropImage); + SETFUNC(DisposeAlignInfo); + SETFUNC(GetFullPath); + SETFUNC(IsTextFile); + SETFUNC(LoadScript); + SETFUNC(queryFeatureCount); + SETFUNC(queryFeatures); + SETFUNC(queryFeatureInt); + SETFUNC(queryFeatureDouble); + SETFUNC(queryFeatureString); + SETFUNC(MakePano); + SETFUNC(MyMakePano); + SETFUNC(ParseScript); + SETFUNC(Progress); + SETFUNC(infoDlg); + SETFUNC(SaveFileAs); + SETFUNC(SetSizeDefaults); + SETFUNC(SetCorrectDefaults); + SETFUNC(SetVRPanoOptionsDefaults); + SETFUNC(SetOptDefaults); + SETFUNC(SettMatrixDefaults); + SETFUNC(SetStitchDefaults); + SETFUNC(SetAlignParams); + SETFUNC(SetLMParams); + SETFUNC(SetGlobalPtr); + SETFUNC(StringtoFullPath); + SETFUNC(readTIFF); + SETFUNC(readtif); + SETFUNC(TIFFClose); + SETFUNC(TIFFOpen); + SETFUNC(TIFFGetField); + SETFUNC(TIFFSetField); + SETFUNC(TIFFReadDirectory); + SETFUNC(TIFFSetDirectory); + SETFUNC(TIFFReadScanline); + SETFUNC(TIFFWriteDirectory); + SETFUNC(TIFFWriteScanline); + SETFUNC(TIFFScanlineSize); + SETFUNC(TwoToOneByte); + SETFUNC(WriteResults); + SETFUNC(nextWord); + SETFUNC(nextLine); + SETFUNC(numLines); + SETFUNC(getVRPanoOptions); + SETFUNC(showScript); + SETFUNC(makePathToHost); + SETFUNC(readPSDMultiLayerImage); + SETFUNC(writeImage); + SETFUNC(writeJPEG); + SETFUNC(makeTempPath); + SETFUNC(readPositions); + SETFUNC(readImage); + SETFUNC(writePNG); + SETFUNC(readAdjustLine); + SETFUNC(pano_sphere_tp); + SETFUNC(execute_stack); + SETFUNC(normalToTriangle); + SETFUNC(ReduceTriangles); + SETFUNC(TriangulatePoints); + SETFUNC(fwiener); + SETFUNC(noisefilter); + SETFUNC(doCoordinateTransform); + SETFUNC(fcnPano); + SETFUNC(distSquared); + SETFUNC(OverlapRMS); + SETFUNC(RunBROptimizer); + SETFUNC(RunLMOptimizer); + SETFUNC(DisposeMultiLayerImage); + SETFUNC(SetDestImage); + SETFUNC(DoColorCorrection); + SETFUNC(SetInvMakeParams); + SETFUNC(SetMakeParams); + SETFUNC(InterpolateImageFile); + SETFUNC(blendImages); + SETFUNC(MorphImageFile); + SETFUNC(PositionCmp); + SETFUNC(cutTheFrame); + SETFUNC(SetUpGamma); + SETFUNC(ThreeToFourBPP); + SETFUNC(HaveEqualSize); + SETFUNC(merge); + SETFUNC(addAlpha); + SETFUNC(FindFile); + SETFUNC(readPSD); + SETFUNC(SaveBufImage); + SETFUNC(LoadBufImage); + SETFUNC(writePrefs); + SETFUNC(CheckParams); + } else if (fdwReason == DLL_PROCESS_DETACH) + { + FreeLibrary(hinstLib); + } + + return TRUE; +} Copied: branches/pano12/PTTrace/PTTrace12.def (from rev 662, branches/pano12/libpano/tools/PTTrace12.def) =================================================================== --- branches/pano12/PTTrace/PTTrace12.def (rev 0) +++ branches/pano12/PTTrace/PTTrace12.def 2007-02-03 05:40:18 UTC (rev 663) @@ -0,0 +1,168 @@ +;------------------------------------------------------------ + +LIBRARY pano12 + +;DESCRIPTION 'Panorama Tools' + + + +EXPORTS + filter_main @1 + mymalloc @2 + myfree @3 + readPrefs @4 + writePrefs @5 + writeTIFF @6 + PrintError @7 +; DispPrg = DispPrg@16 @8 +; SetCPrefs = SetCPrefs@16 @9 + SetWindowOwner @10 +; SetLumOpt = SetLumOpt@16 @11 +; DLLInit = DLLInit@12 @12 +; SetRadOpt = SetRadOpt@16 @13 +; SetHorOpt = SetHorOpt@16 @15 +; SetVerOpt = SetVerOpt@16 @16 +; SetScOpt = SetScOpt@16 @17 +; SetShOpt = SetShOpt@16 @18 +; SetCrOpt = SetCrOpt@16 @19 +; SetAdPrefs = SetAdPrefs@16 @20 +; SetPerspPrefs = SetPerspPrefs@16 @21 +; SetRem = SetRem@16 @22 +; SetSiz = SetSiz@16 @23 +; SetIntp = SetIntp@16 @24 + CopyImageData @25 +; InfoPrg = InfoPrg@16 @26 +; SetCutOpt = SetCutOpt@16 @27 +; SetPanOpt = SetPanOpt@16 @28 +; SetFrPrefs = SetFrPrefs@16 @29 + writePSD @30 + addLayerToFile @31 + writePSDwithLayer @32 + ConvFileName @33 + FourToThreeBPP @34 + SetAdjustDefaults @35 + SetSizeDefaults @36 + SetImageDefaults @37 + SetCorrectDefaults @38 + SetVRPanoOptionsDefaults @39 + getVRPanoOptions @40 + nextWord @41 + nextLine @42 + LoadScript @43 + ParseScript @44 + infoDlg @45 + WriteResults @46 + readPSDMultiLayerImage @47 + DisposeMultiLayerImage @48 + CopyPosition @49 + PositionCmp @50 + SetOptDefaults @51 + SetUpGamma @52 + OverlapRMS @53 + ThreeToFourBPP @54 + GetFullPath @55 + makePathToHost @56 + SaveFileAs @57 + fcnPano @58 + distSquared @59 + SetInvMakeParams @60 + execute_stack @61 + SettMatrixDefaults @62 + doCoordinateTransform @63 + readPositions @64 + RunBROptimizer @65 + RunLMOptimizer @66 + SetLMParams @67 + SetAlignParams @68 + SetGlobalPtr @69 + FindFile @70 + DisposeAlignInfo @71 + showScript @72 + readImage @73 + writeImage @74 + writeJPEG @75 + makeTempPath @76 + MorphImageFile @77 + blendImages @78 + InterpolateImageFile @79 + readPSD @80 + TriangulatePoints @81 + ReduceTriangles @82 + SetStitchDefaults @83 + pano_sphere_tp @84 + normalToTriangle @85 + SetMakeParams @86 + fwiener @87 + noisefilter @88 +; Java_ptutils_CLoadImage = Java_ptutils_CLoadImage@12 @89 +; Java_ptutils_CGetImageRow = Java_ptutils_CGetImageRow@16 @90 +; Java_ptutils_CGetImageWidth = Java_ptutils_CGetImageWidth@12 @91 +; Java_ptutils_CGetImageHeight = Java_ptutils_CGetImageHeight@12 @92 +; Java_ptutils_CLoadProject = Java_ptutils_CLoadProject@12 @93 +; Java_ptutils_CGetImageCount = Java_ptutils_CGetImageCount@8 @94 +; Java_ptutils_CGetImageName = Java_ptutils_CGetImageName@12 @95 +; Java_ptutils_CGetControlPointCount = Java_ptutils_CGetControlPointCount@8 @96 +; Java_ptutils_CGetCP_1n = Java_ptutils_CGetCP_1n@16 @97 +; Java_ptutils_CGetCP_1x = Java_ptutils_CGetCP_1x@16 @98 +; Java_ptutils_CGetCP_1y = Java_ptutils_CGetCP_1y@16 @99 +; Java_ptutils_CGetCP_1t = Java_ptutils_CGetCP_1t@12 @100 +; Java_ptutils_CGetTriangleCount = Java_ptutils_CGetTriangleCount@8 @101 +; Java_ptutils_CGetTR_1v = Java_ptutils_CGetTR_1v@16 @102 +; Java_ptutils_CGetTR_1i = Java_ptutils_CGetTR_1i@12 @103 +; Java_ptutils_CSaveProject = Java_ptutils_CSaveProject@12 @104 +; Java_ptutils_CSetImageName = Java_ptutils_CSetImageName@16 @105 +; Java_ptutils_CSetControlPointCount = Java_ptutils_CSetControlPointCount@12 @106 +; Java_ptutils_CSetCP = Java_ptutils_CSetCP@56 @107 +; Java_ptutils_CSetTriangleCount = Java_ptutils_CSetTriangleCount@12 @108 +; Java_ptutils_CSetTR = Java_ptutils_CSetTR@28 @109 +; Java_ptutils_CGetIndex = Java_ptutils_CGetIndex@12 @110 +; Java_ptutils_CCreateProject = Java_ptutils_CCreateProject@36 @111 +; Java_ptutils_CTriangulate = Java_ptutils_CTriangulate@12 @112 +; Java_ptutils_CReduce = Java_ptutils_CReduce@12 @113 +; Java_ptutils_CCallOptimizer = Java_ptutils_CCallOptimizer@8 @114 +; Java_ptutils_CShowScript = Java_ptutils_CShowScript@8 @115 +; Java_ptutils_CLaunchAndSendScript = Java_ptutils_CLaunchAndSendScript@16 @116 + IsTextFile @117 + StringtoFullPath @118 +; Java_ptutils_CAlignPoint = Java_ptutils_CAlignPoint@20 @119 +; Java_pteditor_CLoadImage = Java_pteditor_CLoadImage@12 @120 +; Java_pteditor_CSaveImage = Java_pteditor_CSaveImage@12 @121 +; Java_pteditor_CGetImageWidth = Java_pteditor_CGetImageWidth@8 @122 +; Java_pteditor_CGetImageHeight = Java_pteditor_CGetImageHeight@8 @123 +; Java_pteditor_CGetImageRow = Java_pteditor_CGetImageRow@16 @124 +; Java_pteditor_CExtract = Java_pteditor_CExtract@56 @125 +; Java_pteditor_CInsert = Java_pteditor_CInsert@48 @126 + Progress @127 + readAdjustLine @134 + MakePano @135 + addAlpha @136 + writePNG @137 + readtif @138 + ARGBtoRGBA @144 + RGBAtoARGB @145 + readTIFF @146 + CheckParams @147 +; Java_ptutils_CGetImageFormat = Java_ptutils_CGetImageFormat@12 @148 +; Java_ptutils_CGetHfov = Java_ptutils_CGetHfov@12 @149 +; Java_ptutils_CGetYaw = Java_ptutils_CGetYaw@12 @150 +; Java_ptutils_CGetPitch = Java_ptutils_CGetPitch@12 @151 +; Java_ptutils_CGetRoll = Java_ptutils_CGetRoll@12 @152 +; Java_pteditor_CSetImageWidth = Java_pteditor_CSetImageWidth@12 @153 +; Java_pteditor_CSetImageHeight = Java_pteditor_CSetImageHeight@12 @154 +; Java_pteditor_CSetImageRow = Java_pteditor_CSetImageRow@16 @155 + TwoToOneByte @156 + CropImage @157 + numLines @158 + DoColorCorrection @159 + cutTheFrame @160 + LoadBufImage @161 + SetDestImage @162 + HaveEqualSize @163 + merge @164 + SaveBufImage @165 + MyMakePano @166 + queryFeatureCount @167 + queryFeatures @168 + queryFeatureInt @169 + queryFeatureDouble @170 + queryFeatureString @171 Copied: branches/pano12/PTTrace/PTTrace12.dsp (from rev 662, branches/pano12/libpano/tools/PTTrace12.dsp) =================================================================== --- branches/pano12/PTTrace/PTTrace12.dsp (rev 0) +++ branches/pano12/PTTrace/PTTrace12.dsp 2007-02-03 05:40:18 UTC (rev 663) @@ -0,0 +1,110 @@ +# Microsoft Developer Studio Project File - Name="PTTrace12" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=PTTrace12 - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "PTTrace12.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "PTTrace12.mak" CFG="PTTrace12 - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "PTTrace12 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "PTTrace12 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "PTTrace12 - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PTTrace12_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PTTrace12_EXPORTS" /FR /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"c:\windows\system32\pano12.dll" + +!ELSEIF "$(CFG)" == "PTTrace12 - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PTTrace12_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PTTrace12_EXPORTS" /FR /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "PTTrace12 - Win32 Release" +# Name "PTTrace12 - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\PTTrace12.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\PTTrace12.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Copied: branches/pano12/PTTrace/PTTrace12.h (from rev 662, branches/pano12/libpano/tools/PTTrace12.h) =================================================================== --- branches/pano12/PTTrace/PTTrace12.h (rev 0) +++ branches/pano12/PTTrace/PTTrace12.h 2007-02-03 05:40:18 UTC (rev 663) @@ -0,0 +1,603 @@ +/* Panorama_Tools - Generate, Edit and Convert Panoramic Images + Copyright (C) 1998,1999 - Helmut Dersch de...@fh... + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +/*------------------------------------------------------------*/ + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + This file is a copy of filter.h and panorama.h from Panorama Tools + with everything removed that is not neccessary for the tracing functions + to work or would break the tracing dll. + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + +#ifndef PTFILTER_H +#define PTFILTER_H + + +#include <math.h> +#include <stdio.h> +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <limits.h> + +#include "..\libpano\panotypes.h" + +// MRDL: Replaced BIGENDIAN with PT_BIGENDIAN to eliminate conflict with +// BIGENDIAN defined in winsock2.h distributed with MingW 2.0 + +// Determine which machine we are using. Macs are set to PT_BIGENDIAN, all others not + +// If you need PT_BIGENDIAN, and don't use MacOS, define it here: +//#define PT_BIGENDIAN 1 + + +// Create a definition if we're on a Windows machine: +#ifndef __Win__ + #if (defined(MSDOS) || defined(WIN32)) + #define __Win__ 1 + #endif +#endif + + +// Create a definition if we're on a Macintosh: +#ifndef __Mac__ + #if (defined(macintosh) || defined(__MC68K__) || defined(__powerc)) + #define __Mac__ 1 + #define PT_BIGENDIAN 1 + #endif +#endif + + + +// Use FSSpec on Macs as Path-specifyers, else strings +#define PATH_SEP '/' + +#ifdef __Mac__ + //#include <Files.h> // commented by Kekus Digital + #include <Carbon/Carbon.h> // added by Kekus Digital + #define fullPath FSSpec + #undef PATH_SEP + #define PATH_SEP ':' + +#else // __Mac__, use ANSI-filefunctions + + #ifdef __Win__ + #ifndef __NO_SYSTEM__ + #include <windows.h> // including this causes problems with libjpeg + #endif + #define MAX_PATH_LENGTH 260 + // was MAX_PATH + #undef PATH_SEP + #define PATH_SEP '\\' + #else + #define MAX_PATH_LENGTH 512 + #endif + + typedef struct{char name[MAX_PATH_LENGTH];} fullPath; + +#endif + + +// Enumerates for TrFormStr.tool +enum{ // Panorama Tools + _perspective, + _correct, + _remap, + _adjust, + _interpolate, + _sizep, // dummy for size-preferences + _version, // dummy for version + _panright, // Pan Controls + _panleft, + _panup, + _pandown, + _zoomin, + _zoomout, + _apply, + _getPano, + _increment +}; + + +// Enumerates for TrFormStr.mode +enum{ // Modes + _interactive, // display dialogs and do Xform + _useprefs, // load saved prefs and do Xform/ no dialogs + _setprefs, // display dialogs and set preferences, no Xform + _usedata, // use supplied data in TrFormStr.data, do Xform + _honor_valid = 8, // Use only pixels with alpha channel set + _show_progress = 16, // Interpolator displays progress bar + _hostCanResize = 32, // o-no; 1-yes (Photoshop: no; GraphicConverter: yes) + _destSupplied = 64, // Destination image allocated by plug-in host + _wrapX = 128 // Wrap image horizontally (if HFOV==360 degrees) +}; + + +// Enumerates for Image.dataformat +enum{ + _RGB, + _Lab, + _Grey +}; + +// Enumerates for TrFormStr.interpolator +enum{ ... [truncated message content] |
From: <jim...@us...> - 2007-02-06 02:00:48
|
Revision: 666 http://svn.sourceforge.net/panotools/?rev=666&view=rev Author: jim0watters Date: 2007-02-05 18:00:45 -0800 (Mon, 05 Feb 2007) Log Message: ----------- Updated Windows version of Pano12Info that displays a dialog box with data. Added Paths: ----------- branches/pano12/PTInfo/ branches/pano12/PTInfo/Pano12Info.rc branches/pano12/PTInfo/Pano12Info.sln branches/pano12/PTInfo/Pano12InfoResource.h branches/pano12/PTInfo/PanoInfo.vcproj branches/pano12/PTInfo/pano12info.c Added: branches/pano12/PTInfo/Pano12Info.rc =================================================================== --- branches/pano12/PTInfo/Pano12Info.rc (rev 0) +++ branches/pano12/PTInfo/Pano12Info.rc 2007-02-06 02:00:45 UTC (rev 666) @@ -0,0 +1,160 @@ +// Microsoft Visual C++ generated resource script. +// +#include "Pano12InfoResource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +//VS2005Express Version +//#include "MFC\winres.h" +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "Pano12InfoResource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "//VS2005Express Version\r\n" + "//#include ""MFC\\winres.h""\r\n" + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_PANINFO DIALOGEX 0, 0, 371, 241 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "PanoTools Info" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "File Version:",IDC_STATIC,7,9,57,8,0,WS_EX_RIGHT + EDITTEXT IDC_FILEVER,70,7,70,14,ES_AUTOHSCROLL | ES_READONLY | + NOT WS_TABSTOP + LTEXT "Comment:",IDC_STATIC,7,25,57,8,0,WS_EX_RIGHT + EDITTEXT IDC_COMMENT,70,23,294,14,ES_AUTOHSCROLL | ES_READONLY | + NOT WS_TABSTOP + LTEXT "Copyright:",IDC_STATIC,7,41,57,8,0,WS_EX_RIGHT + EDITTEXT IDC_COPYRIGHT,70,39,294,14,ES_AUTOHSCROLL | ES_READONLY | + NOT WS_TABSTOP + LTEXT "Optimizer Error:",IDC_STATIC,7,57,57,8,0,WS_EX_RIGHT + EDITTEXT IDC_OPTIMIZERERROR,71,55,70,14,ES_AUTOHSCROLL | + ES_READONLY | NOT WS_TABSTOP + LTEXT "Field of View Limit:",IDC_STATIC,152,56,93,8,0, + WS_EX_RIGHT + EDITTEXT IDC_FIELDOFVIEWLIMIT,252,54,47,14,ES_AUTOHSCROLL | + ES_READONLY | NOT WS_TABSTOP + LTEXT "\xB0",IDC_STATIC,302,56,8,8 + LTEXT "Feature List:",IDC_STATIC,7,77,57,8 + EDITTEXT IDC_EDIT,7,88,357,146,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL | + NOT WS_TABSTOP,WS_EX_CLIENTEDGE +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_PANINFO, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 364 + TOPMARGIN, 7 + BOTTOMMARGIN, 234 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,2,0 + PRODUCTVERSION 1,0,2,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "Display features of the pano12.dll" + VALUE "CompanyName", "Panorama Tools" + VALUE "FileDescription", "Pano12 Information" + VALUE "FileVersion", "1, 0, 2, 0" + VALUE "InternalName", "PanoInfo" + VALUE "LegalCopyright", "Copyright (C) 2007" + VALUE "OriginalFilename", "Pano12Info.exe" + VALUE "ProductName", " Pano12 Application" + VALUE "ProductVersion", "1, 0, 2, 0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: branches/pano12/PTInfo/Pano12Info.sln =================================================================== --- branches/pano12/PTInfo/Pano12Info.sln (rev 0) +++ branches/pano12/PTInfo/Pano12Info.sln 2007-02-06 02:00:45 UTC (rev 666) @@ -0,0 +1,23 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pano12 Info", "PanoInfo.vcproj", "{611A30E5-3D17-403B-A715-4739C7EE59F1}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {611A30E5-3D17-403B-A715-4739C7EE59F1}.Debug.ActiveCfg = Debug|Win32 + {611A30E5-3D17-403B-A715-4739C7EE59F1}.Debug.Build.0 = Debug|Win32 + {611A30E5-3D17-403B-A715-4739C7EE59F1}.Release.ActiveCfg = Release|Win32 + {611A30E5-3D17-403B-A715-4739C7EE59F1}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Added: branches/pano12/PTInfo/Pano12InfoResource.h =================================================================== --- branches/pano12/PTInfo/Pano12InfoResource.h (rev 0) +++ branches/pano12/PTInfo/Pano12InfoResource.h 2007-02-06 02:00:45 UTC (rev 666) @@ -0,0 +1,23 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Pano12Info.rc +// +#define IDD_PANINFO 101 +#define IDC_EDIT 1001 +#define IDC_FILEVER 1003 +#define IDC_COMMENT 1004 +#define IDC_COPYRIGHT 1005 +#define IDC_OPTIMIZERERROR 1006 +#define IDC_OPTIMIZERERROR2 1007 +#define IDC_FIELDOFVIEWLIMIT 1007 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1004 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif Added: branches/pano12/PTInfo/PanoInfo.vcproj =================================================================== --- branches/pano12/PTInfo/PanoInfo.vcproj (rev 0) +++ branches/pano12/PTInfo/PanoInfo.vcproj 2007-02-06 02:00:45 UTC (rev 666) @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="Pano12 Info" + ProjectGUID="{611A30E5-3D17-403B-A715-4739C7EE59F1}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + FavorSizeOrSpeed="2" + AdditionalIncludeDirectories="..\libpano" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="5" + StructMemberAlignment="4" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/Pano12Info.exe" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/PanoInfo.pdb" + SubSystem="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + FavorSizeOrSpeed="2" + AdditionalIncludeDirectories="..\libpano" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="4" + StructMemberAlignment="4" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/Pano12Info.exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter=""> + <File + RelativePath=".\pano12info.c"> + </File> + </Filter> + <File + RelativePath=".\Pano12Info.rc"> + </File> + <File + RelativePath=".\Pano12InfoResource.h"> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Copied: branches/pano12/PTInfo/pano12info.c (from rev 665, branches/pano12/libpano/tools/pano12info.c) =================================================================== --- branches/pano12/PTInfo/pano12info.c (rev 0) +++ branches/pano12/PTInfo/pano12info.c 2007-02-06 02:00:45 UTC (rev 666) @@ -0,0 +1,232 @@ +/* + * PanoInfo Demo app + * + * Display info from pano12 dll/library + * + * May 2004 + * + * Jim Watters (jwatters AT photocreations DOT ca) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#define VC_EXTRALEAN +#include <stdio.h> +#include <windows.h> +#include"version.h" +#include"queryfeature.h" +#include "Pano12InfoResource.h" + +// Use the secure version of the string function starting with Microsoft Visual Studio 2005 . +// These macros are for backwards compatibility for older versions +#if _MSC_VER < 1400 +#define strcat_s(buf,size,str) strcat(buf,str) +#endif + + + +typedef int (*PROC_QF) (int ,char** ,Tp12FeatureType* ); +typedef int (*PROC_QFNUM) (void); +typedef int (*PROC_QFINT) (const char *, int *); +typedef int (*PROC_QFDOUBLE) (const char *, double *); +typedef int (*PROC_QFSTRING) (const char *, char *, const int); + +// Function prototypes. +int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int); +LRESULT CALLBACK MainWndProc(HWND, UINT, WPARAM, LPARAM); + +// Application entry point. +int WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + DialogBox(hinstance, (LPCTSTR)IDD_PANINFO, (HWND)NULL, MainWndProc); + return 1; +} + +LRESULT CALLBACK MainWndProc(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + { + HINSTANCE hDll = NULL; + PROC_QF pfQF = NULL; + PROC_QFNUM pfQFNum = NULL; + PROC_QFINT pfQFInt = NULL; + PROC_QFDOUBLE pfQFDouble = NULL; + PROC_QFSTRING pfQFString = NULL; + + int iResult; + double dResult; + char sResult[256]; + char str1[1000]; + char Description[10000]; + HWND hEditBox = NULL; + + Description[0] = '\0'; + hDll = LoadLibrary("pano12.dll"); + if(!hDll) + { + MessageBox((HWND)NULL, "Could not load pano12.dll", "Pano12 Info", MB_ICONEXCLAMATION); + return TRUE; + } + + pfQF = (PROC_QF) GetProcAddress( hDll, "queryFeatures" ); + pfQFNum = (PROC_QFNUM) GetProcAddress( hDll, "queryFeatureCount" ); + pfQFInt = (PROC_QFINT) GetProcAddress( hDll, "queryFeatureInt" ); + pfQFDouble = (PROC_QFDOUBLE) GetProcAddress( hDll, "queryFeatureDouble" ); + pfQFString = (PROC_QFSTRING) GetProcAddress( hDll, "queryFeatureString" ); + + if(!pfQF) + { + strcat_s(Description, 10000, "Error: The 'queryFeatures' funtion not pressent\r\n"); + } + if(!pfQFNum) + { + strcat_s(Description, 10000, "Error: The 'queryFeatureCount' funtion not pressent\r\n"); + } + if(!pfQFString) + { + strcat_s(Description, 10000, "Error: The 'queryFeatureString' funtion not pressent\r\n"); + } + if(!pfQFInt) + { + strcat_s(Description, 10000, "Error: The 'queryFeatureInt' funtion not pressent\r\n"); + } + if(!pfQFDouble) + { + strcat_s(Description, 10000, "Error: The 'queryFeatureDouble' funtion not pressent\r\n"); + } + + if(pfQFString) + { + if((pfQFString) (PTVERSION_NAME_FILEVERSION, sResult, sizeof(sResult)/sizeof(sResult[0]) )) + { + hEditBox = GetDlgItem(hWnd, IDC_FILEVER); + if( hEditBox ) + { + SendMessage( hEditBox, WM_SETTEXT, (WPARAM)NULL, (LPARAM)sResult); + } + } + + // if((pfQFString) (PTVERSION_NAME_LONG, sResult, sizeof(sResult)/sizeof(sResult[0]) )) + // { + // sprintf_s(str1, 1000, "Pano12 version:\t%s\r\n\r\n", sResult ); + // strcat_s(Description, 10000, str1); + // } + + if((pfQFString) (PTVERSION_NAME_COMMENT, sResult, sizeof(sResult)/sizeof(sResult[0]) )) + { + hEditBox = GetDlgItem(hWnd, IDC_COMMENT); + if( hEditBox ) + { + SendMessage( hEditBox, WM_SETTEXT, (WPARAM)NULL, (LPARAM)sResult); + } + } + + if((pfQFString) (PTVERSION_NAME_LEGALCOPYRIGHT, sResult, sizeof(sResult)/sizeof(sResult[0]) )) + { + hEditBox = GetDlgItem(hWnd, IDC_COPYRIGHT); + if( hEditBox ) + { + SendMessage( hEditBox, WM_SETTEXT, (WPARAM)NULL, (LPARAM)sResult); + } + } + } + + if(pfQFInt) + { + if((pfQFInt) ("CPErrorIsDistSphere", &iResult )) + { + hEditBox = GetDlgItem(hWnd, IDC_OPTIMIZERERROR); + if( hEditBox ) + { + SendMessage( hEditBox, WM_SETTEXT, (WPARAM)NULL, (LPARAM)(iResult? "dist sphere" : "dist rect")); + } + } + } + + if(pfQFDouble) + { + if((pfQFDouble) ("MaxFFOV", &dResult )) + { + hEditBox = GetDlgItem(hWnd, IDC_FIELDOFVIEWLIMIT); + if( hEditBox ) + { +#if _MSC_VER >= 1400 + sprintf_s(str1, 1000, "%2.0f", dResult ); +#else + sprintf(str1, "%2.0f", dResult ); +#endif + SendMessage( hEditBox, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str1); + } + } + } + + if(pfQFNum && pfQF && pfQFString) + { + int i,bufsize,numfeatures; + char *name; + char *value; + Tp12FeatureType type; + + numfeatures = pfQFNum(); + for(i=0; i < numfeatures;i++) + { + pfQF(i, &name, &type); + bufsize = pfQFString(name, NULL, 0)+1; + value = (char*)malloc(bufsize); + pfQFString(name, value, bufsize); + +#if _MSC_VER >= 1400 + sprintf_s(str1, 1000, " %26.26s:\t%s\r\n", name, value); +#else + sprintf(str1, " %26.26s:\t%s\r\n", name, value); +#endif + strcat_s(Description, 10000, str1); + + free(value); + } + + hEditBox = GetDlgItem(hWnd, IDC_EDIT); + + if( hEditBox ) + { + SendMessage( hEditBox, WM_SETTEXT, (WPARAM)NULL, (LPARAM)Description); + } + } + + if(hDll) + FreeLibrary(hDll); + return TRUE; + } + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(hWnd, IDOK); + return TRUE; + + case IDCANCEL: + EndDialog(hWnd, IDCANCEL); + return TRUE; + } + break; + } + } + return FALSE; +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jim...@us...> - 2007-04-09 03:18:38
|
Revision: 684 http://svn.sourceforge.net/panotools/?rev=684&view=rev Author: jim0watters Date: 2007-04-08 20:18:38 -0700 (Sun, 08 Apr 2007) Log Message: ----------- Utility run during install to copy plug-ins to photoshop's plug-in folder. Added Paths: ----------- branches/pano12/PT SetupPI/ branches/pano12/PT SetupPI/SetupPI.rc branches/pano12/PT SetupPI/SetupPI2003.sln branches/pano12/PT SetupPI/SetupPI2003.vcproj branches/pano12/PT SetupPI/SetupPI2005.sln branches/pano12/PT SetupPI/SetupPI2005.vcproj branches/pano12/PT SetupPI/main.cpp branches/pano12/PT SetupPI/resource.h Added: branches/pano12/PT SetupPI/SetupPI.rc =================================================================== --- branches/pano12/PT SetupPI/SetupPI.rc (rev 0) +++ branches/pano12/PT SetupPI/SetupPI.rc 2007-04-09 03:18:38 UTC (rev 684) @@ -0,0 +1,75 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_INSTALFAILED "Installation failed (code 001). See ReleaseNotes.txt for details." + IDS_INSTALLFORHOST "Install plug-ins for %s?" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: branches/pano12/PT SetupPI/SetupPI2003.sln =================================================================== --- branches/pano12/PT SetupPI/SetupPI2003.sln (rev 0) +++ branches/pano12/PT SetupPI/SetupPI2003.sln 2007-04-09 03:18:38 UTC (rev 684) @@ -0,0 +1,23 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetupPI", "SetupPI2003.vcproj", "{CEB483C3-0C63-42FB-88BE-A47C5BF1E642}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Debug.ActiveCfg = Debug|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Debug.Build.0 = Debug|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Release.ActiveCfg = Release|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Added: branches/pano12/PT SetupPI/SetupPI2003.vcproj =================================================================== --- branches/pano12/PT SetupPI/SetupPI2003.vcproj (rev 0) +++ branches/pano12/PT SetupPI/SetupPI2003.vcproj 2007-04-09 03:18:38 UTC (rev 684) @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="windows-1251"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="SetupPI" + ProjectGUID="{CEB483C3-0C63-42FB-88BE-A47C5BF1E642}" + RootNamespace="SetupPI" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\Common" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="0" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="Debug\util.exe" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + SubSystem="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="TRUE"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Common" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="0" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="Release\util.exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath=".\main.cpp"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + <File + RelativePath=".\resource.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + <File + RelativePath=".\SetupPI.rc"> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: branches/pano12/PT SetupPI/SetupPI2005.sln =================================================================== --- branches/pano12/PT SetupPI/SetupPI2005.sln (rev 0) +++ branches/pano12/PT SetupPI/SetupPI2005.sln 2007-04-09 03:18:38 UTC (rev 684) @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetupPI", "SetupPI2005.vcproj", "{CEB483C3-0C63-42FB-88BE-A47C5BF1E642}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Debug.ActiveCfg = Debug|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Debug.Build.0 = Debug|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Release.ActiveCfg = Release|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Debug|Win32.ActiveCfg = Debug|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Debug|Win32.Build.0 = Debug|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Release|Win32.ActiveCfg = Release|Win32 + {CEB483C3-0C63-42FB-88BE-A47C5BF1E642}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: branches/pano12/PT SetupPI/SetupPI2005.vcproj =================================================================== --- branches/pano12/PT SetupPI/SetupPI2005.vcproj (rev 0) +++ branches/pano12/PT SetupPI/SetupPI2005.vcproj 2007-04-09 03:18:38 UTC (rev 684) @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="windows-1251"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="SetupPI" + ProjectGUID="{CEB483C3-0C63-42FB-88BE-A47C5BF1E642}" + RootNamespace="SetupPI" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\Common" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="0" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="Debug\util.exe" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Common" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="0" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="Release\util.exe" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\main.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: branches/pano12/PT SetupPI/main.cpp =================================================================== --- branches/pano12/PT SetupPI/main.cpp (rev 0) +++ branches/pano12/PT SetupPI/main.cpp 2007-04-09 03:18:38 UTC (rev 684) @@ -0,0 +1,375 @@ + +// Panorama Tools + +//#define _CRT_SECURE_NO_DEPRECATE + +#include <windows.h> +#include <stdio.h> +#include <io.h> +#include <direct.h> +#include "resource.h" + +#define MAX_LINE 256 +#define REG_SIZE 512 +#define DIS_SIZE 64 + +// NONtranslational strings +#define ROOT "Root" +#define DESTFOLDER "Panorama Tools\\" +#define SOURCEFOLDER "Photoshop plugins\\" + +static char* filter[] = { + "PTCorrect.8BF", + "PTAdjust.8BF", + "PTRemap.8BF", + "PTPerspect.8BF" +}; + +// Use the secure version of the string function starting with Microsoft Visual Studio 2005 . +// These macros are for backwards compatibility for older versions +#if _MSC_VER < 1400 +#define strcat_s(buf,size,str) strcat(buf,str) +#define strcpy_s(buf,size,str) strcpy(buf,str) +#define vsprintf_s(buf,size,str,arg) vsprintf(buf,str,arg) +#define fopen_s(fp,fn,at) *fp=fopen(fn,at) +#define sscanf_s(buf,val,var) sscanf(buf,val,var); +#endif + +struct ListNode +{ + ListNode *next; + HKEY key; + char path[REG_SIZE]; + char dis[DIS_SIZE]; +}; + +static ListNode *listHead; +static char root[REG_SIZE]; +HINSTANCE g_hInstance = NULL; + +static int display(int type, const char *fmt, ...) +{ + char buf[MAX_LINE]; + va_list ap; + + va_start(ap, fmt); + vsprintf_s(buf, MAX_LINE, fmt, ap); + int rc = MessageBox(NULL, buf, "Info", type); + va_end(ap); + return rc; +} + +static void addElement(HKEY key, char *dir, char *ver, int SizeVer, char *app) +{ + ListNode *p = (ListNode *)malloc(sizeof(ListNode)); + if (!p) + { + return; + } + p->key = key; + strcpy_s(p->path, REG_SIZE, dir); + strcat_s(p->path, REG_SIZE, "\\"); + strcat_s(p->path, REG_SIZE, ver); + strcat_s(p->path, REG_SIZE, "\\PluginPath"); + strcpy_s(p->dis, DIS_SIZE, app); + strcat_s(p->dis, DIS_SIZE, " "); + strcat_s(p->dis, DIS_SIZE, ver); + + // convert app to display + if (strcmp(app, "Photoshop") == 0) + { + float f; int fi; + sscanf_s(ver, "%f", &f); + fi = (int)f; + if (fi == f) + { // integer release + if (fi == 8) + { // must be a CS kind of guy + strcpy_s(p->dis, DIS_SIZE, app); + strcat_s(p->dis, DIS_SIZE, " CS"); + } + else if (fi > 8) + { +#if _MSC_VER < 1400 + sprintf(p->dis, "%s CS%d", app, fi - 7); +#else + sprintf_s(p->dis, DIS_SIZE, "%s CS%d", app, fi - 7); +#endif + } + } + } + + // add to end of list + ListNode *last = listHead; + if (last) + { + while(last->next) + { + last = last->next; + } + last->next = p; + } + else + { + listHead = p; + } + p->next = NULL; +} + +static void enumerate(HKEY key, char *dir, char *app) +{ + LONG rc; + char buf[REG_SIZE]; + HKEY hKey = 0; + DWORD size; + int i; + + rc = RegOpenKeyEx(key, dir, 0, KEY_ENUMERATE_SUB_KEYS, &hKey); + if (rc == 0) + { + size = REG_SIZE; + i = 0; + rc = RegEnumKeyEx(hKey, i, buf, &size, NULL, NULL, NULL, NULL); + while (rc == ERROR_SUCCESS) + { + addElement(key, dir, buf, REG_SIZE, app); + size = REG_SIZE; + rc = RegEnumKeyEx(hKey, ++i, buf, &size, NULL, NULL, NULL, NULL); + } + } + if (hKey) + { + RegCloseKey(hKey); + } +} + +static void findEntries() +{ + enumerate(HKEY_LOCAL_MACHINE, "SOFTWARE\\Adobe\\Photoshop", "Photoshop"); + enumerate(HKEY_LOCAL_MACHINE, "SOFTWARE\\Adobe\\Photoshop Elements", "Photoshop Elements"); +} + +static int cpyPlugin(char *dst, char *root, char *plugin) +{ + char bufSource[REG_SIZE]; + char bufDest[REG_SIZE]; + + // open src + strcpy_s(bufSource, REG_SIZE, root); + strcat_s(bufSource, REG_SIZE, SOURCEFOLDER); + strcat_s(bufSource, REG_SIZE, plugin); + FILE *fpSrc = NULL; + + fopen_s(&fpSrc, bufSource, "rb"); + if (!fpSrc) + { + // display message of failure. + LoadString(g_hInstance, IDS_INSTALFAILED, bufSource, REG_SIZE); + display(MB_OK, bufSource); + return 1; + } + + strcpy_s(bufDest, REG_SIZE, dst); + strcat_s(bufDest, REG_SIZE, plugin); + + // using system(copy source.txt destination.txt") will copy the file attributes + // but displays a command prompt for each copy + //char bufCopyCmd[REG_SIZE*2+10]; + //sprintf_s(bufCopyCmd, sizeof(bufCopyCmd), "copy \"%s\" \"%s\"", bufSource, bufDest); + //system(bufCopyCmd);// "copy source.txt destination.txt"); + + FILE *fpDst = NULL; + fopen_s(&fpDst, bufDest, "wb"); + if (!fpDst) + { + fclose(fpSrc); + return 1; + } + + // copy the file + int c; + while ((c = getc(fpSrc)) != EOF) + { + putc(c, fpDst); + } + + fclose(fpSrc); + fclose(fpDst); + + return 0; +} + +static int cpyPlugins() +{ + HKEY hKey = 0; + DWORD type, size; + LONG rc; + char buf[REG_SIZE]; + + // find plug-in path + rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Panorama Tools", 0, KEY_QUERY_VALUE, &hKey); + if (rc == 0) + { + size = REG_SIZE; + rc = RegQueryValueEx(hKey, ROOT, NULL, &type, (LPBYTE)root, &size); + } + if (hKey) + { + RegCloseKey(hKey); + } + if (rc) + { + return 1; + } + + // ensure trailing slash + if (root[strlen(root)-1] != '\\') + { + strcat_s(root, REG_SIZE, "\\"); + } + + ListNode *p = listHead; + for (ListNode *p = listHead; p; p = p->next) + { + // find Plug-ins directory + rc = RegOpenKeyEx(p->key, p->path, 0, KEY_QUERY_VALUE, &hKey); + if (rc == 0) + { + size = REG_SIZE; + rc = RegQueryValueEx(hKey, NULL, NULL, &type, (LPBYTE)buf, &size); + } + if (hKey) + { + RegCloseKey(hKey); + } + if (rc) + { + continue; + } + char bufMessage[REG_SIZE]; + LoadString(g_hInstance, IDS_INSTALLFORHOST, bufMessage, REG_SIZE); + if (display(MB_YESNO, bufMessage, p->dis) == IDNO) + { + continue; + } + strcat_s(buf, REG_SIZE, DESTFOLDER); + _mkdir(buf); + + for (int i = 0; i < sizeof(filter)/sizeof(char *); i++) + { + if (cpyPlugin(buf, root, filter[i])) + { + return 1; + } + } + } + + return 0; +} + +// Recursive search of dir to find and delete all occurances of files listed in filters[] +static void delPlugin(char *dir) +{ + char buf[REG_SIZE]; + _finddata_t fileinfo; + intptr_t fp; + + // a messy situation here... different languages store plug-ins in different + // places. While we've got the location of the Plug-Ins directory from the + // registry, we don't know what the Filters subdirectory is called. For example, + // in French it's called Filtres. It's likely that the user has installed + // previous plug-ins in the Filters (or Filtres) directory. To make sure we + // cover all bases, and remove all plug-ins, we'll do... + // rm dir/plugin + // rm dir/*/plugin + + // call findfirst to get list of all files under Plug-Ins + strcpy_s(buf, REG_SIZE, dir); + strcat_s(buf, REG_SIZE, "*.*"); + fp = _findfirst(buf, &fileinfo); + if (fp == -1) + { + return; + } + + // delete in current directory + for (int i = 0; i < sizeof(filter)/sizeof(char *); i++) + { + strcpy_s(buf, REG_SIZE, dir); + strcat_s(buf, REG_SIZE, filter[i]); + _unlink(buf); + } + + // Check for subdirectories and then call ourselves to delete plug-ins in there + // and then check their subdir + do + { + if ((fileinfo.attrib & _A_SUBDIR) && (fileinfo.name[0] != '.')) + { + strcpy_s(buf, REG_SIZE, dir); + strcat_s(buf, REG_SIZE, fileinfo.name); + strcat_s(buf, REG_SIZE, "\\"); + + delPlugin(buf); + } + } while (_findnext(fp, &fileinfo) != -1); + + _findclose(fp); +} + +static void delPlugins() +{ + HKEY hKey = 0; + DWORD type, size; + LONG rc; + char buf[REG_SIZE]; + + ListNode *p = listHead; + while(p) + { + // find plug-in + rc = RegOpenKeyEx(p->key, p->path, 0, KEY_QUERY_VALUE, &hKey); + if (rc == 0) + { + size = REG_SIZE; + rc = RegQueryValueEx(hKey, NULL, NULL, &type, (LPBYTE)buf, &size); + } + if (hKey) + { + RegCloseKey(hKey); + } + + if (rc) + { + p = p->next; + continue; + } + + // ensure trailing slash + if (buf[strlen(buf)-1] != '\\') + { + strcat_s(buf, REG_SIZE, "\\"); + } + + delPlugin(buf); + + p = p->next; + } +} + +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR cmdLine, int show) +{ + g_hInstance = hInstance; + bool cpy = strstr(cmdLine, "/Commit") ? true : false; + bool del = strstr(cmdLine, "/Uninstall") ? true : false; + if (cpy || del) + { + findEntries(); + delPlugins(); + } + if (cpy) + { + cpyPlugins(); + } + return 0; +} Added: branches/pano12/PT SetupPI/resource.h =================================================================== --- branches/pano12/PT SetupPI/resource.h (rev 0) +++ branches/pano12/PT SetupPI/resource.h 2007-04-09 03:18:38 UTC (rev 684) @@ -0,0 +1,18 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by SetupPI.rc +// +#define IDS_INSTALFAILED 101 +#define IDS_INSTALFAILED2 102 +#define IDS_INSTALLFORHOST 102 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jim...@us...> - 2007-04-09 03:59:29
|
Revision: 685 http://svn.sourceforge.net/panotools/?rev=685&view=rev Author: jim0watters Date: 2007-04-08 20:59:30 -0700 (Sun, 08 Apr 2007) Log Message: ----------- Microsoft Software Installer (MSI) Project with distributables Added Paths: ----------- branches/pano12/PT Setup/ branches/pano12/PT Setup/AllUsers.mst branches/pano12/PT Setup/Build Instructions.txt branches/pano12/PT Setup/PT Setup.sln branches/pano12/PT Setup/PT Setup.vdproj branches/pano12/PT Setup/README.TXT branches/pano12/PT Setup/applytrans.bat branches/pano12/PT Setup/dist/ branches/pano12/PT Setup/dist/Copyright/ branches/pano12/PT Setup/dist/Copyright/COPYRIGHT_TIFF branches/pano12/PT Setup/dist/Copyright/Copying.html branches/pano12/PT Setup/dist/Copyright/README_JPEG branches/pano12/PT Setup/dist/PT.ico branches/pano12/PT Setup/dist/Photoshop Plugins/ branches/pano12/PT Setup/dist/Photoshop Plugins/PTAdjust.8BF branches/pano12/PT Setup/dist/Photoshop Plugins/PTCorrect.8BF branches/pano12/PT Setup/dist/Photoshop Plugins/PTPerspect.8BF branches/pano12/PT Setup/dist/Photoshop Plugins/PTRemap.8BF branches/pano12/PT Setup/dist/Photoshop Plugins/Readme.txt branches/pano12/PT Setup/dist/Readme.html branches/pano12/PT Setup/dist/ReleaseNotes.txt branches/pano12/PT Setup/dist/Thumbs.db branches/pano12/PT Setup/dist/banner.bmp branches/pano12/PT Setup/dist/pano12.dll branches/pano12/PT Setup/dist/tools/ branches/pano12/PT Setup/dist/tools/PTAverage.exe branches/pano12/PT Setup/dist/tools/PTAverage.txt branches/pano12/PT Setup/dist/tools/PTInterpolate.exe branches/pano12/PT Setup/dist/tools/PTMorpher.exe branches/pano12/PT Setup/dist/tools/PTOptimizer.exe branches/pano12/PT Setup/dist/tools/PTStereo.exe branches/pano12/PT Setup/dist/tools/PTStereo.txt branches/pano12/PT Setup/dist/tools/PTStitcher.exe branches/pano12/PT Setup/dist/tools/PTStitcher.txt branches/pano12/PT Setup/dist/tools/PTStripe.exe branches/pano12/PT Setup/dist/tools/PTStripe.txt branches/pano12/PT Setup/dist/tools/Pano12Info.exe branches/pano12/PT Setup/dist/tools/Scripts/ branches/pano12/PT Setup/dist/tools/Scripts/Optimize_Script.txt branches/pano12/PT Setup/dist/tools/Scripts/Stitch_Script.txt branches/pano12/PT Setup/dist/tools/Templates/ branches/pano12/PT Setup/dist/tools/Templates/3DMF_HEADER branches/pano12/PT Setup/dist/tools/Templates/3DMF_TRIMESH branches/pano12/PT Setup/dist/tools/Templates/INDEXED_FACE_FMT branches/pano12/PT Setup/dist/tools/Templates/LP_ivr branches/pano12/PT Setup/dist/tools/Templates/LPjava_html branches/pano12/PT Setup/dist/tools/Templates/LPjava_ivr branches/pano12/PT Setup/dist/tools/Templates/VRML_HEADER branches/pano12/PT Setup/dist/tools/Templates/vrml_wrl branches/pano12/PT Setup/dist/tools/ptcrypt.jar branches/pano12/PT Setup/dist/tools/pteditor.jar branches/pano12/PT Setup/dist/tools/ptpicker.jar branches/pano12/PT Setup/dist/util.exe branches/pano12/PT Setup/dist/util.vbs Added: branches/pano12/PT Setup/AllUsers.mst =================================================================== (Binary files differ) Property changes on: branches/pano12/PT Setup/AllUsers.mst ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/pano12/PT Setup/Build Instructions.txt =================================================================== --- branches/pano12/PT Setup/Build Instructions.txt (rev 0) +++ branches/pano12/PT Setup/Build Instructions.txt 2007-04-09 03:59:30 UTC (rev 685) @@ -0,0 +1,12 @@ +Update all project files and copy release versions to dist folder. + +Open "PT Setup.sln" in Visual Studio 2003 +Select the PanoTools12 project in the Solution Explorer window. +Open the properties window. +Update version number. +Answer yes to the question "It is recommended that the ProductCode and PackageCode be changed if you change the version. do you wnat to do this?" +Build the project. +Run applytrans.bat to force the install for all users. +NEED: http://msdn2.microsoft.com/en-us/library/aa370834.aspx +Copy the file README.TXT to the PanoTools12 directroy. +Compress panoTools12 dirctory to PanoTools12_yyyymmdd.zip Added: branches/pano12/PT Setup/PT Setup.sln =================================================================== --- branches/pano12/PT Setup/PT Setup.sln (rev 0) +++ branches/pano12/PT Setup/PT Setup.sln 2007-04-09 03:59:30 UTC (rev 685) @@ -0,0 +1,24 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PanoTools12", "PT Setup.vdproj", "{418088F3-B22A-4AF4-99E0-970FA32AD086}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + Description = Panotools instalation project + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {418088F3-B22A-4AF4-99E0-970FA32AD086}.Debug.ActiveCfg = Debug + {418088F3-B22A-4AF4-99E0-970FA32AD086}.Debug.Build.0 = Debug + {418088F3-B22A-4AF4-99E0-970FA32AD086}.Release.ActiveCfg = Release + {418088F3-B22A-4AF4-99E0-970FA32AD086}.Release.Build.0 = Release + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Added: branches/pano12/PT Setup/PT Setup.vdproj =================================================================== --- branches/pano12/PT Setup/PT Setup.vdproj (rev 0) +++ branches/pano12/PT Setup/PT Setup.vdproj 2007-04-09 03:59:30 UTC (rev 685) @@ -0,0 +1,1975 @@ +"DeployProject" +{ +"VSVersion" = "3:701" +"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" +"IsWebType" = "8:FALSE" +"ProjectName" = "8:PanoTools12" +"LanguageId" = "3:1033" +"CodePage" = "3:1252" +"UILanguageId" = "3:1033" +"SccProjectName" = "8:" +"SccLocalPath" = "8:" +"SccAuxPath" = "8:" +"SccProvider" = "8:" + "Hierarchy" + { + "Entry" + { + "MsmKey" = "8:_0783058D44F94000A6373E02318509AB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1B4377C60EB24E1D9C6107694F9A0AA0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_34C87DF028924BFEA8CB302233B22430" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38EA21DEDFAD402F992B0B9CCAB456FB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3C7EBEB964384D369F16687417115B52" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_530A73BC86334914B663F438B12B45B5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_54ED7EEC01884F6BB16EB783E1E50749" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_577FC79BD8644814B6090AC45767CDBE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5DC297AA8AB548FDB9DDC93E22313FFC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_60DF845F58B34466972C689C90980192" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_62234693F68F41DC8699A7A83EB3F21A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6DC0BD0E88694CF0BFBC775DD42AE737" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6FBC3A3778D545D68EA55C0F56EA9EA4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7148B314165F4765A4D19ED7BA4DC06E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7174550455434DA69CB64E5F69B3FE18" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7282BB3EFBD74F53BF744774506E8064" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_872BA9BDC36E4856828060D3E33E48D3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_885A6EA7504C47C38C82CB2ABB0DF944" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8F5DA10B7DBD4A3BB9BA5C40521BD2B0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9018588ACB0C45E8972C1202BCB0B66D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_944DDFA611234B49AA4A8AB629894D56" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_95CA838CA087474B83131157DB93AE10" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9A2A00F4072645D79EA3523047041B6C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B1D9578A2DAE4A53A4C7C2750B26166C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B21C561A6BE34F8CBCBD95A2777C8ECF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BAD9FD64B2E14A8F82C8872E87164D8C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C04CEDCED4034D3692643C9DA5D79DAE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C32C97993B8C4BE78DF08AF4C666027F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C8B3D46C1AB744C88214D0E659A5FA43" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C9A55F7B15614161B30B82F36CB6EA1D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CE6870752680452A9A7B8E0B1B88E7F0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_D55C9525E6B44864B11492AD8E59F300" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_D93E9C16C83A4CEE9F030D79FD549ED9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DA535C8E16A4401CA743F747EE06E41D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E0C6781632B04131BD655D65DF574D66" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E3B4886418884138AAB72F3A66D3F44A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E5B8D64414F7454590C77F85DB508F9C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E75A214FD9A14D6CA1E92A8D8BC22298" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_EEFFFECED9D5476987AB030AA48293C1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F599445666E14EEE8B4722CA93C969CF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + } + "Configurations" + { + "Debug" + { + "DisplayName" = "8:Debug" + "IsDebugOnly" = "11:TRUE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Debug\\PanoTools.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:3" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + } + "Release" + { + "DisplayName" = "8:Release" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:TRUE" + "OutputFilename" = "8:PanoTools12\\PanoTools.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:3" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + } + } + "Deployable" + { + "CustomAction" + { + "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_5583872DBAE949D28FDD72F70C6275F1" + { + "Name" = "8:util.exe" + "Condition" = "8:" + "Object" = "8:_885A6EA7504C47C38C82CB2ABB0DF944" + "FileType" = "3:2" + "InstallAction" = "3:2" + "Arguments" = "8:/Commit" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_9EC01899_6803_47E0_A88A_647C24A51533" + "InstallerClass" = "11:FALSE" + "CustomActionData" = "8:" + } + "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_E04C6F23B7314061A027C45E52DC03E1" + { + "Name" = "8:util.exe" + "Condition" = "8:" + "Object" = "8:_885A6EA7504C47C38C82CB2ABB0DF944" + "FileType" = "3:2" + "InstallAction" = "3:4" + "Arguments" = "8:/Uninstall" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_74E82689_551B_43F2_9D29_8E14D9BCE0B8" + "InstallerClass" = "11:FALSE" + "CustomActionData" = "8:" + } + "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_FD5A8868B8C343DB81B19791C84CA72A" + { + "Name" = "8:util.vbs" + "Condition" = "8:" + "Object" = "8:_54ED7EEC01884F6BB16EB783E1E50749" + "FileType" = "3:4" + "InstallAction" = "3:2" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:2" + "Identifier" = "8:_C67F9080_FA58_4053_A8B0_89880E1477FC" + "InstallerClass" = "11:FALSE" + "CustomActionData" = "8:[TARGETDIR]ReleaseNotes.txt" + } + } + "DefaultFeature" + { + "Name" = "8:DefaultFeature" + "Title" = "8:" + "Description" = "8:" + } + "ExternalPersistence" + { + "LaunchCondition" + { + } + } + "Feature" + { + } + "File" + { + "{A582A373-4685-4296-BEFE-614B80A702C3}:_0783058D44F94000A6373E02318509AB" + { + "SourcePath" = "8:dist\\tools\\pteditor.jar" + "TargetName" = "8:pteditor.jar" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_1B4377C60EB24E1D9C6107694F9A0AA0" + { + "SourcePath" = "8:dist\\Photoshop Plugins\\PTAdjust.8BF" + "TargetName" = "8:PTAdjust.8BF" + "Tag" = "8:" + "Folder" = "8:_8603C495BFE74473A0F9DD1F46BB7CFD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_34C87DF028924BFEA8CB302233B22430" + { + "SourcePath" = "8:dist\\tools\\PTStereo.txt" + "TargetName" = "8:PTStereo.txt" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_38EA21DEDFAD402F992B0B9CCAB456FB" + { + "SourcePath" = "8:dist\\tools\\PTStereo.exe" + "TargetName" = "8:PTStereo.exe" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_3C7EBEB964384D369F16687417115B52" + { + "SourcePath" = "8:dist\\banner.bmp" + "TargetName" = "8:banner.bmp" + "Tag" = "8:" + "Folder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_530A73BC86334914B663F438B12B45B5" + { + "SourcePath" = "8:dist\\tools\\Templates\\VRML_HEADER" + "TargetName" = "8:VRML_HEADER" + "Tag" = "8:" + "Folder" = "8:_888E4945C16E4E2E8103A139BFFCA26A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_54ED7EEC01884F6BB16EB783E1E50749" + { + "SourcePath" = "8:dist\\util.vbs" + "TargetName" = "8:util.vbs" + "Tag" = "8:" + "Folder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:TRUE" + "Hidden" = "11:TRUE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_577FC79BD8644814B6090AC45767CDBE" + { + "SourcePath" = "8:dist\\tools\\Pano12Info.exe" + "TargetName" = "8:Pano12Info.exe" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_5DC297AA8AB548FDB9DDC93E22313FFC" + { + "SourcePath" = "8:dist\\tools\\Scripts\\Stitch_Script.txt" + "TargetName" = "8:Stitch_Script.txt" + "Tag" = "8:" + "Folder" = "8:_540A6C5D2DCC43549CC7F19C0EC8A81D" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_60DF845F58B34466972C689C90980192" + { + "SourcePath" = "8:dist\\PT.ico" + "TargetName" = "8:PT.ico" + "Tag" = "8:" + "Folder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_62234693F68F41DC8699A7A83EB3F21A" + { + "SourcePath" = "8:dist\\tools\\PTMorpher.exe" + "TargetName" = "8:PTMorpher.exe" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_6DC0BD0E88694CF0BFBC775DD42AE737" + { + "SourcePath" = "8:dist\\tools\\PTAverage.txt" + "TargetName" = "8:PTAverage.txt" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_6FBC3A3778D545D68EA55C0F56EA9EA4" + { + "SourcePath" = "8:dist\\Photoshop Plugins\\Readme.txt" + "TargetName" = "8:Readme.txt" + "Tag" = "8:" + "Folder" = "8:_8603C495BFE74473A0F9DD1F46BB7CFD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_7148B314165F4765A4D19ED7BA4DC06E" + { + "SourcePath" = "8:dist\\tools\\Templates\\LPjava_html" + "TargetName" = "8:LPjava_html" + "Tag" = "8:" + "Folder" = "8:_888E4945C16E4E2E8103A139BFFCA26A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_7174550455434DA69CB64E5F69B3FE18" + { + "SourcePath" = "8:dist\\tools\\PTStitcher.exe" + "TargetName" = "8:PTStitcher.exe" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_7282BB3EFBD74F53BF744774506E8064" + { + "SourcePath" = "8:dist\\tools\\Templates\\LP_ivr" + "TargetName" = "8:LP_ivr" + "Tag" = "8:" + "Folder" = "8:_888E4945C16E4E2E8103A139BFFCA26A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_872BA9BDC36E4856828060D3E33E48D3" + { + "SourcePath" = "8:dist\\tools\\ptpicker.jar" + "TargetName" = "8:ptpicker.jar" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_885A6EA7504C47C38C82CB2ABB0DF944" + { + "SourcePath" = "8:dist\\util.exe" + "TargetName" = "8:util.exe" + "Tag" = "8:" + "Folder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:TRUE" + "Hidden" = "11:TRUE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_8F5DA10B7DBD4A3BB9BA5C40521BD2B0" + { + "SourcePath" = "8:dist\\Copyright\\COPYRIGHT_TIFF" + "TargetName" = "8:COPYRIGHT_TIFF" + "Tag" = "8:" + "Folder" = "8:_537D73123C194C9E9C98EE4509AC2F08" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_9018588ACB0C45E8972C1202BCB0B66D" + { + "SourcePath" = "8:dist\\tools\\Templates\\vrml_wrl" + "TargetName" = "8:vrml_wrl" + "Tag" = "8:" + "Folder" = "8:_888E4945C16E4E2E8103A139BFFCA26A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_944DDFA611234B49AA4A8AB629894D56" + { + "SourcePath" = "8:dist\\tools\\ptcrypt.jar" + "TargetName" = "8:ptcrypt.jar" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_95CA838CA087474B83131157DB93AE10" + { + "SourcePath" = "8:dist\\ReleaseNotes.txt" + "TargetName" = "8:ReleaseNotes.txt" + "Tag" = "8:" + "Folder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_9A2A00F4072645D79EA3523047041B6C" + { + "SourcePath" = "8:dist\\Photoshop Plugins\\PTCorrect.8BF" + "TargetName" = "8:PTCorrect.8BF" + "Tag" = "8:" + "Folder" = "8:_8603C495BFE74473A0F9DD1F46BB7CFD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_B1D9578A2DAE4A53A4C7C2750B26166C" + { + "SourcePath" = "8:dist\\Photoshop Plugins\\PTRemap.8BF" + "TargetName" = "8:PTRemap.8BF" + "Tag" = "8:" + "Folder" = "8:_8603C495BFE74473A0F9DD1F46BB7CFD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_B21C561A6BE34F8CBCBD95A2777C8ECF" + { + "SourcePath" = "8:dist\\tools\\Templates\\3DMF_HEADER" + "TargetName" = "8:3DMF_HEADER" + "Tag" = "8:" + "Folder" = "8:_888E4945C16E4E2E8103A139BFFCA26A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_BAD9FD64B2E14A8F82C8872E87164D8C" + { + "SourcePath" = "8:dist\\Readme.html" + "TargetName" = "8:Readme.html" + "Tag" = "8:" + "Folder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_C04CEDCED4034D3692643C9DA5D79DAE" + { + "SourcePath" = "8:dist\\Copyright\\Copying.html" + "TargetName" = "8:Copying.html" + "Tag" = "8:" + "Folder" = "8:_537D73123C194C9E9C98EE4509AC2F08" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_C32C97993B8C4BE78DF08AF4C666027F" + { + "SourcePath" = "8:dist\\tools\\PTStripe.exe" + "TargetName" = "8:PTStripe.exe" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_C8B3D46C1AB744C88214D0E659A5FA43" + { + "SourcePath" = "8:dist\\tools\\Scripts\\Optimize_Script.txt" + "TargetName" = "8:Optimize_Script.txt" + "Tag" = "8:" + "Folder" = "8:_540A6C5D2DCC43549CC7F19C0EC8A81D" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_C9A55F7B15614161B30B82F36CB6EA1D" + { + "SourcePath" = "8:dist\\tools\\PTStitcher.txt" + "TargetName" = "8:PTStitcher.txt" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_CE6870752680452A9A7B8E0B1B88E7F0" + { + "SourcePath" = "8:dist\\tools\\PTStripe.txt" + "TargetName" = "8:PTStripe.txt" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_D55C9525E6B44864B11492AD8E59F300" + { + "SourcePath" = "8:dist\\tools\\PTInterpolate.exe" + "TargetName" = "8:PTInterpolate.exe" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_D93E9C16C83A4CEE9F030D79FD549ED9" + { + "SourcePath" = "8:dist\\tools\\Templates\\INDEXED_FACE_FMT" + "TargetName" = "8:INDEXED_FACE_FMT" + "Tag" = "8:" + "Folder" = "8:_888E4945C16E4E2E8103A139BFFCA26A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_DA535C8E16A4401CA743F747EE06E41D" + { + "SourcePath" = "8:dist\\Copyright\\README_JPEG" + "TargetName" = "8:README_JPEG" + "Tag" = "8:" + "Folder" = "8:_537D73123C194C9E9C98EE4509AC2F08" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_E0C6781632B04131BD655D65DF574D66" + { + "SourcePath" = "8:dist\\tools\\Templates\\LPjava_ivr" + "TargetName" = "8:LPjava_ivr" + "Tag" = "8:" + "Folder" = "8:_888E4945C16E4E2E8103A139BFFCA26A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_E3B4886418884138AAB72F3A66D3F44A" + { + "SourcePath" = "8:dist\\Photoshop Plugins\\PTPerspect.8BF" + "TargetName" = "8:PTPerspect.8BF" + "Tag" = "8:" + "Folder" = "8:_8603C495BFE74473A0F9DD1F46BB7CFD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_E5B8D64414F7454590C77F85DB508F9C" + { + "SourcePath" = "8:dist\\tools\\Templates\\3DMF_TRIMESH" + "TargetName" = "8:3DMF_TRIMESH" + "Tag" = "8:" + "Folder" = "8:_888E4945C16E4E2E8103A139BFFCA26A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_E75A214FD9A14D6CA1E92A8D8BC22298" + { + "SourcePath" = "8:dist\\pano12.dll" + "TargetName" = "8:pano12.dll" + "Tag" = "8:" + "Folder" = "8:_5DCA601879DB41C9B604E46C1620C7F3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_EEFFFECED9D5476987AB030AA48293C1" + { + "SourcePath" = "8:dist\\tools\\PTOptimizer.exe" + "TargetName" = "8:PTOptimizer.exe" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_F599445666E14EEE8B4722CA93C969CF" + { + "SourcePath" = "8:dist\\tools\\PTAverage.exe" + "TargetName" = "8:PTAverage.exe" + "Tag" = "8:" + "Folder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + } + "FileType" + { + } + "Folder" + { + "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_5BC4216C0D0C44E58213BABA085C29AD" + { + "Name" = "8:#1919" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:ProgramMenuFolder" + "Folders" + { + "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_133D7C466DB947659AA1798793F856F5" + { + "Name" = "8:PanoTools" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:NOT REINSTALL" + "Transitive" = "11:TRUE" + "Property" = "8:_30BD00474B854DD4AEFE330B39487E43" + "Folders" + { + } + } + } + } + "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_5DCA601879DB41C9B604E46C1620C7F3" + { + "Name" = "8:#1914" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:SystemFolder" + "Folders" + { + } + } + "{58C0ADA3-3CEA-43BD-A3B3-2EA121BC8217}:_9644D34899864A6C8C68D099C5DD50DD" + { + "DefaultLocation" = "8:[ProgramFilesFolder]\\[ProductName]" + "Name" = "8:#1925" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:TARGETDIR" + "Folders" + { + "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_4CD49FADF4EF44B1851D316FD2CA78A8" + { + "Name" = "8:tools" + "AlwaysCreate" = "11:TRUE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_2297766446AD4A56AB57E951F672B80A" + "Folders" + { + "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_540A6C5D2DCC43549CC7F19C0EC8A81D" + { + "Name" = "8:scripts" + "AlwaysCreate" = "11:TRUE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_F6AF0F627A7D4AF296496A1EA453AFB8" + "Folders" + { + } + } + "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_888E4945C16E4E2E8103A139BFFCA26A" + { + "Name" = "8:templates" + "AlwaysCreate" = "11:TRUE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_5F91B99E9C7649F0A92F036059FC1EE8" + "Folders" + { + } + } + } + } + "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_537D73123C194C9E9C98EE4509AC2F08" + { + "Name" = "8:Copyright" + "AlwaysCreate" = "11:TRUE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_ADFED15646AE4813A82425821AA981B3" + "Folders" + { + } + } + "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_8603C495BFE74473A0F9DD1F46BB7CFD" + { + "Name" = "8:Photoshop plugins" + "AlwaysCreate" = "11:TRUE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_602649E55930464A8205B1DE049F0A52" + "Folders" + { + } + } + } + } + "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_99E8AA5504A84DB39FFD314BE68B3E7D" + { + "Name" = "8:#1916" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:DesktopFolder" + "Folders" + { + "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_C95062D4BAB242CAA44245BB297B27F3" + { + "Name" = "8:PanoTools" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:NOT REINSTALL" + "Transitive" = "11:TRUE" + "Property" = "8:_94D967280DED461C97D1F8925C5E35A2" + "Folders" + { + } + } + } + } + } + "LaunchCondition" + { + "{E4DE4623-56CB-424E-96A0-1AD21D5ECA20}:_1250E3AA589F41888CE9342BCE65E252" + { + "Name" = "8:Run only if Privileged" + "Condition" = "8:Privileged" + "Message" = "8:You must have administrative rights to run the install" + "InstallUrl" = "8:" + } + } + "Locator" + { + } + "MsiBootstrapper" + { + "LangId" = "3:1033" + } + "Product" + { + "Name" = "8:Microsoft Visual Studio" + "ProductName" = "8:Panorama Tools" + "ProductCode" = "8:{57106FC7-5620-4FA0-8E96-EB09C001FDFD}" + "PackageCode" = "8:{396DAC52-7EA1-4B09-A84F-346CB804881F}" + "UpgradeCode" = "8:{B5C6176F-FF43-450C-A4F6-D6D256620285}" + "RestartWWWService" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" + "DetectNewerInstalledVersion" = "11:TRUE" + "ProductVersion" = "8:2.8.5" + "Manufacturer" = "8:Open Source" + "ARPHELPTELEPHONE" = "8:http://groups.yahoo.com/group/PanoToolsNG/" + "ARPHELPLINK" = "8:http://wiki.panotools.org" + "Title" = "8:Setup Panorama Tools 12" + "Subject" = "8:" + "ARPCONTACT" = "8:Panorama Tools" + "Keywords" = "8:PT pano12 PanoTools Panoramatools" + "ARPCOMMENTS" = "8:Set of tools for creating and manipulating panoramas from images." + "ARPURLINFOABOUT" = "8:http://sourceforge.net/projects/panotools/" + "ARPPRODUCTICON" = "8:_60DF845F58B34466972C689C90980192" + "ARPIconIndex" = "3:0" + "SearchPath" = "8:" + "UseSystemSearchPath" = "11:TRUE" + } + "Registry" + { + "HKLM" + { + "Keys" + { + "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_8648813F40C14EA3B68B901C9BD11FC9" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_AB47C2EA190C4892A185A5641395C0F6" + { + "Name" = "8:Panorama Tools" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_A51EA5B09B1244ECBDDCD32BA513D9FD" + { + "Name" = "8:Root" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:2" + "Value" = "8:[TARGETDIR]" + } + } + } + } + "Values" + { + } + } + } + } + "HKCU" + { + "Keys" + { + "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_16E44620A54F42F798B376B1A0A55712" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_CC514A63DB8F43558A2C8AECFE0B0AC5" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCR" + { + "Keys" + { + } + } + "HKU" + { + "Keys" + { + } + } + "HKPU" + { + "Keys" + { + } + } + } + "Sequences" + { + } + "Shortcut" + { + "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_1206514B85B34AACBB75090B6243FAB9" + { + "Name" = "8:PTMorpher" + "Arguments" = "8:" + "Description" = "8:PanoTools morphing tool to change one image into another." + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:TRUE" + "Target" = "8:_62234693F68F41DC8699A7A83EB3F21A" + "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" + "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Icon" = "8:" + "Feature" = "8:" + } + "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_1ECF7A44669F47C4A11762C89C5831B2" + { + "Name" = "8:Readme" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:TRUE" + "Target" = "8:_BAD9FD64B2E14A8F82C8872E87164D8C" + "Folder" = "8:_133D7C466DB947659AA1798793F856F5" + "WorkingFolder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Icon" = "8:" + "Feature" = "8:" + } + "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_288B29AC42024923AD5CF75FE61DBCD5" + { + "Name" = "8:Tools" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:TRUE" + "Target" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Folder" = "8:_133D7C466DB947659AA1798793F856F5" + "WorkingFolder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Icon" = "8:_60DF845F58B34466972C689C90980192" + "Feature" = "8:" + } + "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_340B2F4E77F34D84805521BF2039E55F" + { + "Name" = "8:PTOptimizer" + "Arguments" = "8:" + "Description" = "8:PanoTools utility to calculate best image positions by ligning up control points. " + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:TRUE" + "Target" = "8:_EEFFFECED9D5476987AB030AA48293C1" + "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" + "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" + "Icon" = "8:" + "Feature" = "8:" + } + "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_4A4DB24A521F492D8065FC33F017BD0B" + { + "Name" = "8:PTInterpolate" + "Arguments" = "8:" + "Description" = "8:PanoTools utility to create intermediate views of any position between two images of the same scene taken from different positions." + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + ... [truncated message content] |
From: <jim...@us...> - 2007-12-31 04:23:54
|
Revision: 764 http://panotools.svn.sourceforge.net/panotools/?rev=764&view=rev Author: jim0watters Date: 2007-12-30 20:23:58 -0800 (Sun, 30 Dec 2007) Log Message: ----------- clean up of lingering changes to pano12 installer. Modified Paths: -------------- branches/pano12/PT Setup/AllUsers.mst branches/pano12/PT Setup/PT Setup.vdproj branches/pano12/PT Setup/README.TXT branches/pano12/PT Setup/applytrans.bat branches/pano12/PT Setup/dist/Readme.html branches/pano12/PT Setup/dist/ReleaseNotes.txt branches/pano12/libpano/tools/PTOptimizer.c branches/pano12/libpano/tools/makefile.ptoptimizer.win32 branches/pano12/libpano/version.h branches/pano12/ptfilter/cpyBuf.cpp Modified: branches/pano12/PT Setup/AllUsers.mst =================================================================== (Binary files differ) Modified: branches/pano12/PT Setup/PT Setup.vdproj =================================================================== --- branches/pano12/PT Setup/PT Setup.vdproj 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/PT Setup/PT Setup.vdproj 2007-12-31 04:23:58 UTC (rev 764) @@ -63,6 +63,12 @@ } "Entry" { + "MsmKey" = "8:_5856B57BA0DE4257B932F6EB67C33FC6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_5DC297AA8AB548FDB9DDC93E22313FFC" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -117,12 +123,6 @@ } "Entry" { - "MsmKey" = "8:_885A6EA7504C47C38C82CB2ABB0DF944" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_8F5DA10B7DBD4A3BB9BA5C40521BD2B0" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -293,31 +293,31 @@ { "CustomAction" { - "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_5583872DBAE949D28FDD72F70C6275F1" + "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_37E9A523B6B3453F84627968E526ED3C" { - "Name" = "8:util.exe" - "Condition" = "8:" - "Object" = "8:_885A6EA7504C47C38C82CB2ABB0DF944" + "Name" = "8:InstallPlugIns.exe" + "Condition" = "8:FILEEXISTSPLUGININSTALLER=1" + "Object" = "8:_5856B57BA0DE4257B932F6EB67C33FC6" "FileType" = "3:2" - "InstallAction" = "3:2" - "Arguments" = "8:/Commit" + "InstallAction" = "3:4" + "Arguments" = "8:/Uninstall" "EntryPoint" = "8:" "Sequence" = "3:1" - "Identifier" = "8:_9EC01899_6803_47E0_A88A_647C24A51533" + "Identifier" = "8:_BE3E0757_8245_4747_935F_CBE19BE4FCB8" "InstallerClass" = "11:FALSE" "CustomActionData" = "8:" } - "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_E04C6F23B7314061A027C45E52DC03E1" + "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_C0691195AB3140839223FC6C14C50D95" { - "Name" = "8:util.exe" - "Condition" = "8:" - "Object" = "8:_885A6EA7504C47C38C82CB2ABB0DF944" + "Name" = "8:InstallPlugIns.exe" + "Condition" = "8:CHECKBOX_PLUGINS=1" + "Object" = "8:_5856B57BA0DE4257B932F6EB67C33FC6" "FileType" = "3:2" - "InstallAction" = "3:4" - "Arguments" = "8:/Uninstall" + "InstallAction" = "3:2" + "Arguments" = "8:/Commit" "EntryPoint" = "8:" "Sequence" = "3:1" - "Identifier" = "8:_74E82689_551B_43F2_9D29_8E14D9BCE0B8" + "Identifier" = "8:_0F4737DB_FAD0_4B7F_B469_173830D5B757" "InstallerClass" = "11:FALSE" "CustomActionData" = "8:" } @@ -513,6 +513,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_5856B57BA0DE4257B932F6EB67C33FC6" + { + "SourcePath" = "8:dist\\InstallPlugIns.exe" + "TargetName" = "8:InstallPlugIns.exe" + "Tag" = "8:" + "Folder" = "8:_9644D34899864A6C8C68D099C5DD50DD" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:TRUE" + "Hidden" = "11:TRUE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{A582A373-4685-4296-BEFE-614B80A702C3}:_5DC297AA8AB548FDB9DDC93E22313FFC" { "SourcePath" = "8:dist\\tools\\Scripts\\Stitch_Script.txt" @@ -693,26 +713,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_885A6EA7504C47C38C82CB2ABB0DF944" - { - "SourcePath" = "8:dist\\util.exe" - "TargetName" = "8:util.exe" - "Tag" = "8:" - "Folder" = "8:_9644D34899864A6C8C68D099C5DD50DD" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:TRUE" - "Hidden" = "11:TRUE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{A582A373-4685-4296-BEFE-614B80A702C3}:_8F5DA10B7DBD4A3BB9BA5C40521BD2B0" { "SourcePath" = "8:dist\\Copyright\\COPYRIGHT_TIFF" @@ -1172,8 +1172,8 @@ { "Name" = "8:PanoTools" "AlwaysCreate" = "11:FALSE" - "Condition" = "8:NOT REINSTALL" - "Transitive" = "11:TRUE" + "Condition" = "8:CHECKBOX_STARTMENU" + "Transitive" = "11:FALSE" "Property" = "8:_30BD00474B854DD4AEFE330B39487E43" "Folders" { @@ -1272,8 +1272,8 @@ { "Name" = "8:PanoTools" "AlwaysCreate" = "11:FALSE" - "Condition" = "8:NOT REINSTALL" - "Transitive" = "11:TRUE" + "Condition" = "8:CHECKBOX_DESKTOP" + "Transitive" = "11:FALSE" "Property" = "8:_94D967280DED461C97D1F8925C5E35A2" "Folders" { @@ -1294,6 +1294,21 @@ } "Locator" { + "{FE475C8F-2277-44C4-85EE-F30EEC65FE8B}:_942B1962D3FF4A21817FFBA7DA706F87" + { + "Name" = "8:PluginInstaller" + "Folder" = "8:[TARGETDIR]" + "Depth" = "2:1" + "FileName" = "8:InstallPlugIns.exe" + "MinVesion" = "8:" + "MaxVersion" = "8:" + "MinSize" = "8:" + "MaxSize" = "8:" + "MinDate" = "8:" + "MaxDate" = "8:" + "Languages" = "8:" + "Property" = "8:FILEEXISTSPLUGININSTALLER" + } } "MsiBootstrapper" { @@ -1303,19 +1318,19 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Panorama Tools" - "ProductCode" = "8:{57106FC7-5620-4FA0-8E96-EB09C001FDFD}" - "PackageCode" = "8:{396DAC52-7EA1-4B09-A84F-346CB804881F}" + "ProductCode" = "8:{F5267DBB-D019-42D4-98BF-3E7B085422CB}" + "PackageCode" = "8:{347DD483-D814-433D-B9D2-739C09FFB09A}" "UpgradeCode" = "8:{B5C6176F-FF43-450C-A4F6-D6D256620285}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" - "ProductVersion" = "8:2.8.5" + "ProductVersion" = "8:2.8.6006" "Manufacturer" = "8:Open Source" - "ARPHELPTELEPHONE" = "8:http://groups.yahoo.com/group/PanoToolsNG/" - "ARPHELPLINK" = "8:http://wiki.panotools.org" + "ARPHELPTELEPHONE" = "8:http://sourceforge.net/projects/panotools/" + "ARPHELPLINK" = "8:http://groups.yahoo.com/group/PanoToolsNG/" "Title" = "8:Setup Panorama Tools 12" "Subject" = "8:" - "ARPCONTACT" = "8:Panorama Tools" + "ARPCONTACT" = "8:http://wiki.panotools.org" "Keywords" = "8:PT pano12 PanoTools Panoramatools" "ARPCOMMENTS" = "8:Set of tools for creating and manipulating panoramas from images." "ARPURLINFOABOUT" = "8:http://sourceforge.net/projects/panotools/" @@ -1351,9 +1366,17 @@ } "Values" { + "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_2572D67C0ED5482095419A277A245EE9" + { + "Name" = "8:root" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:4" + "Value" = "8:" + } "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_A51EA5B09B1244ECBDDCD32BA513D9FD" { - "Name" = "8:Root" + "Name" = "8:" "Condition" = "8:" "Transitive" = "11:FALSE" "ValueTypes" = "3:2" @@ -1433,7 +1456,7 @@ "Description" = "8:PanoTools morphing tool to change one image into another." "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_62234693F68F41DC8699A7A83EB3F21A" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1444,10 +1467,10 @@ { "Name" = "8:Readme" "Arguments" = "8:" - "Description" = "8:" + "Description" = "8:Quick start help file on Panorama Tools" "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_BAD9FD64B2E14A8F82C8872E87164D8C" "Folder" = "8:_133D7C466DB947659AA1798793F856F5" "WorkingFolder" = "8:_9644D34899864A6C8C68D099C5DD50DD" @@ -1458,10 +1481,10 @@ { "Name" = "8:Tools" "Arguments" = "8:" - "Description" = "8:" + "Description" = "8:Open the folder to Panorama Tools" "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" "Folder" = "8:_133D7C466DB947659AA1798793F856F5" "WorkingFolder" = "8:_9644D34899864A6C8C68D099C5DD50DD" @@ -1475,7 +1498,7 @@ "Description" = "8:PanoTools utility to calculate best image positions by ligning up control points. " "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_EEFFFECED9D5476987AB030AA48293C1" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1489,7 +1512,7 @@ "Description" = "8:PanoTools utility to create intermediate views of any position between two images of the same scene taken from different positions." "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_D55C9525E6B44864B11492AD8E59F300" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1503,7 +1526,7 @@ "Description" = "8:PanoTools Panorama stitching tool that remaps, adjusts, and combines arbitrary images to panoramic views." "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_7174550455434DA69CB64E5F69B3FE18" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1517,7 +1540,7 @@ "Description" = "8:PanoTools utility to creates 3-dimensional objects from 2 or more stereoscopic images." "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_38EA21DEDFAD402F992B0B9CCAB456FB" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1531,7 +1554,7 @@ "Description" = "8:PanoTools interactive panorama editor." "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_0783058D44F94000A6373E02318509AB" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1545,7 +1568,7 @@ "Description" = "8:PanoTools graphical user interface for selecting control points on image pairs and creating script files." "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_872BA9BDC36E4856828060D3E33E48D3" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1559,7 +1582,7 @@ "Description" = "8:PanoTools utitlity to combines images into movie-stripes for viewing in object-viewers. " "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_C32C97993B8C4BE78DF08AF4C666027F" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1573,7 +1596,7 @@ "Description" = "8:PanoTools utility to averages images to reduce noise and enhance density." "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_F599445666E14EEE8B4722CA93C969CF" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1587,7 +1610,7 @@ "Description" = "8:PanoTools utility to encrypt panoramas to only display from one web location." "ShowCmd" = "3:1" "IconIndex" = "3:0" - "Transitive" = "11:TRUE" + "Transitive" = "11:FALSE" "Target" = "8:_944DDFA611234B49AA4A8AB629894D56" "Folder" = "8:_C95062D4BAB242CAA44245BB297B27F3" "WorkingFolder" = "8:_4CD49FADF4EF44B1851D316FD2CA78A8" @@ -1661,6 +1684,263 @@ "Attributes" = "3:1" "Dialogs" { + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_8E3F1A6B280B4F5BA892304142A4C76E" + { + "Sequence" = "3:300" + "DisplayName" = "8:Checkboxes (A)" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdCustomCheck1Dlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:2" + "Value" = "8:_3C7EBEB964384D369F16687417115B52" + "UsePlugInResources" = "11:TRUE" + } + "BannerText" + { + "Name" = "8:BannerText" + "DisplayName" = "8:#1014" + "Description" = "8:#1114" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:Options" + "DefaultValue" = "8:#1214" + "UsePlugInResources" = "11:TRUE" + } + "BodyText" + { + "Name" = "8:BodyText" + "DisplayName" = "8:#1015" + "Description" = "8:#1115" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:Choose what items to install" + "DefaultValue" = "8:#1215" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox1Label" + { + "Name" = "8:Checkbox1Label" + "DisplayName" = "8:#1034" + "Description" = "8:#1134" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:Add a folder with shortcuts to Panorama Tools on the Desktop." + "DefaultValue" = "8:#1234" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox1Property" + { + "Name" = "8:Checkbox1Property" + "DisplayName" = "8:#1030" + "Description" = "8:#1130" + "Type" = "3:14" + "ContextData" = "8:Public" + "Attributes" = "3:2" + "Setting" = "3:2" + "Value" = "8:CHECKBOX_DESKTOP" + "DefaultValue" = "8:CHECKBOXA1" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox1Value" + { + "Name" = "8:Checkbox1Value" + "DisplayName" = "8:#1038" + "Description" = "8:#1138" + "Type" = "3:2" + "ContextData" = "8:Unchecked=;Checked=1" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:1" + "DefaultValue" = "8:" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox1Visible" + { + "Name" = "8:Checkbox1Visible" + "DisplayName" = "8:#1026" + "Description" = "8:#1126" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox2Label" + { + "Name" = "8:Checkbox2Label" + "DisplayName" = "8:#1035" + "Description" = "8:#1135" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:Add shortcuts to the Panorama Tools folder in Start menu." + "DefaultValue" = "8:#1235" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox2Property" + { + "Name" = "8:Checkbox2Property" + "DisplayName" = "8:#1031" + "Description" = "8:#1131" + "Type" = "3:14" + "ContextData" = "8:Public" + "Attributes" = "3:2" + "Setting" = "3:2" + "Value" = "8:CHECKBOX_STARTMENU" + "DefaultValue" = "8:CHECKBOXA2" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox2Value" + { + "Name" = "8:Checkbox2Value" + "DisplayName" = "8:#1039" + "Description" = "8:#1139" + "Type" = "3:2" + "ContextData" = "8:Unchecked=;Checked=1" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:1" + "DefaultValue" = "8:" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox2Visible" + { + "Name" = "8:Checkbox2Visible" + "DisplayName" = "8:#1027" + "Description" = "8:#1127" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox3Label" + { + "Name" = "8:Checkbox3Label" + "DisplayName" = "8:#1036" + "Description" = "8:#1136" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:Remove existing plug-ins and search for Photosphop to install" + "DefaultValue" = "8:#1236" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox3Property" + { + "Name" = "8:Checkbox3Property" + "DisplayName" = "8:#1032" + "Description" = "8:#1132" + "Type" = "3:14" + "ContextData" = "8:Public" + "Attributes" = "3:2" + "Setting" = "3:2" + "Value" = "8:CHECKBOX_PLUGINS" + "DefaultValue" = "8:CHECKBOXA3" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox3Value" + { + "Name" = "8:Checkbox3Value" + "DisplayName" = "8:#1040" + "Description" = "8:#1140" + "Type" = "3:2" + "ContextData" = "8:Unchecked=;Checked=1" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:1" + "DefaultValue" = "8:" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox3Visible" + { + "Name" = "8:Checkbox3Visible" + "DisplayName" = "8:#1028" + "Description" = "8:#1128" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox4Label" + { + "Name" = "8:Checkbox4Label" + "DisplayName" = "8:#1037" + "Description" = "8:#1137" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1237" + "DefaultValue" = "8:#1237" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox4Property" + { + "Name" = "8:Checkbox4Property" + "DisplayName" = "8:#1033" + "Description" = "8:#1133" + "Type" = "3:14" + "ContextData" = "8:Public" + "Attributes" = "3:2" + "Setting" = "3:2" + "Value" = "8:CHECKBOXA4" + "DefaultValue" = "8:CHECKBOXA4" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox4Value" + { + "Name" = "8:Checkbox4Value" + "DisplayName" = "8:#1041" + "Description" = "8:#1141" + "Type" = "3:2" + "ContextData" = "8:Unchecked=;Checked=1" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:" + "DefaultValue" = "8:" + "UsePlugInResources" = "11:TRUE" + } + "Checkbox4Visible" + { + "Name" = "8:Checkbox4Visible" + "DisplayName" = "8:#1029" + "Description" = "8:#1129" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:0" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_9B8A10E281874979B651ED8A95CA0017" { "Sequence" = "3:100" @@ -1703,16 +1983,39 @@ "Type" = "3:3" "ContextData" = "8:" "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" + "Setting" = "3:2" + "Value" = "8:The installer will guide you through the steps required to install [ProductName] [version] on your computer." "DefaultValue" = "8:#1203" "UsePlugInResources" = "11:TRUE" } } } + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_DDE54AD10AFB436C8AC048C4B4954F75" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:2" + "Value" = "8:_3C7EBEB964384D369F16687417115B52" + "UsePlugInResources" = "11:TRUE" + } + } + } "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_E8DF50B3750A41B7BE18992D4083DF9F" { - "Sequence" = "3:300" + "Sequence" = "3:400" "DisplayName" = "8:Confirm Installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" Modified: branches/pano12/PT Setup/README.TXT =================================================================== --- branches/pano12/PT Setup/README.TXT 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/PT Setup/README.TXT 2007-12-31 04:23:58 UTC (rev 764) @@ -1,9 +1,11 @@ INSTALLATION INSTRUCTIONS -To install Panorama Tools double-click on file setup.exe. Be sure you -have actually unzipped the files. Installation will not work properly if -you try installing from within a zip application. +To install Panorama Tools on Windows, extract the PanoTools12 folder +and all the files to a temporary location. Double click on the setup.exe +file to start installation. Installation may not work properly if you try +installing from within a zip application. + You will need admin permission to do the install. Once installed you do not need admin permission to run Panorama Tools. During installation you are offered a choice: Install for "everyone" or "just me". It's usually best @@ -15,15 +17,26 @@ tools (Visual Studio). For more information visit www.microsoft.com and search Microsoft.com for "script blocking security software". +SHORTCUTS + +During installation you are offered a choice of adding shortcuts to the +desktop and to the start menu. There are many tools that make up +PanoTools. When the shortcuts are added to the desktop All the tools are +placed in a single folder to keep them together and take up minimum space. +Many of these tools can be used by dropping images and/or scripts on them. +For example you may have a script to extract the cube faces from a panorama. +Drop this script and the panorama image onto PTStitcher to create the cube faces. + PHOTOSHOP PLUG-INS -The Photoshop plug-ins are installed automatically for all versions of +The Photoshop plug-ins are installed automatically for many versions of Photoshop and Photoshop Elements. After installation open an image in Photoshop and choose Filters > Panorama Tools to run the plug-ins. +Installation will remove previous version of plug-ins first then install the new ones. Installation assumes that prevous versions of the plug-ins are located in Plug-ins or Plug-ins\Filters directory. If this is not the case, or you have -renamed an old version, automatic installation will fail. In the event that +renamed an old version, they may not be removed. In the event that installation fails, or for installation instructions for other applications such as Paint Shop Pro, see the Release Notes. The Release Notes are displayed at the end of installation and may also be found in the installation directory. Modified: branches/pano12/PT Setup/applytrans.bat =================================================================== --- branches/pano12/PT Setup/applytrans.bat 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/PT Setup/applytrans.bat 2007-12-31 04:23:58 UTC (rev 764) @@ -1 +1,2 @@ -"C:\Program Files\Microsoft Platform SDK\Bin\msitran" -a "AllUsers.mst" "PanoTools12\PanoTools.msi" \ No newline at end of file +"C:\Program Files\Microsoft Platform SDK\Bin\msitran" -a "AllUsers.mst" "PanoTools12\PanoTools.msi" +pause \ No newline at end of file Modified: branches/pano12/PT Setup/dist/Readme.html =================================================================== --- branches/pano12/PT Setup/dist/Readme.html 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/PT Setup/dist/Readme.html 2007-12-31 04:23:58 UTC (rev 764) @@ -45,7 +45,7 @@ </tr> <tr valign=top> <td width="10px"><strong>PTAverage</strong></td> - <td>Averages images to reduce noise and enhance density.</td> + <td>Averages images together to reduce noise and enhance density.</td> </tr> <tr valign=top> <td width="10px"><strong>PTStripe</strong></td> @@ -65,11 +65,13 @@ </tr> <tr valign=top> <td width="10px"><strong>PTRemap</strong></td> - <td>Change an image from one projection to another projection.</td> + <td> + Plug-in to change an image from one projection to another projection.</td> </tr> <tr valign=top> <td width="10px"><strong>PTPerspect</strong></td> - <td>Simulates a shift lens in sofware for normal or fisheye lenses.</td> + <td> + Plug-in to simulates a shift lens in sofware for normal or fisheye lenses.</td> </tr> </table> </div> @@ -87,7 +89,8 @@ <br /> <br /> <strong>PTOptimizer</strong> updates the script files used by <strong>PTStitcher</strong>, - <strong>PTStereo</strong>, <strong>PTInterpolate</strong>, and <strong>PTMorpher</strong>.<br /> + <strong>PTStereo</strong>, <strong>PTInterpolate</strong>, and <strong>PTMorpher</strong> + by ligning up control points.<br /> <br /> <strong>PTAverage</strong>, and <strong>PTStripe</strong> work by dropping images onto them.<br /> <br /> Modified: branches/pano12/PT Setup/dist/ReleaseNotes.txt =================================================================== --- branches/pano12/PT Setup/dist/ReleaseNotes.txt 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/PT Setup/dist/ReleaseNotes.txt 2007-12-31 04:23:58 UTC (rev 764) @@ -1,24 +1,30 @@ RELEASE NOTES -Panorama Tools suit of tools and plug-ins have been installed on your -computer. A shortcut to this file for is in the Windows Start menu. -A shortcut to the tools folder is in the Widows Start menu and a folder -with all the individual tools is on the desktop. +Panorama Tools suit of tools and plug-ins have been installed on your +computer. A shortcut to the tools folder is in the Widows Start menu and +a folder with all the individual tools is on the desktop. To access this file +again, from the Start menu choose PanoTools, Tools, and then ReleaseNotes. -The items installed are limited to those that dynamically link to pano12.dll +The items included in this installer are limited to those that dynamically link +to pano12.dll pano12.dll is installed into the "Windows\system32" folder. -Tools are installed into the "Program Files\Panorama Tools\tools" folder. -Plug-ins are installed into the "Program Files\Panorama Tools\Photoshop plugins" folder. +Tools are installed by default into the "Program Files\Panorama Tools\tools" +folder. If you choose a different directory it will be installed there. +Plug-ins are installed into the "Program Files\Panorama Tools\Photoshop +plugins" folder. Previous version of the Panotools Plugins installed in the +Photoshop or Photoshop Elements folder are removed before copying the new files. See Readme.html for details of all items installed. + PHOTOSHOP PLUG-IN For Photoshop and Photoshop Elements you will find the plug-ins in their application's menu under Filters > Panorama Tools. To install the plug-ins for other applications see the instructions below. + PHOTOSHOP PLUG-IN INSTALLATION Installation is automatic for Photoshop and Photoshop Elements. However, @@ -26,8 +32,8 @@ these instructions apply. To install the Photoshop plug-ins first remove the old version of the plug-ins -from the Photoshop Plug-Ins or Plug-Ins\Filters directory. The old plug-ins are -called +from the Photoshop Plug-Ins, Plug-Ins\Panorama Tools, or Plug-Ins\Filters +directory. The old plug-ins are called PTAdjust.8BF PTCorrect.8BF @@ -56,12 +62,29 @@ 3. If still present, close Photoshop and repeat step 1. After removing the plug-ins from Photoshop copy a new plug-ins from the -installation directory to Photoshop's Plug-ins directory. That is, copy -the plug-ins +installation directory to Photoshop's Plug-ins directory. It is better to +create a folder call "Panorama Tools" to put the plug-ins in if it does +not already exist. That is, copy the plug-ins - from: C:\Program Files\PanoTools\*.8BF - to: C:\Program Files\Adobe\Adobe Photoshop ???\Plug-Ins + from: C:\Program Files\Panorama Tools\Photoshop plugins\*.8BF + to: C:\Program Files\Adobe\Adobe Photoshop ???\Plug-Ins\Panorama Tools\ -After copying the new plug-ins to Photoshop's Plug-ins\Filters directory +After copying the new plug-ins to Photoshop's Plug-ins\Panorama Tools directory start Photoshop, open an image, and choose Filter > Panorama Tools. + +PHOTOSHOP PLUG-IN ERRORS + +Out of memory errors + +see http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=320005 +The Panotools plug-ins and filters in Photoshop, use large contiguous chunks +of RAM. You may see out of memory errors when these plug-ins cannot access +enough contiguous RAM because you don't have enough RAM or the RAM is too +fragmented. + +If you occasionally get out of memory errors, restart Photoshop to defragment +your RAM. If these errors occur frequently, decrease the memory slider in +Photoshop in 5% increments to see if giving less memory to Photoshop allows +Camera Raw and other filters and plug-ins the amount of contiguous RAM that +they need. \ No newline at end of file Modified: branches/pano12/libpano/tools/PTOptimizer.c =================================================================== --- branches/pano12/libpano/tools/PTOptimizer.c 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/libpano/tools/PTOptimizer.c 2007-12-31 04:23:58 UTC (rev 764) @@ -26,7 +26,7 @@ // gcc -oPTOptimizer -I/usr/include/pano12 -lpano12 PTOptimizer.c -#include "filter.h" +#include "..\\filter.h" #include <stdio.h> #define PT_OPTIMIZER_VERSION "PTOptimizer Version " VERSION ", written by Helmut Dersch\n" @@ -80,7 +80,7 @@ RunLMOptimizer( &opt ); ainf.data = opt.message; WriteResults( script, &infile, &ainf, distSquared, 0); - exit(0); + exit(0); } DisposeAlignInfo( &ainf ); } Modified: branches/pano12/libpano/tools/makefile.ptoptimizer.win32 =================================================================== --- branches/pano12/libpano/tools/makefile.ptoptimizer.win32 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/libpano/tools/makefile.ptoptimizer.win32 2007-12-31 04:23:58 UTC (rev 764) @@ -5,4 +5,4 @@ # Created Jim Watters May 15 2004 PTOptimizer.exe : PTOptimizer.c - gcc -oPTOptimizer -l../pano12 PTOptimizer.c + gcc -oPTOptimizer -l../pano12.dll PTOptimizer.c Modified: branches/pano12/libpano/version.h =================================================================== --- branches/pano12/libpano/version.h 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/libpano/version.h 2007-12-31 04:23:58 UTC (rev 764) @@ -37,7 +37,7 @@ // Numeric style of global version, same as VERSION with more precision #ifndef PTVERSION_FILEVERSIONNUMBER -#define PTVERSION_FILEVERSIONNUMBER 2,8,6,0 +#define PTVERSION_FILEVERSIONNUMBER 2,8,6,1 #endif #ifndef PTVERSION_NAME_LONG Modified: branches/pano12/ptfilter/cpyBuf.cpp =================================================================== --- branches/pano12/ptfilter/cpyBuf.cpp 2007-12-31 01:08:38 UTC (rev 763) +++ branches/pano12/ptfilter/cpyBuf.cpp 2007-12-31 04:23:58 UTC (rev 764) @@ -1,4 +1,4 @@ -// This program is free software; you can redistribute +// This program is free software; you can redistribute // it and/or modify it under the terms of the GNU // General Public License as published by the Free // Software Foundation; either version 2 of the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |