From: <kor...@us...> - 2009-09-27 11:57:41
|
Revision: 1088 http://panotools.svn.sourceforge.net/panotools/?rev=1088&view=rev Author: kornelbenko Date: 2009-09-27 11:57:32 +0000 (Sun, 27 Sep 2009) Log Message: ----------- libpano/CMakeLists.txt: Added ${_common_libs} to the link stage of the shared pano13 lib. Needed on OSX Platform. Corrected the copyright-dates Modified Paths: -------------- trunk/libpano/CMakeLists.txt trunk/libpano/man/CMakeLists.txt trunk/libpano/tests/CMakeLists.txt trunk/libpano/tests/simpleStitch/CMakeLists.txt trunk/libpano/tests/simpleTiff16/CMakeLists.txt trunk/libpano/tools/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-27 09:51:54 UTC (rev 1087) +++ trunk/libpano/CMakeLists.txt 2009-09-27 11:57:32 UTC (rev 1088) @@ -203,6 +203,7 @@ # We have some header files at top source level now include_directories(${CMAKE_SOURCE_DIR}) add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) +target_link_libraries(pano13 ${_common_libs}) add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src}) set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13) Modified: trunk/libpano/man/CMakeLists.txt =================================================================== --- trunk/libpano/man/CMakeLists.txt 2009-09-27 09:51:54 UTC (rev 1087) +++ trunk/libpano/man/CMakeLists.txt 2009-09-27 11:57:32 UTC (rev 1088) @@ -1,7 +1,7 @@ # This file is part of libpano13, the hugin build environment. # Licence details can be found in the file gpl.txt. # -# Copyright (c) 2008, 2009 Kornel Benko, <Kor...@be...> +# Copyright (c) 2009 Kornel Benko, <Kor...@be...> # project(man) Modified: trunk/libpano/tests/CMakeLists.txt =================================================================== --- trunk/libpano/tests/CMakeLists.txt 2009-09-27 09:51:54 UTC (rev 1087) +++ trunk/libpano/tests/CMakeLists.txt 2009-09-27 11:57:32 UTC (rev 1088) @@ -1,7 +1,7 @@ # This file is part of libpano13, the hugin build environment. # Licence details can be found in the file gpl.txt. # -# Copyright (c) 2008, 2009 Kornel Benko, <Kor...@be...> +# Copyright (c) 2009 Kornel Benko, <Kor...@be...> # project(test) Modified: trunk/libpano/tests/simpleStitch/CMakeLists.txt =================================================================== --- trunk/libpano/tests/simpleStitch/CMakeLists.txt 2009-09-27 09:51:54 UTC (rev 1087) +++ trunk/libpano/tests/simpleStitch/CMakeLists.txt 2009-09-27 11:57:32 UTC (rev 1088) @@ -1,7 +1,7 @@ # This file is part of libpano13, the hugin build environment. # Licence details can be found in the file gpl.txt. # -# Copyright (c) 2008, 2009 Kornel Benko, <Kor...@be...> +# Copyright (c) 2009 Kornel Benko, <Kor...@be...> # project(test1) Modified: trunk/libpano/tests/simpleTiff16/CMakeLists.txt =================================================================== --- trunk/libpano/tests/simpleTiff16/CMakeLists.txt 2009-09-27 09:51:54 UTC (rev 1087) +++ trunk/libpano/tests/simpleTiff16/CMakeLists.txt 2009-09-27 11:57:32 UTC (rev 1088) @@ -1,7 +1,7 @@ # This file is part of libpano13, the hugin build environment. # Licence details can be found in the file gpl.txt. # -# Copyright (c) 2008, 2009 Kornel Benko, <Kor...@be...> +# Copyright (c) 2009 Kornel Benko, <Kor...@be...> # project(test2) Modified: trunk/libpano/tools/CMakeLists.txt =================================================================== --- trunk/libpano/tools/CMakeLists.txt 2009-09-27 09:51:54 UTC (rev 1087) +++ trunk/libpano/tools/CMakeLists.txt 2009-09-27 11:57:32 UTC (rev 1088) @@ -1,7 +1,7 @@ # This file is part of libpano13, the hugin build environment. # Licence details can be found in the file gpl.txt. # -# Copyright (c) 2008, 2009 Kornel Benko, <Kor...@be...> +# Copyright (c) 2009 Kornel Benko, <Kor...@be...> # project(tools) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-09-28 18:13:26
|
Revision: 1094 http://panotools.svn.sourceforge.net/panotools/?rev=1094&view=rev Author: kornelbenko Date: 2009-09-28 18:13:14 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Use the correct target to add dependencies and also to create executables. On windows, bind with tha static target/library, on other platforms with the shared target. Modified Paths: -------------- trunk/libpano/CMakeLists.txt trunk/libpano/tools/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-28 10:37:42 UTC (rev 1093) +++ trunk/libpano/CMakeLists.txt 2009-09-28 18:13:14 UTC (rev 1094) @@ -205,6 +205,9 @@ target_link_libraries(pano13 ${_common_libs}) set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") install(TARGETS pano13 LIBRARY DESTINATION lib) + set(_pano_target pano13) +else() + set(_pano_target pano13a) endif() #create and install static library @@ -217,9 +220,9 @@ set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR}) add_subdirectory(man) -add_dependencies(pano13 man) +add_dependencies(${_pano_target} man) add_subdirectory(tools) -add_dependencies(tools pano13) +add_dependencies(tools ${_pano_target}) macro(setstripped _varname _value) string(STRIP ${_value} _v) Modified: trunk/libpano/tools/CMakeLists.txt =================================================================== --- trunk/libpano/tools/CMakeLists.txt 2009-09-28 10:37:42 UTC (rev 1093) +++ trunk/libpano/tools/CMakeLists.txt 2009-09-28 18:13:14 UTC (rev 1094) @@ -23,7 +23,7 @@ foreach(_cmd ${commands}) add_executable(${_cmd} ${_cmd}.c) - target_link_libraries(${_cmd} pano13 ${_common_libs}) + target_link_libraries(${_cmd} ${_pano_target} ${_common_libs}) install(TARGETS ${_cmd} DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel) endforeach(_cmd) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jim...@us...> - 2009-10-08 02:52:02
|
Revision: 1098 http://panotools.svn.sourceforge.net/panotools/?rev=1098&view=rev Author: jim0watters Date: 2009-10-08 02:51:56 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Move function to PTCommon where it belongs. Fix many possible memory leaks detected by CppCheck Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/PTcommon.h trunk/libpano/tools/PTmender.c Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2009-10-08 02:48:06 UTC (rev 1097) +++ trunk/libpano/ChangeLog 2009-10-08 02:51:56 UTC (rev 1098) @@ -1,3 +1,13 @@ +2009-10-07 jim0watters + + * PTmender.c: use define for path seperator. + + * ColourBrightness.c, file.c, hdrfile.c, main.c, parser.c, PTcommon.c, + ptstitch.c, tiff.c pttiff.h: Fixed many possible memory leaks for libpano + + * PTblender.c, PTmasker.c, PTmender.h, PTroller.c: Fixed many possible + memory leaks for the tools. + 2009-09-25 <dm...@uv...> * parser.c (ReadImageDescription): Removed a debugging printf I forgot Modified: trunk/libpano/PTcommon.h =================================================================== --- trunk/libpano/PTcommon.h 2009-10-08 02:48:06 UTC (rev 1097) +++ trunk/libpano/PTcommon.h 2009-10-08 02:51:56 UTC (rev 1098) @@ -64,7 +64,7 @@ int panoPSDCreate( fullPath *fullPathImages, int, fullPath*, pano_flattening_parms*); int panoCreatePanorama(fullPath ptrImageFileNames[], int counterImageFiles, fullPath *panoFileName, fullPath *scriptFileName); - +void ARGtoRGBAImage(Image *im); void panoReplaceExt(char* filename, char *extension); int panoUnCropTiff(char *inputFile, char *outputFile); Modified: trunk/libpano/tools/PTmender.c =================================================================== --- trunk/libpano/tools/PTmender.c 2009-10-08 02:48:06 UTC (rev 1097) +++ trunk/libpano/tools/PTmender.c 2009-10-08 02:51:56 UTC (rev 1098) @@ -388,7 +388,7 @@ char* Filename(fullPath* path) { char *temp; - if ((temp = strrchr(path->name, '/')) != NULL) { + if ((temp = strrchr(path->name, PATH_SEP)) != NULL) { temp++; } else { temp = path->name; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2009-10-11 21:45:40
|
Revision: 1103 http://panotools.svn.sourceforge.net/panotools/?rev=1103&view=rev Author: dangelo Date: 2009-10-11 21:45:33 +0000 (Sun, 11 Oct 2009) Log Message: ----------- Use Te0 as plane_yaw and Te1 as plane_pitch. This allows specification of the plane that is used in the translation mosaic (TrX, TrY, TrZ) mode. Not sure if the code is bug free, though. It mostly worked as expected but didn't work nicely for the nadir usecase in my limited tests. Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/filter.h trunk/libpano/math.c Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2009-10-11 08:30:27 UTC (rev 1102) +++ trunk/libpano/ChangeLog 2009-10-11 21:45:33 UTC (rev 1103) @@ -1,3 +1,11 @@ +2009-10-11 dangelo + + * filter.h, math.c: Use Te0 as plane_yaw and Te1 as + plane_pitch. This allows specification of the plane that is used in + the translation mosaic (TrX, TrY, TrZ) mode. Not sure if the code is + bug free, though. It mostly worked as expected but didn't work nicely + for the nadir usecase in my limited tests. + 2009-10-07 jim0watters * PTmender.c: use define for path seperator. Modified: trunk/libpano/filter.h =================================================================== --- trunk/libpano/filter.h 2009-10-11 08:30:27 UTC (rev 1102) +++ trunk/libpano/filter.h 2009-10-11 21:45:33 UTC (rev 1103) @@ -379,12 +379,12 @@ double horizontal; double vertical; - // Tilt + // Tilt double tilt[4]; // 0 around x, 1 around y, 2 around z, 3 scaling factor - // Translation of cmaera plane - double trans[3]; - // For testing new projections - double test[4]; + // Translation of cmaera plane + double trans[3]; + // For testing new projections + double test[4]; Image *im; Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2009-10-11 08:30:27 UTC (rev 1102) +++ trunk/libpano/math.c 2009-10-11 21:45:33 UTC (rev 1103) @@ -40,7 +40,11 @@ void matrix_matrix_mult ( double m1[3][3],double m2[3][3],double result[3][3]); int polzeros_(); +void cubeZero( double *a, int *n, double *root ); +void squareZero( double *a, int *n, double *root ); +double cubeRoot( double x ); + //------------------------- Some auxilliary math functions -------------------------------------------- // atanh is not available on MSVC. Use the atanh routine from gsl @@ -1794,134 +1798,205 @@ return 1; } -/** transfer a point from a camera centered at x1,y1,z1 into the camera at x2,y2,z2 */ -int plane_transfer_to_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params) +/** convert erect to cartesian XYZ coordinates + */ +int cart_erect( double x_dest, double y_dest, double * xyz, double distance) { - // params: distance, x1,y1,z1 - - double phi, theta; - double x_plane, y_plane; - double x_ray,y_ray,z_ray; + // phi is azimuth (negative angle around y axis, starting at the z axis) + double phi = x_dest / distance; + double theta_zenith = M_PI/2.0 - (y_dest / distance); + // compute cartesian coordinates.. + //pos[2] = cos(-phi)*sin(theta_zenith); + //pos[0] = sin(-phi)*sin(theta_zenith); + //pos[1] = cos(theta_zenith); + xyz[0] = sin(theta_zenith)*sin(phi); + xyz[1] = cos(theta_zenith); + xyz[2] = sin(theta_zenith)*-cos(phi); - phi = x_dest / mp->distance; - theta = - y_dest / mp->distance + PI / 2.0; - if(theta < 0) - { - theta = - theta; - phi += PI; + return 1; +} + + +/** convert cartesian coordinates into spherical ones + */ +int erect_cart(double * xyz, double *x_src, double *y_src, double distance) +{ + *x_src = atan2(xyz[0],-xyz[2]) * distance; + *y_src = asin(xyz[1]/sqrt(xyz[0]*xyz[0]+xyz[1]*xyz[1]+xyz[2]*xyz[2])) * distance; +} + + +/** Compute intersection between line and point. + * n : a,b,c,d coefficients of plane (a,b,c = normal vector) + * p1: point on line + * p2: point on line + * See http://local.wasp.uwa.edu.au/~pbourke/geometry/planeline/ + */ +int line_plane_intersection(double n[4], + double p1[3], + double p2[3], + double * result) +{ + int i; + // direction vector of line + double d[3]; + double u,num,den; + + for (i=0;i<3;i++) + d[i] = p2[i]-p1[i]; + num = n[0]*p1[0]+n[1]*p1[1]+n[2]*p1[2] + n[3]; + den = -n[0]*d[0]-n[1]*d[1]-n[2]*d[2]; + if (fabs(den) < 1e-15) { + return 0; } - if(theta > PI) - { - theta = PI - (theta - PI); - phi += PI; + u = num/den; + + if (u < 0) { + // This is match is in the wrong direction, ignore + return 0; } + /* printf("intersect, dir: %f %f %f, num: %f, denom: %f, u: %f\n", d[0], d[1], d[2], num, den, u); + */ - // if the ray goes behind the camera, abort here - // normalize phi to be in the -PI, PI range - while(phi <= -PI) - phi += 2*PI; - while(phi > PI) - phi -= 2*PI; + for (i=0;i<3;i++) + result[i] = p1[i]+u*d[i]; - // check if the point is "in front" of the camera - if (phi < -PI/2.0 || phi > PI/2.0) - // behind, transform considered invalid + return 1; +} + +/** transfer a point from the master camera through a plane into camera + * at TrX, TrY, TrZ using the plane located at Te0 (yaw), Te1 (pitch) + */ +int plane_transfer_to_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params) +{ + // params: distance, x1,y1,z1 + + double plane_coeff[4]; + double p1[3]; + double p2[3]; + double intersection[3]; + + // compute ray of sight for the current pixel in + // the master panorama camera. + // camera point + p1[0] = p1[1] = p1[2] = 0; + // point on sphere. + cart_erect(x_dest, y_dest, &p2[0], mp->distance); + + // compute plane description + cart_erect(DEG_TO_RAD(mp->test[0]), -DEG_TO_RAD(mp->test[1]), + &plane_coeff[0], 1.0); + + // plane_coeff[0..2] is both the normal and a point + // on the plane. + plane_coeff[3] = - plane_coeff[0]*plane_coeff[0] + - plane_coeff[1]*plane_coeff[1] + - plane_coeff[2]*plane_coeff[2]; + + /* + printf("Plane: y:%f p:%f coefficients: %f %f %f %f, ray direction: %f %f %f\n", + mp->test[0], mp->test[1], plane_coeff[0], plane_coeff[1], plane_coeff[2], plane_coeff[3], + p2[0],p2[1],p2[2]); + */ + + // perform intersection. + + if (!line_plane_intersection(plane_coeff, p1, p2, &intersection[0])) { + // printf("No intersection found, %f %f %f\n", p2[0], p2[1], p2[2]); return 0; + } - // compute the position on the intermediate plane - // the ray originates from the pano center (0,0,0) - // and intersects the plane located at z=-1 - // basically rect_erect, but with distance = 1 - x_plane = tan(phi); - y_plane = 1.0 / (tan( theta ) * cos(phi)); + // compute ray leading to the camera. + intersection[0] -= mp->trans[0]; + intersection[1] -= mp->trans[1]; + intersection[2] -= mp->trans[2]; - // compute ray leading to to the camera. - x_ray = x_plane - mp->trans[0]; - y_ray = y_plane - mp->trans[1]; - z_ray = mp->trans[2] + 1.0; - // transform into erect - // basically erect_rect - *x_src = mp->distance * atan2( x_ray, z_ray ); - *y_src = mp->distance * atan2( y_ray, sqrt( z_ray*z_ray + x_ray*x_ray ) ); + erect_cart(&intersection[0], x_src, y_src, mp->distance); /* - printf("plane(%.1f,%.1f%.1f): %8.5f %8.5f -> %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n", - mp->trans[0], mp->trans[1], mp->trans[2], + printf("pano->plane->cam(%.1f, %.1f, %.1f, y:%1f,p:%1f): %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n", + mp->trans[0], mp->trans[1], mp->trans[2], mp->test[0], mp->test[1], x_dest, y_dest, - //RAD_TO_DEG(phi), RAD_TO_DEG(theta), - x_plane, y_plane, - x_ray, y_ray, z_ray, *x_src, *y_src); + intersection[0], intersection[1], intersection[2], + *x_src, *y_src); */ return 1; } + /** transfer a point from a camera centered at x1,y1,z1 into the camera at x2,y2,z2 */ int plane_transfer_from_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params) { + + double phi, theta; + double plane_coeff[4]; + double p1[3]; + double p2[3]; + double intersection[3]; + // params: MakeParams - double phi, theta; - double x_plane, y_plane; - double x_ray,y_ray,z_ray; + // compute ray of sight for the current pixel in + // the master panorama camera. + // camera point + p1[0] = mp->trans[0]; + p1[1] = mp->trans[1]; + p1[2] = mp->trans[2]; - phi = x_dest / mp->distance; - theta = - y_dest / mp->distance + PI / 2.0; - if(theta < 0) - { - theta = - theta; - phi += PI; - } - if(theta > PI) - { - theta = PI - (theta - PI); - phi += PI; - } + // point on sphere (direction vector in camera coordinates) + cart_erect(x_dest, y_dest, &p2[0], mp->distance); + // add camera position to get point on ray + p2[0] += p1[0]; + p2[1] += p1[1]; + p2[2] += p1[2]; - // normalize phi to be in the -PI, PI range - while(phi <= -PI) - phi += 2*PI; - while(phi > PI) - phi -= 2*PI; - // check if the point is "in front" of the panorama camera - if (phi < -PI/2.0 || phi > PI/2.0) - // behind, transform considered invalid - return 0; + // compute plane description + cart_erect(DEG_TO_RAD(mp->test[0]), -DEG_TO_RAD(mp->test[1]), + &plane_coeff[0], 1.0); - // compute the position on the intermediate plane - // Intersection of ray from the image center (Tx,Ty,Tz) - // with plane located at z=-1 - x_plane = (mp->trans[2]+1.0)* tan(phi); - y_plane = (mp->trans[2]+1.0) / (tan( theta ) * cos(phi)); + // plane_coeff[0..2] is both the normal and a point + // on the plane. + plane_coeff[3] = - plane_coeff[0]*plane_coeff[0] + - plane_coeff[1]*plane_coeff[1] + - plane_coeff[2]*plane_coeff[2]; - // shift according to camera position - x_plane += mp->trans[0]; - y_plane += mp->trans[1]; + /* + printf("Plane: y:%f p:%f coefficients: %f %f %f %f, ray direction: %f %f %f\n", + mp->test[0], mp->test[1], plane_coeff[0], plane_coeff[1], plane_coeff[2], plane_coeff[3], + p2[0],p2[1],p2[2]); + */ - x_ray = x_plane; - y_ray = y_plane; - z_ray = 1.0; + // compute intersection + if (!line_plane_intersection(plane_coeff, p1, p2, &intersection[0])) { + //printf("No intersection found, %f %f %f\n", p2[0], p2[1], p2[2]); + return 0; + } + + // the intersection vector is the vector of the ray of sight from + // the master panorama camera. + // transform into erect - // basically erect_rect - *x_src = mp->distance * atan2( x_ray, z_ray ); - *y_src = mp->distance * atan2( y_ray, sqrt( z_ray*z_ray + x_ray*x_ray ) ); + erect_cart(&intersection[0], x_src, y_src, mp->distance); /* - printf("cam->plane(%.1f,%.1f%.1f): %8.5f %8.5f -> %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n", - mp->trans[0], mp->trans[1], mp->trans[2], + printf("cam->plane->pano(%.1f, %.1f, %.1f, y:%1f,p:%1f): %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n", + mp->trans[0], mp->trans[1], mp->trans[2], mp->test[0], mp->test[1], x_dest, y_dest, - //RAD_TO_DEG(phi), RAD_TO_DEG(theta), - x_plane, y_plane, - x_ray, y_ray, z_ray, *x_src, *y_src); + intersection[0], intersection[1], intersection[2], + *x_src, *y_src); + */ + return 1; } + /** convert from erect to biplane */ int biplane_erect ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ) { @@ -2351,12 +2426,9 @@ } #endif -void cubeZero( double *a, int *n, double *root ); -void squareZero( double *a, int *n, double *root ); -double cubeRoot( double x ); -void cubeZero( double *a, int *n, double *root ){ +void cubeZero( double *a, int *n, double *root ) { if( a[3] == 0.0 ){ // second order polynomial squareZero( a, n, root ); }else{ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dm...@us...> - 2009-10-14 09:11:54
|
Revision: 1108 http://panotools.svn.sourceforge.net/panotools/?rev=1108&view=rev Author: dmg Date: 2009-10-14 09:11:42 +0000 (Wed, 14 Oct 2009) Log Message: ----------- this commit should have been few weeks ago... fixes incorrect normalization of angles in tilt Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/PTcommon.c trunk/libpano/adjust.c trunk/libpano/filter.h Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2009-10-12 17:12:57 UTC (rev 1107) +++ trunk/libpano/ChangeLog 2009-10-14 09:11:42 UTC (rev 1108) @@ -16,10 +16,19 @@ * PTblender.c, PTmasker.c, PTmender.h, PTroller.c: Fixed many possible memory leaks for the tools. +2009-09-26 <dm...@uv...> + + * adjust.c (SetAlignParams): Trying to normalize the angles didn't + really worked. Disabled for the time begin + + * filter.h (NORM_ANGLE_RAD): Totally incorrect implementation before. + + + 2009-09-25 <dm...@uv...> - + * parser.c (ReadImageDescription): Removed a debugging printf I forgot - + 2009-09-25 <dm...@uv...> * correct.c (SetCorrectDefaults): Initialized values of new parameters. Modified: trunk/libpano/PTcommon.c =================================================================== --- trunk/libpano/PTcommon.c 2009-10-12 17:12:57 UTC (rev 1107) +++ trunk/libpano/PTcommon.c 2009-10-14 09:11:42 UTC (rev 1108) @@ -894,7 +894,7 @@ } else { PrintError("No support for this ouput image format (%s). Output will be TIFF_m", output_file_format); } - //croppedTIFFIntermediate = 0; + // croppedTIFFIntermediate = 0; Modified: trunk/libpano/adjust.c =================================================================== --- trunk/libpano/adjust.c 2009-10-12 17:12:57 UTC (rev 1107) +++ trunk/libpano/adjust.c 2009-10-14 09:11:42 UTC (rev 1108) @@ -2497,15 +2497,15 @@ } // tilt if( (k = optInfo->opt[i].tiltXopt) > 0 ){ - if( k == 1 ){ optInfo->im[i].cP.tilt_x = x[j++]; NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_x); + if( k == 1 ){ optInfo->im[i].cP.tilt_x = x[j++]; //NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_x); }else{ optInfo->im[i].cP.tilt_x = optInfo->im[k-2].cP.tilt_x;} } if( (k = optInfo->opt[i].tiltYopt) > 0 ){ - if( k == 1 ){ optInfo->im[i].cP.tilt_y = x[j++]; NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_y); + if( k == 1 ){ optInfo->im[i].cP.tilt_y = x[j++]; //NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_y); }else{ optInfo->im[i].cP.tilt_y = optInfo->im[k-2].cP.tilt_y;} } if( (k = optInfo->opt[i].tiltZopt) > 0 ){ - if( k == 1 ){ optInfo->im[i].cP.tilt_z = x[j++];NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_z); + if( k == 1 ){ optInfo->im[i].cP.tilt_z =x[j++]; //NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_z); }else{ optInfo->im[i].cP.tilt_z = optInfo->im[k-2].cP.tilt_z;} } if( (k = optInfo->opt[i].tiltScaleOpt) > 0 ){ @@ -2515,6 +2515,11 @@ optInfo->im[i].cP.tilt_scale = 0.001; //make sure it never becomes zero } optInfo->im[i].cP.tilt_scale = fabs(optInfo->im[i].cP.tilt_scale); + /* + if (optInfo->im[i].cP.tilt_scale > 10) { + optInfo->im[i].cP.tilt_scale = 10; //make sure it never gets out of control + } + */ } else{ optInfo->im[i].cP.tilt_scale = optInfo->im[k-2].cP.tilt_scale;} } // translate Modified: trunk/libpano/filter.h =================================================================== --- trunk/libpano/filter.h 2009-10-12 17:12:57 UTC (rev 1107) +++ trunk/libpano/filter.h 2009-10-14 09:11:42 UTC (rev 1108) @@ -71,7 +71,7 @@ // Normalize an angle to +/-180degrees #define NORM_ANGLE( x ) while( x >180.0 ) x -= 360.0; while( x < -180.0 ) x += 360.0; -#define NORM_ANGLE_RAD( x ) fmod((x), PI) +#define NORM_ANGLE_RAD( x ) while( (x) >PI ) (x) -= 2 * PI; while( (x) < -PI ) (x) += 2 * PI; // Convert degree to radian This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jim...@us...> - 2009-11-08 03:05:54
|
Revision: 1136 http://panotools.svn.sourceforge.net/panotools/?rev=1136&view=rev Author: jim0watters Date: 2009-11-08 03:05:46 +0000 (Sun, 08 Nov 2009) Log Message: ----------- Allow building the CMD and GUI versions of pano13.dll Modified Paths: -------------- trunk/libpano/libpano13.def trunk/libpano/pano13vc.def trunk/libpano/sys_ansi.c trunk/libpano/sys_ansi.h Modified: trunk/libpano/libpano13.def =================================================================== --- trunk/libpano/libpano13.def 2009-11-08 01:00:24 UTC (rev 1135) +++ trunk/libpano/libpano13.def 2009-11-08 03:05:46 UTC (rev 1136) @@ -14,27 +14,27 @@ writePrefs @5 writeTIFF @6 PrintError @7 - DispPrg = DispPrg@16 @8 - SetCPrefs = SetCPrefs@16 @9 +; 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 +; 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 +; InfoPrg = InfoPrg@16 @26 +; SetCutOpt = SetCutOpt@16 @27 +; SetPanOpt = SetPanOpt@16 @28 +; SetFrPrefs = SetFrPrefs@16 @29 writePSD @30 addLayerToFile @31 writePSDwithLayer @32 @@ -78,10 +78,10 @@ FindFile @70 DisposeAlignInfo @71 showScript @72 - readImage @73 - writeImage @74 +; readImage @73 +; writeImage @74 writeJPEG @75 - makeTempPath @76 +; makeTempPath @76 MorphImageFile @77 blendImages @78 InterpolateImageFile @79 @@ -94,44 +94,44 @@ 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 +; 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 +; 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 TIFFOpen @128 TIFFClose @129 @@ -152,14 +152,14 @@ 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 +; 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 @@ -181,17 +181,17 @@ PT_setErrorFcn @174 execute_stack_new @175 InsertFileName @176 - VerifyTiffsAreCompatible @177 - AddStitchingMasks @178 - FlattenTIFF @179 - CreatePSD @180 - CreatePanorama @181 +; VerifyTiffsAreCompatible @177 +; AddStitchingMasks @178 + panoFlattenTIFF @179 +; CreatePSD @180 + panoCreatePanorama @181 ptQuietFlag @182 - ReplaceExt @183 + panoReplaceExt @183 ColourBrightness @184 - TiffSetImageParameters @185 - TiffGetImageParameters @186 +; TiffSetImageParameters @185 +; TiffGetImageParameters @186 getCropInformationFromTiff @187 setCropInformationInTiff @188 - writeCroppedTIFF @ 189 + writeCroppedTIFF @189 dieWithError @190 \ No newline at end of file Modified: trunk/libpano/pano13vc.def =================================================================== --- trunk/libpano/pano13vc.def 2009-11-08 01:00:24 UTC (rev 1135) +++ trunk/libpano/pano13vc.def 2009-11-08 03:05:46 UTC (rev 1136) @@ -10,27 +10,27 @@ writePrefs @5 writeTIFF @6 PrintError @7 - DispPrg@16 = DispPrg @8 - SetCPrefs@16 = SetCPrefs @9 +; DispPrg@16 = DispPrg @8 +; SetCPrefs@16 = SetCPrefs @9 SetWindowOwner @10 - SetLumOpt@16 = SetLumOpt @11 - DLLInit@12 = DLLInit @12 - SetRadOpt@16 = SetRadOpt @13 - SetHorOpt@16 = SetHorOpt @15 - SetVerOpt@16 = SetVerOpt @16 - SetScOpt@16 = SetScOpt @17 - SetShOpt@16 = SetShOpt @18 - SetCrOpt@16 = SetCrOpt @19 - SetAdPrefs@16 = SetAdPrefs @20 - SetPerspPrefs@16 = SetPerspPrefs @21 - SetRem@16 = SetRem @22 - SetSiz@16 = SetSiz @23 - SetIntp@16 = SetIntp @24 +; SetLumOpt@16 = SetLumOpt @11 +; DLLInit@12 = DLLInit @12 +; SetRadOpt@16 = SetRadOpt @13 +; SetHorOpt@16 = SetHorOpt @15 +; SetVerOpt@16 = SetVerOpt @16 +; SetScOpt@16 = SetScOpt @17 +; SetShOpt@16 = SetShOpt @18 +; SetCrOpt@16 = SetCrOpt @19 +; SetAdPrefs@16 = SetAdPrefs @20 +; SetPerspPrefs@16 = SetPerspPrefs @21 +; SetRem@16 = SetRem @22 +; SetSiz@16 = SetSiz @23 +; SetIntp@16 = SetIntp @24 CopyImageData @25 - InfoPrg@16 = InfoPrg @26 - SetCutOpt@16 = SetCutOpt @27 - SetPanOpt@16 = SetPanOpt @28 - SetFrPrefs@16 = SetFrPrefs @29 +; InfoPrg@16 = InfoPrg @26 +; SetCutOpt@16 = SetCutOpt @27 +; SetPanOpt@16 = SetPanOpt @28 +; SetFrPrefs@16 = SetFrPrefs @29 writePSD @30 addLayerToFile @31 writePSDwithLayer @32 @@ -90,44 +90,44 @@ SetMakeParams @86 fwiener @87 noisefilter @88 - Java_ptutils_CLoadImage@12 = Java_ptutils_CLoadImage @89 - Java_ptutils_CGetImageRow@16 = Java_ptutils_CGetImageRow @90 - Java_ptutils_CGetImageWidth@12 = Java_ptutils_CGetImageWidth @91 - Java_ptutils_CGetImageHeight@12 = Java_ptutils_CGetImageHeight @92 - Java_ptutils_CLoadProject@12 = Java_ptutils_CLoadProject @93 - Java_ptutils_CGetImageCount@8 = Java_ptutils_CGetImageCount @94 - Java_ptutils_CGetImageName@12 = Java_ptutils_CGetImageName @95 - Java_ptutils_CGetControlPointCount@8 = Java_ptutils_CGetControlPointCount @96 - Java_ptutils_CGetCP_1n@16 = Java_ptutils_CGetCP_1n @97 - Java_ptutils_CGetCP_1x@16 = Java_ptutils_CGetCP_1x @98 - Java_ptutils_CGetCP_1y@16 = Java_ptutils_CGetCP_1y @99 - Java_ptutils_CGetCP_1t@12 = Java_ptutils_CGetCP_1t @100 - Java_ptutils_CGetTriangleCount@8 = Java_ptutils_CGetTriangleCount @101 - Java_ptutils_CGetTR_1v@16 = Java_ptutils_CGetTR_1v @102 - Java_ptutils_CGetTR_1i@12 = Java_ptutils_CGetTR_1i @103 - Java_ptutils_CSaveProject@12 = Java_ptutils_CSaveProject @104 - Java_ptutils_CSetImageName@16 = Java_ptutils_CSetImageName @105 - Java_ptutils_CSetControlPointCount@12 = Java_ptutils_CSetControlPointCount @106 - Java_ptutils_CSetCP@56 = Java_ptutils_CSetCP @107 - Java_ptutils_CSetTriangleCount@12 = Java_ptutils_CSetTriangleCount @108 - Java_ptutils_CSetTR@28 = Java_ptutils_CSetTR @109 - Java_ptutils_CGetIndex@12 = Java_ptutils_CGetIndex @110 - Java_ptutils_CCreateProject@36 = Java_ptutils_CCreateProject @111 - Java_ptutils_CTriangulate@12 = Java_ptutils_CTriangulate @112 - Java_ptutils_CReduce@12 = Java_ptutils_CReduce @113 - Java_ptutils_CCallOptimizer@8 = Java_ptutils_CCallOptimizer @114 - Java_ptutils_CShowScript@8 = Java_ptutils_CShowScript @115 - Java_ptutils_CLaunchAndSendScript@16 = Java_ptutils_CLaunchAndSendScript @116 +; Java_ptutils_CLoadImage@12 = Java_ptutils_CLoadImage @89 +; Java_ptutils_CGetImageRow@16 = Java_ptutils_CGetImageRow @90 +; Java_ptutils_CGetImageWidth@12 = Java_ptutils_CGetImageWidth @91 +; Java_ptutils_CGetImageHeight@12 = Java_ptutils_CGetImageHeight @92 +; Java_ptutils_CLoadProject@12 = Java_ptutils_CLoadProject @93 +; Java_ptutils_CGetImageCount@8 = Java_ptutils_CGetImageCount @94 +; Java_ptutils_CGetImageName@12 = Java_ptutils_CGetImageName @95 +; Java_ptutils_CGetControlPointCount@8 = Java_ptutils_CGetControlPointCount @96 +; Java_ptutils_CGetCP_1n@16 = Java_ptutils_CGetCP_1n @97 +; Java_ptutils_CGetCP_1x@16 = Java_ptutils_CGetCP_1x @98 +; Java_ptutils_CGetCP_1y@16 = Java_ptutils_CGetCP_1y @99 +; Java_ptutils_CGetCP_1t@12 = Java_ptutils_CGetCP_1t @100 +; Java_ptutils_CGetTriangleCount@8 = Java_ptutils_CGetTriangleCount @101 +; Java_ptutils_CGetTR_1v@16 = Java_ptutils_CGetTR_1v @102 +; Java_ptutils_CGetTR_1i@12 = Java_ptutils_CGetTR_1i @103 +; Java_ptutils_CSaveProject@12 = Java_ptutils_CSaveProject @104 +; Java_ptutils_CSetImageName@16 = Java_ptutils_CSetImageName @105 +; Java_ptutils_CSetControlPointCount@12 = Java_ptutils_CSetControlPointCount @106 +; Java_ptutils_CSetCP@56 = Java_ptutils_CSetCP @107 +; Java_ptutils_CSetTriangleCount@12 = Java_ptutils_CSetTriangleCount @108 +; Java_ptutils_CSetTR@28 = Java_ptutils_CSetTR @109 +; Java_ptutils_CGetIndex@12 = Java_ptutils_CGetIndex @110 +; Java_ptutils_CCreateProject@36 = Java_ptutils_CCreateProject @111 +; Java_ptutils_CTriangulate@12 = Java_ptutils_CTriangulate @112 +; Java_ptutils_CReduce@12 = Java_ptutils_CReduce @113 +; Java_ptutils_CCallOptimizer@8 = Java_ptutils_CCallOptimizer @114 +; Java_ptutils_CShowScript@8 = Java_ptutils_CShowScript @115 +; Java_ptutils_CLaunchAndSendScript@16 = Java_ptutils_CLaunchAndSendScript @116 IsTextFile @117 StringtoFullPath @118 - Java_ptutils_CAlignPoint@20 = Java_ptutils_CAlignPoint @119 - Java_pteditor_CLoadImage@12 = Java_pteditor_CLoadImage @120 - Java_pteditor_CSaveImage@12 = Java_pteditor_CSaveImage @121 - Java_pteditor_CGetImageWidth@8 = Java_pteditor_CGetImageWidth @122 - Java_pteditor_CGetImageHeight@8 = Java_pteditor_CGetImageHeight @123 - Java_pteditor_CGetImageRow@16 = Java_pteditor_CGetImageRow @124 - Java_pteditor_CExtract@56 = Java_pteditor_CExtract @125 - Java_pteditor_CInsert@48 = Java_pteditor_CInsert @126 +; Java_ptutils_CAlignPoint@20 = Java_ptutils_CAlignPoint @119 +; Java_pteditor_CLoadImage@12 = Java_pteditor_CLoadImage @120 +; Java_pteditor_CSaveImage@12 = Java_pteditor_CSaveImage @121 +; Java_pteditor_CGetImageWidth@8 = Java_pteditor_CGetImageWidth @122 +; Java_pteditor_CGetImageHeight@8 = Java_pteditor_CGetImageHeight @123 +; Java_pteditor_CGetImageRow@16 = Java_pteditor_CGetImageRow @124 +; Java_pteditor_CExtract@56 = Java_pteditor_CExtract @125 +; Java_pteditor_CInsert@48 = Java_pteditor_CInsert @126 Progress @127 TIFFOpen @128 TIFFClose @129 @@ -148,14 +148,14 @@ RGBAtoARGB @145 readTIFF @146 CheckParams @147 - Java_ptutils_CGetImageFormat@12 = Java_ptutils_CGetImageFormat @148 - Java_ptutils_CGetHfov@12 = Java_ptutils_CGetHfov @149 - Java_ptutils_CGetYaw@12 = Java_ptutils_CGetYaw @150 - Java_ptutils_CGetPitch@12 = Java_ptutils_CGetPitch @151 - Java_ptutils_CGetRoll@12 = Java_ptutils_CGetRoll @152 - Java_pteditor_CSetImageWidth@12 = Java_pteditor_CSetImageWidth @153 - Java_pteditor_CSetImageHeight@12 = Java_pteditor_CSetImageHeight @154 - Java_pteditor_CSetImageRow@16 = Java_pteditor_CSetImageRow @155 +; Java_ptutils_CGetImageFormat@12 = Java_ptutils_CGetImageFormat @148 +; Java_ptutils_CGetHfov@12 = Java_ptutils_CGetHfov @149 +; Java_ptutils_CGetYaw@12 = Java_ptutils_CGetYaw @150 +; Java_ptutils_CGetPitch@12 = Java_ptutils_CGetPitch @151 +; Java_ptutils_CGetRoll@12 = Java_ptutils_CGetRoll @152 +; Java_pteditor_CSetImageWidth@12 = Java_pteditor_CSetImageWidth @153 +; Java_pteditor_CSetImageHeight@12 = Java_pteditor_CSetImageHeight @154 +; Java_pteditor_CSetImageRow@16 = Java_pteditor_CSetImageRow @155 TwoToOneByte @156 CropImage @157 numLines @158 @@ -179,11 +179,11 @@ InsertFileName @176 ; VerifyTiffsAreCompatible @177 ; AddStitchingMasks @178 -; FlattenTIFF @179 + panoFlattenTIFF @179 ; CreatePSD @180 -; CreatePanorama @181 + panoCreatePanorama @181 ptQuietFlag @182 -; ReplaceExt @183 + panoReplaceExt @183 ColourBrightness @184 ; TiffSetImageParameters @185 ; TiffGetImageParameters @186 Modified: trunk/libpano/sys_ansi.c =================================================================== --- trunk/libpano/sys_ansi.c 2009-11-08 01:00:24 UTC (rev 1135) +++ trunk/libpano/sys_ansi.c 2009-11-08 03:05:46 UTC (rev 1136) @@ -25,6 +25,8 @@ //------------------ Public functions required by filter.h ------------------------------- +void SetWindowOwner(HWND Owner) {return;} +void CenterDialog(HWND hDlg) {return;} void filter_main( TrformStr *TrPtr, struct size_Prefs *spref) { Modified: trunk/libpano/sys_ansi.h =================================================================== --- trunk/libpano/sys_ansi.h 2009-11-08 01:00:24 UTC (rev 1135) +++ trunk/libpano/sys_ansi.h 2009-11-08 03:05:46 UTC (rev 1136) @@ -41,6 +41,9 @@ \ return( FALSE ); +void SetWindowOwner(HWND Owner); +void CenterDialog(HWND hDlg); + #define kSetRemapPrefs_dlg "REMAP" #define kSetRemapPrefs_InRect 350 #define kSetRemapPrefs_InPano 351 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jim...@us...> - 2009-11-08 03:09:33
|
Revision: 1137 http://panotools.svn.sourceforge.net/panotools/?rev=1137&view=rev Author: jim0watters Date: 2009-11-08 03:09:24 +0000 (Sun, 08 Nov 2009) Log Message: ----------- Updated Visual Studio Solution and Project files for building libpano and all the tools. Modified Paths: -------------- trunk/libpano/libpano.sln trunk/libpano/libpano.vcproj trunk/libpano/tools/PTAInterpolate.vcproj trunk/libpano/tools/PTOptimizer.vcproj trunk/libpano/tools/PTblender.vcproj trunk/libpano/tools/PTcrop.vcproj trunk/libpano/tools/PTinfo.vcproj trunk/libpano/tools/PTmasker.vcproj trunk/libpano/tools/PTmender.vcproj trunk/libpano/tools/PTroller.vcproj trunk/libpano/tools/PTtiff2psd.vcproj trunk/libpano/tools/PTtiffdump.vcproj trunk/libpano/tools/PTuncrop.vcproj trunk/libpano/tools/mpremap.vcproj Modified: trunk/libpano/libpano.sln =================================================================== --- trunk/libpano/libpano.sln 2009-11-08 03:05:46 UTC (rev 1136) +++ trunk/libpano/libpano.sln 2009-11-08 03:09:24 UTC (rev 1137) @@ -1,7 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pano13", "libpano.vcproj", "{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTblender", "tools\PTblender.vcproj", "{20D1E094-A4B5-4294-85CE-229529065789}" ProjectSection(ProjectDependencies) = postProject @@ -58,115 +57,126 @@ {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpremap", "tools\mpremap.vcproj", "{D6E6335C-274E-4FE4-8954-AF542F972C1B}" + ProjectSection(ProjectDependencies) = postProject + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} + EndProjectSection +EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug DLL CMD = Debug DLL CMD - Debug LIB CMD = Debug LIB CMD - Release DLL CMD = Release DLL CMD - Release LIB CMD = Release LIB CMD + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug CMD|Win32 = Debug CMD|Win32 + Debug CMD|x64 = Debug CMD|x64 + Release CMD|Win32 = Release CMD|Win32 + Release CMD|x64 = Release CMD|x64 EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.2 = Debug GUI|x64 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.Build.0 = Release CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.Build.0 = Release CMD|x64 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.Build.0 = Release CMD|x64 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.ActiveCfg = Debug DLL CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.Build.0 = Debug DLL CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.ActiveCfg = Debug LIB CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.Build.0 = Debug LIB CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.ActiveCfg = Release DLL CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.Build.0 = Release DLL CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.ActiveCfg = Release LIB CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.Build.0 = Release LIB CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.Build.0 = Release LIB|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.Build.0 = Release DLL|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.Build.0 = Release LIB|Win32 + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection EndGlobal Modified: trunk/libpano/libpano.vcproj =================================================================== --- trunk/libpano/libpano.vcproj 2009-11-08 03:05:46 UTC (rev 1136) +++ trunk/libpano/libpano.vcproj 2009-11-08 03:09:24 UTC (rev 1137) @@ -1,425 +1,589 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9.00" Name="pano13" ProjectGUID="{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}" RootNamespace="Panotools" - Keyword="MakeFileProj"> + Keyword="MakeFileProj" + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration - Name="Release DLL CMD|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0"> + Name="Debug CMD|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" + Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="0" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLinkerTool" - RegisterOutput="FALSE" - IgnoreImportLibrary="FALSE" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" - OutputFile="$(OutDir)/pano13.dll" - LinkIncremental="0" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" - IgnoreAllDefaultLibraries="FALSE" - IgnoreDefaultLibraryNames="LIBCMT" - ModuleDefinitionFile="pano13vc.def" - GenerateDebugInformation="FALSE" - EntryPointSymbol="" - ImportLibrary="$(OutDir)/pano13.lib" - TargetMachine="1"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="$(IntDir)/pano13.res"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release CMD|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool - Name="VCWebDeploymentTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Debug DLL CMD|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0"> + Name="VCXMLDataGeneratorTool" + /> <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + RuntimeLibrary="0" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib" - OutputFile="$(OutDir)/pano13.dll" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" - IgnoreAllDefaultLibraries="FALSE" - IgnoreDefaultLibraryNames="LIBCMTD" - ModuleDefinitionFile="pano13vc.def" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb" - EntryPointSymbol="" - ImportLibrary="$(OutDir)/pano13.lib" - TargetMachine="1"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="$(IntDir)/pano13.res"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug LIB CMD|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug GUI|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" - CharacterSet="0"> + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava" - MinimalRebuild="TRUE" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" + EnableFunctionLevelLinking="true" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="TRUE"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName=""/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Release LIB CMD|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release GUI|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" - CharacterSet="0"> + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="0" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" RuntimeLibrary="0" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" + Detect64BitPortabilityProblems="false" DebugInformationFormat="0" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="TRUE"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName=""/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug LIB GUI|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug CMD|x64" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" - CharacterSet="0"> + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava" - MinimalRebuild="TRUE" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="TRUE"/> + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName=""/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release CMD|x64" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Debug DLL GUI|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0"> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + RuntimeLibrary="0" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib" - OutputFile="$(OutDir)/pano13.dll" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" - IgnoreAllDefaultLibraries="FALSE" - IgnoreDefaultLibraryNames="LIBCMTD" - ModuleDefinitionFile="pano13vc.def" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb" - EntryPointSymbol="" - ImportLibrary="$(OutDir)/pano13.lib" - TargetMachine="1"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="$(IntDir)/pano13.res"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Release LIB GUI|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug GUI|x64" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" - CharacterSet="0"> + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" + Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" + EnableFunctionLevelLinking="true" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="0" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="TRUE"/> + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName=""/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release GUI|x64" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release DLL GUI|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0"> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="0" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + RuntimeLibrary="0" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" + Detect64BitPortabilityProblems="false" DebugInformationFormat="0" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLinkerTool" - RegisterOutput="FALSE" - IgnoreImportLibrary="FALSE" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" - OutputFile="$(OutDir)/pano13.dll" - LinkIncremental="0" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" - IgnoreAllDefaultLibraries="FALSE" - IgnoreDefaultLibraryNames="LIBCMT" - ModuleDefinitionFile="pano13vc.def" - GenerateDebugInformation="FALSE" - EntryPointSymbol="" - ImportLibrary="$(OutDir)/pano13.lib" - TargetMachine="1"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="$(IntDir)/pano13.res"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -428,316 +592,451 @@ <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > <File - RelativePath=".\adjust.c"> + RelativePath=".\adjust.c" + > </File> <File - RelativePath=".\bmp.c"> + RelativePath=".\bmp.c" + > </File> <File - RelativePath=".\ColourBrightness.c"> + RelativePath=".\ColourBrightness.c" + > </File> <File - RelativePath=".\correct.c"> + RelativePath=".\correct.c" + > </File> <File - RelativePath=".\fftn.c"> + RelativePath=".\fftn.c" + > </File> <File - RelativePath=".\file.c"> + RelativePath=".\file.c" + > </File> <File - RelativePath=".\filter.c"> + RelativePath=".\filter.c" + > </File> <File - RelativePath=".\fourier.c"> + RelativePath=".\fourier.c" + > </File> <File - RelativePath=".\tools\compat_win32\getopt.c"> + RelativePath=".\tools\compat_win32\getopt.c" + > </File> <File - RelativePath=".\hdrfile.c"> + RelativePath=".\hdrfile.c" + > </File> <File - RelativePath=".\jpeg.c"> + RelativePath=".\jpeg.c" + > </File> <File - RelativePath=".\jpegicc.c"> + RelativePath=".\jpegicc.c" + > </File> <File - RelativePath=".\lmdif.c"> + RelativePath=".\lmdif.c" + > </File> <File - RelativePath=".\math.c"> + RelativePath=".\math.c" + > </File> <File - RelativePath=".\metadata.c"> + RelativePath=".\metadata.c" + > </File> <File - RelativePath=".\morpher.c"> + RelativePath=".\morpher.c" + > </File> <File - RelativePath=".\multilayer.c"> + RelativePath=".\multilayer.c" + > </File> <File - RelativePath=".\optimize.c"> + RelativePath=".\optimize.c" + > </File> <File - RelativePath=".\parser.c"> + RelativePath=".\parser.c" + > </File> <File - RelativePath=".\perspect.c"> + RelativePath=".\perspect.c" + > </File> <File - RelativePath=".\png.c"> + RelativePath=".\png.c" + > </File> <File - RelativePath=".\ppm.c"> + RelativePath=".\ppm.c" + > </File> <File - RelativePath=".\PTcommon.c"> + RelativePath=".\PTcommon.c" + > </File> <File - RelativePath=".\PTDialogs.c"> + RelativePath=".\PTDialogs.c" + > </File> <File - RelativePath=".\pteditor.c"> + RelativePath=".\pteditor.c" + > </File> <File - RelativePath=".\ptfeather.c"> + RelativePath=".\ptfeather.c" + > </File> <File - RelativePath=".\ptpicker.c"> + RelativePath=".\ptpicker.c" + > </File> <File - RelativePath=".\ptstitch.c"> + RelativePath=".\ptstitch.c" + > </File> <File - RelativePath=".\queryfeature.c"> + RelativePath=".\queryfeature.c" + > </File> <File - RelativePath=".\remap.c"> + RelativePath=".\remap.c" + > </File> <File - RelativePath=".\resample.c"> + RelativePath=".\resample.c" + > </File> <File - RelativePath=".\rgbe.c"> + RelativePath=".\rgbe.c" + > </File> <File - RelativePath=".\seamer.c"> + RelativePath=".\seamer.c" + > </File> <File - RelativePath=".\sys_ansi.c"> + RelativePath=".\sys_ansi.c" + > <FileConfiguration - Name="Debug LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug DLL GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release DLL GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> </File> <File - RelativePath=".\sys_common.c"> + RelativePath=".\sys_common.c" + > </File> <File - RelativePath=".\sys_win.c"> + RelativePath=".\sys_win.c" + > <FileConfiguration - Name="Release DLL CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug DLL CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> </File> <File - RelativePath=".\tiff.c"> + RelativePath=".\tiff.c" + > </File> <File - RelativePath=".\Triangulate.c"> + RelativePath=".\Triangulate.c" + > </File> <File - RelativePath=".\ZComb.c"> + RelativePath=".\ZComb.c" + > </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > <File - RelativePath=".\ColourBrightness.h"> + RelativePath=".\ColourBrightness.h" + > </File> <File - RelativePath=".\f2c.h"> + RelativePath=".\f2c.h" + > </File> <File - RelativePath=".\fftn.h"> + RelativePath=".\fftn.h" + > </File> <File - RelativePath=".\file.h"> + RelativePath=".\file.h" + > </File> <File - RelativePath=".\filter.h"> + RelativePath=".\filter.h" + > </File> <File - RelativePath=".\tools\compat_win32\getopt.h"> + RelativePath=".\tools\compat_win32\getopt.h" + > </File> <File - RelativePath=".\metadata.h"> + RelativePath=".\metadata.h" + > </File> <File - RelativePath=".\panorama.h"> + RelativePath=".\panorama.h" + > </File> <File - RelativePath=".\pt_stdint.h"> + RelativePath=".\pt_stdint.h" + > </File> <File - RelativePath=".\PTcommon.h"> + RelativePath=".\PTcommon.h" + > </File> <File - RelativePath=".\pteditor.h"> + RelativePath=".\pteditor.h" + > </File> <File - RelativePath=".\ptutils.h"> + RelativePath=".\ptutils.h" + > </File> <File - RelativePath=".\resource.h"> + RelativePath=".\resource.h" + > </File> <File - RelativePath=".\rgbe.h"> + RelativePath=".\rgbe.h" + > </File> <File - RelativePath=".\seamer.h"> + RelativePath=".\seamer.h" + > </File> <File - RelativePath=".\sys_ansi.h"> + RelativePath=".\sys_ansi.h" + > <FileConfiguration - Name="Debug LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug DLL GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Release DLL GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> </File> <File - RelativePath=".\sys_win.h"> + RelativePath=".\sys_win.h" + > <FileConfiguration - Name="Release DLL CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug DLL CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> </File> <File - RelativePath=".\version.h"> + RelativePath=".\version.h" + > </File> <File - RelativePath=".\ZComb.h"> + RelativePath=".\ZComb.h" + > </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > <File - RelativePath=".\pano13.rc"> + RelativePath=".\pano13.rc" + > <FileConfiguration - Name="Debug LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCResourceCompilerTool"/> + Name="VCResourceCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCResourceCompilerTool"/> + Name="VCResourceCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCResourceCompilerTool"/> + Name="VCResourceCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCResourceCompilerTool"/> + Name="VCResourceCompilerTool" + /> </FileConfiguration> + <FileConfiguration + Name="Debug CMD|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release CMD|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug GUI|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release GUI|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> </File> <File - RelativePath=".\pano13vc.def"> + RelativePath=".\pano13vc.def" + > </File> </Filter> </Files> Modified: trunk/libpano/tools/PTAInterpolate.vcproj =================================================================== --- trunk/libpano/tools/PTAInterpolate.vcproj 2009-11-08 03:05:46 UTC (rev 1136) +++ trunk/libpano/tools/PTAInterpolate.vcproj 2009-11-08 03:09:24 UTC (rev 1137) @@ -1,216 +1,347 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9.00" Name="PTAInterpolate" ProjectGUID="{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}" - Keyword="Win32Proj"> + RootNamespace="PTAInterpolate" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration - Name="Debug LIB|Win32" - OutputDirectory="Debug" - IntermediateDirectory="Debug" + Name="Debug CMD|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" - CharacterSet="2"> + CharacterSet="2" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="TRUE" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTAInterpolate.exe" LinkIncremental="2" AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" IgnoreDefaultLibraryNames="LIBCMT" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb" SubSystem="1" - TargetMachine="1"/> + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Release LIB|Win32" - OutputDirectory="Release" - IntermediateDirectory="Release" + Name="Release CMD|Win32... [truncated message content] |
From: <dm...@us...> - 2009-11-10 22:33:32
|
Revision: 1145 http://panotools.svn.sourceforge.net/panotools/?rev=1145&view=rev Author: dmg Date: 2009-11-10 22:33:19 +0000 (Tue, 10 Nov 2009) Log Message: ----------- reverting to revisions 1118 due to compilation errors Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/libpano.sln trunk/libpano/libpano.vcproj trunk/libpano/libpano13.def trunk/libpano/math.c trunk/libpano/pano13vc.def trunk/libpano/sys_ansi.c trunk/libpano/sys_ansi.h trunk/libpano/tools/PTAInterpolate.vcproj trunk/libpano/tools/PTOptimizer.vcproj trunk/libpano/tools/PTblender.c trunk/libpano/tools/PTblender.vcproj trunk/libpano/tools/PTcrop.vcproj trunk/libpano/tools/PTinfo.vcproj trunk/libpano/tools/PTmasker.vcproj trunk/libpano/tools/PTmender.vcproj trunk/libpano/tools/PTroller.vcproj trunk/libpano/tools/PTtiff2psd.vcproj trunk/libpano/tools/PTtiffdump.vcproj trunk/libpano/tools/PTuncrop.vcproj Removed Paths: ------------- trunk/libpano/tools/mpremap/ trunk/libpano/tools/mpremap.c trunk/libpano/tools/mpremap.rc trunk/libpano/tools/mpremap.vcproj trunk/libpano/tools/ppmstream.c trunk/libpano/tools/ppmstream.h trunk/libpano/tools/preprocess.c trunk/libpano/tools/spline.c trunk/libpano/tools/string2.c trunk/libpano/tools/string2.h Property Changed: ---------------- trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0000.tif trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0001.tif trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0000.tif trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0001.tif Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2009-11-10 20:49:43 UTC (rev 1144) +++ trunk/libpano/ChangeLog 2009-11-10 22:33:19 UTC (rev 1145) @@ -1,12 +1,3 @@ -2009-11-07 Jim Watters - - * Added MPRemap - tools/mpremap.c, tools/mpremap.rc, tools/mpremap.vcproj, tools/ppmstream.c, tools/ppmstream.h, - tools/preprocess.c, tools/spline.c, tools/string2.c, tools/string2.h, and libpano/tools/mpremap/*.* - An updated version of Helmut Dersch's Moving Panoramas Remap for libPano13 - http://webuser.fh-furtwangen.de/~dersch/mp/MotionPanoramas.html - - 2009-10-11 dangelo * filter.h, math.c: Use Te0 as plane_yaw and Te1 as Modified: trunk/libpano/libpano.sln =================================================================== --- trunk/libpano/libpano.sln 2009-11-10 20:49:43 UTC (rev 1144) +++ trunk/libpano/libpano.sln 2009-11-10 22:33:19 UTC (rev 1145) @@ -1,6 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pano13", "libpano.vcproj", "{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTblender", "tools\PTblender.vcproj", "{20D1E094-A4B5-4294-85CE-229529065789}" ProjectSection(ProjectDependencies) = postProject @@ -57,126 +58,115 @@ {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpremap", "tools\mpremap.vcproj", "{D6E6335C-274E-4FE4-8954-AF542F972C1B}" - ProjectSection(ProjectDependencies) = postProject - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} - EndProjectSection -EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug CMD|Win32 = Debug CMD|Win32 - Debug CMD|x64 = Debug CMD|x64 - Release CMD|Win32 = Release CMD|Win32 - Release CMD|x64 = Release CMD|x64 + GlobalSection(SolutionConfiguration) = preSolution + Debug DLL CMD = Debug DLL CMD + Debug LIB CMD = Debug LIB CMD + Release DLL CMD = Release DLL CMD + Release LIB CMD = Release LIB CMD EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.2 = Debug GUI|x64 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.Build.0 = Release CMD|x64 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.Build.0 = Release CMD|x64 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.Build.0 = Release CMD|x64 + GlobalSection(ProjectDependencies) = postSolution EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + GlobalSection(ProjectConfiguration) = postSolution + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.ActiveCfg = Debug DLL CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.Build.0 = Debug DLL CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.ActiveCfg = Debug LIB CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.Build.0 = Debug LIB CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.ActiveCfg = Release DLL CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.Build.0 = Release DLL CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.ActiveCfg = Release LIB CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.Build.0 = Release LIB CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.Build.0 = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.Build.0 = Release DLL|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.Build.0 = Release LIB|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.Build.0 = Debug DLL|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.Build.0 = Debug LIB|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.ActiveCfg = Release DLL|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.Build.0 = Release DLL|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.ActiveCfg = Release LIB|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.Build.0 = Release LIB|Win32 EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection EndGlobal Modified: trunk/libpano/libpano.vcproj =================================================================== --- trunk/libpano/libpano.vcproj 2009-11-10 20:49:43 UTC (rev 1144) +++ trunk/libpano/libpano.vcproj 2009-11-10 22:33:19 UTC (rev 1145) @@ -1,589 +1,425 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="7.10" Name="pano13" ProjectGUID="{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}" RootNamespace="Panotools" - Keyword="MakeFileProj" - TargetFrameworkVersion="131072" - > + Keyword="MakeFileProj"> <Platforms> <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> + Name="Win32"/> </Platforms> - <ToolFiles> - </ToolFiles> <Configurations> <Configuration - Name="Debug CMD|Win32" - OutputDirectory="$(ConfigurationName)\$(PlatformName)" - IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" - ConfigurationType="4" - CharacterSet="0" - BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" - > + Name="Release DLL CMD|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0"> <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava" + RuntimeLibrary="2" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="0" CallingConvention="0" - CompileAs="0" - /> + CompileAs="0"/> <Tool - Name="VCManagedResourceCompilerTool" - /> + Name="VCCustomBuildTool"/> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="" - /> + Name="VCLinkerTool" + RegisterOutput="FALSE" + IgnoreImportLibrary="FALSE" + AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + OutputFile="$(OutDir)/pano13.dll" + LinkIncremental="0" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + IgnoreAllDefaultLibraries="FALSE" + IgnoreDefaultLibraryNames="LIBCMT" + ModuleDefinitionFile="pano13vc.def" + GenerateDebugInformation="FALSE" + EntryPointSymbol="" + ImportLibrary="$(OutDir)/pano13.lib" + TargetMachine="1"/> <Tool - Name="VCPreLinkEventTool" - CommandLine="" - /> + Name="VCMIDLTool"/> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCALinkTool" - /> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCResourceCompilerTool" + ResourceOutputFileName="$(IntDir)/pano13.res"/> <Tool - Name="VCFxCopTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release CMD|Win32" - OutputDirectory="$(ConfigurationName)\$(PlatformName)" - IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" - ConfigurationType="4" - CharacterSet="0" - BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" - > + Name="VCXMLDataGeneratorTool"/> <Tool - Name="VCPreBuildEventTool" - /> + Name="VCWebDeploymentTool"/> <Tool - Name="VCCustomBuildTool" - /> + Name="VCManagedWrapperGeneratorTool"/> <Tool - Name="VCXMLDataGeneratorTool" - /> + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Debug DLL CMD|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0"> <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" + Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava" + BasicRuntimeChecks="3" + RuntimeLibrary="3" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="3" CallingConvention="0" - CompileAs="0" - /> + CompileAs="0"/> <Tool - Name="VCManagedResourceCompilerTool" - /> + Name="VCCustomBuildTool"/> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="" - /> + Name="VCLinkerTool" + AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib" + OutputFile="$(OutDir)/pano13.dll" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + IgnoreAllDefaultLibraries="FALSE" + IgnoreDefaultLibraryNames="LIBCMTD" + ModuleDefinitionFile="pano13vc.def" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb" + EntryPointSymbol="" + ImportLibrary="$(OutDir)/pano13.lib" + TargetMachine="1"/> <Tool - Name="VCPreLinkEventTool" - CommandLine="" - /> + Name="VCMIDLTool"/> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCALinkTool" - /> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCResourceCompilerTool" + ResourceOutputFileName="$(IntDir)/pano13.res"/> <Tool - Name="VCFxCopTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCPostBuildEventTool" - /> + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Debug GUI|Win32" - OutputDirectory="$(ConfigurationName)\$(PlatformName)" - IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + Name="Debug LIB CMD|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - CharacterSet="0" - BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" - > + CharacterSet="0"> <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" - MinimalRebuild="true" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava" + MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" - EnableFunctionLevelLinking="true" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="false" + Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="3" CallingConvention="0" - CompileAs="0" - /> + CompileAs="0"/> <Tool - Name="VCManagedResourceCompilerTool" - /> + Name="VCCustomBuildTool"/> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="" - /> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="TRUE"/> <Tool - Name="VCPreLinkEventTool" - CommandLine="" - /> + Name="VCMIDLTool"/> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCALinkTool" - /> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCResourceCompilerTool" + ResourceOutputFileName=""/> <Tool - Name="VCFxCopTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCPostBuildEventTool" - /> + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Release GUI|Win32" - OutputDirectory="$(ConfigurationName)\$(PlatformName)" - IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + Name="Release LIB CMD|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - CharacterSet="0" - BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" - > + CharacterSet="0"> <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="0" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava" RuntimeLibrary="0" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="false" + Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="0" CallingConvention="0" - CompileAs="0" - /> + CompileAs="0"/> <Tool - Name="VCManagedResourceCompilerTool" - /> + Name="VCCustomBuildTool"/> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="" - /> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="TRUE"/> <Tool - Name="VCPreLinkEventTool" - CommandLine="" - /> + Name="VCMIDLTool"/> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCALinkTool" - /> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCResourceCompilerTool" + ResourceOutputFileName=""/> <Tool - Name="VCFxCopTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCPostBuildEventTool" - /> + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Debug CMD|x64" - OutputDirectory="$(ConfigurationName)\$(PlatformName)" - IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + Name="Debug LIB GUI|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - CharacterSet="0" - BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" - > + CharacterSet="0"> <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" - MinimalRebuild="true" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava" + MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="false" + Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="3" CallingConvention="0" - CompileAs="0" - /> + CompileAs="0"/> <Tool - Name="VCManagedResourceCompilerTool" - /> + Name="VCCustomBuildTool"/> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="" - /> - <Tool Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> + IgnoreAllDefaultLibraries="TRUE"/> <Tool - Name="VCALinkTool" - /> + Name="VCMIDLTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCPreBuildEventTool"/> <Tool - Name="VCFxCopTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release CMD|x64" - OutputDirectory="$(ConfigurationName)\$(PlatformName)" - IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" - ConfigurationType="4" - CharacterSet="0" - BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" - > + Name="VCResourceCompilerTool" + ResourceOutputFileName=""/> <Tool - Name="VCPreBuildEventTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCCustomBuildTool" - /> + Name="VCXMLDataGeneratorTool"/> <Tool - Name="VCXMLDataGeneratorTool" - /> + Name="VCManagedWrapperGeneratorTool"/> <Tool - Name="VCWebServiceProxyGeneratorTool" - /> + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Debug DLL GUI|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0"> <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" + Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava" + BasicRuntimeChecks="3" + RuntimeLibrary="3" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="3" CallingConvention="0" - CompileAs="0" - /> + CompileAs="0"/> <Tool - Name="VCManagedResourceCompilerTool" - /> + Name="VCCustomBuildTool"/> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="" - /> + Name="VCLinkerTool" + AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib" + OutputFile="$(OutDir)/pano13.dll" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + IgnoreAllDefaultLibraries="FALSE" + IgnoreDefaultLibraryNames="LIBCMTD" + ModuleDefinitionFile="pano13vc.def" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb" + EntryPointSymbol="" + ImportLibrary="$(OutDir)/pano13.lib" + TargetMachine="1"/> <Tool - Name="VCPreLinkEventTool" - CommandLine="" - /> + Name="VCMIDLTool"/> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCALinkTool" - /> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCResourceCompilerTool" + ResourceOutputFileName="$(IntDir)/pano13.res"/> <Tool - Name="VCFxCopTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCPostBuildEventTool" - /> + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Debug GUI|x64" - OutputDirectory="$(ConfigurationName)\$(PlatformName)" - IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + Name="Release LIB GUI|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - CharacterSet="0" - BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" - > + CharacterSet="0"> <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava" + RuntimeLibrary="0" StructMemberAlignment="4" - EnableFunctionLevelLinking="true" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="0" CallingConvention="0" - CompileAs="0" - /> + CompileAs="0"/> <Tool - Name="VCManagedResourceCompilerTool" - /> + Name="VCCustomBuildTool"/> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="" - /> - <Tool Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> + IgnoreAllDefaultLibraries="TRUE"/> <Tool - Name="VCALinkTool" - /> + Name="VCMIDLTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCPreBuildEventTool"/> <Tool - Name="VCFxCopTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release GUI|x64" - OutputDirectory="$(ConfigurationName)\$(PlatformName)" - IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" - ConfigurationType="4" - CharacterSet="0" - BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" - > + Name="VCResourceCompilerTool" + ResourceOutputFileName=""/> <Tool - Name="VCPreBuildEventTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCCustomBuildTool" - /> + Name="VCXMLDataGeneratorTool"/> <Tool - Name="VCXMLDataGeneratorTool" - /> + Name="VCManagedWrapperGeneratorTool"/> <Tool - Name="VCWebServiceProxyGeneratorTool" - /> + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release DLL GUI|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0"> <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="0" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava" + RuntimeLibrary="2" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="false" + Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="0" CallingConvention="0" - CompileAs="0" - /> + CompileAs="0"/> <Tool - Name="VCManagedResourceCompilerTool" - /> + Name="VCCustomBuildTool"/> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="" - /> + Name="VCLinkerTool" + RegisterOutput="FALSE" + IgnoreImportLibrary="FALSE" + AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + OutputFile="$(OutDir)/pano13.dll" + LinkIncremental="0" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + IgnoreAllDefaultLibraries="FALSE" + IgnoreDefaultLibraryNames="LIBCMT" + ModuleDefinitionFile="pano13vc.def" + GenerateDebugInformation="FALSE" + EntryPointSymbol="" + ImportLibrary="$(OutDir)/pano13.lib" + TargetMachine="1"/> <Tool - Name="VCPreLinkEventTool" - CommandLine="" - /> + Name="VCMIDLTool"/> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> + Name="VCPostBuildEventTool"/> <Tool - Name="VCALinkTool" - /> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXDCMakeTool" - /> + Name="VCPreLinkEventTool"/> <Tool - Name="VCBscMakeTool" - /> + Name="VCResourceCompilerTool" + ResourceOutputFileName="$(IntDir)/pano13.res"/> <Tool - Name="VCFxCopTool" - /> + Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCPostBuildEventTool" - /> + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> @@ -592,451 +428,316 @@ <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File - RelativePath=".\adjust.c" - > + RelativePath=".\adjust.c"> </File> <File - RelativePath=".\bmp.c" - > + RelativePath=".\bmp.c"> </File> <File - RelativePath=".\ColourBrightness.c" - > + RelativePath=".\ColourBrightness.c"> </File> <File - RelativePath=".\correct.c" - > + RelativePath=".\correct.c"> </File> <File - RelativePath=".\fftn.c" - > + RelativePath=".\fftn.c"> </File> <File - RelativePath=".\file.c" - > + RelativePath=".\file.c"> </File> <File - RelativePath=".\filter.c" - > + RelativePath=".\filter.c"> </File> <File - RelativePath=".\fourier.c" - > + RelativePath=".\fourier.c"> </File> <File - RelativePath=".\tools\compat_win32\getopt.c" - > + RelativePath=".\tools\compat_win32\getopt.c"> </File> <File - RelativePath=".\hdrfile.c" - > + RelativePath=".\hdrfile.c"> </File> <File - RelativePath=".\jpeg.c" - > + RelativePath=".\jpeg.c"> </File> <File - RelativePath=".\jpegicc.c" - > + RelativePath=".\jpegicc.c"> </File> <File - RelativePath=".\lmdif.c" - > + RelativePath=".\lmdif.c"> </File> <File - RelativePath=".\math.c" - > + RelativePath=".\math.c"> </File> <File - RelativePath=".\metadata.c" - > + RelativePath=".\metadata.c"> </File> <File - RelativePath=".\morpher.c" - > + RelativePath=".\morpher.c"> </File> <File - RelativePath=".\multilayer.c" - > + RelativePath=".\multilayer.c"> </File> <File - RelativePath=".\optimize.c" - > + RelativePath=".\optimize.c"> </File> <File - RelativePath=".\parser.c" - > + RelativePath=".\parser.c"> </File> <File - RelativePath=".\perspect.c" - > + RelativePath=".\perspect.c"> </File> <File - RelativePath=".\png.c" - > + RelativePath=".\png.c"> </File> <File - RelativePath=".\ppm.c" - > + RelativePath=".\ppm.c"> </File> <File - RelativePath=".\PTcommon.c" - > + RelativePath=".\PTcommon.c"> </File> <File - RelativePath=".\PTDialogs.c" - > + RelativePath=".\PTDialogs.c"> </File> <File - RelativePath=".\pteditor.c" - > + RelativePath=".\pteditor.c"> </File> <File - RelativePath=".\ptfeather.c" - > + RelativePath=".\ptfeather.c"> </File> <File - RelativePath=".\ptpicker.c" - > + RelativePath=".\ptpicker.c"> </File> <File - RelativePath=".\ptstitch.c" - > + RelativePath=".\ptstitch.c"> </File> <File - RelativePath=".\queryfeature.c" - > + RelativePath=".\queryfeature.c"> </File> <File - RelativePath=".\remap.c" - > + RelativePath=".\remap.c"> </File> <File - RelativePath=".\resample.c" - > + RelativePath=".\resample.c"> </File> <File - RelativePath=".\rgbe.c" - > + RelativePath=".\rgbe.c"> </File> <File - RelativePath=".\seamer.c" - > + RelativePath=".\seamer.c"> </File> <File - RelativePath=".\sys_ansi.c" - > + RelativePath=".\sys_ansi.c"> <FileConfiguration - Name="Debug GUI|Win32" - ExcludedFromBuild="true" - > + Name="Debug LIB GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCLCompilerTool" - /> + Name="VCCLCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" - ExcludedFromBuild="true" - > + Name="Debug DLL GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCLCompilerTool" - /> + Name="VCCLCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" - ExcludedFromBuild="true" - > + Name="Release LIB GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCLCompilerTool" - /> + Name="VCCLCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Release GUI|x64" - ExcludedFromBuild="true" - > + Name="Release DLL GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCLCompilerTool" - /> + Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File - RelativePath=".\sys_common.c" - > + RelativePath=".\sys_common.c"> </File> <File - RelativePath=".\sys_win.c" - > + RelativePath=".\sys_win.c"> <FileConfiguration - Name="Debug CMD|Win32" - ExcludedFromBuild="true" - > + Name="Release DLL CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCLCompilerTool" - /> + Name="VCCLCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" - ExcludedFromBuild="true" - > + Name="Debug DLL CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCLCompilerTool" - /> + Name="VCCLCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" - ExcludedFromBuild="true" - > + Name="Debug LIB CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCLCompilerTool" - /> + Name="VCCLCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Release CMD|x64" - ExcludedFromBuild="true" - > + Name="Release LIB CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCLCompilerTool" - /> + Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File - RelativePath=".\tiff.c" - > + RelativePath=".\tiff.c"> </File> <File - RelativePath=".\Triangulate.c" - > + RelativePath=".\Triangulate.c"> </File> <File - RelativePath=".\ZComb.c" - > + RelativePath=".\ZComb.c"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> <File - RelativePath=".\ColourBrightness.h" - > + RelativePath=".\ColourBrightness.h"> </File> <File - RelativePath=".\f2c.h" - > + RelativePath=".\f2c.h"> </File> <File - RelativePath=".\fftn.h" - > + RelativePath=".\fftn.h"> </File> <File - RelativePath=".\file.h" - > + RelativePath=".\file.h"> </File> <File - RelativePath=".\filter.h" - > + RelativePath=".\filter.h"> </File> <File - RelativePath=".\tools\compat_win32\getopt.h" - > + RelativePath=".\tools\compat_win32\getopt.h"> </File> <File - RelativePath=".\metadata.h" - > + RelativePath=".\metadata.h"> </File> <File - RelativePath=".\panorama.h" - > + RelativePath=".\panorama.h"> </File> <File - RelativePath=".\pt_stdint.h" - > + RelativePath=".\pt_stdint.h"> </File> <File - RelativePath=".\PTcommon.h" - > + RelativePath=".\PTcommon.h"> </File> <File - RelativePath=".\pteditor.h" - > + RelativePath=".\pteditor.h"> </File> <File - RelativePath=".\ptutils.h" - > + RelativePath=".\ptutils.h"> </File> <File - RelativePath=".\resource.h" - > + RelativePath=".\resource.h"> </File> <File - RelativePath=".\rgbe.h" - > + RelativePath=".\rgbe.h"> </File> <File - RelativePath=".\seamer.h" - > + RelativePath=".\seamer.h"> </File> <File - RelativePath=".\sys_ansi.h" - > + RelativePath=".\sys_ansi.h"> <FileConfiguration - Name="Debug GUI|Win32" - ExcludedFromBuild="true" - > + Name="Debug LIB GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCustomBuildTool" - /> + Name="VCCustomBuildTool"/> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" - ExcludedFromBuild="true" - > + Name="Debug DLL GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCustomBuildTool" - /> + Name="VCCustomBuildTool"/> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" - ExcludedFromBuild="true" - > + Name="Release LIB GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCustomBuildTool" - /> + Name="VCCustomBuildTool"/> </FileConfiguration> <FileConfiguration - Name="Release GUI|x64" - ExcludedFromBuild="true" - > + Name="Release DLL GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCustomBuildTool" - /> + Name="VCCustomBuildTool"/> </FileConfiguration> </File> <File - RelativePath=".\sys_win.h" - > + RelativePath=".\sys_win.h"> <FileConfiguration - Name="Debug CMD|Win32" - ExcludedFromBuild="true" - > + Name="Release DLL CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCustomBuildTool" - /> + Name="VCCustomBuildTool"/> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" - ExcludedFromBuild="true" - > + Name="Debug DLL CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCustomBuildTool" - /> + Name="VCCustomBuildTool"/> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" - ExcludedFromBuild="true" - > + Name="Debug LIB CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCustomBuildTool" - /> + Name="VCCustomBuildTool"/> </FileConfiguration> <FileConfiguration - Name="Release CMD|x64" - ExcludedFromBuild="true" - > + Name="Release LIB CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCCustomBuildTool" - /> + Name="VCCustomBuildTool"/> </FileConfiguration> </File> <File - RelativePath=".\version.h" - > + RelativePath=".\version.h"> </File> <File - RelativePath=".\ZComb.h" - > + RelativePath=".\ZComb.h"> </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> <File - RelativePath=".\pano13.rc" - > + RelativePath=".\pano13.rc"> <FileConfiguration - Name="Debug CMD|Win32" - ExcludedFromBuild="true" - > + Name="Debug LIB CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCResourceCompilerTool" - /> + Name="VCResourceCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" - ExcludedFromBuild="true" - > + Name="Release LIB CMD|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCResourceCompilerTool" - /> + Name="VCResourceCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Debug GUI|Win32" - ExcludedFromBuild="true" - > + Name="Debug LIB GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCResourceCompilerTool" - /> + Name="VCResourceCompilerTool"/> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" - ExcludedFromBuild="true" - > + Name="Release LIB GUI|Win32" + ExcludedFromBuild="TRUE"> <Tool - Name="VCResourceCompilerTool" - /> + Name="VCResourceCompilerTool"/> </FileConfiguration> - <FileConfiguration - Name="Debug CMD|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCResourceCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release CMD|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCResourceCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug GUI|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCResourceCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release GUI|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCResourceCompilerTool" - /> - </FileConfiguration> </File> <File - RelativePath=".\pano13vc.def" - > + RelativePath=".\pano13vc.def"> </File> </Filter> </Files> Modified: trunk/libpano/libpano13.def =================================================================== --- trunk/libpano/libpano13.def 2009-11-10 20:49:43 UTC (rev 1144) +++ trunk/libpano/libpano13.def 2009-11-10 22:33:19 UTC (rev 1145) @@ -14,27 +14,27 @@ writePrefs @5 writeTIFF @6 PrintError @7 -; DispPrg = DispPrg@16 @8 -; SetCPrefs = SetCPrefs@16 @9 + 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 + 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 + InfoPrg = InfoPrg@16 @26 + SetCutOpt = SetCutOpt@16 @27 + SetPanOpt = SetPanOpt@16 @28 + SetFrPrefs = SetFrPrefs@16 @29 writePSD @30 addLayerToFile @31 writePSDwithLayer @32 @@ -78,10 +78,10 @@ FindFile @70 DisposeAlignInfo @71 showScript @72 -; readImage @73 -; writeImage @74 + readImage @73 + writeImage @74 writeJPEG @75 -; makeTempPath @76 + makeTempPath @76 MorphImageFile @77 blendImages @78 InterpolateImageFile @79 @@ -94,44 +94,44 @@ 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_ptuti... [truncated message content] |
From: <dm...@us...> - 2009-11-12 04:12:39
|
Revision: 1151 http://panotools.svn.sourceforge.net/panotools/?rev=1151&view=rev Author: dmg Date: 2009-11-12 04:12:26 +0000 (Thu, 12 Nov 2009) Log Message: ----------- rebased changes from Jim, except ansi_sys.c Modified Paths: -------------- trunk/libpano/libpano.sln trunk/libpano/libpano.vcproj trunk/libpano/libpano13.def trunk/libpano/math.c trunk/libpano/pano13vc.def trunk/libpano/tools/PTAInterpolate.vcproj trunk/libpano/tools/PTOptimizer.vcproj trunk/libpano/tools/PTblender.vcproj trunk/libpano/tools/PTcrop.vcproj trunk/libpano/tools/PTinfo.vcproj trunk/libpano/tools/PTmasker.vcproj trunk/libpano/tools/PTmender.vcproj trunk/libpano/tools/PTroller.vcproj trunk/libpano/tools/PTtiff2psd.vcproj trunk/libpano/tools/PTtiffdump.vcproj trunk/libpano/tools/PTuncrop.vcproj Modified: trunk/libpano/libpano.sln =================================================================== --- trunk/libpano/libpano.sln 2009-11-11 23:25:42 UTC (rev 1150) +++ trunk/libpano/libpano.sln 2009-11-12 04:12:26 UTC (rev 1151) @@ -1,7 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pano13", "libpano.vcproj", "{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTblender", "tools\PTblender.vcproj", "{20D1E094-A4B5-4294-85CE-229529065789}" ProjectSection(ProjectDependencies) = postProject @@ -58,115 +57,126 @@ {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpremap", "tools\mpremap.vcproj", "{D6E6335C-274E-4FE4-8954-AF542F972C1B}" + ProjectSection(ProjectDependencies) = postProject + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} + EndProjectSection +EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug DLL CMD = Debug DLL CMD - Debug LIB CMD = Debug LIB CMD - Release DLL CMD = Release DLL CMD - Release LIB CMD = Release LIB CMD + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug CMD|Win32 = Debug CMD|Win32 + Debug CMD|x64 = Debug CMD|x64 + Release CMD|Win32 = Release CMD|Win32 + Release CMD|x64 = Release CMD|x64 EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.2 = Debug GUI|x64 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.Build.0 = Release CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.Build.0 = Release CMD|x64 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.Build.0 = Release CMD|x64 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.ActiveCfg = Debug DLL CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.Build.0 = Debug DLL CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.ActiveCfg = Debug LIB CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.Build.0 = Debug LIB CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.ActiveCfg = Release DLL CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.Build.0 = Release DLL CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.ActiveCfg = Release LIB CMD|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.Build.0 = Release LIB CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.Build.0 = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.Build.0 = Release DLL|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.Build.0 = Release LIB|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.Build.0 = Debug DLL|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.Build.0 = Debug LIB|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.ActiveCfg = Release DLL|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.Build.0 = Release DLL|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.ActiveCfg = Release LIB|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.Build.0 = Release LIB|Win32 + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection EndGlobal Modified: trunk/libpano/libpano.vcproj =================================================================== --- trunk/libpano/libpano.vcproj 2009-11-11 23:25:42 UTC (rev 1150) +++ trunk/libpano/libpano.vcproj 2009-11-12 04:12:26 UTC (rev 1151) @@ -1,425 +1,589 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9.00" Name="pano13" ProjectGUID="{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}" RootNamespace="Panotools" - Keyword="MakeFileProj"> + Keyword="MakeFileProj" + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration - Name="Release DLL CMD|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0"> + Name="Debug CMD|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" + Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="0" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLinkerTool" - RegisterOutput="FALSE" - IgnoreImportLibrary="FALSE" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" - OutputFile="$(OutDir)/pano13.dll" - LinkIncremental="0" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" - IgnoreAllDefaultLibraries="FALSE" - IgnoreDefaultLibraryNames="LIBCMT" - ModuleDefinitionFile="pano13vc.def" - GenerateDebugInformation="FALSE" - EntryPointSymbol="" - ImportLibrary="$(OutDir)/pano13.lib" - TargetMachine="1"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="$(IntDir)/pano13.res"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release CMD|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool - Name="VCWebDeploymentTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Debug DLL CMD|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0"> + Name="VCXMLDataGeneratorTool" + /> <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + RuntimeLibrary="0" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib" - OutputFile="$(OutDir)/pano13.dll" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" - IgnoreAllDefaultLibraries="FALSE" - IgnoreDefaultLibraryNames="LIBCMTD" - ModuleDefinitionFile="pano13vc.def" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb" - EntryPointSymbol="" - ImportLibrary="$(OutDir)/pano13.lib" - TargetMachine="1"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="$(IntDir)/pano13.res"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug LIB CMD|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug GUI|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" - CharacterSet="0"> + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava" - MinimalRebuild="TRUE" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" + EnableFunctionLevelLinking="true" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="TRUE"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName=""/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Release LIB CMD|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release GUI|Win32" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" - CharacterSet="0"> + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="0" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" RuntimeLibrary="0" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" + Detect64BitPortabilityProblems="false" DebugInformationFormat="0" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="TRUE"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName=""/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug LIB GUI|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug CMD|x64" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" - CharacterSet="0"> + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava" - MinimalRebuild="TRUE" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="TRUE"/> + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName=""/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release CMD|x64" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Debug DLL GUI|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0"> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + RuntimeLibrary="0" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib" - OutputFile="$(OutDir)/pano13.dll" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" - IgnoreAllDefaultLibraries="FALSE" - IgnoreDefaultLibraryNames="LIBCMTD" - ModuleDefinitionFile="pano13vc.def" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb" - EntryPointSymbol="" - ImportLibrary="$(OutDir)/pano13.lib" - TargetMachine="1"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="$(IntDir)/pano13.res"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Release LIB GUI|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug GUI|x64" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" - CharacterSet="0"> + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" + Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" + EnableFunctionLevelLinking="true" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="0" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="TRUE"/> + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName=""/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release GUI|x64" + OutputDirectory="$(ConfigurationName)\$(PlatformName)" + IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" + > <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release DLL GUI|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="0"> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="0" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + RuntimeLibrary="0" StructMemberAlignment="4" + ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" + Detect64BitPortabilityProblems="false" DebugInformationFormat="0" CallingConvention="0" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCLinkerTool" - RegisterOutput="FALSE" - IgnoreImportLibrary="FALSE" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" - OutputFile="$(OutDir)/pano13.dll" - LinkIncremental="0" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" - IgnoreAllDefaultLibraries="FALSE" - IgnoreDefaultLibraryNames="LIBCMT" - ModuleDefinitionFile="pano13vc.def" - GenerateDebugInformation="FALSE" - EntryPointSymbol="" - ImportLibrary="$(OutDir)/pano13.lib" - TargetMachine="1"/> + Name="VCResourceCompilerTool" + ResourceOutputFileName="" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPreLinkEventTool" + CommandLine="" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - ResourceOutputFileName="$(IntDir)/pano13.res"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -428,316 +592,451 @@ <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > <File - RelativePath=".\adjust.c"> + RelativePath=".\adjust.c" + > </File> <File - RelativePath=".\bmp.c"> + RelativePath=".\bmp.c" + > </File> <File - RelativePath=".\ColourBrightness.c"> + RelativePath=".\ColourBrightness.c" + > </File> <File - RelativePath=".\correct.c"> + RelativePath=".\correct.c" + > </File> <File - RelativePath=".\fftn.c"> + RelativePath=".\fftn.c" + > </File> <File - RelativePath=".\file.c"> + RelativePath=".\file.c" + > </File> <File - RelativePath=".\filter.c"> + RelativePath=".\filter.c" + > </File> <File - RelativePath=".\fourier.c"> + RelativePath=".\fourier.c" + > </File> <File - RelativePath=".\tools\compat_win32\getopt.c"> + RelativePath=".\tools\compat_win32\getopt.c" + > </File> <File - RelativePath=".\hdrfile.c"> + RelativePath=".\hdrfile.c" + > </File> <File - RelativePath=".\jpeg.c"> + RelativePath=".\jpeg.c" + > </File> <File - RelativePath=".\jpegicc.c"> + RelativePath=".\jpegicc.c" + > </File> <File - RelativePath=".\lmdif.c"> + RelativePath=".\lmdif.c" + > </File> <File - RelativePath=".\math.c"> + RelativePath=".\math.c" + > </File> <File - RelativePath=".\metadata.c"> + RelativePath=".\metadata.c" + > </File> <File - RelativePath=".\morpher.c"> + RelativePath=".\morpher.c" + > </File> <File - RelativePath=".\multilayer.c"> + RelativePath=".\multilayer.c" + > </File> <File - RelativePath=".\optimize.c"> + RelativePath=".\optimize.c" + > </File> <File - RelativePath=".\parser.c"> + RelativePath=".\parser.c" + > </File> <File - RelativePath=".\perspect.c"> + RelativePath=".\perspect.c" + > </File> <File - RelativePath=".\png.c"> + RelativePath=".\png.c" + > </File> <File - RelativePath=".\ppm.c"> + RelativePath=".\ppm.c" + > </File> <File - RelativePath=".\PTcommon.c"> + RelativePath=".\PTcommon.c" + > </File> <File - RelativePath=".\PTDialogs.c"> + RelativePath=".\PTDialogs.c" + > </File> <File - RelativePath=".\pteditor.c"> + RelativePath=".\pteditor.c" + > </File> <File - RelativePath=".\ptfeather.c"> + RelativePath=".\ptfeather.c" + > </File> <File - RelativePath=".\ptpicker.c"> + RelativePath=".\ptpicker.c" + > </File> <File - RelativePath=".\ptstitch.c"> + RelativePath=".\ptstitch.c" + > </File> <File - RelativePath=".\queryfeature.c"> + RelativePath=".\queryfeature.c" + > </File> <File - RelativePath=".\remap.c"> + RelativePath=".\remap.c" + > </File> <File - RelativePath=".\resample.c"> + RelativePath=".\resample.c" + > </File> <File - RelativePath=".\rgbe.c"> + RelativePath=".\rgbe.c" + > </File> <File - RelativePath=".\seamer.c"> + RelativePath=".\seamer.c" + > </File> <File - RelativePath=".\sys_ansi.c"> + RelativePath=".\sys_ansi.c" + > <FileConfiguration - Name="Debug LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug DLL GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release DLL GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> </File> <File - RelativePath=".\sys_common.c"> + RelativePath=".\sys_common.c" + > </File> <File - RelativePath=".\sys_win.c"> + RelativePath=".\sys_win.c" + > <FileConfiguration - Name="Release DLL CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug DLL CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCLCompilerTool"/> + Name="VCCLCompilerTool" + /> </FileConfiguration> </File> <File - RelativePath=".\tiff.c"> + RelativePath=".\tiff.c" + > </File> <File - RelativePath=".\Triangulate.c"> + RelativePath=".\Triangulate.c" + > </File> <File - RelativePath=".\ZComb.c"> + RelativePath=".\ZComb.c" + > </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > <File - RelativePath=".\ColourBrightness.h"> + RelativePath=".\ColourBrightness.h" + > </File> <File - RelativePath=".\f2c.h"> + RelativePath=".\f2c.h" + > </File> <File - RelativePath=".\fftn.h"> + RelativePath=".\fftn.h" + > </File> <File - RelativePath=".\file.h"> + RelativePath=".\file.h" + > </File> <File - RelativePath=".\filter.h"> + RelativePath=".\filter.h" + > </File> <File - RelativePath=".\tools\compat_win32\getopt.h"> + RelativePath=".\tools\compat_win32\getopt.h" + > </File> <File - RelativePath=".\metadata.h"> + RelativePath=".\metadata.h" + > </File> <File - RelativePath=".\panorama.h"> + RelativePath=".\panorama.h" + > </File> <File - RelativePath=".\pt_stdint.h"> + RelativePath=".\pt_stdint.h" + > </File> <File - RelativePath=".\PTcommon.h"> + RelativePath=".\PTcommon.h" + > </File> <File - RelativePath=".\pteditor.h"> + RelativePath=".\pteditor.h" + > </File> <File - RelativePath=".\ptutils.h"> + RelativePath=".\ptutils.h" + > </File> <File - RelativePath=".\resource.h"> + RelativePath=".\resource.h" + > </File> <File - RelativePath=".\rgbe.h"> + RelativePath=".\rgbe.h" + > </File> <File - RelativePath=".\seamer.h"> + RelativePath=".\seamer.h" + > </File> <File - RelativePath=".\sys_ansi.h"> + RelativePath=".\sys_ansi.h" + > <FileConfiguration - Name="Debug LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug DLL GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Release DLL GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> </File> <File - RelativePath=".\sys_win.h"> + RelativePath=".\sys_win.h" + > <FileConfiguration - Name="Release DLL CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug DLL CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|x64" + ExcludedFromBuild="true" + > <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> </FileConfiguration> </File> <File - RelativePath=".\version.h"> + RelativePath=".\version.h" + > </File> <File - RelativePath=".\ZComb.h"> + RelativePath=".\ZComb.h" + > </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > <File - RelativePath=".\pano13.rc"> + RelativePath=".\pano13.rc" + > <FileConfiguration - Name="Debug LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCResourceCompilerTool"/> + Name="VCResourceCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB CMD|Win32" - ExcludedFromBuild="TRUE"> + Name="Release CMD|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCResourceCompilerTool"/> + Name="VCResourceCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Debug LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Debug GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCResourceCompilerTool"/> + Name="VCResourceCompilerTool" + /> </FileConfiguration> <FileConfiguration - Name="Release LIB GUI|Win32" - ExcludedFromBuild="TRUE"> + Name="Release GUI|Win32" + ExcludedFromBuild="true" + > <Tool - Name="VCResourceCompilerTool"/> + Name="VCResourceCompilerTool" + /> </FileConfiguration> + <FileConfiguration + Name="Debug CMD|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release CMD|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug GUI|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release GUI|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> </File> <File - RelativePath=".\pano13vc.def"> + RelativePath=".\pano13vc.def" + > </File> </Filter> </Files> Modified: trunk/libpano/libpano13.def =================================================================== --- trunk/libpano/libpano13.def 2009-11-11 23:25:42 UTC (rev 1150) +++ trunk/libpano/libpano13.def 2009-11-12 04:12:26 UTC (rev 1151) @@ -14,27 +14,27 @@ writePrefs @5 writeTIFF @6 PrintError @7 - DispPrg = DispPrg@16 @8 - SetCPrefs = SetCPrefs@16 @9 +; 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 +; 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 +; InfoPrg = InfoPrg@16 @26 +; SetCutOpt = SetCutOpt@16 @27 +; SetPanOpt = SetPanOpt@16 @28 +; SetFrPrefs = SetFrPrefs@16 @29 writePSD @30 addLayerToFile @31 writePSDwithLayer @32 @@ -78,10 +78,10 @@ FindFile @70 DisposeAlignInfo @71 showScript @72 - readImage @73 - writeImage @74 +; readImage @73 +; writeImage @74 writeJPEG @75 - makeTempPath @76 +; makeTempPath @76 MorphImageFile @77 blendImages @78 InterpolateImageFile @79 @@ -94,44 +94,44 @@ 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_ptu... [truncated message content] |
From: <jim...@us...> - 2009-11-14 03:42:28
|
Revision: 1154 http://panotools.svn.sourceforge.net/panotools/?rev=1154&view=rev Author: jim0watters Date: 2009-11-14 03:42:21 +0000 (Sat, 14 Nov 2009) Log Message: ----------- build dynamic lib as CMD version. Modified Paths: -------------- trunk/libpano/sys_ansi.c trunk/libpano/sys_ansi.h trunk/libpano/sys_win.c Modified: trunk/libpano/sys_ansi.c =================================================================== --- trunk/libpano/sys_ansi.c 2009-11-13 22:59:39 UTC (rev 1153) +++ trunk/libpano/sys_ansi.c 2009-11-14 03:42:21 UTC (rev 1154) @@ -25,7 +25,12 @@ //------------------ Public functions required by filter.h ------------------------------- +// Required by filter.h but not used in the sys_ansi build of panotools. +// just return and do nothing +void SetWindowOwner(void * Owner) {return;} +void CenterDialog(void * hDlg) {return;} + void filter_main( TrformStr *TrPtr, struct size_Prefs *spref) { dispatch ( TrPtr, spref); @@ -50,9 +55,12 @@ toPrint = fmt; } - if( JavaUI ){ +#ifdef HasJava +if( JavaUI ){ JPrintError( toPrint ); - }else{ + }else +#endif + { printf(toPrint); // Add an end of line if none is provide Modified: trunk/libpano/sys_ansi.h =================================================================== --- trunk/libpano/sys_ansi.h 2009-11-13 22:59:39 UTC (rev 1153) +++ trunk/libpano/sys_ansi.h 2009-11-14 03:42:21 UTC (rev 1154) @@ -38,9 +38,11 @@ #define GenDialog( VarType, DlgRes, Title, SetControl,SText, \ GText, DlgAction, WinFunc) \ - \ return( FALSE ); +void SetWindowOwner(void * Owner); +void CenterDialog(void * hDlg); + #define kSetRemapPrefs_dlg "REMAP" #define kSetRemapPrefs_InRect 350 #define kSetRemapPrefs_InPano 351 Modified: trunk/libpano/sys_win.c =================================================================== --- trunk/libpano/sys_win.c 2009-11-13 22:59:39 UTC (rev 1153) +++ trunk/libpano/sys_win.c 2009-11-14 03:42:21 UTC (rev 1154) @@ -110,9 +110,11 @@ vsprintf(message, fmt, ap); +#ifdef HasJava if( JavaUI ) JPrintError( message ); else +#endif // MessageBox(GetFocus(), (LPSTR)message, (LPSTR)"", MB_OK | MB_ICONHAND) ; MessageBox((HWND)NULL, (LPSTR)message, (LPSTR)"Panorama Tools", MB_OK | MB_ICONHAND) ; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dm...@us...> - 2009-12-27 10:04:44
|
Revision: 1197 http://panotools.svn.sourceforge.net/panotools/?rev=1197&view=rev Author: dmg Date: 2009-12-27 10:04:37 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Implemented general panini. Math provided by Tom Sharpless Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/PTcommon.c trunk/libpano/adjust.c trunk/libpano/filter.h trunk/libpano/math.c trunk/libpano/panorama.h trunk/libpano/parser.c trunk/libpano/queryfeature.c Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2009-12-24 00:22:07 UTC (rev 1196) +++ trunk/libpano/ChangeLog 2009-12-27 10:04:37 UTC (rev 1197) @@ -1,3 +1,10 @@ +2009-12-26 dmg <dm...@uv...> + + * queryfeature.c, parser.c, panorama.h, filter.h, math.c, + adjust.c: Added general form of panini general projection. It + takes one parameter: the distance factor, any possitive + number. Math by Tom Sharpless. + 2009-10-11 dangelo * filter.h, math.c: Use Te0 as plane_yaw and Te1 as Modified: trunk/libpano/PTcommon.c =================================================================== --- trunk/libpano/PTcommon.c 2009-12-24 00:22:07 UTC (rev 1196) +++ trunk/libpano/PTcommon.c 2009-12-27 10:04:37 UTC (rev 1197) @@ -894,7 +894,8 @@ } else { PrintError("No support for this ouput image format (%s). Output will be TIFF_m", output_file_format); } - // croppedTIFFIntermediate = 0; + // enable this to avoid cropped tiffs. usually for testing + croppedTIFFIntermediate = 0; Modified: trunk/libpano/adjust.c =================================================================== --- trunk/libpano/adjust.c 2009-12-24 00:22:07 UTC (rev 1196) +++ trunk/libpano/adjust.c 2009-12-27 10:04:37 UTC (rev 1197) @@ -736,6 +736,12 @@ equipanini_erect(b/2.0, 0.0, &tx, &ty, & tpara); mp->distance = pn->width/(2.0*tx); break; + case _panini_general: + // We need to set the distance in the mp parameter + mp->distance = 1.0; + panini_general_erect(b/2.0, 0.0, &tx, &ty, mp); + mp->distance = pn->width/(2.0*tx); + break; case _architectural: tpara = 1; arch_erect(b/2.0, 0.0, &tx, &ty, & tpara); @@ -901,6 +907,10 @@ { SetDesc(stack[i], erect_equipanini, &(mp->distance) ); i++; // Convert equipanini to sphere } + else if(pn->format == _panini_general) + { + SetDesc(stack[i], erect_panini_general, mp ); i++; // Convert general panini to sphere + } else if(pn->format == _architectural) { SetDesc(stack[i], erect_arch, &(mp->distance) ); i++; // Convert arch to sphere @@ -1108,6 +1118,11 @@ equipanini_erect(b/2.0, 0.0, &tx, &ty, & tpara); mp->distance = pn->width/(2.0*tx); break; + case _panini_general: + mp->distance = 1.0; + panini_general_erect(b/2.0, 0.0, &tx, &ty, mp); + mp->distance = pn->width/(2.0*tx); + break; case _architectural: tpara = 1; arch_erect(b/2.0, 0.0, &tx, &ty, & tpara); @@ -1328,8 +1343,12 @@ } else if(pn->format == _equipanini) { - SetDesc(stack[i], equipanini_erect, &(mp->distance) ); i++; // Convert panini to sphere + SetDesc(stack[i], equipanini_erect, &(mp->distance) ); i++; // Convert equi panini to sphere } + else if(pn->format == _panini_general) + { + SetDesc(stack[i], panini_general_erect, mp ); i++; // Convert general panini to sphere + } else if(pn->format == _architectural) { SetDesc(stack[i], arch_erect, &(mp->distance) ); i++; // Convert arch to sphere @@ -2907,7 +2926,8 @@ g->pano.format != _albersequalareaconic && g->pano.format != _millercylindrical && g->pano.format != _panini && g->pano.format != _architectural && g->pano.format != _equisolid && g->pano.format != _equipanini && - g->pano.format != _biplane && g->pano.format != _triplane + g->pano.format != _biplane && g->pano.format != _triplane && + g->pano.format != _panini_general ) err=11; // Check Control Points Modified: trunk/libpano/filter.h =================================================================== --- trunk/libpano/filter.h 2009-12-24 00:22:07 UTC (rev 1196) +++ trunk/libpano/filter.h 2009-12-27 10:04:37 UTC (rev 1197) @@ -888,6 +888,9 @@ int equipanini_erect ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); int erect_equipanini ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); +int panini_general_erect ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); +int erect_panini_general ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); + int arch_erect ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); int erect_arch ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2009-12-24 00:22:07 UTC (rev 1196) +++ trunk/libpano/math.c 2009-12-27 10:04:37 UTC (rev 1197) @@ -982,6 +982,41 @@ } +/** convert from erect to panini */ +int panini_general_erect( double lambda_dest,double phi_dest, double* x_src, double* y_src, void* params) +{ + // params: distanceparam + // this is the inverse + + double phi, lambda, temp,y,x; + double d; + double distance; + + if (mp->pn->formatParamCount == 0) { + // if no latitude values given, then set defaults + mp->pn->formatParamCount = 1; + mp->pn->formatParam[0] = 2.0; //d parm + } + d = mp->pn->formatParam[0]; + + distance = mp->distance; + phi = phi_dest/distance; + lambda = lambda_dest/distance; + + x = d * tan (lambda / d); + + // now compute y + y = (d * tan(phi)) / ( d - 1 + cos(lambda)); + // Now rescale + *y_src = distance * y; + *x_src = distance * x; + return 1; +} + + + + + /** convert from panini to erect */ int erect_panini( double x_dest,double y_dest, double* x_src, double* y_src, void* params) { @@ -1010,7 +1045,44 @@ } +/** convert from panini to erect */ +int erect_panini_general( double x_dest,double y_dest, double* lambda_src, double* phi_src, void* params) +{ + double y; + double x; + double temp; + double lambda; + double phi; + double d; + double distance; + assert(mp != NULL); + if (mp->pn->formatParamCount == 0) { + // if no latitude values given, then set defaults + mp->pn->formatParamCount = 1; + mp->pn->formatParam[0] = 2.0; //d parm + } + d = mp->pn->formatParam[0]; + assert(d > 0); + distance = mp->distance; + y = y_dest/distance; + x = x_dest/distance; + + lambda = d * atan2(x,d); + + phi = atan2(y * (d -1 + cos(lambda)), d); + + *lambda_src = lambda * distance; + *phi_src = phi * distance; + /* + if (fabs (y_dest - 0.5) < 0.01) + fprintf(stderr, "Coordinates (%f,%f) (%f,%f) d %f \n", x_dest, y_dest, *lambda_src, *phi_src, d); + */ + return 1; +} + + + /** convert from erect to equi panini */ int equipanini_erect( double x_dest,double y_dest, double* x_src, double* y_src, void* params) { Modified: trunk/libpano/panorama.h =================================================================== --- trunk/libpano/panorama.h 2009-12-24 00:22:07 UTC (rev 1196) +++ trunk/libpano/panorama.h 2009-12-27 10:04:37 UTC (rev 1197) @@ -283,7 +283,8 @@ _equisolid = 21, // fisheye-equisolid FOV (equisolid fisheye) = 4 * arcsin (frame size/(focal length * 4)) _equipanini = 22, _biplane = 23, - _triplane = 24, + _triplane = 24, + _panini_general = 25 }; enum @@ -307,9 +308,10 @@ PANO_FORMAT_EQUI_PANINI = 16, PANO_FORMAT_BIPLANE = 17, PANO_FORMAT_TRIPLANE = 18, + PANO_FORMAT_PANINI_GENERAL = 19, }; -#define PANO_FORMAT_COUNT 19 +#define PANO_FORMAT_COUNT 20 enum { // Enumerates external number of image f<index> Modified: trunk/libpano/parser.c =================================================================== --- trunk/libpano/parser.c 2009-12-24 00:22:07 UTC (rev 1196) +++ trunk/libpano/parser.c 2009-12-27 10:04:37 UTC (rev 1197) @@ -693,6 +693,9 @@ case PANO_FORMAT_EQUI_PANINI: gl->pano.format = _equipanini; break; + case PANO_FORMAT_PANINI_GENERAL: + gl->pano.format = _panini_general; + break; case PANO_FORMAT_ARCHITECTURAL: gl->pano.format = _architectural; break; @@ -912,8 +915,9 @@ case _architectural: format = PANO_FORMAT_ARCHITECTURAL; break; case _orthographic: format = PANO_FORMAT_ORTHOGRAPHIC; break; case _equisolid: format = PANO_FORMAT_EQUISOLID; break; - case _biplane: format = PANO_FORMAT_BIPLANE; break; - case _triplane: format = PANO_FORMAT_TRIPLANE; break; + case _biplane: format = PANO_FORMAT_BIPLANE; break; + case _triplane: format = PANO_FORMAT_TRIPLANE; break; + case _panini_general: format = PANO_FORMAT_PANINI_GENERAL; break; default: format = -1; break; } @@ -1276,6 +1280,9 @@ case PANO_FORMAT_PANINI: p->pano.format = _panini; break; + case PANO_FORMAT_PANINI_GENERAL: + p->pano.format = _panini_general; + break; case PANO_FORMAT_EQUI_PANINI: p->pano.format = _equipanini; break; Modified: trunk/libpano/queryfeature.c =================================================================== --- trunk/libpano/queryfeature.c 2009-12-24 00:22:07 UTC (rev 1196) +++ trunk/libpano/queryfeature.c 2009-12-27 10:04:37 UTC (rev 1197) @@ -362,8 +362,9 @@ _orthographic, _equisolid, _equipanini, - _biplane, - _triplane, + _biplane, + _triplane, + _panini_general, }; @@ -417,6 +418,17 @@ features->maxVFOV = 179; features->maxHFOV = 359; break; + case PANO_FORMAT_PANINI_GENERAL: + features->maxVFOV = 179; + features->maxHFOV = 359; + features->numberOfParameters = 1; + features->parm[0].name = "d"; + features->parm[1].name = "phi2"; + for (i=0;i<2;i++) { + features->parm[i].minValue = +0.00001; + features->parm[i].maxValue = 10e10; + } + break; case PANO_FORMAT_FISHEYE_FF: features->maxVFOV = 360; features->maxHFOV = 360; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dm...@us...> - 2010-01-01 21:46:00
|
Revision: 1204 http://panotools.svn.sourceforge.net/panotools/?rev=1204&view=rev Author: dmg Date: 2010-01-01 21:45:50 +0000 (Fri, 01 Jan 2010) Log Message: ----------- fixed minor errors in the panini general Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/math.c trunk/libpano/queryfeature.c Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2010-01-01 12:16:15 UTC (rev 1203) +++ trunk/libpano/ChangeLog 2010-01-01 21:45:50 UTC (rev 1204) @@ -1,3 +1,8 @@ +2010-01-01 dmg <dm...@uv...> + + * queryfeature.c (panoProjectionFeaturesQuery): Cleaned up the + general panini parameters. + 2009-12-27 dmg <dm...@uv...> * queryfeature.c: Yesterday I forgot to add the name of the Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2010-01-01 12:16:15 UTC (rev 1203) +++ trunk/libpano/math.c 2010-01-01 21:45:50 UTC (rev 1204) @@ -1007,11 +1007,8 @@ // now compute y - /* - y = (d * tan(phi)) / ( d - 1 + cos(lambda)); - */ - if (phi != 0) { + if (lambda != 0) { y = tan(phi) * x/ sin(lambda); } else { y = tan(phi) ; Modified: trunk/libpano/queryfeature.c =================================================================== --- trunk/libpano/queryfeature.c 2010-01-01 12:16:15 UTC (rev 1203) +++ trunk/libpano/queryfeature.c 2010-01-01 21:45:50 UTC (rev 1204) @@ -424,11 +424,8 @@ features->maxHFOV = 359; features->numberOfParameters = 1; features->parm[0].name = "d"; - features->parm[1].name = "phi2"; - for (i=0;i<2;i++) { - features->parm[i].minValue = +0.00001; - features->parm[i].maxValue = 10e10; - } + features->parm[0].minValue = +0.00001; + features->parm[0].maxValue = 10e10; break; case PANO_FORMAT_FISHEYE_FF: features->maxVFOV = 360; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dm...@us...> - 2010-01-03 18:19:57
|
Revision: 1207 http://panotools.svn.sourceforge.net/panotools/?rev=1207&view=rev Author: dmg Date: 2010-01-03 18:19:46 +0000 (Sun, 03 Jan 2010) Log Message: ----------- Updated changelog and comments Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/parser.c Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2010-01-03 18:00:53 UTC (rev 1206) +++ trunk/libpano/ChangeLog 2010-01-03 18:19:46 UTC (rev 1207) @@ -1,5 +1,15 @@ +2010-01-03 dmg <dm...@uv...> + + * Pablo fixed the bug in which, if a Tr[xyz] was present, the + Translation operation was executed, even if the parms were + zero. This restricted the FOV to 180 degrees, regardless of + projection. + 2010-01-01 dmg <dm...@uv...> + * math.c (panini_general_erect): Fixed minor typing error when + implementing the formulae. + * queryfeature.c (panoProjectionFeaturesQuery): Cleaned up the general panini parameters. Modified: trunk/libpano/parser.c =================================================================== --- trunk/libpano/parser.c 2010-01-03 18:00:53 UTC (rev 1206) +++ trunk/libpano/parser.c 2010-01-03 18:19:46 UTC (rev 1207) @@ -404,6 +404,8 @@ return -1; } if (li == NULL) return -1; + // Make sure that we only apply trans when these parameters are not zero + // Otherwise images are not rendered beyond 180 degrees FOV if (im->cP.trans_x != 0.0 || im->cP.trans_y != 0.0 || im->cP.trans_z != 0.0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jim...@us...> - 2010-01-05 22:14:15
|
Revision: 1209 http://panotools.svn.sourceforge.net/panotools/?rev=1209&view=rev Author: jim0watters Date: 2010-01-05 22:14:03 +0000 (Tue, 05 Jan 2010) Log Message: ----------- Update the Visual Studio projects and solutions Resolved issue of libpano always recompiling all files even when no source files changed. Resolved issue of builds use the same names for temporary files, this causes a file in use error on a multicore machines. Add pano13.lib as a dependency in the tool projects Modified Paths: -------------- trunk/libpano/libpano.sln trunk/libpano/libpano.vcproj trunk/libpano/tools/PTAInterpolate.vcproj trunk/libpano/tools/PTOptimizer.vcproj trunk/libpano/tools/PTblender.vcproj trunk/libpano/tools/PTcrop.vcproj trunk/libpano/tools/PTinfo.vcproj trunk/libpano/tools/PTmasker.vcproj trunk/libpano/tools/PTmender.vcproj trunk/libpano/tools/PTroller.vcproj trunk/libpano/tools/PTtiff2psd.vcproj trunk/libpano/tools/PTtiffdump.vcproj trunk/libpano/tools/PTuncrop.vcproj Modified: trunk/libpano/libpano.sln =================================================================== --- trunk/libpano/libpano.sln 2010-01-05 21:14:05 UTC (rev 1208) +++ trunk/libpano/libpano.sln 2010-01-05 22:14:03 UTC (rev 1209) @@ -2,6 +2,11 @@ # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pano13", "libpano.vcproj", "{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTAInterpolate", "tools\PTAInterpolate.vcproj", "{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}" + ProjectSection(ProjectDependencies) = postProject + {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTblender", "tools\PTblender.vcproj", "{20D1E094-A4B5-4294-85CE-229529065789}" ProjectSection(ProjectDependencies) = postProject {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} @@ -32,36 +37,26 @@ {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTtiff2psd", "tools\PTtiff2psd.vcproj", "{20D1E094-A4B5-4294-85CE-229529065716}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTroller", "tools\PTroller.vcproj", "{20D1E094-A4B5-4294-85CE-229529065786}" ProjectSection(ProjectDependencies) = postProject {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTtiffdump", "tools\PTtiffdump.vcproj", "{20D1E094-A4B5-4294-85CE-229529065711}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTtiff2psd", "tools\PTtiff2psd.vcproj", "{20D1E094-A4B5-4294-85CE-229529065716}" ProjectSection(ProjectDependencies) = postProject {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTuncrop", "tools\PTuncrop.vcproj", "{20D1E094-A4B5-4294-85CE-229529065712}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTtiffdump", "tools\PTtiffdump.vcproj", "{20D1E094-A4B5-4294-85CE-229529065711}" ProjectSection(ProjectDependencies) = postProject {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTroller", "tools\PTroller.vcproj", "{20D1E094-A4B5-4294-85CE-229529065786}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTuncrop", "tools\PTuncrop.vcproj", "{20D1E094-A4B5-4294-85CE-229529065712}" ProjectSection(ProjectDependencies) = postProject {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTAInterpolate", "tools\PTAInterpolate.vcproj", "{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}" - ProjectSection(ProjectDependencies) = postProject - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpremap", "tools\mpremap.vcproj", "{D6E6335C-274E-4FE4-8954-AF542F972C1B}" - ProjectSection(ProjectDependencies) = postProject - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug CMD|Win32 = Debug CMD|Win32 @@ -74,11 +69,18 @@ {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.2 = Debug GUI|x64 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.Build.0 = Release CMD|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.ActiveCfg = Release CMD|x64 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.Build.0 = Release CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.Build.0 = Release CMD|x64 {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 @@ -127,6 +129,14 @@ {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.Build.0 = Release CMD|Win32 {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.ActiveCfg = Release CMD|x64 {20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.Build.0 = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.Build.0 = Debug CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.Build.0 = Release CMD|Win32 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.ActiveCfg = Release CMD|x64 + {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.Build.0 = Release CMD|x64 {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 {20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 @@ -151,30 +161,6 @@ {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.Build.0 = Release CMD|Win32 {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.ActiveCfg = Release CMD|x64 {20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.Build.0 = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.Build.0 = Release CMD|x64 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.Build.0 = Release CMD|x64 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.Build.0 = Debug CMD|x64 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.Build.0 = Release CMD|Win32 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.ActiveCfg = Release CMD|x64 - {D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.Build.0 = Release CMD|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/libpano/libpano.vcproj =================================================================== --- trunk/libpano/libpano.vcproj 2010-01-05 21:14:05 UTC (rev 1208) +++ trunk/libpano/libpano.vcproj 2010-01-05 22:14:03 UTC (rev 1209) @@ -45,13 +45,13 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" + ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -90,7 +90,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -111,20 +111,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" - AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" - RuntimeLibrary="0" + Optimization="0" + AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" + PreprocessorDefinitions="_WIN64;WIN64; WIN32;_CONSOLE;_LIB;_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" + ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" + DebugInformationFormat="3" CallingConvention="0" CompileAs="0" /> @@ -160,7 +161,7 @@ /> </Configuration> <Configuration - Name="Debug GUI|Win32" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -184,18 +185,17 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" + AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;NDEBUG" + RuntimeLibrary="0" StructMemberAlignment="4" - EnableFunctionLevelLinking="true" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" + ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="0" CallingConvention="0" CompileAs="0" /> @@ -231,7 +231,7 @@ /> </Configuration> <Configuration - Name="Release GUI|Win32" + Name="Release CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -252,17 +252,18 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="0" FavorSizeOrSpeed="0" - AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" + PreprocessorDefinitions="_WIN64;WIN64; WIN32;_CONSOLE;_LIB;NDEBUG" RuntimeLibrary="0" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" + ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="0" @@ -301,7 +302,7 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Debug GUI|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -322,18 +323,18 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" + AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" + EnableFunctionLevelLinking="true" + ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -372,7 +373,7 @@ /> </Configuration> <Configuration - Name="Release CMD|x64" + Name="Debug GUI|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -397,17 +398,18 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" - AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB" - RuntimeLibrary="0" + Optimization="0" + AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" + PreprocessorDefinitions="_WIN64;WIN64; WIN32;_WINDOWS;_LIB;_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" + EnableFunctionLevelLinking="true" + ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" + DebugInformationFormat="3" CallingConvention="0" CompileAs="0" /> @@ -443,7 +445,7 @@ /> </Configuration> <Configuration - Name="Debug GUI|x64" + Name="Release GUI|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -464,22 +466,20 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" + AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;NDEBUG" + RuntimeLibrary="0" StructMemberAlignment="4" - EnableFunctionLevelLinking="true" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" + ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="0" CallingConvention="0" CompileAs="0" /> @@ -543,11 +543,11 @@ Optimization="2" InlineFunctionExpansion="0" FavorSizeOrSpeed="0" - AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src";"$(JDK_HOME)\include";"$(JDK_HOME)\include\win32"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB" + AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" + PreprocessorDefinitions="_WIN64;WIN64; WIN32;_WINDOWS;_LIB;NDEBUG" RuntimeLibrary="0" StructMemberAlignment="4" - ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" + ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="0" @@ -693,6 +693,70 @@ <File RelativePath=".\pteditor.c" > + <FileConfiguration + Name="Debug CMD|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug CMD|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release CMD|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release CMD|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug GUI|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug GUI|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release GUI|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release GUI|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File RelativePath=".\ptfeather.c" @@ -701,6 +765,70 @@ <File RelativePath=".\ptpicker.c" > + <FileConfiguration + Name="Debug CMD|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug CMD|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release CMD|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release CMD|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug GUI|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug GUI|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release GUI|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release GUI|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File RelativePath=".\ptstitch.c" @@ -738,7 +866,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" + Name="Debug GUI|x64" ExcludedFromBuild="true" > <Tool @@ -746,7 +874,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" + Name="Release GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -778,7 +906,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" + Name="Debug CMD|x64" ExcludedFromBuild="true" > <Tool @@ -786,7 +914,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" + Name="Release CMD|Win32" ExcludedFromBuild="true" > <Tool @@ -892,7 +1020,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" + Name="Debug GUI|x64" ExcludedFromBuild="true" > <Tool @@ -900,7 +1028,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" + Name="Release GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -928,7 +1056,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" + Name="Debug CMD|x64" ExcludedFromBuild="true" > <Tool @@ -936,7 +1064,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" + Name="Release CMD|Win32" ExcludedFromBuild="true" > <Tool @@ -978,7 +1106,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" + Name="Debug CMD|x64" ExcludedFromBuild="true" > <Tool @@ -986,7 +1114,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|Win32" + Name="Release CMD|Win32" ExcludedFromBuild="true" > <Tool @@ -994,7 +1122,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" + Name="Release CMD|x64" ExcludedFromBuild="true" > <Tool @@ -1002,7 +1130,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" + Name="Debug GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -1010,7 +1138,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|x64" + Name="Debug GUI|x64" ExcludedFromBuild="true" > <Tool @@ -1018,7 +1146,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" + Name="Release GUI|Win32" ExcludedFromBuild="true" > <Tool Modified: trunk/libpano/tools/PTAInterpolate.vcproj =================================================================== --- trunk/libpano/tools/PTAInterpolate.vcproj 2010-01-05 21:14:05 UTC (rev 1208) +++ trunk/libpano/tools/PTAInterpolate.vcproj 2010-01-05 22:14:03 UTC (rev 1209) @@ -50,10 +50,11 @@ MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -67,10 +68,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTAInterpolate.exe" LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb" @@ -84,6 +85,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -102,7 +104,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -123,16 +125,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -146,23 +153,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTAInterpolate.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -181,7 +189,7 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -202,20 +210,17 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -229,23 +234,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTAInterpolate.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -292,10 +298,11 @@ AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="0" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -309,10 +316,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTAInterpolate.exe" LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" @@ -326,6 +333,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" Modified: trunk/libpano/tools/PTOptimizer.vcproj =================================================================== --- trunk/libpano/tools/PTOptimizer.vcproj 2010-01-05 21:14:05 UTC (rev 1208) +++ trunk/libpano/tools/PTOptimizer.vcproj 2010-01-05 22:14:03 UTC (rev 1209) @@ -50,10 +50,11 @@ MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -69,10 +70,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PToptimizer.exe" LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb" @@ -86,6 +87,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -104,7 +106,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -125,16 +127,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -142,7 +149,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -150,23 +157,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" - OutputFile="$(OutDir)/PTOptimizer.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + OutputFile="$(OutDir)/PToptimizer.exe" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -185,7 +193,7 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -206,20 +214,17 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -227,7 +232,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool @@ -235,23 +240,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" - OutputFile="$(OutDir)/PToptimizer.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64"" - IgnoreDefaultLibraryNames="LIBCMT" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + OutputFile="$(OutDir)/PTOptimizer.exe" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -298,10 +304,11 @@ AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="0" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -317,10 +324,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTOptimizer.exe" LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" @@ -334,6 +341,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" Modified: trunk/libpano/tools/PTblender.vcproj =================================================================== --- trunk/libpano/tools/PTblender.vcproj 2010-01-05 21:14:05 UTC (rev 1208) +++ trunk/libpano/tools/PTblender.vcproj 2010-01-05 22:14:03 UTC (rev 1209) @@ -50,10 +50,11 @@ MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -67,10 +68,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTblender.exe" LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/PTblender.pdb" @@ -84,6 +85,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -102,7 +104,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -123,16 +125,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -146,23 +153,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTblender.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTblender.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -181,7 +189,7 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -202,20 +210,17 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -229,23 +234,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTblender.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTblender.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -292,10 +298,11 @@ AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="0" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -309,10 +316,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTblender.exe" LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" @@ -326,6 +333,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" Modified: trunk/libpano/tools/PTcrop.vcproj =================================================================== --- trunk/libpano/tools/PTcrop.vcproj 2010-01-05 21:14:05 UTC (rev 1208) +++ trunk/libpano/tools/PTcrop.vcproj 2010-01-05 22:14:03 UTC (rev 1209) @@ -50,10 +50,11 @@ MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -67,10 +68,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTcrop.exe" LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/PTcrop.pdb" @@ -84,6 +85,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -102,7 +104,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -123,16 +125,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -146,23 +153,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTcrop.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTcrop.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -181,7 +189,7 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -202,20 +210,17 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -229,23 +234,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTcrop.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTcrop.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -292,10 +298,11 @@ AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="0" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -309,10 +316,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTcrop.exe" LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" @@ -326,6 +333,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" Modified: trunk/libpano/tools/PTinfo.vcproj =================================================================== --- trunk/libpano/tools/PTinfo.vcproj 2010-01-05 21:14:05 UTC (rev 1208) +++ trunk/libpano/tools/PTinfo.vcproj 2010-01-05 22:14:03 UTC (rev 1209) @@ -50,10 +50,11 @@ MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -67,10 +68,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTinfo.exe" LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/PTinfo.pdb" @@ -84,6 +85,7 @@ /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -102,7 +104,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -123,16 +125,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -146,23 +153,24 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" + AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTinfo.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTinfo.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" + DependencyInformationFile="$(IntDir)\$(TargetFileName)mt.dep" /> <Tool Name="VCXDCMakeTool" @@ -181,7 +189,7 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -202,20 +210,17 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - ... [truncated message content] |
From: <tks...@us...> - 2010-01-06 18:35:06
|
Revision: 1210 http://panotools.svn.sourceforge.net/panotools/?rev=1210&view=rev Author: tksharpless Date: 2010-01-06 18:34:42 +0000 (Wed, 06 Jan 2010) Log Message: ----------- First working version of panini_general projection. Tested only with PTmender, not yet under hugin. Modified Paths: -------------- trunk/libpano/adjust.c trunk/libpano/math.c trunk/libpano/parser.c trunk/libpano/queryfeature.c Modified: trunk/libpano/adjust.c =================================================================== --- trunk/libpano/adjust.c 2010-01-05 22:14:03 UTC (rev 1209) +++ trunk/libpano/adjust.c 2010-01-06 18:34:42 UTC (rev 1210) @@ -741,6 +741,12 @@ mp->distance = 1.0; panini_general_erect(b/2.0, 0.0, &tx, &ty, mp); mp->distance = pn->width/(2.0*tx); + /** DEBUG: round trip test **/ + erect_panini_general(0.5*pn->width, 0, &tx, &ty, mp); + tx *= 2; + ty = b * mp->distance; + ty -= tx; + /****/ break; case _architectural: tpara = 1; Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2010-01-05 22:14:03 UTC (rev 1209) +++ trunk/libpano/math.c 2010-01-06 18:34:42 UTC (rev 1210) @@ -981,51 +981,136 @@ return 1; } +/** legalize the nominal parameters of panini_general + and translate to working values in precomputedValue[] -/** convert from erect to panini */ -int panini_general_erect( double lambda_dest,double phi_dest, double* x_src, double* y_src, void* params) -{ - // params: distanceparam - // this is the inverse + Returns a pointer to the panini_general image, which + may either be the source ("im") or destination ("pn"), + with its precomputed values set appropriately; or 0 + in case of error. - double phi, lambda, temp,y,x; - double d; - double distance; + Any unspecified parameters are defaulted. + Hugin sets all params as doubles, quantized to integer values. + So the nominal range must be large: + cmpr -100:0:50 <-> d = 0:1:->infinity NOTE nonlinear + tops, bots -50:50 <-> sqz -1:1 + These ranges are also set in queryfeature.c + returns 0: failed, 1: OK + Returns quickly if correect working values are already set. + Ideally a "new values" transaction with frontend will clear + precomputedCount, but I don't know that to be the case, so + keep static copies of the previous params to check, too. + + When panini_general is the destination, the distanceparam in + the MakeParams may not correctly convert equirectangular + coordinates to angles in radians. +**/ +Image * check_panini_general(struct MakeParams* pmp){ + static double oldparm[4] = {0, 0, 0, 0}; + Image * ppg = 0; + int ok = 0, i; double t,s; + /* select the p_g Image */ + if( pmp->im->format == _panini_general ) ppg = pmp->im; + else if( pmp->pn->format == _panini_general ) ppg = pmp->pn; + else return 0; + /* default unspecified values to 0 */ + for( i = ppg->formatParamCount; i < 3; i++ ) ppg->formatParam[i] = 0; + /* check for new values */ + if( ppg->precomputedCount == 3 ){ + ok = 1; + for(i=0; i< 3; i++){ + if(ppg->formatParam[i] != oldparm[i]){ + ok = 0; + break; + } + } + } + if( ok ) return ppg; /* old values still valid */ - if (mp->pn->formatParamCount == 0) { - // if no latitude values given, then set defaults - mp->pn->formatParamCount = 1; - mp->pn->formatParam[0] = 2.0; //d parm - } - d = mp->pn->formatParam[0]; + /* clip values legal */ + if(ppg->formatParam[0] < -100) ppg->formatParam[0] = -100; + else if(ppg->formatParam[0] > 50) ppg->formatParam[0] = 50; + if(ppg->formatParam[1] < -50) ppg->formatParam[0] = -50; + else if(ppg->formatParam[1] > 50) ppg->formatParam[0] = 50; + if(ppg->formatParam[2] < -50) ppg->formatParam[0] = -50; + else if(ppg->formatParam[2] > 50) ppg->formatParam[0] = 50; + /* save new values */ + for(i=0; i < 3; i++) oldparm[i] = ppg->formatParam[i]; + /* translate to working values */ + ppg->precomputedCount = 3; + t = (50 - oldparm[0]) / 50; /* -100:50 => 3:0 */ + s = 1.5 / (t + 0.0001) - 1.5/3.0001; + ppg->precomputedValue[0] = s; + ppg->precomputedValue[1] = oldparm[1] / 50; + ppg->precomputedValue[2] = oldparm[2] / 50; + return ppg; +} + +/** convert from panini_general to erect **/ +int erect_panini_general( double x_dest,double y_dest, double* lambda_src, double* phi_src, void* params) +{ /* params -> MakeParams */ + double x, y, lambda, phi, d, distance; + double S; + + Image * ppg = check_panini_general(mp); + if( !ppg ) + return 0; + d = ppg->precomputedValue[0]; distance = mp->distance; - phi = phi_dest/distance; - lambda = lambda_dest/distance; + y = y_dest/distance; + x = x_dest/distance; - x = d * tan (lambda / d); + if( x == 0 ) lambda = 0; + else{ + /* solve quadratic for cosine of azimuth angle */ + double k, kk, dd, del, ca; + k = fabs(x) / (d + 1); + kk = k * k; + dd = d * d; + del = kk * kk * dd - (kk + 1) * (kk * dd - 1); + if( del < 0 ) + return 0; + ca = (-kk * d + sqrt( del )) / (kk + 1); + /* use that to compute S, and angle */ + S = (d + ca)/(d + 1); + lambda = atan2( S * x, ca ); + } + phi = atan(S * y); + + *lambda_src = lambda * distance; + *phi_src = phi * distance; + return 1; +} - // now compute y - if (lambda != 0) { - y = tan(phi) * x/ sin(lambda); - } else { - y = tan(phi) ; - } +/** convert from erect to panini_general **/ +int panini_general_erect( double lambda_dest,double phi_dest, double* x_src, double* y_src, void* params) +{ /* params -> MakeParams */ + double phi, lambda, s,y,x; + double d; // >= 0 + double distance; + Image * ppg = check_panini_general(mp); + if( !ppg ) + return 0; + d = ppg->precomputedValue[0]; - // Now rescale - *y_src = distance * y; + distance = mp->distance; + phi = phi_dest/distance; + lambda = lambda_dest/distance; + + s = (d + 1) / (d + cos(lambda)); + x = sin(lambda) * s; + y = tan(phi) * s; + + *y_src = distance * y; *x_src = distance * x; return 1; } - - - - /** convert from panini to erect */ int erect_panini( double x_dest,double y_dest, double* x_src, double* y_src, void* params) { @@ -1054,54 +1139,8 @@ } -/** convert from panini to erect */ -int erect_panini_general( double x_dest,double y_dest, double* lambda_src, double* phi_src, void* params) -{ - double y; - double x; - double temp; - double lambda; - double phi; - double d; - double distance; - assert(mp != NULL); - if (mp->pn->formatParamCount == 0) { - // if no latitude values given, then set defaults - mp->pn->formatParamCount = 1; - mp->pn->formatParam[0] = 2.0; //d parm - } - d = mp->pn->formatParam[0]; - assert(d > 0); - distance = mp->distance; - y = y_dest/distance; - x = x_dest/distance; - lambda = d * atan2(x,d); - - if (x != 0) { - phi = atan2(y * sin(lambda) * x/fabs(x), fabs(x)); - } else { - phi = atan(y); - } - - /* - phi = atan2(y * (d -1 + cos(lambda)), d); - - */ - - *lambda_src = lambda * distance; - *phi_src = phi * distance; - - /* - if (fabs (y_dest - 0.5) < 0.01) - fprintf(stderr, "Coordinates (%f,%f) (%f,%f) d %f \n", x_dest, y_dest, *lambda_src, *phi_src, d); - */ - return 1; -} - - - /** convert from erect to equi panini */ int equipanini_erect( double x_dest,double y_dest, double* x_src, double* y_src, void* params) { Modified: trunk/libpano/parser.c =================================================================== --- trunk/libpano/parser.c 2010-01-05 22:14:03 UTC (rev 1209) +++ trunk/libpano/parser.c 2010-01-06 18:34:42 UTC (rev 1210) @@ -1947,7 +1947,7 @@ if (b != NULL) { while (b != NULL) { if (sscanf(b, "%lf", &tempDbl) == 1) { - if (++im.formatParamCount >= PANO_PROJECTION_MAX_PARMS) { + if (++im.formatParamCount > PANO_PROJECTION_MAX_PARMS) { PrintError("Illegal number of projection parameters. Maximum is %d", PANO_PROJECTION_MAX_PARMS); return -1; } Modified: trunk/libpano/queryfeature.c =================================================================== --- trunk/libpano/queryfeature.c 2010-01-05 22:14:03 UTC (rev 1209) +++ trunk/libpano/queryfeature.c 2010-01-06 18:34:42 UTC (rev 1210) @@ -373,6 +373,7 @@ { // REturn the number of Projection formats available in the library assert(sizeof(panoFormatNames) == PANO_FORMAT_COUNT * sizeof(char*)); + assert(sizeof(panoFormatNames) == PANO_FORMAT_COUNT * sizeof(int)); return PANO_FORMAT_COUNT; } @@ -420,15 +421,19 @@ features->maxHFOV = 359; break; case PANO_FORMAT_PANINI_GENERAL: - features->maxVFOV = 179; - features->maxHFOV = 359; - features->numberOfParameters = 1; - features->parm[0].name = "d"; - // the min value is > 0 and the max is infinite... but I am not sure we - // want to set them to those values... this needs more thinking - // and see how hugin can handle it. - features->parm[0].minValue = +0.00001; - features->parm[0].maxValue = 10e10; + features->maxVFOV = 150; + features->maxHFOV = 300; + features->numberOfParameters = 3; + features->parm[0].name = "hcmp"; + features->parm[1].name = "tops"; + features->parm[2].name = "bots"; + features->parm[0].minValue = -100; + features->parm[0].maxValue = 50; + features->parm[1].minValue = -50; + features->parm[1].maxValue = 50; + features->parm[2].minValue = -50; + features->parm[2].maxValue = 50; + break; case PANO_FORMAT_FISHEYE_FF: features->maxVFOV = 360; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dm...@us...> - 2010-01-08 09:21:06
|
Revision: 1213 http://panotools.svn.sourceforge.net/panotools/?rev=1213&view=rev Author: dmg Date: 2010-01-08 09:21:00 +0000 (Fri, 08 Jan 2010) Log Message: ----------- review of general panini code committed by Tom few days ago Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/math.c Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2010-01-06 20:09:15 UTC (rev 1212) +++ trunk/libpano/ChangeLog 2010-01-08 09:21:00 UTC (rev 1213) @@ -1,3 +1,8 @@ +2010-01-08 dmg <dm...@uv...> + + * math.c: Reviewed and reformatted code by Tom for his implementation + of the panini general. + 2010-01-03 dmg <dm...@uv...> * Pablo fixed the bug in which, if a Tr[xyz] was present, the Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2010-01-06 20:09:15 UTC (rev 1212) +++ trunk/libpano/math.c 2010-01-08 09:21:00 UTC (rev 1213) @@ -1005,107 +1005,139 @@ the MakeParams may not correctly convert equirectangular coordinates to angles in radians. **/ -Image * check_panini_general(struct MakeParams* pmp){ - static double oldparm[4] = {0, 0, 0, 0}; - Image * ppg = 0; - int ok = 0, i; double t,s; - /* select the p_g Image */ - if( pmp->im->format == _panini_general ) ppg = pmp->im; - else if( pmp->pn->format == _panini_general ) ppg = pmp->pn; - else return 0; - /* default unspecified values to 0 */ - for( i = ppg->formatParamCount; i < 3; i++ ) ppg->formatParam[i] = 0; - /* check for new values */ - if( ppg->precomputedCount == 3 ){ - ok = 1; - for(i=0; i< 3; i++){ - if(ppg->formatParam[i] != oldparm[i]){ - ok = 0; - break; - } - } - } - if( ok ) return ppg; /* old values still valid */ +Image * check_panini_general(struct MakeParams* pmp) +{ + // DMG We cannot have a static variables. + // Makes the code non-reentrant XXXX - /* clip values legal */ - if(ppg->formatParam[0] < -100) ppg->formatParam[0] = -100; - else if(ppg->formatParam[0] > 50) ppg->formatParam[0] = 50; - if(ppg->formatParam[1] < -50) ppg->formatParam[0] = -50; - else if(ppg->formatParam[1] > 50) ppg->formatParam[0] = 50; - if(ppg->formatParam[2] < -50) ppg->formatParam[0] = -50; - else if(ppg->formatParam[2] > 50) ppg->formatParam[0] = 50; - /* save new values */ - for(i=0; i < 3; i++) oldparm[i] = ppg->formatParam[i]; - /* translate to working values */ - ppg->precomputedCount = 3; - t = (50 - oldparm[0]) / 50; /* -100:50 => 3:0 */ - s = 1.5 / (t + 0.0001) - 1.5/3.0001; - ppg->precomputedValue[0] = s; - ppg->precomputedValue[1] = oldparm[1] / 50; - ppg->precomputedValue[2] = oldparm[2] / 50; + static double oldparm[4] = {0, 0, 0, 0}; + Image * ppg = NULL; + int ok = FALSE; + int i; + double t,s; - return ppg; + /* select the p_g Image */ + + // Only act if it is panini + if( pmp->im->format == _panini_general ) // input panini --is it supported? + ppg = pmp->im; + else if( pmp->pn->format == _panini_general ) // output panini + ppg = pmp->pn; + else + return NULL; + + /* default unspecified values to 0 */ + for( i = ppg->formatParamCount; i < 3; i++ ) + ppg->formatParam[i] = 0; + /* check for new values */ + if( ppg->precomputedCount == 3 ) { + ok = TRUE; + for(i=0; i< 3; i++){ + if(ppg->formatParam[i] != oldparm[i]) { + ok = FALSE; + break; + } + } + } + if( ok ) + return ppg; /* old values still valid */ + + /* clip values legal */ + if(ppg->formatParam[0] < -100) + ppg->formatParam[0] = -100; + else if(ppg->formatParam[0] > 50) + ppg->formatParam[0] = 50; + + if(ppg->formatParam[1] < -50) + ppg->formatParam[0] = -50; + else if(ppg->formatParam[1] > 50) + ppg->formatParam[0] = 50; + + if(ppg->formatParam[2] < -50) + ppg->formatParam[0] = -50; + else if(ppg->formatParam[2] > 50) + ppg->formatParam[0] = 50; + + /* save new values */ + for(i=0; i < 3; i++) + oldparm[i] = ppg->formatParam[i]; + + /* translate to working values */ + // Tom, would you mind explanining in a comment the defaults? DMG XXX + ppg->precomputedCount = 3; + t = (50 - oldparm[0]) / 50; /* -100:50 => 3:0 */ + s = 1.5 / (t + 0.0001) - 1.5/3.0001; + ppg->precomputedValue[0] = s; + ppg->precomputedValue[1] = oldparm[1] / 50; + ppg->precomputedValue[2] = oldparm[2] / 50; + + return ppg; } /** convert from panini_general to erect **/ int erect_panini_general( double x_dest,double y_dest, double* lambda_src, double* phi_src, void* params) { /* params -> MakeParams */ double x, y, lambda, phi, d, distance; - double S; - - Image * ppg = check_panini_general(mp); - if( !ppg ) - return 0; - d = ppg->precomputedValue[0]; + double S; + + Image * ppg = check_panini_general(mp); + if( !ppg ) + return FALSE; + + d = ppg->precomputedValue[0]; + distance = mp->distance; y = y_dest/distance; x = x_dest/distance; - if( x == 0 ) lambda = 0; - else{ + if( x == 0 ) + lambda = 0; + else { /* solve quadratic for cosine of azimuth angle */ - double k, kk, dd, del, ca; - k = fabs(x) / (d + 1); - kk = k * k; - dd = d * d; - del = kk * kk * dd - (kk + 1) * (kk * dd - 1); - if( del < 0 ) - return 0; - ca = (-kk * d + sqrt( del )) / (kk + 1); + double k, kk, dd, del, ca; + k = fabs(x) / (d + 1); + kk = k * k; + dd = d * d; + del = kk * kk * dd - (kk + 1) * (kk * dd - 1); + if( del < 0 ) + return 0; + ca = (-kk * d + sqrt( del )) / (kk + 1); /* use that to compute S, and angle */ - S = (d + ca)/(d + 1); - lambda = atan2( S * x, ca ); - } - phi = atan(S * y); - + S = (d + ca)/(d + 1); + lambda = atan2( S * x, ca ); + } + phi = atan(S * y); + *lambda_src = lambda * distance; *phi_src = phi * distance; - - return 1; + + return TRUE; } /** convert from erect to panini_general **/ int panini_general_erect( double lambda_dest,double phi_dest, double* x_src, double* y_src, void* params) -{ /* params -> MakeParams */ +{ + /* params -> MakeParams */ double phi, lambda, s,y,x; double d; // >= 0 double distance; - Image * ppg = check_panini_general(mp); - if( !ppg ) - return 0; + Image * ppg = check_panini_general(mp); + if( !ppg ) + return 0; + d = ppg->precomputedValue[0]; - + distance = mp->distance; phi = phi_dest/distance; lambda = lambda_dest/distance; - s = (d + 1) / (d + cos(lambda)); + s = (d + 1) / (d + cos(lambda)); x = sin(lambda) * s; y = tan(phi) * s; - + *y_src = distance * y; *x_src = distance * x; return 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dm...@us...> - 2010-01-10 01:35:40
|
Revision: 1216 http://panotools.svn.sourceforge.net/panotools/?rev=1216&view=rev Author: dmg Date: 2010-01-10 01:35:34 +0000 (Sun, 10 Jan 2010) Log Message: ----------- fixed the problem with the assert in query feature Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/queryfeature.c Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2010-01-09 14:24:55 UTC (rev 1215) +++ trunk/libpano/ChangeLog 2010-01-10 01:35:34 UTC (rev 1216) @@ -1,3 +1,10 @@ +2010-01-09 dmg <dm...@uv...> + + * queryfeature.c (panoProjectionFormatCount): Fix for one the + problem with the type of the pointer. This was a big error I + introduced some time ago. This code removes the hard coded data + type. + 2010-01-08 dmg <dm...@uv...> * math.c: Reviewed and reformatted code by Tom for his implementation Modified: trunk/libpano/queryfeature.c =================================================================== --- trunk/libpano/queryfeature.c 2010-01-09 14:24:55 UTC (rev 1215) +++ trunk/libpano/queryfeature.c 2010-01-10 01:35:34 UTC (rev 1216) @@ -372,7 +372,7 @@ int panoProjectionFormatCount(void) { // Return the number of Projection formats available in the library - assert(sizeof(panoFormatNames) == PANO_FORMAT_COUNT * sizeof(char*)); + assert(sizeof(panoFormatNames) == PANO_FORMAT_COUNT * sizeof(typeof (panoFormatNames[0]))); return PANO_FORMAT_COUNT; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-11 16:57:42
|
Revision: 1217 http://panotools.svn.sourceforge.net/panotools/?rev=1217&view=rev Author: tksharpless Date: 2010-01-11 16:57:34 +0000 (Mon, 11 Jan 2010) Log Message: ----------- Limit actual hFOV for panini_general to max feasible Modified Paths: -------------- trunk/libpano/math.c trunk/libpano/queryfeature.c Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2010-01-10 01:35:34 UTC (rev 1216) +++ trunk/libpano/math.c 2010-01-11 16:57:34 UTC (rev 1217) @@ -981,44 +981,38 @@ return 1; } -/** legalize the nominal parameters of panini_general - and translate to working values in precomputedValue[] +/** set up working parameters for panini_general - Returns a pointer to the panini_general image, which - may either be the source ("im") or destination ("pn"), - with its precomputed values set appropriately; or 0 - in case of error. + setup_panini_general(&MakeParams) selects the Image struct + corresponding to the pannini_general image and returns its + address, or a NULL pointer for failure. - Any unspecified parameters are defaulted. - Hugin sets all params as doubles, quantized to integer values. - So the nominal range must be large: - cmpr -100:0:50 <-> d = 0:1:->infinity NOTE nonlinear - tops, bots -50:50 <-> sqz -1:1 - These ranges are also set in queryfeature.c - returns 0: failed, 1: OK - Returns quickly if correect working values are already set. - Ideally a "new values" transaction with frontend will clear - precomputedCount, but I don't know that to be the case, so - keep static copies of the previous params to check, too. - - When panini_general is the destination, the distanceparam in - the MakeParams may not correctly convert equirectangular - coordinates to angles in radians. + If the selected Image has an invalid precomputedCount, it + posts the proper distanceparam and puts working parameter + values in precomputeValue[]. + + SetMakeParams (adjust.c) calls this function in lieu of setting + distanceparam. + + The 'UI' projection params, described in queryfeature.c, have + extended ranges to accomodate the integer-valued control sliders + in hugin. They are mapped to the working values as follows + cmpr -100:0:50 <-> d = 0:1:->infinity NOTE very nonlinear + tops, bots -50:50 <-> sqz -1:1 linear + CAUTION these ranges are assumed, not read from queryfeature.c + + The maximum feasible hFOV depends on the compression parameter + and on a projection angle limit that is hard coded here. We + set distanceparam to limit the actual hFOV accordingly if the + requested hFOV is larger. + **/ -Image * check_panini_general(struct MakeParams* pmp) -{ - // DMG We cannot have a static variables. - // Makes the code non-reentrant XXXX - - static double oldparm[4] = {0, 0, 0, 0}; +Image * setup_panini_general(struct MakeParams* pmp) +{ int i; + double s,t,d,a,v; Image * ppg = NULL; - int ok = FALSE; - int i; - double t,s; - /* select the p_g Image */ - - // Only act if it is panini + // Only act if it is panini_general if( pmp->im->format == _panini_general ) // input panini --is it supported? ppg = pmp->im; else if( pmp->pn->format == _panini_general ) // output panini @@ -1026,51 +1020,66 @@ else return NULL; - /* default unspecified values to 0 */ + /* check number of precomputed param values */ + if( ppg->precomputedCount == 4 ) + return ppg; // OK + + /* default unspecified values to 0, giving + stereographic compresssion (d = 1) + and no squeezes. + */ for( i = ppg->formatParamCount; i < 3; i++ ) ppg->formatParam[i] = 0; - /* check for new values */ - if( ppg->precomputedCount == 3 ) { - ok = TRUE; - for(i=0; i< 3; i++){ - if(ppg->formatParam[i] != oldparm[i]) { - ok = FALSE; - break; - } - } - } - if( ok ) - return ppg; /* old values still valid */ - - /* clip values legal */ + /* clip values legal */ if(ppg->formatParam[0] < -100) ppg->formatParam[0] = -100; else if(ppg->formatParam[0] > 50) ppg->formatParam[0] = 50; - if(ppg->formatParam[1] < -50) ppg->formatParam[0] = -50; else if(ppg->formatParam[1] > 50) ppg->formatParam[0] = 50; - if(ppg->formatParam[2] < -50) ppg->formatParam[0] = -50; else if(ppg->formatParam[2] > 50) ppg->formatParam[0] = 50; - /* save new values */ - for(i=0; i < 3; i++) - oldparm[i] = ppg->formatParam[i]; + /* post working param values */ + t = (50 - ppg->formatParam[0]) / 50; /* -100:50 => 3:0 */ + d = 1.5 / (t + 0.0001) - 1.5/3.0001; + ppg->precomputedValue[0] = d; + ppg->precomputedValue[1] = ppg->formatParam[1] / 50; + ppg->precomputedValue[2] = ppg->formatParam[2] / 50; - /* translate to working values */ - // Tom, would you mind explanining in a comment the defaults? DMG XXX - ppg->precomputedCount = 3; - t = (50 - oldparm[0]) / 50; /* -100:50 => 3:0 */ - s = 1.5 / (t + 0.0001) - 1.5/3.0001; - ppg->precomputedValue[0] = s; - ppg->precomputedValue[1] = oldparm[1] / 50; - ppg->precomputedValue[2] = oldparm[2] / 50; - + /* post max feasible half-FOV as angle and x value */ + // theoretical max angle (infeasible for d < 1.1 or so) + if( d > 1. ) + s = -1/d; + else + s = -d; + a = acos( s ); + // actual limit may be max projection angle... + t = DEG_TO_RAD( 80 ); // max allowed projection angle + s = asin(d * sin(t)) + t ; // corresp. max azimuth + if( a > s ){ // clip to projection angle limit + a = s; + } + // clip hFOV to feasible limit + v = 0.5 * DEG_TO_RAD( ppg->hfov ); + if( v > a ) + v = a; + + // x coordinate limit + s = sin( a ) * (d + 1) / (d + cos(a)); + + // distance param + t = sin(v) * (d+1) / (d + cos(v)); + pmp->distance = 0.5 * ppg->width / t; + + ppg->precomputedValue[3] = a; // max lambda + ppg->precomputedValue[4] = s; // max x + + ppg->precomputedCount = 4; return ppg; } @@ -1080,7 +1089,7 @@ double x, y, lambda, phi, d, distance; double S; - Image * ppg = check_panini_general(mp); + Image * ppg = setup_panini_general(mp); if( !ppg ) return FALSE; @@ -1090,6 +1099,11 @@ y = y_dest/distance; x = x_dest/distance; + // fail if outside feasible FOV + if( fabs(x) > ppg->precomputedValue[4] ) + return 0; + + if( x == 0 ) lambda = 0; else { @@ -1124,16 +1138,20 @@ double d; // >= 0 double distance; - Image * ppg = check_panini_general(mp); + Image * ppg = setup_panini_general(mp); if( !ppg ) return 0; d = ppg->precomputedValue[0]; distance = mp->distance; + lambda = lambda_dest/distance; phi = phi_dest/distance; - lambda = lambda_dest/distance; + // fail if outside feasible FOV + if( fabs(lambda) > ppg->precomputedValue[3] ) + return 0; + s = (d + 1) / (d + cos(lambda)); x = sin(lambda) * s; y = tan(phi) * s; Modified: trunk/libpano/queryfeature.c =================================================================== --- trunk/libpano/queryfeature.c 2010-01-10 01:35:34 UTC (rev 1216) +++ trunk/libpano/queryfeature.c 2010-01-11 16:57:34 UTC (rev 1217) @@ -420,8 +420,8 @@ features->maxHFOV = 359; break; case PANO_FORMAT_PANINI_GENERAL: - features->maxVFOV = 180; - features->maxHFOV = 240; + features->maxVFOV = 160; + features->maxHFOV = 320; features->numberOfParameters = 3; features->parm[0].name = "hcmp"; features->parm[1].name = "tops"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-11 17:55:04
|
Revision: 1218 http://panotools.svn.sourceforge.net/panotools/?rev=1218&view=rev Author: tksharpless Date: 2010-01-11 17:54:57 +0000 (Mon, 11 Jan 2010) Log Message: ----------- add squeezes to panini_general. and supporting changes to adjust.c & filter.h Modified Paths: -------------- trunk/libpano/adjust.c trunk/libpano/filter.h trunk/libpano/math.c Modified: trunk/libpano/adjust.c =================================================================== --- trunk/libpano/adjust.c 2010-01-11 16:57:34 UTC (rev 1217) +++ trunk/libpano/adjust.c 2010-01-11 17:54:57 UTC (rev 1218) @@ -737,11 +737,10 @@ mp->distance = pn->width/(2.0*tx); break; case _panini_general: - // We need to set the distance in the mp parameter - mp->distance = 1.0; - panini_general_erect(b/2.0, 0.0, &tx, &ty, mp); - mp->distance = pn->width/(2.0*fabs(tx)); - // that fabs() is a workaround, needed until we have better FOV control + // call setup_panini_general() to set distanceparam + pn->precomputedCount = 0; // clear old settings + setup_panini_general( mp ); + // should abort now if it returns NULL break; case _architectural: tpara = 1; @@ -1120,9 +1119,9 @@ mp->distance = pn->width/(2.0*tx); break; case _panini_general: - mp->distance = 1.0; - panini_general_erect(b/2.0, 0.0, &tx, &ty, mp); - mp->distance = pn->width/(2.0*fabs(tx)); // workaround + // call setup_panini_general() to set distanceparam + setup_panini_general( mp ); + // should abort now if it returns NULL break; case _architectural: tpara = 1; Modified: trunk/libpano/filter.h =================================================================== --- trunk/libpano/filter.h 2010-01-11 16:57:34 UTC (rev 1217) +++ trunk/libpano/filter.h 2010-01-11 17:54:57 UTC (rev 1218) @@ -890,6 +890,7 @@ int panini_general_erect ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); int erect_panini_general ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); +Image * setup_panini_general ( struct MakeParams * pmp ); int arch_erect ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); int erect_arch ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2010-01-11 16:57:34 UTC (rev 1217) +++ trunk/libpano/math.c 2010-01-11 17:54:57 UTC (rev 1218) @@ -1087,7 +1087,7 @@ int erect_panini_general( double x_dest,double y_dest, double* lambda_src, double* phi_src, void* params) { /* params -> MakeParams */ double x, y, lambda, phi, d, distance; - double S; + double S, q, t; Image * ppg = setup_panini_general(mp); if( !ppg ) @@ -1121,6 +1121,19 @@ lambda = atan2( S * x, ca ); } phi = atan(S * y); + + /* squeeze */ + q = ppg->precomputedValue[y < 0 ? 1 : 2]; + if( q > 0 ){ + /* soft squeeze */ + t = q * 2 * cos(lambda) / PI; + phi *= t + 1; + } else if( q < 0 ){ + /* hard squeeze */ + q = -q; + t = cos(lambda) * tan(y); + phi += q * (t - phi); + } *lambda_src = lambda * distance; *phi_src = phi * distance; @@ -1134,7 +1147,7 @@ { /* params -> MakeParams */ - double phi, lambda, s,y,x; + double phi, lambda, q,t,s,y,x; double d; // >= 0 double distance; @@ -1156,7 +1169,20 @@ x = sin(lambda) * s; y = tan(phi) * s; - *y_src = distance * y; + /* squeeze */ + q = ppg->precomputedValue[y < 0 ? 1 : 2]; + if( q > 0 ){ + /* soft squeeze */ + t = q * 2 * cos(lambda) / PI; + phi /= t + 1; + } else if( q < 0 ){ + /* hard squeeze */ + q = -q; + t = cos(lambda) * tan(y); + phi -= q * (t - phi); + } + + *y_src = distance * y; *x_src = distance * x; return 1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-12 22:15:41
|
Revision: 1221 http://panotools.svn.sourceforge.net/panotools/?rev=1221&view=rev Author: tksharpless Date: 2010-01-12 22:15:34 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Final adjustments to panini_general projection: Corrected the transverse straightening (hard) squeeze. Rescaled squeeze params to -100:100 with soft squeeze < 0 and hard squeeze > 0. Renamed params "Cmpr, Tops, Bots". Modified Paths: -------------- trunk/libpano/math.c trunk/libpano/queryfeature.c Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2010-01-12 22:04:27 UTC (rev 1220) +++ trunk/libpano/math.c 2010-01-12 22:15:34 UTC (rev 1221) @@ -998,7 +998,9 @@ extended ranges to accomodate the integer-valued control sliders in hugin. They are mapped to the working values as follows cmpr -100:0:50 <-> d = 0:1:->infinity NOTE very nonlinear - tops, bots -50:50 <-> sqz -1:1 linear + tops, bots -100:100 <-> sqz -1:1 linear + < 0 gives soft squeeze + > 0 give transverse straightening squeeze CAUTION these ranges are assumed, not read from queryfeature.c The maximum feasible hFOV depends on the compression parameter @@ -1021,7 +1023,7 @@ return NULL; /* check number of precomputed param values */ - if( ppg->precomputedCount == 4 ) + if( ppg->precomputedCount == 5 ) return ppg; // OK /* default unspecified values to 0, giving @@ -1033,23 +1035,23 @@ /* clip values legal */ if(ppg->formatParam[0] < -100) ppg->formatParam[0] = -100; - else if(ppg->formatParam[0] > 50) - ppg->formatParam[0] = 50; - if(ppg->formatParam[1] < -50) - ppg->formatParam[0] = -50; - else if(ppg->formatParam[1] > 50) - ppg->formatParam[0] = 50; - if(ppg->formatParam[2] < -50) - ppg->formatParam[0] = -50; - else if(ppg->formatParam[2] > 50) - ppg->formatParam[0] = 50; + else if(ppg->formatParam[0] > 100) + ppg->formatParam[0] = 100; + if(ppg->formatParam[1] < -100) + ppg->formatParam[1] = -100; + else if(ppg->formatParam[1] > 100) + ppg->formatParam[1] = 100; + if(ppg->formatParam[2] < -100) + ppg->formatParam[2] = -100; + else if(ppg->formatParam[2] > 100) + ppg->formatParam[2] = 100; /* post working param values */ t = (50 - ppg->formatParam[0]) / 50; /* -100:50 => 3:0 */ d = 1.5 / (t + 0.0001) - 1.5/3.0001; ppg->precomputedValue[0] = d; - ppg->precomputedValue[1] = ppg->formatParam[1] / 50; - ppg->precomputedValue[2] = ppg->formatParam[2] / 50; + ppg->precomputedValue[1] = ppg->formatParam[1] / 100; + ppg->precomputedValue[2] = ppg->formatParam[2] / 100; /* post max feasible half-FOV as angle and x value */ // theoretical max angle (infeasible for d < 1.1 or so) @@ -1079,7 +1081,7 @@ ppg->precomputedValue[3] = a; // max lambda ppg->precomputedValue[4] = s; // max x - ppg->precomputedCount = 4; + ppg->precomputedCount = 5; return ppg; } @@ -1087,7 +1089,7 @@ int erect_panini_general( double x_dest,double y_dest, double* lambda_src, double* phi_src, void* params) { /* params -> MakeParams */ double x, y, lambda, phi, d, distance; - double S, q, t; + double S, cl, q, t; Image * ppg = setup_panini_general(mp); if( !ppg ) @@ -1104,82 +1106,85 @@ return 0; - if( x == 0 ) + if( x == 0 ){ lambda = 0; - else { + S = 1; + cl = 1; + } else { /* solve quadratic for cosine of azimuth angle */ - double k, kk, dd, del, ca; + double k, kk, dd, del; k = fabs(x) / (d + 1); kk = k * k; dd = d * d; del = kk * kk * dd - (kk + 1) * (kk * dd - 1); if( del < 0 ) return 0; - ca = (-kk * d + sqrt( del )) / (kk + 1); + cl = (-kk * d + sqrt( del )) / (kk + 1); /* use that to compute S, and angle */ - S = (d + ca)/(d + 1); - lambda = atan2( S * x, ca ); + S = (d + cl)/(d + 1); + lambda = atan2( S * x, cl ); } - phi = atan(S * y); + phi = atan(S * y); /* squeeze */ q = ppg->precomputedValue[y < 0 ? 1 : 2]; - if( q > 0 ){ + if( q < 0 ){ + q = -q; /* soft squeeze */ - t = q * 2 * cos(lambda) / PI; + t = q * 2 * (cl - 0.707) / PI; phi *= t + 1; - } else if( q < 0 ){ + } else if( q > 0 ){ /* hard squeeze */ - q = -q; - t = cos(lambda) * tan(y); + t = atan( y * cl ); phi += q * (t - phi); } + + *lambda_src = lambda * distance; + *phi_src = phi * distance; - *lambda_src = lambda * distance; - *phi_src = phi * distance; - - return TRUE; + return TRUE; } -/** convert from erect to panini_general **/ + /** convert from erect to panini_general **/ int panini_general_erect( double lambda_dest,double phi_dest, double* x_src, double* y_src, void* params) { - /* params -> MakeParams */ + /* params -> MakeParams */ - double phi, lambda, q,t,s,y,x; - double d; // >= 0 - double distance; + double phi, lambda, q,t,s,y,x; + double d; // >= 0 + double distance; - Image * ppg = setup_panini_general(mp); - if( !ppg ) - return 0; + Image * ppg = setup_panini_general(mp); + if( !ppg ) + return 0; - d = ppg->precomputedValue[0]; + d = ppg->precomputedValue[0]; - distance = mp->distance; - lambda = lambda_dest/distance; - phi = phi_dest/distance; + distance = mp->distance; + lambda = lambda_dest/distance; + phi = phi_dest/distance; // fail if outside feasible FOV if( fabs(lambda) > ppg->precomputedValue[3] ) return 0; - s = (d + 1) / (d + cos(lambda)); - x = sin(lambda) * s; - y = tan(phi) * s; + s = (d + 1) / (d + cos(lambda)); + x = sin(lambda) * s; + y = tan(phi) * s; - /* squeeze */ + /* unsqueeze */ q = ppg->precomputedValue[y < 0 ? 1 : 2]; - if( q > 0 ){ + if( q < 0 ){ + q = -q; /* soft squeeze */ - t = q * 2 * cos(lambda) / PI; - phi /= t + 1; - } else if( q < 0 ){ + t = q * 2 * (cos(lambda) - 0.707) / PI; + y = s * tan(phi /(t + 1)); + + } else if( q > 0 ){ /* hard squeeze */ - q = -q; - t = cos(lambda) * tan(y); - phi -= q * (t - phi); + t = tan(phi) * cos(lambda); + y += q * (t - y); } *y_src = distance * y; Modified: trunk/libpano/queryfeature.c =================================================================== --- trunk/libpano/queryfeature.c 2010-01-12 22:04:27 UTC (rev 1220) +++ trunk/libpano/queryfeature.c 2010-01-12 22:15:34 UTC (rev 1221) @@ -423,15 +423,15 @@ features->maxVFOV = 160; features->maxHFOV = 320; features->numberOfParameters = 3; - features->parm[0].name = "hcmp"; - features->parm[1].name = "tops"; - features->parm[2].name = "bots"; + features->parm[0].name = "Cmpr"; + features->parm[1].name = "Tops"; + features->parm[2].name = "Bots"; features->parm[0].minValue = -100; features->parm[0].maxValue = 50; - features->parm[1].minValue = -50; - features->parm[1].maxValue = 50; - features->parm[2].minValue = -50; - features->parm[2].maxValue = 50; + features->parm[1].minValue = -100; + features->parm[1].maxValue = 100; + features->parm[2].minValue = -100; + features->parm[2].maxValue = 100; break; case PANO_FORMAT_FISHEYE_FF: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-13 19:40:14
|
Revision: 1222 http://panotools.svn.sourceforge.net/panotools/?rev=1222&view=rev Author: tksharpless Date: 2010-01-13 19:40:05 +0000 (Wed, 13 Jan 2010) Log Message: ----------- MSVC projects updated 1) add property sheet LocalDefs.vsprops to define local environment symbols for all projects. Can be edited in MSVC to suit your system. Only one there now is WXWIDGETS_HOME. 2) exclude PTAinterpolate from builds, as it references writeProject() in ptpicker.c, which is already excluded from libpano. 3) correct puntuation in the linker properties for PTuncrop. Modified Paths: -------------- trunk/libpano/libpano.sln trunk/libpano/libpano.vcproj trunk/libpano/tools/PTAInterpolate.vcproj trunk/libpano/tools/PTOptimizer.vcproj trunk/libpano/tools/PTblender.vcproj trunk/libpano/tools/PTcrop.vcproj trunk/libpano/tools/PTinfo.vcproj trunk/libpano/tools/PTmasker.vcproj trunk/libpano/tools/PTmender.vcproj trunk/libpano/tools/PTroller.vcproj trunk/libpano/tools/PTtiff2psd.vcproj trunk/libpano/tools/PTtiffdump.c trunk/libpano/tools/PTtiffdump.vcproj trunk/libpano/tools/PTuncrop.vcproj Added Paths: ----------- trunk/libpano/LocalDefs.vsprops Added: trunk/libpano/LocalDefs.vsprops =================================================================== --- trunk/libpano/LocalDefs.vsprops (rev 0) +++ trunk/libpano/LocalDefs.vsprops 2010-01-13 19:40:05 UTC (rev 1222) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="LocalDefs" + > + <UserMacro + Name="WXWIDGETS_HOME" + Value="C:\Users\Public\HuginSDK-2009\wxWidgets-2.8.10" + PerformEnvironmentSet="true" + /> +</VisualStudioPropertySheet> Modified: trunk/libpano/libpano.sln =================================================================== --- trunk/libpano/libpano.sln 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/libpano.sln 2010-01-13 19:40:05 UTC (rev 1222) @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +# Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pano13", "libpano.vcproj", "{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTAInterpolate", "tools\PTAInterpolate.vcproj", "{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}" @@ -78,7 +78,6 @@ {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.ActiveCfg = Debug CMD|x64 {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.Build.0 = Debug CMD|x64 {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.ActiveCfg = Release CMD|Win32 - {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.Build.0 = Release CMD|Win32 {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.ActiveCfg = Release CMD|x64 {9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.Build.0 = Release CMD|x64 {20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32 Modified: trunk/libpano/libpano.vcproj =================================================================== --- trunk/libpano/libpano.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/libpano.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" + InheritedPropertySheets=".\LocalDefs.vsprops" CharacterSet="0" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -90,10 +91,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" + InheritedPropertySheets=".\LocalDefs.vsprops" CharacterSet="0" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -111,21 +113,20 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="_WIN64;WIN64; WIN32;_CONSOLE;_LIB;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;NDEBUG" + RuntimeLibrary="0" StructMemberAlignment="4" ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="0" CallingConvention="0" CompileAs="0" /> @@ -161,10 +162,11 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug GUI|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" + InheritedPropertySheets=".\LocalDefs.vsprops" CharacterSet="0" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -185,17 +187,18 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" + Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;NDEBUG" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" + EnableFunctionLevelLinking="true" ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" + DebugInformationFormat="3" CallingConvention="0" CompileAs="0" /> @@ -231,10 +234,11 @@ /> </Configuration> <Configuration - Name="Release CMD|x64" + Name="Release GUI|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" + InheritedPropertySheets=".\LocalDefs.vsprops" CharacterSet="0" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -252,7 +256,6 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -260,7 +263,7 @@ InlineFunctionExpansion="0" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="_WIN64;WIN64; WIN32;_CONSOLE;_LIB;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;NDEBUG" RuntimeLibrary="0" StructMemberAlignment="4" ProgramDataBaseFileName="$(IntDir)\pano13.pdb" @@ -302,7 +305,7 @@ /> </Configuration> <Configuration - Name="Debug GUI|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -323,17 +326,17 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;_DEBUG" + PreprocessorDefinitions="_WIN64;WIN64; WIN32;_CONSOLE;_LIB;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" StructMemberAlignment="4" - EnableFunctionLevelLinking="true" ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" @@ -373,7 +376,7 @@ /> </Configuration> <Configuration - Name="Debug GUI|x64" + Name="Release CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -398,18 +401,17 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="0" + FavorSizeOrSpeed="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="_WIN64;WIN64; WIN32;_WINDOWS;_LIB;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="_WIN64;WIN64; WIN32;_CONSOLE;_LIB;NDEBUG" + RuntimeLibrary="0" StructMemberAlignment="4" - EnableFunctionLevelLinking="true" ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="0" CallingConvention="0" CompileAs="0" /> @@ -445,7 +447,7 @@ /> </Configuration> <Configuration - Name="Release GUI|Win32" + Name="Debug GUI|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" @@ -466,20 +468,22 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="0" - FavorSizeOrSpeed="0" + Optimization="0" AdditionalIncludeDirectories=""$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;NDEBUG" - RuntimeLibrary="0" + PreprocessorDefinitions="_WIN64;WIN64; WIN32;_WINDOWS;_LIB;_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" + EnableFunctionLevelLinking="true" ProgramDataBaseFileName="$(IntDir)\pano13.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" + DebugInformationFormat="3" CallingConvention="0" CompileAs="0" /> @@ -702,7 +706,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" + Name="Release CMD|Win32" ExcludedFromBuild="true" > <Tool @@ -710,7 +714,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" + Name="Debug GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -718,7 +722,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|x64" + Name="Release GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -726,7 +730,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|Win32" + Name="Debug CMD|x64" ExcludedFromBuild="true" > <Tool @@ -734,7 +738,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" + Name="Release CMD|x64" ExcludedFromBuild="true" > <Tool @@ -742,7 +746,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" + Name="Debug GUI|x64" ExcludedFromBuild="true" > <Tool @@ -774,7 +778,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" + Name="Release CMD|Win32" ExcludedFromBuild="true" > <Tool @@ -782,7 +786,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" + Name="Debug GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -790,7 +794,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|x64" + Name="Release GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -798,7 +802,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|Win32" + Name="Debug CMD|x64" ExcludedFromBuild="true" > <Tool @@ -806,7 +810,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" + Name="Release CMD|x64" ExcludedFromBuild="true" > <Tool @@ -814,7 +818,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" + Name="Debug GUI|x64" ExcludedFromBuild="true" > <Tool @@ -866,7 +870,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" + Name="Release GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -874,7 +878,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" + Name="Debug GUI|x64" ExcludedFromBuild="true" > <Tool @@ -906,7 +910,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" + Name="Release CMD|Win32" ExcludedFromBuild="true" > <Tool @@ -914,7 +918,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" + Name="Debug CMD|x64" ExcludedFromBuild="true" > <Tool @@ -1020,7 +1024,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" + Name="Release GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -1028,7 +1032,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" + Name="Debug GUI|x64" ExcludedFromBuild="true" > <Tool @@ -1056,7 +1060,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" + Name="Release CMD|Win32" ExcludedFromBuild="true" > <Tool @@ -1064,7 +1068,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" + Name="Debug CMD|x64" ExcludedFromBuild="true" > <Tool @@ -1106,7 +1110,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug CMD|x64" + Name="Release CMD|Win32" ExcludedFromBuild="true" > <Tool @@ -1114,7 +1118,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|Win32" + Name="Debug GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -1122,7 +1126,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release CMD|x64" + Name="Release GUI|Win32" ExcludedFromBuild="true" > <Tool @@ -1130,7 +1134,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|Win32" + Name="Debug CMD|x64" ExcludedFromBuild="true" > <Tool @@ -1138,7 +1142,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug GUI|x64" + Name="Release CMD|x64" ExcludedFromBuild="true" > <Tool @@ -1146,7 +1150,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release GUI|Win32" + Name="Debug GUI|x64" ExcludedFromBuild="true" > <Tool Modified: trunk/libpano/tools/PTAInterpolate.vcproj =================================================================== --- trunk/libpano/tools/PTAInterpolate.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTAInterpolate.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTAInterpolate.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTAInterpolate.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTOptimizer.vcproj =================================================================== --- trunk/libpano/tools/PTOptimizer.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTOptimizer.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -106,10 +107,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -127,16 +129,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -149,7 +147,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool @@ -158,16 +156,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" - OutputFile="$(OutDir)/PToptimizer.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + OutputFile="$(OutDir)/PTOptimizer.exe" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -193,7 +191,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -214,12 +212,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -232,7 +234,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -241,16 +243,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" - OutputFile="$(OutDir)/PTOptimizer.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + OutputFile="$(OutDir)/PToptimizer.exe" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTblender.vcproj =================================================================== --- trunk/libpano/tools/PTblender.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTblender.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTblender.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTblender.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTblender.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTblender.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTcrop.vcproj =================================================================== --- trunk/libpano/tools/PTcrop.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTcrop.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTcrop.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTcrop.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTcrop.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTcrop.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTinfo.vcproj =================================================================== --- trunk/libpano/tools/PTinfo.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTinfo.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTinfo.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTinfo.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTinfo.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTinfo.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTmasker.vcproj =================================================================== --- trunk/libpano/tools/PTmasker.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTmasker.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTmasker.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTmasker.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTmasker.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTmasker.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTmender.vcproj =================================================================== --- trunk/libpano/tools/PTmender.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTmender.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTmender.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTmender.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTmender.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTmender.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTroller.vcproj =================================================================== --- trunk/libpano/tools/PTroller.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTroller.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTroller.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTroller.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTroller.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTroller.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTtiff2psd.vcproj =================================================================== --- trunk/libpano/tools/PTtiff2psd.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTtiff2psd.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTtiff2psd.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTtiff2psd.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTtiff2psd.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTtiff2psd.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" Modified: trunk/libpano/tools/PTtiffdump.c =================================================================== --- trunk/libpano/tools/PTtiffdump.c 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTtiffdump.c 2010-01-13 19:40:05 UTC (rev 1222) @@ -37,11 +37,11 @@ #include <stdio.h> #include <stdlib.h> -#ifndef _MSC_VER -#include <unistd.h> -#else -#include "compat_win32/getopt.h" -#endif +#ifndef _MSC_VER +#include <unistd.h> +#else +#include "compat_win32/getopt.h" +#endif #include "tiffio.h" #include "panorama.h" Modified: trunk/libpano/tools/PTtiffdump.vcproj =================================================================== --- trunk/libpano/tools/PTtiffdump.vcproj 2010-01-12 22:15:34 UTC (rev 1221) +++ trunk/libpano/tools/PTtiffdump.vcproj 2010-01-13 19:40:05 UTC (rev 1222) @@ -24,6 +24,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -104,10 +105,11 @@ /> </Configuration> <Configuration - Name="Debug CMD|x64" + Name="Release CMD|Win32" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="..\LocalDefs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm" > @@ -125,16 +127,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -155,15 +153,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTtiffdump.exe" - LinkIncremental="2" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" - IgnoreDefaultLibraryNames="LIBCMT" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/PTtiffdump.pdb" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -189,7 +187,7 @@ /> </Configuration> <Configuration - Name="Release CMD|Win32" + Name="Debug CMD|x64" OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" @@ -210,12 +208,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="compat_win32;..\;"$(WXWIDGETS_HOME)\src\zlib";"$(WXWIDGETS_HOME)\src\png";"$(WXWIDGETS_HOME)\src\tiff";"$(WXWIDGETS_HOME)\src\jpeg";"$(WXWIDGETS_HOME)\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" StructMemberAlignment="4" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb" @@ -236,15 +238,15 @@ Name="VCLinkerTool" AdditionalDependencies="pano13.lib wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib" OutputFile="$(OutDir)/PTtiffdump.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib";"..\$(ConfigurationName)\$(PlatformName)"" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WXWIDGETS_HOME)\lib\vc_lib64";"..\$(ConfigurationName)\$(PlatformName)"" + IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/PTtiffdump.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> ... [truncated message content] |
From: <tks...@us...> - 2010-01-16 14:03:21
|
Revision: 1226 http://panotools.svn.sourceforge.net/panotools/?rev=1226&view=rev Author: tksharpless Date: 2010-01-16 14:03:14 +0000 (Sat, 16 Jan 2010) Log Message: ----------- Add the reference implementation of General Pannini: PaniniGeneral.c, PaniniGeneral.h Add function to query dynamic FOV limits Make sys_win.h not assume a DLL build define htons macro in ColourBrightness.c if undefined Modified Paths: -------------- trunk/libpano/ColourBrightness.c trunk/libpano/filter.h trunk/libpano/math.c trunk/libpano/panorama.h trunk/libpano/queryfeature.c trunk/libpano/sys_win.h Added Paths: ----------- trunk/libpano/PaniniGeneral.c trunk/libpano/PaniniGeneral.h Modified: trunk/libpano/ColourBrightness.c =================================================================== --- trunk/libpano/ColourBrightness.c 2010-01-16 12:30:31 UTC (rev 1225) +++ trunk/libpano/ColourBrightness.c 2010-01-16 14:03:14 UTC (rev 1226) @@ -44,6 +44,29 @@ #define round(x) (int)(x) #endif +#ifndef htons +// byte reordering macros -- avoids loading sockets lib on Windows +#define LITTLE_ENDIAN // change if your Windows box is from Mars +#if defined(BIG_ENDIAN) && !defined(LITTLE_ENDIAN) +#define htons(A) (A) +#define htonl(A) (A) +#define ntohs(A) (A) +#define ntohl(A) (A) +#elif defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) +#define htons(A) (((uint16)(A) & 0xff00) >> 8 | ((uint16)(A) & 0x00ff) << 8 ) +#define htonl(A) ((((uint32)(A) & 0xff000000) >> 24) | \ +((uint32)(A) & 0x00ff0000) >> 8 | \ +((uint32)(A) & 0x0000ff00) << 8 | \ +((uint32)(A) & 0x000000ff) << 24) +#define ntohs htons +#define ntohl htohl +#else +#error "Either BIG_ENDIAN or LITTLE_ENDIAN must be #defined, but not both." +#endif +#endif /ndef htons + + + FILE *debugFile = 0; Added: trunk/libpano/PaniniGeneral.c =================================================================== --- trunk/libpano/PaniniGeneral.c (rev 0) +++ trunk/libpano/PaniniGeneral.c 2010-01-16 14:03:14 UTC (rev 1226) @@ -0,0 +1,128 @@ +/* PaniniGeneral.c 15Jan2010 TKS + +This is the reference implementation of the General Pannini +Projection, an elaboration of the basic Pannini projection +discovered by Bruno Postle and Thomas Sharpless in December +2008 in paintings by Gian Paolo Pannini (1691-1765). + + (C) copyright 2010 Thomas K Sharpless +Free license is hereby granted for noncommercial use +under the terms of the GNU Lesser General Public License +version 2.1 as published by the Free Software Foundation +and appearing in the file LICENSE.LGPL included in the +packaging of this file. Please review the following +information to ensure the requirementsGeneral of the GNU Lesser +General Public License version 2.1 will be met: +http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + + +*/ +#include "PaniniGeneral.h" + +#include <math.h> + +#define PI 3.1415926535897932384626433832795 +#define D2R( x ) ((x) * PI / 180 ) +#define R2D( x ) ((x) * 180 / PI ) + +int panini_general_toSphere ( double* lon, double* lat, + double h, double v, + double d, double top, double bot + ) +{ + double S, cl, q, t; + + if( d < 0 ) return 0; + if( h == 0 ){ + *lon = 0; + S = 1; + cl = 1; + } else { + /* solve quadratic for cosine of azimuth angle */ + double k, kk, dd, del; + k = fabs(h) / (d + 1); + kk = k * k; + dd = d * d; + del = kk * kk * dd - (kk + 1) * (kk * dd - 1); + if( del < 0 ) + return 0; + cl = (-kk * d + sqrt( del )) / (kk + 1); + /* use that to compute S, and angle */ + S = (d + cl)/(d + 1); + *lon = atan2( S * h, cl ); + } + *lat = atan(S * v); + + /* squeeze */ + q = v < 0 ? top : bot; + if( q < 0 ){ + q = -q; + /* soft squeeze */ + t = q * 2 * (cl - 0.707) / PI; + *lat *= t + 1; + } else if( q > 0 ){ + /* hard squeeze */ + t = atan( v * cl ); + t = q * (t - *lat); + *lat += t; + } + + return 1; +} +int panini_general_toPlane ( double lon, double lat, + double* h, double* v, + double d, double top, double bot + ) +{ + double S, q, t; + + if( d < 0 ) return 0; + + S = (d + 1) / (d + cos(lon)); + *h = sin(lon) * S; + *v = tan(lat) * S; + + /* squeeze */ + q = v < 0 ? top : bot; + if( q < 0 ){ + q = -q; + /* soft squeeze */ + t = q * 2 * (cos(lon) - 0.707) / PI; + *v = S * tan(lat /(t + 1)); + } else if( q > 0 ){ + /* hard squeeze */ + t = tan(lat) * cos(lon); + *v += q * (t - *v); + } + + + return 1; +} + +int panini_general_maxVAs ( double d, + double maxProj, + double * maxView + ) +{ double a, s; + + if( d < 0 ) return 0; + +/* hFOV... */ + // theoretical max angle (infeasible for d < 1.1 or so) + if( d > 1. ) + s = -1/d; + else + s = -d; + a = acos( s ); + // actual limit may be max projection angle... + s = asin(d * sin(maxProj)) + maxProj ; + if( a > s ){ // clip to projection angle limit + a = s; + } + maxView[0] = a; + +/* vFOV... */ + maxView[1] = maxProj; + + return 1; +} Added: trunk/libpano/PaniniGeneral.h =================================================================== --- trunk/libpano/PaniniGeneral.h (rev 0) +++ trunk/libpano/PaniniGeneral.h 2010-01-16 14:03:14 UTC (rev 1226) @@ -0,0 +1,57 @@ +/* PaniniGeneral.h 15Jan2010 TKS + +This is the reference implementation of the General Pannini +Projection, an elaboration of the basic Pannini projection +discovered by Bruno Postle and Thomas Sharpless in December +2008 in paintings by Gian Paolo Pannini (1691-1765). + + (C) copyright 2010 Thomas K Sharpless +Free license is hereby granted for noncommercial use +under the terms of the GNU Lesser General Public License +version 2.1 as published by the Free Software Foundation +and appearing in the file LICENSE.LGPL included in the +packaging of this file. Please review the following +information to ensure the requirementsGeneral of the GNU Lesser +General Public License version 2.1 will be met: +http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + +It is a parameterized mapping between sphere and plane, +that gives synthetic perspective views on the plane when +the sphere holds a linear projection of the scene. Sphere +coordinates (phi, theta) are equirectangular: longitude and +latitude angles, in radians, relative to a point on the equator. +Plane coordinates (h, v) are relative to the image of the same +point, typically but not necessarily the center point of +the view. The plane y coordinate is negative upward, as is +typical in image processing software. + +There are 3 parameters: + d [0:infinity) controls horizontal compression + t [-1:1] controls vertical compression at top + b [-1:1] controls vertical compression at bottom + +There are functions to map cooridnates in either direction +and one to compute the maximum feasible field of view of the +plane image, given a d value and the projection angle limit +of your display system. + +Angles passed to and returned by panini_general_maxVAs() +are max view angles (half-FOVs) in radians. + +All 3 functions return an integer: 0: failure, 1: OK. +Computed coordinates and FOVs are returned in arguments +passed by address. + +*/ +int panini_general_toPlane ( double phi, double theta, + double* h, double* v, + double d, double t, double b + ); +int panini_general_toSphere ( double* phi, double* theta, + double h, double v, + double d, double t, double b + ); +int panini_general_maxVAs ( double d, + double maxProj, + double * maxView + ); Modified: trunk/libpano/filter.h =================================================================== --- trunk/libpano/filter.h 2010-01-16 12:30:31 UTC (rev 1225) +++ trunk/libpano/filter.h 2010-01-16 14:03:14 UTC (rev 1226) @@ -891,6 +891,7 @@ int panini_general_erect ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); int erect_panini_general ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); Image * setup_panini_general ( struct MakeParams * pmp ); +int maxFOVs_panini_general ( double *params, double *fovs ); int arch_erect ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); int erect_arch ( double x_dest,double y_dest, double* x_src, double* y_src, void* params ); Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2010-01-16 12:30:31 UTC (rev 1225) +++ trunk/libpano/math.c 2010-01-16 14:03:14 UTC (rev 1226) @@ -22,6 +22,8 @@ #include <float.h> #include "f2c.h" +#include "PaniniGeneral.h" + #define R_EPS 1.0e-6 #define MAXITER 100 @@ -981,37 +983,87 @@ return 1; } -/** set up working parameters for panini_general +/** General Pannini Projection setup_panini_general(&MakeParams) selects the Image struct corresponding to the pannini_general image and returns its address, or a NULL pointer for failure. If the selected Image has an invalid precomputedCount, it - posts the proper distanceparam and puts working parameter - values in precomputeValue[]. + posts the distanceparam corresponding to min( max feasible + hFOV, requested hFOV) and puts working parameter values in + precomputeValue[] in the selected Image. SetMakeParams (adjust.c) calls this function in lieu of setting distanceparam. - The 'UI' projection params, described in queryfeature.c, have - extended ranges to accomodate the integer-valued control sliders - in hugin. They are mapped to the working values as follows + The user-visible projection params, described in queryfeature.c, + are scaled to accomodate integer-valued control sliders in a GUI. + unscaleParams_panini_general() sets working values as follows: cmpr -100:0:50 <-> d = 0:1:->infinity NOTE very nonlinear tops, bots -100:100 <-> sqz -1:1 linear < 0 gives soft squeeze > 0 give transverse straightening squeeze CAUTION these ranges are assumed, not read from queryfeature.c - The maximum feasible hFOV depends on the compression parameter - and on a projection angle limit that is hard coded here. We - set distanceparam to limit the actual hFOV accordingly if the - requested hFOV is larger. + maxFOVs_panini_general() calculates the maximum feasible FOVs + for a given scaled parameter set. Those also depends on a + projection angle limit, that is hard coded here. FOVs in degrees. **/ +#define MAX_PROJ_ANGLE 80 + +int unscaleParams_panini_general( + double * gui_params, // cmpr, tops, bots + double * wrk_params // d, t, b + ) +{ + double t; + + /* check for legal values */ + if( gui_params[0] < -100 + || gui_params[0] > 50 + ) return 0; + if( gui_params[1] < -100 + || gui_params[1] > 100 + ) return 0; + if( gui_params[2] < -100 + || gui_params[2] > 100 + ) return 0; + + /* post working param values */ + t = (50 - gui_params[0]) / 50; /* -100:50 => 3:0 */ + wrk_params[0] = 1.5 / (t + 0.0001) - 1.5/3.0001; + wrk_params[1] = gui_params[1] / 100; + wrk_params[2] = gui_params[2] / 100; + + return 1; +} + +int maxFOVs_panini_general ( double *params, double *fovs ){ + double wparams[3], mfovs[2]; + /* translate user params to working values */ + if( !unscaleParams_panini_general( params, wparams ) + ) + return 0; + /* compute max half-fovs in radians */ + if( !panini_general_maxVAs( wparams[0], + DEG_TO_RAD(MAX_PROJ_ANGLE), + mfovs + ) + ) + return 0; + + /* return full fovs in degrees */ + fovs[0] = 2 * RAD_TO_DEG(mfovs[0]); + fovs[1] = 2 * RAD_TO_DEG(mfovs[1]); + + return 1; +} + Image * setup_panini_general(struct MakeParams* pmp) { int i; - double s,t,d,a,v; + double s,t,d,a,v, vl[2]; Image * ppg = NULL; // Only act if it is panini_general @@ -1032,40 +1084,22 @@ */ for( i = ppg->formatParamCount; i < 3; i++ ) ppg->formatParam[i] = 0; - /* clip values legal */ - if(ppg->formatParam[0] < -100) - ppg->formatParam[0] = -100; - else if(ppg->formatParam[0] > 100) - ppg->formatParam[0] = 100; - if(ppg->formatParam[1] < -100) - ppg->formatParam[1] = -100; - else if(ppg->formatParam[1] > 100) - ppg->formatParam[1] = 100; - if(ppg->formatParam[2] < -100) - ppg->formatParam[2] = -100; - else if(ppg->formatParam[2] > 100) - ppg->formatParam[2] = 100; - /* post working param values */ - t = (50 - ppg->formatParam[0]) / 50; /* -100:50 => 3:0 */ - d = 1.5 / (t + 0.0001) - 1.5/3.0001; - ppg->precomputedValue[0] = d; - ppg->precomputedValue[1] = ppg->formatParam[1] / 100; - ppg->precomputedValue[2] = ppg->formatParam[2] / 100; + /* translate user params to working values */ + if( !unscaleParams_panini_general( ppg->formatParam, ppg->precomputedValue ) + ) + return NULL; + d = ppg->precomputedValue[0]; /* post max feasible half-FOV as angle and x value */ - // theoretical max angle (infeasible for d < 1.1 or so) - if( d > 1. ) - s = -1/d; - else - s = -d; - a = acos( s ); - // actual limit may be max projection angle... - t = DEG_TO_RAD( 80 ); // max allowed projection angle - s = asin(d * sin(t)) + t ; // corresp. max azimuth - if( a > s ){ // clip to projection angle limit - a = s; - } + if( !panini_general_maxVAs( d, + DEG_TO_RAD( 80 ), // max projection angle + vl // max view angles h, v + ) + ) + return 0; + a = vl[0]; + // clip hFOV to feasible limit v = 0.5 * DEG_TO_RAD( ppg->hfov ); if( v > a ) @@ -1089,7 +1123,6 @@ int erect_panini_general( double x_dest,double y_dest, double* lambda_src, double* phi_src, void* params) { /* params -> MakeParams */ double x, y, lambda, phi, d, distance; - double S, cl, q, t; Image * ppg = setup_panini_general(mp); if( !ppg ) @@ -1104,40 +1137,13 @@ // fail if outside feasible FOV if( fabs(x) > ppg->precomputedValue[4] ) return 0; - - - if( x == 0 ){ - lambda = 0; - S = 1; - cl = 1; - } else { - /* solve quadratic for cosine of azimuth angle */ - double k, kk, dd, del; - k = fabs(x) / (d + 1); - kk = k * k; - dd = d * d; - del = kk * kk * dd - (kk + 1) * (kk * dd - 1); - if( del < 0 ) - return 0; - cl = (-kk * d + sqrt( del )) / (kk + 1); - /* use that to compute S, and angle */ - S = (d + cl)/(d + 1); - lambda = atan2( S * x, cl ); - } - phi = atan(S * y); - - /* squeeze */ - q = ppg->precomputedValue[y < 0 ? 1 : 2]; - if( q < 0 ){ - q = -q; - /* soft squeeze */ - t = q * 2 * (cl - 0.707) / PI; - phi *= t + 1; - } else if( q > 0 ){ - /* hard squeeze */ - t = atan( y * cl ); - phi += q * (t - phi); - } + // call mapping fn + if( !panini_general_toSphere( &lambda, &phi, x, y, + ppg->precomputedValue[0], + ppg->precomputedValue[1], + ppg->precomputedValue[2]) + ) + return 0; *lambda_src = lambda * distance; *phi_src = phi * distance; @@ -1151,7 +1157,7 @@ { /* params -> MakeParams */ - double phi, lambda, q,t,s,y,x; + double phi, lambda, y,x; double d; // >= 0 double distance; @@ -1169,24 +1175,14 @@ if( fabs(lambda) > ppg->precomputedValue[3] ) return 0; - s = (d + 1) / (d + cos(lambda)); - x = sin(lambda) * s; - y = tan(phi) * s; - - /* unsqueeze */ - q = ppg->precomputedValue[y < 0 ? 1 : 2]; - if( q < 0 ){ - q = -q; - /* soft squeeze */ - t = q * 2 * (cos(lambda) - 0.707) / PI; - y = s * tan(phi /(t + 1)); + // call mapping fn + if( !panini_general_toPlane( lambda, phi, &x, &y, + ppg->precomputedValue[0], + ppg->precomputedValue[1], + ppg->precomputedValue[2]) + ) + return 0; - } else if( q > 0 ){ - /* hard squeeze */ - t = tan(phi) * cos(lambda); - y += q * (t - y); - } - *y_src = distance * y; *x_src = distance * x; return 1; Modified: trunk/libpano/panorama.h =================================================================== --- trunk/libpano/panorama.h 2010-01-16 12:30:31 UTC (rev 1225) +++ trunk/libpano/panorama.h 2010-01-16 14:03:14 UTC (rev 1226) @@ -509,10 +509,15 @@ pano_projection_parameter parm[PANO_PROJECTION_MAX_PARMS]; } pano_projection_features; - - int panoProjectionFeaturesQuery(int projection, pano_projection_features *features); int panoProjectionFormatCount(void); +/** APIs to read dynamic features that depend on projection parameters + projection argument is an index, same as for queryFeatures() +**/ +int queryFOVLimits( int projection, + double * params, /* length depends on projection */ + double * lims /* [0] = maxhfov, [1] = maxvfov */ + ); Modified: trunk/libpano/queryfeature.c =================================================================== --- trunk/libpano/queryfeature.c 2010-01-16 12:30:31 UTC (rev 1225) +++ trunk/libpano/queryfeature.c 2010-01-16 14:03:14 UTC (rev 1226) @@ -493,5 +493,31 @@ return 1; } +int queryFOVLimits( int projection, /* projection index */ + double * params, /* length depends on projection */ + double * lims /* [0] = maxhfov, [1] = maxvfov */ + ) +{ + pano_projection_features pf; + int ok = panoProjectionFeaturesQuery(projection, &pf); + lims[0] = lims[1] = 0; + if( !ok ) return 0; + // default fixed values + lims[0] = pf.maxHFOV; + lims[1] = pf.maxVFOV; + // compute dynamic values + switch (projection) { + default: + break; + case PANO_FORMAT_PANINI_GENERAL: + maxFOVs_panini_general (params, lims ); + break; + case PANO_FORMAT_ALBERS_EQUAL_AREA_CONIC: + break; + } + return 1; +} + + Modified: trunk/libpano/sys_win.h =================================================================== --- trunk/libpano/sys_win.h 2010-01-16 12:30:31 UTC (rev 1225) +++ trunk/libpano/sys_win.h 2010-01-16 14:03:14 UTC (rev 1226) @@ -117,8 +117,13 @@ typedef LPSTR *Handle; +#ifdef _DLL extern HINSTANCE hDllInstance; extern HWND wndOwner; +#else +#define hDllInstance 0 +#define wndOwner 0 +#endif void SetWindowOwner(HWND Owner); void CenterDialog(HWND hDlg); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-16 14:15:14
|
Revision: 1227 http://panotools.svn.sourceforge.net/panotools/?rev=1227&view=rev Author: tksharpless Date: 2010-01-16 14:15:08 +0000 (Sat, 16 Jan 2010) Log Message: ----------- Add general panini sources to CMakeLists.txt Add LGPL license text for PaniniGeneral Modified Paths: -------------- trunk/libpano/CMakeLists.txt Added Paths: ----------- trunk/libpano/LICENSE.LGPL Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2010-01-16 14:03:14 UTC (rev 1226) +++ trunk/libpano/CMakeLists.txt 2010-01-16 14:15:08 UTC (rev 1227) @@ -1,300 +1,302 @@ -## cmakelists.txt for libpano13 in a Hugin build environment. -## 03-04 Aug 2009 TKSharpless -## -## Builds libpano13 only, by default without support for the -## Java programs ptpicker and pteditor. To include that, you -## can define HAVE_JAVA on the CMake command line. The Java -## header jni.h and its dependencies must then be in your -## include search path(this script does not find them). -## -## This script uses the Hugin CMake modules to find required -## image file format libraries, so it needs to know the name -## of the Hign source tree root. By default that must be -## "../hugin" relative to the libpano root(that contains -## this file). But you can set HUGIN_BASE_DIR to the path -## name of the Hugin root on the CMake command line. -## -## The parent directory of the Hugin root is one place where -## dependencies will be looked for. On Windows that should -## be the root directory of the Hugin SDK, and the wxWidgets -## package will likely supply the dependencies. Note: you -## may need to edit the wxWidgets version number below. -## - - -# requires at least cmake 2.6, now -cmake_minimum_required(VERSION 2.6) - -## Locate the hugin source root and its parent directory -IF(HUGIN_BASE_DIR) - GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${HUGIN_BASE_DIR} PATH CACHE) - set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules) -ELSE(HUGIN_BASE_DIR) - GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE) - set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules) -ENDIF(HUGIN_BASE_DIR) - -include(CheckIncludeFiles) - -## global setup -project(libpano13) - -## -## wxWidgets -## -# This must come before FINDs for tiff, jpeg, png, zlib to enable -# finding the wxWidgets distributions of those packages on Windows. -IF(WIN32) - SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) - ADD_DEFINITIONS(-D__Win__) - FIND_PACKAGE(wxWidgets REQUIRED) - set(win_c "tools/compat_win32/getopt.c") -ENDIF(WIN32) - - -## -## Graphics libraries -## -# wxWidgets sub-packages will be used if native ones aren't found - -FIND_PACKAGE(TIFF REQUIRED) -INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) -FIND_PACKAGE(JPEG REQUIRED) -INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) -FIND_PACKAGE(PNG REQUIRED) -INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) -INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) - -set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES}) - -# -# Check build type and set options accordingly -# -IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE Release CACHE STRING - "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." - FORCE) -ENDIF(NOT CMAKE_BUILD_TYPE) -IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") - ADD_DEFINITIONS(-DDEBUG) - IF(UNIX) - ADD_DEFINITIONS(-Wall) - ENDIF(UNIX) -ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") - -IF(UNIX) - ADD_DEFINITIONS(-D__Ansi__) -ELSE(UNIX) - IF(MSVC) - # Stop MSVC8 from bitching about the C library - ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) - # Stop MSVC9 from bitching about possibly invalid STL usage - ADD_DEFINITIONS(/D_SCL_SECURE_NO_WARNINGS) - # Stop MSVC9 from bitching about POSIX names without underscores - ADD_DEFINITIONS(/D_CRT_NONSTDC_NO_DEPRECATE) - # compile everything for the static C runtime - FOREACH(TYPE C CXX) - # makefiles use blank configuration - FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") - #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") - SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") - # fix up static libc flags - STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") - # *FORCE* to override whats already placed into the cache - SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING - "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) - #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") - ENDFOREACH(CFG) - ENDFOREACH(TYPE) - # link only with the static C runtime !! THIS IS A MUST !! - SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") - # ensure that the flags are not duplicaated on subsequent runs - STRING(REPLACE " /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" "" NEW_FLAGS "${NEW_FLAGS}") - # note that flag names(NODEFAULTLIB) etc.) are case sensitive - SET(CMAKE_EXE_LINKER_FLAGS - "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" - CACHE STRING "for MSVC" FORCE -) - ENDIF(MSVC) -ENDIF(UNIX) - -## -## Here is the part that builds libpano -## -if(HAVE_JAVA) - set(java_h pteditor.h ptutils.h) - set(java_c ptpicker.c pteditor.c) -else() - set(java_c javastub.c) -endif(HAVE_JAVA) - -set(pano13_install_hdr - panorama.h - filter.h - version.h - panotypes.h - PTcommon.h - pt_stdint.h - file.h - queryfeature.h - pteditor.h - ptutils.h) - -set(pano13_hdr - ${java_h} - ${pano13_install_hdr} - ColourBrightness.h - f2c.h - fftn.h - rgbe.h - sys_ansi.h - sys_win.h - ZComb.h -) - -set(pano13_res - pano13.rc - pano13vc.def -) - -set(pano13_src - ${java_c} - ${win_c} - adjust.c - bmp.c - ColourBrightness.c - correct.c - fftn.c - file.c - filter.c - fourier.c - hdrfile.c - jpeg.c - jpegicc.c - lmdif.c - math.c - metadata.c - morpher.c - multilayer.c - optimize.c - pan.c - parser.c - perspect.c - png.c - ppm.c - PTcommon.c - PTDialogs.c - ptfeather.c - ptstitch.c - queryfeature.c - remap.c - resample.c - rgbe.c - seamer.c - sys_ansi.c - sys_common.c - tiff.c - Triangulate.c - ZComb.c -) -# We have some header files at top source level now -include_directories(${CMAKE_SOURCE_DIR}) - -if(NOT WIN32) - # Create and install shared library on non-windows - add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) - target_link_libraries(pano13 ${_common_libs}) - set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") - install(TARGETS pano13 LIBRARY DESTINATION lib) - set(_pano_target pano13) -else() - set(_pano_target pano13a) -endif() - -#create and install static library -add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src}) -set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13) -install(TARGETS pano13a ARCHIVE DESTINATION lib) - -install(FILES ${pano13_install_hdr} DESTINATION "include/pano13") - -set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR}) - -add_subdirectory(man) -add_dependencies(${_pano_target} man) -add_subdirectory(tools) -add_dependencies(tools ${_pano_target}) - -macro(setstripped _varname _value) - string(STRIP ${_value} _v) - if(USE_POSIX_PACKAGING) - string(TOLOWER ${_v} ${_varname}) - else() - set(${_varname} ${_v}) - endif() -endmacro(setstripped) - -file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines) -foreach(_c_l ${_config_lines}) - if(_c_l MATCHES "^AC_INIT\\(\\[\([^,]+\)\\], *\\[\([^,]+\)\\], *\([^,]+\)") - setstripped(PACKAGE_BASE ${CMAKE_MATCH_1}) - setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2}) - setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3}) - if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\\.\([0-9]+\).*$") - message(STATUS "found version = ${PACKAGE_VERSION}") - set(PANO_MAJOR_VERSION ${CMAKE_MATCH_1}) - set(PANO_MINOR_VERSION ${CMAKE_MATCH_2}) - set(PANO_PATCH_VERSION ${CMAKE_MATCH_3}) - endif() - endif() -endforeach(_c_l) - -# set some variables which are used in libpano13.pc.in -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) -set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(LIB_JPEG ${JPEG_LIBRARY}) -set(LIB_TIFF ${TIFF_LIBRARY}) -set(LIB_ZLIB ${ZLIB_LIBRARY}) -set(LIB_PNG ${PNG_LIBRARY}) -set(VERSION ${PACKAGE_VERSION}) - -configure_file("${TOP_SRC_DIR}/libpano13.pc.in" "${CMAKE_BINARY_DIR}/libpano13.pc" @ONLY) - -install(FILES "${CMAKE_BINARY_DIR}/libpano13.pc" DESTINATION "lib/pkgconfig") - -set(CPACK_PACKAGE_VERSION_MAJOR "${PANO_MAJOR_VERSION}") -set(CPACK_PACKAGE_VERSION_MINOR "${PANO_MINOR_VERSION}") -set(CPACK_PACKAGE_VERSION_PATCH "${PANO_PATCH_VERSION}") - -# needed by rpm -set(CPACK_SET_DESTDIR "ON") - -# the next ones are needed by deb -set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}") -set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/README") -set(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/gpl.txt") - -# Find the revision number and use it as the release in rpm-package-build. -# This way we may omit the otherwise needed "--force" parameter when -# installing from that rpm package. -# ... Disabled for the moment, because configure.ac supplies a value -find_program(_svnversion svnversion) -message(STATUS "svnversion = ${_svnversion}") -if(NOT ${_svnversion} MATCHES "-NOTFOUND") - execute_process(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) - # We use this value also to set the package-patch-value - if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)") - #set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1}) - endif() -endif() - -set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13-${PACKAGE_VERSION}") - -include(CPack) - - -enable_testing() -add_subdirectory(tests) +## cmakelists.txt for libpano13 in a Hugin build environment. +## 03-04 Aug 2009 TKSharpless +## +## Builds libpano13 only, by default without support for the +## Java programs ptpicker and pteditor. To include that, you +## can define HAVE_JAVA on the CMake command line. The Java +## header jni.h and its dependencies must then be in your +## include search path(this script does not find them). +## +## This script uses the Hugin CMake modules to find required +## image file format libraries, so it needs to know the name +## of the Hign source tree root. By default that must be +## "../hugin" relative to the libpano root(that contains +## this file). But you can set HUGIN_BASE_DIR to the path +## name of the Hugin root on the CMake command line. +## +## The parent directory of the Hugin root is one place where +## dependencies will be looked for. On Windows that should +## be the root directory of the Hugin SDK, and the wxWidgets +## package will likely supply the dependencies. Note: you +## may need to edit the wxWidgets version number below. +## + + +# requires at least cmake 2.6, now +cmake_minimum_required(VERSION 2.6) + +## Locate the hugin source root and its parent directory +IF(HUGIN_BASE_DIR) + GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${HUGIN_BASE_DIR} PATH CACHE) + set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules) +ELSE(HUGIN_BASE_DIR) + GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE) + set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules) +ENDIF(HUGIN_BASE_DIR) + +include(CheckIncludeFiles) + +## global setup +project(libpano13) + +## +## wxWidgets +## +# This must come before FINDs for tiff, jpeg, png, zlib to enable +# finding the wxWidgets distributions of those packages on Windows. +IF(WIN32) + SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) + ADD_DEFINITIONS(-D__Win__) + FIND_PACKAGE(wxWidgets REQUIRED) + set(win_c "tools/compat_win32/getopt.c") +ENDIF(WIN32) + + +## +## Graphics libraries +## +# wxWidgets sub-packages will be used if native ones aren't found + +FIND_PACKAGE(TIFF REQUIRED) +INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) +FIND_PACKAGE(JPEG REQUIRED) +INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) +FIND_PACKAGE(PNG REQUIRED) +INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + +set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES}) + +# +# Check build type and set options accordingly +# +IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE Release CACHE STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + FORCE) +ENDIF(NOT CMAKE_BUILD_TYPE) +IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + ADD_DEFINITIONS(-DDEBUG) + IF(UNIX) + ADD_DEFINITIONS(-Wall) + ENDIF(UNIX) +ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + +IF(UNIX) + ADD_DEFINITIONS(-D__Ansi__) +ELSE(UNIX) + IF(MSVC) + # Stop MSVC8 from bitching about the C library + ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) + # Stop MSVC9 from bitching about possibly invalid STL usage + ADD_DEFINITIONS(/D_SCL_SECURE_NO_WARNINGS) + # Stop MSVC9 from bitching about POSIX names without underscores + ADD_DEFINITIONS(/D_CRT_NONSTDC_NO_DEPRECATE) + # compile everything for the static C runtime + FOREACH(TYPE C CXX) + # makefiles use blank configuration + FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") + #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") + SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") + # fix up static libc flags + STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") + # *FORCE* to override whats already placed into the cache + SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING + "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) + #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") + ENDFOREACH(CFG) + ENDFOREACH(TYPE) + # link only with the static C runtime !! THIS IS A MUST !! + SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") + # ensure that the flags are not duplicaated on subsequent runs + STRING(REPLACE " /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" "" NEW_FLAGS "${NEW_FLAGS}") + # note that flag names(NODEFAULTLIB) etc.) are case sensitive + SET(CMAKE_EXE_LINKER_FLAGS + "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" + CACHE STRING "for MSVC" FORCE +) + ENDIF(MSVC) +ENDIF(UNIX) + +## +## Here is the part that builds libpano +## +if(HAVE_JAVA) + set(java_h pteditor.h ptutils.h) + set(java_c ptpicker.c pteditor.c) +else() + set(java_c javastub.c) +endif(HAVE_JAVA) + +set(pano13_install_hdr + panorama.h + filter.h + version.h + panotypes.h + PTcommon.h + pt_stdint.h + file.h + queryfeature.h + pteditor.h + ptutils.h) + +set(pano13_hdr + ${java_h} + ${pano13_install_hdr} + ColourBrightness.h + f2c.h + fftn.h + rgbe.h + sys_ansi.h + sys_win.h + ZComb.h + PaniniGeneral.h +) + +set(pano13_res + pano13.rc + pano13vc.def +) + +set(pano13_src + ${java_c} + ${win_c} + adjust.c + bmp.c + ColourBrightness.c + correct.c + fftn.c + file.c + filter.c + fourier.c + hdrfile.c + jpeg.c + jpegicc.c + lmdif.c + math.c + metadata.c + morpher.c + multilayer.c + optimize.c + pan.c + parser.c + perspect.c + png.c + ppm.c + PTcommon.c + PTDialogs.c + ptfeather.c + ptstitch.c + queryfeature.c + remap.c + resample.c + rgbe.c + seamer.c + sys_ansi.c + sys_common.c + tiff.c + Triangulate.c + ZComb.c + PaniniGeneral.c +) +# We have some header files at top source level now +include_directories(${CMAKE_SOURCE_DIR}) + +if(NOT WIN32) + # Create and install shared library on non-windows + add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) + target_link_libraries(pano13 ${_common_libs}) + set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") + install(TARGETS pano13 LIBRARY DESTINATION lib) + set(_pano_target pano13) +else() + set(_pano_target pano13a) +endif() + +#create and install static library +add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src}) +set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13) +install(TARGETS pano13a ARCHIVE DESTINATION lib) + +install(FILES ${pano13_install_hdr} DESTINATION "include/pano13") + +set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR}) + +add_subdirectory(man) +add_dependencies(${_pano_target} man) +add_subdirectory(tools) +add_dependencies(tools ${_pano_target}) + +macro(setstripped _varname _value) + string(STRIP ${_value} _v) + if(USE_POSIX_PACKAGING) + string(TOLOWER ${_v} ${_varname}) + else() + set(${_varname} ${_v}) + endif() +endmacro(setstripped) + +file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines) +foreach(_c_l ${_config_lines}) + if(_c_l MATCHES "^AC_INIT\\(\\[\([^,]+\)\\], *\\[\([^,]+\)\\], *\([^,]+\)") + setstripped(PACKAGE_BASE ${CMAKE_MATCH_1}) + setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2}) + setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3}) + if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\\.\([0-9]+\).*$") + message(STATUS "found version = ${PACKAGE_VERSION}") + set(PANO_MAJOR_VERSION ${CMAKE_MATCH_1}) + set(PANO_MINOR_VERSION ${CMAKE_MATCH_2}) + set(PANO_PATCH_VERSION ${CMAKE_MATCH_3}) + endif() + endif() +endforeach(_c_l) + +# set some variables which are used in libpano13.pc.in +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(LIB_JPEG ${JPEG_LIBRARY}) +set(LIB_TIFF ${TIFF_LIBRARY}) +set(LIB_ZLIB ${ZLIB_LIBRARY}) +set(LIB_PNG ${PNG_LIBRARY}) +set(VERSION ${PACKAGE_VERSION}) + +configure_file("${TOP_SRC_DIR}/libpano13.pc.in" "${CMAKE_BINARY_DIR}/libpano13.pc" @ONLY) + +install(FILES "${CMAKE_BINARY_DIR}/libpano13.pc" DESTINATION "lib/pkgconfig") + +set(CPACK_PACKAGE_VERSION_MAJOR "${PANO_MAJOR_VERSION}") +set(CPACK_PACKAGE_VERSION_MINOR "${PANO_MINOR_VERSION}") +set(CPACK_PACKAGE_VERSION_PATCH "${PANO_PATCH_VERSION}") + +# needed by rpm +set(CPACK_SET_DESTDIR "ON") + +# the next ones are needed by deb +set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/README") +set(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/gpl.txt") + +# Find the revision number and use it as the release in rpm-package-build. +# This way we may omit the otherwise needed "--force" parameter when +# installing from that rpm package. +# ... Disabled for the moment, because configure.ac supplies a value +find_program(_svnversion svnversion) +message(STATUS "svnversion = ${_svnversion}") +if(NOT ${_svnversion} MATCHES "-NOTFOUND") + execute_process(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) + # We use this value also to set the package-patch-value + if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)") + #set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1}) + endif() +endif() + +set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13-${PACKAGE_VERSION}") + +include(CPack) + + +enable_testing() +add_subdirectory(tests) Added: trunk/libpano/LICENSE.LGPL =================================================================== --- trunk/libpano/LICENSE.LGPL (rev 0) +++ trunk/libpano/LICENSE.LGPL 2010-01-16 14:15:08 UTC (rev 1227) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-17 10:07:10
|
Revision: 1230 http://panotools.svn.sourceforge.net/panotools/?rev=1230&view=rev Author: tksharpless Date: 2010-01-17 10:07:03 +0000 (Sun, 17 Jan 2010) Log Message: ----------- Default projection parameters and dynamic FOV limits API fixes Define htons() macro in ColourBrightness.c only for MSVC compiles Modified Paths: -------------- trunk/libpano/ColourBrightness.c trunk/libpano/math.c trunk/libpano/panorama.h trunk/libpano/queryfeature.c Modified: trunk/libpano/ColourBrightness.c =================================================================== --- trunk/libpano/ColourBrightness.c 2010-01-16 16:09:46 UTC (rev 1229) +++ trunk/libpano/ColourBrightness.c 2010-01-17 10:07:03 UTC (rev 1230) @@ -38,13 +38,17 @@ #include "pttiff.h" + +#ifdef _MSC_VER + // MSVC doesn't support round() -#ifdef _MSC_VER //#define round(x) ( (int) (x+0.5) ) #define round(x) (int)(x) -#endif -#ifndef htons +// MSVC wants htons() to be a library function +// here we define it as a macro instead +#undef htons +#undef htonl // byte reordering macros -- avoids loading sockets lib on Windows #define LITTLE_ENDIAN // change if your Windows box is from Mars #if defined(BIG_ENDIAN) && !defined(LITTLE_ENDIAN) @@ -63,10 +67,11 @@ #else #error "Either BIG_ENDIAN or LITTLE_ENDIAN must be #defined, but not both." #endif -#endif /ndef htons +#endif //def _MSC_VER + FILE *debugFile = 0; Modified: trunk/libpano/math.c =================================================================== --- trunk/libpano/math.c 2010-01-16 16:09:46 UTC (rev 1229) +++ trunk/libpano/math.c 2010-01-17 10:07:03 UTC (rev 1230) @@ -1000,7 +1000,7 @@ The user-visible projection params, described in queryfeature.c, are scaled to accomodate integer-valued control sliders in a GUI. unscaleParams_panini_general() sets working values as follows: - cmpr -100:0:50 <-> d = 0:1:->infinity NOTE very nonlinear + cmpr 0:100:150 <-> d = 0:1:->infinity NOTE very nonlinear tops, bots -100:100 <-> sqz -1:1 linear < 0 gives soft squeeze > 0 give transverse straightening squeeze @@ -1021,8 +1021,8 @@ double t; /* check for legal values */ - if( gui_params[0] < -100 - || gui_params[0] > 50 + if( gui_params[0] < 0 + || gui_params[0] > 150 ) return 0; if( gui_params[1] < -100 || gui_params[1] > 100 @@ -1032,7 +1032,7 @@ ) return 0; /* post working param values */ - t = (50 - gui_params[0]) / 50; /* -100:50 => 3:0 */ + t = (150 - gui_params[0]) / 50; /* 0:150 => 3:0 */ wrk_params[0] = 1.5 / (t + 0.0001) - 1.5/3.0001; wrk_params[1] = gui_params[1] / 100; wrk_params[2] = gui_params[2] / 100; Modified: trunk/libpano/panorama.h =================================================================== --- trunk/libpano/panorama.h 2010-01-16 16:09:46 UTC (rev 1229) +++ trunk/libpano/panorama.h 2010-01-17 10:07:03 UTC (rev 1230) @@ -418,7 +418,7 @@ // This are the maximum number of parameters accepted by a given projection -#define PANO_PROJECTION_MAX_PARMS 3 +#define PANO_PROJECTION_MAX_PARMS 6 // This are the maximum number of internal parameters used by a given projection #define PANO_PROJECTION_PRECOMPUTED_VALUES 10 @@ -492,6 +492,7 @@ { double minValue; // used only if float double maxValue; + double defValue; // default char *name; // name of the parameter (for the purpose of legibility) } pano_projection_parameter; Modified: trunk/libpano/queryfeature.c =================================================================== --- trunk/libpano/queryfeature.c 2010-01-16 16:09:46 UTC (rev 1229) +++ trunk/libpano/queryfeature.c 2010-01-17 10:07:03 UTC (rev 1230) @@ -378,8 +378,9 @@ int panoProjectionFeaturesQuery(int projection, pano_projection_features *features) { - // Return information regarding the characteristics of each of the projections - // in the library. + // Return static information on the characteristics of each of the projections + // in the library. This now includes min, max and defualt parameter values. + // All data are zero by default. int i; @@ -426,8 +427,9 @@ features->parm[0].name = "Cmpr"; features->parm[1].name = "Tops"; features->parm[2].name = "Bots"; - features->parm[0].minValue = -100; - features->parm[0].maxValue = 50; + features->parm[0].minValue = 0; + features->parm[0].maxValue = 150; + features->parm[0].defValue = 100; features->parm[1].minValue = -100; features->parm[1].maxValue = 100; features->parm[2].minValue = -100; @@ -469,6 +471,9 @@ features->parm[i].minValue = -90; features->parm[i].maxValue = +90; } + features->parm[0].defValue = 0; + features->parm[1].defValue = 60; + break; case PANO_FORMAT_BIPLANE: features->maxVFOV = 179; @@ -477,6 +482,7 @@ features->parm[0].name = "alpha"; features->parm[0].minValue=1; features->parm[0].maxValue=179; + features->parm[0].defValue=45; break; case PANO_FORMAT_TRIPLANE: features->maxVFOV = 179; @@ -485,6 +491,7 @@ features->parm[0].name = "alpha"; features->parm[0].minValue=1; features->parm[0].maxValue=120; + features->parm[0].defValue=60; break; default: assert(0); // A projection is missing! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dm...@us...> - 2010-01-17 23:26:31
|
Revision: 1232 http://panotools.svn.sourceforge.net/panotools/?rev=1232&view=rev Author: dmg Date: 2010-01-17 23:26:23 +0000 (Sun, 17 Jan 2010) Log Message: ----------- Removed LICENSE.LGPL and updated Makefile.am for new panini files Modified Paths: -------------- trunk/libpano/ChangeLog trunk/libpano/Makefile.am Removed Paths: ------------- trunk/libpano/LICENSE.LGPL Modified: trunk/libpano/ChangeLog =================================================================== --- trunk/libpano/ChangeLog 2010-01-17 21:29:04 UTC (rev 1231) +++ trunk/libpano/ChangeLog 2010-01-17 23:26:23 UTC (rev 1232) @@ -1,3 +1,8 @@ +2010-01-17 dmg <dm...@uv...> + + * Makefile.am: Added new panini source code files to the building + of the library. + 2010-01-09 dmg <dm...@uv...> * queryfeature.c (panoProjectionFormatCount): Fix for one the Deleted: trunk/libpano/LICENSE.LGPL =================================================================== --- trunk/libpano/LICENSE.LGPL 2010-01-17 21:29:04 UTC (rev 1231) +++ trunk/libpano/LICENSE.LGPL 2010-01-17 23:26:23 UTC (rev 1232) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Modified: trunk/libpano/Makefile.am =================================================================== --- trunk/libpano/Makefile.am 2010-01-17 21:29:04 UTC (rev 1231) +++ trunk/libpano/Makefile.am 2010-01-17 23:26:23 UTC (rev 1232) @@ -6,7 +6,7 @@ optimize.c morpher.c Triangulate.c \ seamer.c hdrfile.c rgbe.c rgbe.h \ tiff.c ZComb.c jpeg.c png.c multilayer.c sys_common.c PTcommon.c ColourBrightness.c\ - metadata.c jpegicc.c ptstitch.c ptfeather.c + metadata.c jpegicc.c ptstitch.c ptfeather.c PaniniGeneral.c if HasJava JAVA_SRC = ptpicker.c pteditor.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |