From: <tm...@us...> - 2009-12-31 14:46:35
|
Revision: 4845 http://hugin.svn.sourceforge.net/hugin/?rev=4845&view=rev Author: tmodes Date: 2009-12-31 14:46:18 +0000 (Thu, 31 Dec 2009) Log Message: ----------- Keep source tree clean (create src/celeste/Config.h in CMake binary folder) Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/src/celeste/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-12-30 09:58:28 UTC (rev 4844) +++ hugin/trunk/CMakeLists.txt 2009-12-31 14:46:18 UTC (rev 4845) @@ -71,6 +71,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/foreign ) include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/vigra ) include_directories( ${CMAKE_SOURCE_DIR}/src/celeste ) +include_directories( ${CMAKE_BINARY_DIR}/src/celeste ) # this function is not available on some systems, notably FreeBSD and Windows include(CheckFunctionExists) Modified: hugin/trunk/src/celeste/CMakeLists.txt =================================================================== --- hugin/trunk/src/celeste/CMakeLists.txt 2009-12-30 09:58:28 UTC (rev 4844) +++ hugin/trunk/src/celeste/CMakeLists.txt 2009-12-31 14:46:18 UTC (rev 4845) @@ -23,15 +23,15 @@ IF(WIN32) ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Config.h - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.win32 ${CMAKE_CURRENT_SOURCE_DIR}/Config.h + OUTPUT ${CMAKE_BINARY_DIR}/src/celeste/Config.h + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.win32 ${CMAKE_BINARY_DIR}/src/celeste/Config.h DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.win32 ) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nologo -O2 -EHsc -I. -D __WIN32__ -D _CRT_SECURE_NO_DEPRECATE") ELSE (WIN32) ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Config.h - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.linux ${CMAKE_CURRENT_SOURCE_DIR}/Config.h + OUTPUT ${CMAKE_BINARY_DIR}/src/celeste/Config.h + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.linux ${CMAKE_BINARY_DIR}/src/celeste/Config.h DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.linux ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2010-01-04 14:25:53
|
Revision: 4848 http://hugin.svn.sourceforge.net/hugin/?rev=4848&view=rev Author: dangelo Date: 2010-01-04 14:25:34 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Added pano_trafo, a command line tool to transform between image and panorama coordinates (and vice versa) Probably useful for testing the transforms and for verifying interest point detectors. Modified Paths: -------------- hugin/trunk/doc/Makefile.pod2man hugin/trunk/src/tools/CMakeLists.txt Added Paths: ----------- hugin/trunk/doc/pano_trafo.1 hugin/trunk/doc/pano_trafo.pod hugin/trunk/src/tools/pano_trafo.cpp Modified: hugin/trunk/doc/Makefile.pod2man =================================================================== --- hugin/trunk/doc/Makefile.pod2man 2010-01-02 09:43:10 UTC (rev 4847) +++ hugin/trunk/doc/Makefile.pod2man 2010-01-04 14:25:34 UTC (rev 4848) @@ -2,8 +2,9 @@ # after making any .pod alterations and commit the resulting man(1) files. man_MANS = align_image_stack.1 autooptimiser.1 fulla.1 hugin_hdrmerge.1 \ - hugin.1 hugin_stitch_project.1 nona_gui.1 nona.1 vig_optimize.1 deghosting_mask.1 \ - celeste_standalone.1 PTBatcherGUI.1 tca_correct.1 pto2mk.1 calibrate_lens.1 cpclean.1 + hugin.1 hugin_stitch_project.0 nona_gui.1 nona.1 vig_optimize.1 deghosting_mask.1 \ + celeste_standalone.1 PTBatcherGUI.1 tca_correct.1 pto2mk.1 calibrate_lens.1 cpclean.1 \ + pano_trafo.1 all: $(man_MANS) Added: hugin/trunk/doc/pano_trafo.1 =================================================================== --- hugin/trunk/doc/pano_trafo.1 (rev 0) +++ hugin/trunk/doc/pano_trafo.1 2010-01-04 14:25:34 UTC (rev 4848) @@ -0,0 +1,152 @@ +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.ie \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. nr % 0 +. rr F +.\} +.el \{\ +. de IX +.. +.\} +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "PANO_TRAFO 1" +.TH PANO_TRAFO 1 "2010-01-04" "perl v5.10.0" "HUGIN" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" +pano_trafo \- Transform image coordinates. +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +\&\fBpano_trafo\fR [options] \fIpano.pto\fR \fIimage_number\fR +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +\&\fBcpclean\fR reads image coordiates (x y) from standard input and +prints the corresponding panorama coordinates to standard output. +.SH "OPTIONS" +.IX Header "OPTIONS" +.IP "\fB\-r\fR" 4 +.IX Item "-r" +Reverse transformation, read panorama coordinates and print image +coordinates. +.IP "\fB\-h\fR" 4 +.IX Item "-h" +shows help +.SH "AUTHORS" +.IX Header "AUTHORS" +Pablo d'Angelo Added: hugin/trunk/doc/pano_trafo.pod =================================================================== --- hugin/trunk/doc/pano_trafo.pod (rev 0) +++ hugin/trunk/doc/pano_trafo.pod 2010-01-04 14:25:34 UTC (rev 4848) @@ -0,0 +1,31 @@ +=head1 NAME + +pano_trafo - Transform image coordinates. + +=head1 SYNOPSIS + +B<pano_trafo> [options] I<pano.pto> I<image_number> + +=head1 DESCRIPTION + +B<cpclean> reads image coordiates (x y) from standard input and +prints the corresponding panorama coordinates to standard output. + +=head1 OPTIONS + +=over + +=item B<-r> + +Reverse transformation, read panorama coordinates and print image +coordinates. + +=item B<-h> + +shows help + +=back + +=head1 AUTHORS + +Pablo d'Angelo Modified: hugin/trunk/src/tools/CMakeLists.txt =================================================================== --- hugin/trunk/src/tools/CMakeLists.txt 2010-01-02 09:43:10 UTC (rev 4847) +++ hugin/trunk/src/tools/CMakeLists.txt 2010-01-04 14:25:34 UTC (rev 4848) @@ -26,9 +26,13 @@ add_executable(cpclean cpclean.cpp) target_link_libraries(cpclean ${common_libs} ) +add_executable(pano_trafo pano_trafo.cpp) +target_link_libraries(pano_trafo ${common_libs} ) + add_executable(hugin_hdrmerge hugin_hdrmerge.cpp ../deghosting/deghosting.cpp) target_link_libraries(hugin_hdrmerge ${common_libs} ${image_libs} ) -install(TARGETS nona vig_optimize autooptimiser fulla align_image_stack tca_correct pto2mk cpclean hugin_hdrmerge +install(TARGETS nona vig_optimize autooptimiser fulla align_image_stack + tca_correct pto2mk cpclean hugin_hdrmerge pano_trafo DESTINATION ${BINDIR}) Added: hugin/trunk/src/tools/pano_trafo.cpp =================================================================== --- hugin/trunk/src/tools/pano_trafo.cpp (rev 0) +++ hugin/trunk/src/tools/pano_trafo.cpp 2010-01-04 14:25:34 UTC (rev 4848) @@ -0,0 +1,126 @@ +// -*- c-basic-offset: 4 -*- + +/** @file cpclean.cpp + * + * @brief program to remove wrong control points by statistical method + * + * the algorithm is based on ptoclean by Bruno Postle + * + * @author Thomas Modes + * + * $Id: cpclean.cpp 4822 2009-12-19 23:17:06Z brunopostle $ + * + */ + +/* This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <hugin_version.h> + +#include <fstream> +#include <sstream> +#ifdef WIN32 + #include <getopt.h> +#else + #include <unistd.h> +#endif + +#include <panodata/Panorama.h> +#include <panotools/PanoToolsInterface.h> + +using namespace std; +using namespace HuginBase; +using namespace AppBase; + +static void usage(const char * name) +{ + cout << name << ": transform pixel coordinates" << endl + << "pano_trafo version " << DISPLAY_VERSION << endl + << endl + << "Usage: " << name << " input.pto image_nr" << endl + << endl + << "pano_trafo reads pixel coordinates from standard input and prints" << endl + << "the transformed coordinates to standard out." << endl + << " -r Transform from panorama to image coordinates" << endl + << " -h shows help" << endl + << endl; +} + +int main(int argc, char *argv[]) +{ + // parse arguments + const char * optstring = "hr"; + + int c; + bool reverse = false; + while ((c = getopt (argc, argv, optstring)) != -1) + { + switch (c) { + case 'h': + usage(argv[0]); + return 0; + case 'r': + reverse = true; + break; + case '?': + break; + default: + abort (); + } + } + + if (argc - optind != 2) + { + usage(argv[0]); + return 1; + }; + + string input=argv[optind]; + int imageNumber = atoi(argv[optind+1]); + + Panorama pano; + ifstream prjfile(input.c_str()); + if (!prjfile.good()) { + cerr << "could not open script : " << input << endl; + return 1; + } + pano.setFilePrefix(hugin_utils::getPathPrefix(input)); + DocumentData::ReadWriteError err = pano.readData(prjfile); + if (err != DocumentData::SUCCESSFUL) { + cerr << "error while parsing panos tool script: " << input << endl; + cerr << "DocumentData::ReadWriteError code: " << err << endl; + return 1; + } + + if (imageNumber >= pano.getNrOfImages()) { + cerr << "Not enough images in panorama" << endl; + return 1; + } + + // pano tools interface + HuginBase::PTools::Transform trafo; + if (reverse) { + trafo.createTransform(pano.getSrcImage(imageNumber), pano.getOptions()); + } else { + trafo.createInvTransform(pano.getSrcImage(imageNumber), pano.getOptions()); + } + + double xin,yin,xout,yout; + while( fscanf(stdin, "%lf %lf", &xin, &yin) == 2 ) { + trafo.transformImgCoord(xout, yout, xin, yin); + fprintf(stdout,"%f %f\n",xout, yout); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-16 16:12:26
|
Revision: 4900 http://hugin.svn.sourceforge.net/hugin/?rev=4900&view=rev Author: tksharpless Date: 2010-01-16 16:12:18 +0000 (Sat, 16 Jan 2010) Log Message: ----------- PanoramaOptions.cpp use new dyanmic mFOV limit query CMake scripts adjusted to match current libpano install script on Windows. Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindPANO13.cmake hugin/trunk/CMakeModules/win_bundle.cmake hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-01-16 15:50:46 UTC (rev 4899) +++ hugin/trunk/CMakeLists.txt 2010-01-16 16:12:18 UTC (rev 4900) @@ -205,7 +205,7 @@ # Now it is a cache variable you can edit in cmakesetup --TKS # IF( NOT Boost_root_suffix ) - SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE ) + SET( Boost_root_suffix _1_39_0 CACHE STRING "suffix of boost root dir." FORCE ) ENDIF( NOT Boost_root_suffix ) IF(WIN32) Modified: hugin/trunk/CMakeModules/FindPANO13.cmake =================================================================== --- hugin/trunk/CMakeModules/FindPANO13.cmake 2010-01-16 15:50:46 UTC (rev 4899) +++ hugin/trunk/CMakeModules/FindPANO13.cmake 2010-01-16 16:12:18 UTC (rev 4900) @@ -8,28 +8,25 @@ # PANO13_DEBUG_LIBRARIES, debug ditto. # PANO13_FOUND, If != "YES", do not try to use PANO13. -# In Pablo's Windows setup ${SOURCE_BASE_DIR}/libpano contains pano12 -# and pano13. This code also works if pano13 is in ${SOURCE_BASE_DIR} -## NOTE the form "pano13/panorama.h" is used in #includes in some -## Hugin source files, so we are stuck with that for now. + +## NOTE the form "pano13/panorama.h" is used in #includes in +## some hugin source files, so we are stuck with that. FIND_PATH(PANO13_INCLUDE_DIR pano13/panorama.h /usr/local/include /usr/include + ${SOURCE_BASE_DIR}/libpano13/include ${SOURCE_BASE_DIR}/libpano ${SOURCE_BASE_DIR} ) -# Pablo's Windows setup has the link libs in subdirs Debug -# and Release of libpano/pano13, as "Panotools.lib". This -# code will also find them in pano13 or in pano13/lib, and -# with names pano13 or pano13d. + FIND_LIBRARY(PANO13_LIBRARIES NAMES pano13 PATHS /usr/lib /usr/local/lib "${PANO13_INCLUDE_DIR}/pano13/Release LIB CMD" "${PANO13_INCLUDE_DIR}/pano13/Release CMD/Win32" ${PANO13_INCLUDE_DIR}/pano13/Release - ${SOURCE_BASE_DIR}/pano13/lib + ${SOURCE_BASE_DIR}/libpano13/lib ${SOURCE_BASE_DIR}/pano13 ) Modified: hugin/trunk/CMakeModules/win_bundle.cmake =================================================================== --- hugin/trunk/CMakeModules/win_bundle.cmake 2010-01-16 15:50:46 UTC (rev 4899) +++ hugin/trunk/CMakeModules/win_bundle.cmake 2010-01-16 16:12:18 UTC (rev 4900) @@ -1,122 +1,124 @@ -IF(WIN32) - - # copy installer files -# CONFIGURE_FILE(platforms/windows/msi/WixFragmentRegistry.wxs ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/WixFragmentRegistry.wxs COPYONLY) -# CONFIGURE_FILE(platforms/windows/msi/hugin.warsetup ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/hugin.warsetup ) - # bug: CONFIGURE_FILE destroys the bitmaps. -# CONFIGURE_FILE(platforms/windows/msi/top_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/top_banner.bmp COPYONLY) -# CONFIGURE_FILE(platforms/windows/msi/big_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/big_banner.bmp COPYONLY) - - # install hugin readme, license etc. - INSTALL(FILES AUTHORS COPYING LICENCE_VIGRA - DESTINATION doc/hugin) - - # find the path to enblend and panotools build directories - # and copy required binaries into hugin installation folder - FIND_PATH(PANO13_EXE_DIR PTmender.exe - ${SOURCE_BASE_DIR}/libpano/pano13/tools - ${SOURCE_BASE_DIR}/libpano/pano13/tools/Release - ${SOURCE_BASE_DIR}/libpano/tools - "${SOURCE_BASE_DIR}/libpano/pano13/tools/Release CMD/Win32" - ${SOURCE_BASE_DIR}/libpano/tools/Release - DOC "Location of pano13 executables" - NO_DEFAULT_PATH) - FILE(GLOB PANO13_EXECUTABLES ${PANO13_EXE_DIR}/*.exe) - INSTALL(FILES ${PANO13_EXECUTABLES} DESTINATION ${BINDIR}) - - # TODO: install documentation for panotools? - FIND_PATH(PANO13_SRC_DIR filter.h - ${SOURCE_BASE_DIR}/libpano/pano13 - DOC "Location of pano13 source" - NO_DEFAULT_PATH) - INSTALL(FILES ${PANO13_SRC_DIR}/AUTHORS - ${PANO13_SRC_DIR}/gpl.txt - ${PANO13_SRC_DIR}/README - ${PANO13_SRC_DIR}/TODO - ${PANO13_SRC_DIR}/doc/Optimize.txt - ${PANO13_SRC_DIR}/doc/PTblender.readme - ${PANO13_SRC_DIR}/doc/PTmender.readme - ${PANO13_SRC_DIR}/doc/stitch.txt - DESTINATION doc/panotools) - - # install enblend/enfuse files - - FIND_PATH(ENBLEND_EXE_DIR enblend_openmp.exe - ${SOURCE_BASE_DIR}/enblend-enfuse-4.0 - DOC "Location of enblend executables" - NO_DEFAULT_PATH - ) - IF(${ENBLEND_EXE_DIR} MATCHES "-NOTFOUND") - # enblend-enfuse 4.0 not found - # try finding enblend-enfuse 3.0, 3.2 - FIND_PATH(ENBLEND_EXE_DIR enblend.exe - ${SOURCE_BASE_DIR}/enblend-3.1 - ${SOURCE_BASE_DIR}/enblend-enfuse-3.2 - ${SOURCE_BASE_DIR}/enblend.build - ${SOURCE_BASE_DIR}/enblend - DOC "Location of enblend executables" - NO_DEFAULT_PATH - ) - SET(ENBLEND_DOC_FILES ${ENBLEND_EXE_DIR}/AUTHORS - ${ENBLEND_EXE_DIR}/ChangeLog - ${ENBLEND_EXE_DIR}/COPYING - ${ENBLEND_EXE_DIR}/NEWS - ${ENBLEND_EXE_DIR}/README - ${ENBLEND_EXE_DIR}/README_WINDOWS.txt - ${ENBLEND_EXE_DIR}/TODO - ${ENBLEND_EXE_DIR}/VIGRA_LICENSE) - ELSE() - # file of enblend-enfuse 4.0 - SET(ENBLEND_DOC_FILES ${ENBLEND_EXE_DIR}/AUTHORS.txt - ${ENBLEND_EXE_DIR}/ChangeLog.txt - ${ENBLEND_EXE_DIR}/COPYING.txt - ${ENBLEND_EXE_DIR}/NEWS.txt - ${ENBLEND_EXE_DIR}/README.txt - ${ENBLEND_EXE_DIR}/VIGRA_LICENSE.txt - ${ENBLEND_EXE_DIR}/doc/enblend.pdf - ${ENBLEND_EXE_DIR}/doc/enfuse.pdf - ) - - ENDIF() - - FILE(GLOB ENBLEND_EXECUTABLES ${ENBLEND_EXE_DIR}/*.exe) - INSTALL(FILES ${ENBLEND_EXECUTABLES} DESTINATION ${BINDIR}) - INSTALL(FILES ${ENBLEND_DOC_FILES} DESTINATION doc/enblend) - - # find path to UnxUtils and install required files - FIND_PATH(UnxUtils_DIR UnxUtilsDist.html - ${SOURCE_BASE_DIR}/UnxUtils - DOC "Location of UnxUtils (http://sf.net/projects/unxutils) files" - NO_DEFAULT_PATH) - - INSTALL(FILES ${UnxUtils_DIR}/usr/local/wbin/make.exe - ${UnxUtils_DIR}/usr/local/wbin/basename.exe - ${UnxUtils_DIR}/usr/local/wbin/cp.exe - ${UnxUtils_DIR}/usr/local/wbin/rm.exe - ${UnxUtils_DIR}/usr/local/wbin/echo.exe - ${UnxUtils_DIR}/usr/local/wbin/uname.exe - ${UnxUtils_DIR}/bin/sh.exe - DESTINATION ${BINDIR}) - - # install exiftool - FIND_PATH(EXIFTOOL_EXE_DIR exiftool.exe - ${SOURCE_BASE_DIR}/tools - ${SOURCE_BASE_DIR}/exiftool - DOC "Location of exiftool.exe" - NO_DEFAULT_PATH) - INSTALL(FILES ${EXIFTOOL_EXE_DIR}/exiftool.exe DESTINATION ${BINDIR}) - - # grab and install autopano-sift-C - FIND_PATH(AP_SIFT_DIR bin/autopano.exe - ${SOURCE_BASE_DIR}/autopano-sift-C - ${SOURCE_BASE_DIR}/autopano-sift-C/INSTALL/FILES - DOC "Base directory of autopano-sift-C installation" - NO_DEFAULT_PATH) - FILE(GLOB AP_SIFT_EXE ${AP_SIFT_DIR}/bin/*) - INSTALL(FILES ${AP_SIFT_EXE} DESTINATION ${BINDIR}) - - FILE(GLOB AP_SIFT_MAN ${AP_SIFT_DIR}/share/man/man*/*) - INSTALL(FILES ${AP_SIFT_MAN} DESTINATION doc/autopano-sift-C) - -ENDIF(WIN32) - +IF(WIN32) + + # copy installer files +# CONFIGURE_FILE(platforms/windows/msi/WixFragmentRegistry.wxs ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/WixFragmentRegistry.wxs COPYONLY) +# CONFIGURE_FILE(platforms/windows/msi/hugin.warsetup ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/hugin.warsetup ) + # bug: CONFIGURE_FILE destroys the bitmaps. +# CONFIGURE_FILE(platforms/windows/msi/top_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/top_banner.bmp COPYONLY) +# CONFIGURE_FILE(platforms/windows/msi/big_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/big_banner.bmp COPYONLY) + + # install hugin readme, license etc. + INSTALL(FILES AUTHORS COPYING LICENCE_VIGRA + DESTINATION doc/hugin) + + # find the path to enblend and panotools build directories + # and copy required binaries into hugin installation folder + FIND_PATH(PANO13_EXE_DIR PTmender.exe + ${PANO13_INCLUDE_DIR}/pano13/tools + ${PANO13_INCLUDE_DIR}/pano13/tools/Release + "${PANO13_INCLUDE_DIR}/pano13/tools/Release CMD/win32" + ${SOURCE_BASE_DIR}/libpano/tools + "${SOURCE_BASE_DIR}/libpano/pano13/tools/Release CMD/Win32" + ${SOURCE_BASE_DIR}/libpano/tools/Release + DOC "Location of pano13 executables" + NO_DEFAULT_PATH) + FILE(GLOB PANO13_EXECUTABLES ${PANO13_EXE_DIR}/*.exe) + INSTALL(FILES ${PANO13_EXECUTABLES} DESTINATION ${BINDIR}) + + # TODO: install documentation for panotools? + FIND_PATH(PANO13_SRC_DIR filter.h + ${PANO13_INCLUDE_DIR}/pano13 + DOC "Location of pano13 source" + NO_DEFAULT_PATH) + INSTALL(FILES ${PANO13_SRC_DIR}/AUTHORS + ${PANO13_SRC_DIR}/gpl.txt + ${PANO13_SRC_DIR}/LICENSE.LGPL + ${PANO13_SRC_DIR}/README + ${PANO13_SRC_DIR}/TODO + ${PANO13_SRC_DIR}/doc/Optimize.txt + ${PANO13_SRC_DIR}/doc/PTblender.readme + ${PANO13_SRC_DIR}/doc/PTmender.readme + ${PANO13_SRC_DIR}/doc/stitch.txt + DESTINATION doc/panotools) + + # install enblend/enfuse files + + FIND_PATH(ENBLEND_EXE_DIR enblend_openmp.exe + ${SOURCE_BASE_DIR}/enblend-enfuse-4.0 + DOC "Location of enblend executables" + NO_DEFAULT_PATH + ) + IF(${ENBLEND_EXE_DIR} MATCHES "-NOTFOUND") + # enblend-enfuse 4.0 not found + # try finding enblend-enfuse 3.0, 3.2 + FIND_PATH(ENBLEND_EXE_DIR enblend.exe + ${SOURCE_BASE_DIR}/enblend-3.1 + ${SOURCE_BASE_DIR}/enblend-enfuse-3.2 + ${SOURCE_BASE_DIR}/enblend.build + ${SOURCE_BASE_DIR}/enblend + DOC "Location of enblend executables" + NO_DEFAULT_PATH + ) + SET(ENBLEND_DOC_FILES ${ENBLEND_EXE_DIR}/AUTHORS + ${ENBLEND_EXE_DIR}/ChangeLog + ${ENBLEND_EXE_DIR}/COPYING + ${ENBLEND_EXE_DIR}/NEWS + ${ENBLEND_EXE_DIR}/README + ${ENBLEND_EXE_DIR}/README_WINDOWS.txt + ${ENBLEND_EXE_DIR}/TODO + ${ENBLEND_EXE_DIR}/VIGRA_LICENSE) + ELSE() + # file of enblend-enfuse 4.0 + SET(ENBLEND_DOC_FILES ${ENBLEND_EXE_DIR}/AUTHORS.txt + ${ENBLEND_EXE_DIR}/ChangeLog.txt + ${ENBLEND_EXE_DIR}/COPYING.txt + ${ENBLEND_EXE_DIR}/NEWS.txt + ${ENBLEND_EXE_DIR}/README.txt + ${ENBLEND_EXE_DIR}/VIGRA_LICENSE.txt + ${ENBLEND_EXE_DIR}/doc/enblend.pdf + ${ENBLEND_EXE_DIR}/doc/enfuse.pdf + ) + + ENDIF() + + FILE(GLOB ENBLEND_EXECUTABLES ${ENBLEND_EXE_DIR}/*.exe) + INSTALL(FILES ${ENBLEND_EXECUTABLES} DESTINATION ${BINDIR}) + INSTALL(FILES ${ENBLEND_DOC_FILES} DESTINATION doc/enblend) + + # find path to UnxUtils and install required files + FIND_PATH(UnxUtils_DIR UnxUtilsDist.html + ${SOURCE_BASE_DIR}/UnxUtils + DOC "Location of UnxUtils (http://sf.net/projects/unxutils) files" + NO_DEFAULT_PATH) + + INSTALL(FILES ${UnxUtils_DIR}/usr/local/wbin/make.exe + ${UnxUtils_DIR}/usr/local/wbin/basename.exe + ${UnxUtils_DIR}/usr/local/wbin/cp.exe + ${UnxUtils_DIR}/usr/local/wbin/rm.exe + ${UnxUtils_DIR}/usr/local/wbin/echo.exe + ${UnxUtils_DIR}/usr/local/wbin/uname.exe + ${UnxUtils_DIR}/bin/sh.exe + DESTINATION ${BINDIR}) + + # install exiftool + FIND_PATH(EXIFTOOL_EXE_DIR exiftool.exe + ${SOURCE_BASE_DIR}/tools + ${SOURCE_BASE_DIR}/exiftool + DOC "Location of exiftool.exe" + NO_DEFAULT_PATH) + INSTALL(FILES ${EXIFTOOL_EXE_DIR}/exiftool.exe DESTINATION ${BINDIR}) + + # grab and install autopano-sift-C + FIND_PATH(AP_SIFT_DIR bin/autopano.exe + ${SOURCE_BASE_DIR}/autopano-sift-C + ${SOURCE_BASE_DIR}/autopano-sift-C/INSTALL/FILES + DOC "Base directory of autopano-sift-C installation" + NO_DEFAULT_PATH) + FILE(GLOB AP_SIFT_EXE ${AP_SIFT_DIR}/bin/*) + INSTALL(FILES ${AP_SIFT_EXE} DESTINATION ${BINDIR}) + + FILE(GLOB AP_SIFT_MAN ${AP_SIFT_DIR}/share/man/man*/*) + INSTALL(FILES ${AP_SIFT_MAN} DESTINATION doc/autopano-sift-C) + +ENDIF(WIN32) + Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-01-16 15:50:46 UTC (rev 4899) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-01-16 16:12:18 UTC (rev 4900) @@ -263,7 +263,8 @@ || f == EQUI_PANINI || f == BIPLANE || f == TRIPLANE - || f == GENERAL_PANINI); + || f == GENERAL_PANINI + ); } @@ -450,6 +451,16 @@ double PanoramaOptions::getMaxHFOV() const { +#if 1 + double parms[6]; + double fovs[2]; + int i; + for( i = 0; i < m_projFeatures.numberOfParameters; i++){ + } + if( !queryFOVLimits((int)m_projectionFormat, parms, fovs )) + return 0; + return fovs[0]; +#else double param=0; pano_projection_features pfeat; if (panoProjectionFeaturesQuery((int)m_projectionFormat, &pfeat)) { @@ -476,16 +487,28 @@ } else { return 360; } +#endif } double PanoramaOptions::getMaxVFOV() const { +#if 1 + double parms[6]; + double fovs[2]; + int i; + for( i = 0; i < m_projFeatures.numberOfParameters; i++){ + } + if( !queryFOVLimits((int)m_projectionFormat, parms, fovs )) + return 0; + return fovs[1]; +#else pano_projection_features pfeat; if (panoProjectionFeaturesQuery((int) m_projectionFormat, &pfeat)) { return pfeat.maxVFOV; } else { return 180; } +#endif } DestPanoImage PanoramaOptions::getDestImage() const This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-18 16:09:09
|
Revision: 4911 http://hugin.svn.sourceforge.net/hugin/?rev=4911&view=rev Author: tksharpless Date: 2010-01-18 16:09:02 +0000 (Mon, 18 Jan 2010) Log Message: ----------- Removed LICENSE.GPL from libpano install list Dynamic FOVs now work right; all fovs are handled better (panodata/PanoramaOptions.cpp) Narrower preview projection params text boxes make more room for sliders Modified Paths: -------------- hugin/trunk/CMakeModules/win_bundle.cmake hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp hugin/trunk/src/hugin1/hugin/PreviewFrame.cpp hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h Modified: hugin/trunk/CMakeModules/win_bundle.cmake =================================================================== --- hugin/trunk/CMakeModules/win_bundle.cmake 2010-01-18 06:54:57 UTC (rev 4910) +++ hugin/trunk/CMakeModules/win_bundle.cmake 2010-01-18 16:09:02 UTC (rev 4911) @@ -32,7 +32,6 @@ NO_DEFAULT_PATH) INSTALL(FILES ${PANO13_SRC_DIR}/AUTHORS ${PANO13_SRC_DIR}/gpl.txt - ${PANO13_SRC_DIR}/LICENSE.LGPL ${PANO13_SRC_DIR}/README ${PANO13_SRC_DIR}/TODO ${PANO13_SRC_DIR}/doc/Optimize.txt Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp 2010-01-18 06:54:57 UTC (rev 4910) +++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp 2010-01-18 16:09:02 UTC (rev 4911) @@ -398,7 +398,7 @@ wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, // draw border all around 5); // border width m_projParamTextCtrl[i] = new wxTextCtrl(m_projection_panel, PROJ_PARAM_VAL_ID+i, _("0"), - wxDefaultPosition,wxDefaultSize, wxTE_PROCESS_ENTER); + wxDefaultPosition, wxSize(35,-1), wxTE_PROCESS_ENTER); m_projParamSizer->Add(m_projParamTextCtrl[i], 0, // not vertically strechable wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, // draw border all around Modified: hugin/trunk/src/hugin1/hugin/PreviewFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreviewFrame.cpp 2010-01-18 06:54:57 UTC (rev 4910) +++ hugin/trunk/src/hugin1/hugin/PreviewFrame.cpp 2010-01-18 16:09:02 UTC (rev 4911) @@ -302,7 +302,7 @@ wxALL | wxALIGN_CENTER_VERTICAL, // draw border all around 5); // border width m_projParamTextCtrl[i] = new wxTextCtrl(this, PROJ_PARAM_VAL_ID+i, wxT("0"), - wxDefaultPosition,wxDefaultSize, wxTE_PROCESS_ENTER); + wxDefaultPosition, wxSize(35,-1), wxTE_PROCESS_ENTER); m_projParamSizer->Add(m_projParamTextCtrl[i], 0, // not vertically strechable wxALL | wxALIGN_CENTER_VERTICAL, // draw border all around Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-01-18 06:54:57 UTC (rev 4910) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-01-18 16:09:02 UTC (rev 4911) @@ -34,15 +34,17 @@ A PanoramaOptions holds a copy of the pano_projection_features from panoProjectionFeaturesQuery(). Original implementation updated that oftener than necessary (it can change only when the projection - does) possibly with the hope of tracking dynamic changes. + does) possibly with the hope of tracking dynamic changes. Revised implementation loads the full pano_projection_features only when projection changes, and updates its max FOV values only when parameter values change. Member fns getMaxHFOV() and getMaxVFOV() - now return those local values. - - The special default projection parameter values formerly set here are - now set in libpano (queryfeature.c) + now return those local values. + + setProjection() now posts default projection parameters that come + from libpano in the pano_projection_features block. The default + projection parameter values formerly set here are now in libpano + (queryfeature.c) */ @@ -170,9 +172,6 @@ void PanoramaOptions::setProjection(ProjectionFormat f) { - // copy current fovs - double hfov = getHFOV(), vfov = getVFOV(); - // post new projection type if ((int) f >= panoProjectionFormatCount()) { // reset to equirect if this projection is not known @@ -187,14 +186,11 @@ for(int i = 0; i < m_projFeatures.numberOfParameters; i++){ m_projectionParams[i] = m_projFeatures.parm[i].defValue; } + // post new params, determine fov limits, clip current fovs... setProjectionParameters( m_projectionParams ); - - // restore old fovs if possible - if (fovCalcSupported(m_projectionFormat) && fovCalcSupported(f)) - { - setHFOV(hfov, false); - setVFOV(vfov); - } + // post new fovs + setHFOV(m_hfov, false); + setVFOV(getVFOV()); } @@ -214,7 +210,9 @@ } } } - /* get dynamic FOV limits corresponding to the new parameters */ + /* get dynamic FOV limits corresponding to the new parameters, + clip current fovs to those limits, and post the results + */ double parms[6]; double fovs[2]; int i; @@ -223,11 +221,11 @@ } if( queryFOVLimits((int)m_projectionFormat, parms, fovs )){ m_projFeatures.maxHFOV = fovs[0]; + m_hfov = std::min(m_hfov, fovs[0]); m_projFeatures.maxVFOV = fovs[1]; } - - /* clip current fovs to new limits */ - setHFOV( m_hfov, true); + setHFOV( m_hfov, false ); + setVFOV( getVFOV() ); } bool PanoramaOptions::fovCalcSupported(ProjectionFormat f) const @@ -306,7 +304,7 @@ m_roi &= vigra::Rect2D(m_size); } - DEBUG_DEBUG(" HFOV: " << m_hfov << " size: " << m_size << " roi:" << m_roi << " => vfov: " << getVFOV()); + DEBUG_DEBUG(" HFOV: " << m_hfov << " size: " << m_size << " roi:" << m_roi << " => vfov: " << getVFOV() ); } void PanoramaOptions::setHFOV(double h, bool keepView) @@ -319,13 +317,9 @@ if (h <= 0) { h = 1; } - double vfov; - if (keepView) { - vfov = getVFOV(); - } m_hfov = std::min(h, getMaxHFOV()); if (keepView) { - setVFOV(std::min(vfov, getMaxVFOV())); + setVFOV(std::min(getVFOV(), getMaxVFOV())); } } @@ -427,6 +421,7 @@ } */ DEBUG_DEBUG(" HFOV: " << m_hfov << " size: " << m_size << " roi: " << m_roi << " => vfov: " << VFOV); + return VFOV; } Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h 2010-01-18 06:54:57 UTC (rev 4910) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h 2010-01-18 16:09:02 UTC (rev 4911) @@ -406,6 +406,7 @@ static const std::string fileformatNames[]; static const std::string fileformatExt[]; double m_hfov; + double m_vfov; // unsigned int m_width; // unsigned int m_height; ProjectionFormat m_projectionFormat; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <all...@us...> - 2010-01-18 18:00:16
|
Revision: 4913 http://hugin.svn.sourceforge.net/hugin/?rev=4913&view=rev Author: allardkatan Date: 2010-01-18 17:59:52 +0000 (Mon, 18 Jan 2010) Log Message: ----------- Updated files related to the windows installer Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/platforms/windows/installer/CMakeLists.txt hugin/trunk/platforms/windows/installer/installer_howto.txt hugin/trunk/platforms/windows/installer/installer_license.txt Added Paths: ----------- hugin/trunk/platforms/windows/installer/hugin_prerelease.iss hugin/trunk/platforms/windows/installer/hugin_release.iss hugin/trunk/platforms/windows/installer/huginplugin.iss Removed Paths: ------------- hugin/trunk/platforms/windows/installer/hugin-SDK_allard.iss hugin/trunk/platforms/windows/installer/hugin.iss hugin/trunk/platforms/windows/installer/hugin_no_patents.iss Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-01-18 17:51:29 UTC (rev 4912) +++ hugin/trunk/CMakeLists.txt 2010-01-18 17:59:52 UTC (rev 4913) @@ -50,6 +50,8 @@ SET(HUGIN_WC_REVISION 0) FILE(READ "${PROJECT_SOURCE_DIR}/rev.txt" HUGIN_WC_REVISION) MESSAGE("-- Current SVN revision is ${HUGIN_WC_REVISION}") + MESSAGE("-- Assuming this is a tarball (release) build for ${HUGIN_PACKAGE_VERSION}") + SET(HUGIN_DEVELOPMENT_VERSION 0) ENDIF (EXISTS ${PROJECT_SOURCE_DIR}/.svn) # version to display Modified: hugin/trunk/platforms/windows/installer/CMakeLists.txt =================================================================== --- hugin/trunk/platforms/windows/installer/CMakeLists.txt 2010-01-18 17:51:29 UTC (rev 4912) +++ hugin/trunk/platforms/windows/installer/CMakeLists.txt 2010-01-18 17:59:52 UTC (rev 4913) @@ -16,9 +16,9 @@ # InnoSetup installer files # using @VAR@ for substituion because ${VAR} might interfere with InnoSetup's own syntax - CONFIGURE_FILE(hugin.iss ${CMAKE_INSTALL_PREFIX}/../hugin.iss) - CONFIGURE_FILE(hugin_no_patents.iss ${CMAKE_INSTALL_PREFIX}/../hugin_no_patents.iss) - CONFIGURE_FILE(hugin-SDK_Allard.iss ${CMAKE_INSTALL_PREFIX}/../hugin-SDKproof.iss) + CONFIGURE_FILE(hugin_release.iss ${CMAKE_INSTALL_PREFIX}/../hugin_release.iss) + CONFIGURE_FILE(hugin_prerelease.iss ${CMAKE_INSTALL_PREFIX}/../hugin_prerelease.iss) + CONFIGURE_FILE(PreRelease_Notes.txt ${CMAKE_INSTALL_PREFIX}/../PreRelease_Notes.txt) CONFIGURE_FILE(modpath.iss ${CMAKE_INSTALL_PREFIX}/../modpath.iss @ONLY) # Images for installer Deleted: hugin/trunk/platforms/windows/installer/hugin-SDK_allard.iss =================================================================== --- hugin/trunk/platforms/windows/installer/hugin-SDK_allard.iss 2010-01-18 17:51:29 UTC (rev 4912) +++ hugin/trunk/platforms/windows/installer/hugin-SDK_allard.iss 2010-01-18 17:59:52 UTC (rev 4913) @@ -1,290 +0,0 @@ -; Hugin InnoSetup Installer File -; (C) 2008 Yuval Levy, licensed under GPL V2 -; Minor adaptations 2009 by Allard Katan -; if possible, let the Make process edit AppVerName to have a proper, automated SVN numbering -; make sure that the Make process copies this file from platforms/windows/msi to INSTALL/ -; and that it also copes the files win_installer_readme.txt and win_release_notes.txt to INSTALL/ -; prior to running it with the Inno Setup Compiler 5.2.2 - -[Setup] -AppName=Hugin -; ApId is checked to determine wheter to append to a particular existing uninstall log -; keep it the same for updates of the same installation -AppId=Hugin_rc_builds -AppVerName=Hugin 0.8.0.@HUGIN_WC_REVISION@SVN-@HUGIN_BUILDER@ -AppPublisher=Allard -AppPublisherURL=http://www.allardkatan.net/misc/hugin -AppVersion=0.8.0.@HUGIN_WC_REVISION@SVN-@HUGIN_BUILDER@ -AppSupportURL=http://tech.groups.yahoo.com/group/PanoToolsNG/ -AppUpdatesURL=http://groups.google.com/group/hugin-ptx -; necessary to create file associations -ChangesAssociations=yes -; necessary to edit system path -ChangesEnvironment=yes -; should default to yes, but reports indicate that the entry was not created by the previous installer -CreateUninstallRegKey=yes -; default yes, but for updaters better no. play with it -UpdateUninstallLogAppName=yes -DefaultDirName={pf}\Hugin -DefaultGroupName=Hugin -; AllowNoIcons does not affect entries in the Tasks section that have their own checkboxes -AllowNoIcons=yes -; show list of types only to reduce complexity unless customizing -AlwaysShowComponentsList=no -LicenseFile=installer_license.txt -PrivilegesRequired=poweruser -UsePreviousAppDir=yes -; HOOK to run a VBS (theoretically to check if an app is running: AppMutex. See Documentation if you want to use it -; Uninstall stuff made nicer -UninstallDisplayIcon={app}\bin\hugin.exe,0 -; cosmetic stuff -AppCopyright=Copyright (C) 2004-2009 Pablo d'Angelo -FlatComponentsList=No -; might not work as the example was with a file.ico -SetupIconFile=hugin.ico -WizardSmallImageFile=smallimage.bmp -WizardImageStretch=no -WizardImageFile=wizardimage.bmp -; compression: solid compression only recommended for smaller (<100MB) -; test it to see if it is significantly better -Compression=lzma/ultra64 -SolidCompression=yes - - -[Types] -Name: default; Description: Default installation (Autopano-SIFT-C) -Name: full; Description: Full installation -Name: enblend; Description: Enblend/Enfuse and helper files/droplets only -Name: photoshop; Description: Photoshop Plugins only (not available yet) -Name: gimp; Description: Gimp Plugins only (not available yet) -Name: custom; Description: Custom installation (recommended for testing); Flags: iscustom - -[Components] -Name: core; Description: Hugin; Types: default full custom; Flags: fixed -Name: translations; Description: Hugin Language Pack; Types: default full custom -Name: enblend; Description: Enblend/Enfuse; Types: default full enblend custom -;Name: "matchnshift"; Description: "Match-n-Shift w. Matchpoint (EXPERIMENTAL)"; Types: full custom; -;Name: matchnshift_ap; Description: Match-n-Shift w. Autopano (Patent issues in the USA!); Types: full custom ; Allard: commented this line as match-n-shift is not in the SDK (yet) -Name: ap_p; Description: Autopano-C-Complete (Patent issues in the USA!); Types: full custom -Name: ap_c; Description: Autopano-SIFT-C (Patent issues in the USA!); Types: default custom -Name: matchpoint; Description: Matchpoint (EXPERIMENTAL); Types: full custom -Name: p_matic; Description: Panomatic-0.9.4 (Patent issues in the USA!); Types: full custom -Name: p_matic_NOSSE; Description: Panomatic-0.9.4 NO SSE (older CPUs); Types: full custom -Name: panotools; Description: Panotools Command Line Tools; Types: default full custom -Name: photoshop; Description: Photoshop Plugins (N/A yet); Types: full photoshop custom -Name: gimp; Description: Gimp Plugins (N/A yet); Types: full gimp custom - -; not necessary (if the directory is not empty) but clean -[Dirs] -; bin is not read-only because we may want to customize the droplets -Name: {app}\bin -Name: {app}\doc -Name: {app}\share; Attribs: hidden - -; for wildcards to apply to subfolders, set flag recursesubdirs -; initially copied only the there subfolders recursively -; but to assign files to different components I need a finer grained description -[Files] -; hugin executables -Source: FILES\bin\align_image_stack.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\autooptimiser.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\basename.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\cp.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\echo.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\exiftool.exe; DestDir: {app}\bin; Components: core enblend; Flags: overwritereadonly -Source: FILES\bin\fulla.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\hugin.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\hugin_hdrmerge.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\hugin_stitch_project.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\make.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\nona.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\nona_gui.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\rm.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\sh.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\uname.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\vig_optimize.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\celeste_standalone.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -;Allard: added extensions fro PTBatcher files -Source: FILES\bin\PTBatcher.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly -Source: FILES\bin\PTBatcherGUI.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly - -; autopano-sift-c executables -Source: FILES\bin\autopano.exe; DestDir: {app}\bin; Components: ap_p; Flags: overwritereadonly -Source: FILES\bin\generatekeys.exe; DestDir: {app}\bin; Components: ap_p; Flags: overwritereadonly -Source: FILES\bin\autopano-sift-c.exe; DestDir: {app}\bin; Components: ap_c; Flags: overwritereadonly -;Allard: changed autopano-c-complete.exe into autopano-c-complete.vbs -Source: FILES\bin\autopano-c-complete.vbs; DestDir: {app}\bin; Components: ap_p; Flags: overwritereadonly -;Source: FILES\bin\match-n-shift.exe; DestDir: {app}\bin; Components: matchnshift matchnshift_ap; Flags: overwritereadonly ;Allard: commented this line as match-n-shift is not in the SDK (yet) -;Source: FILES\bin\perl58.dll; DestDir: {app}\bin; Components: matchnshift matchnshift_ap ap_p matchpoint; Flags: overwritereadonly ;Allard: commented this line as match-n-shift is not in the SDK (yet) -;Source: FILES\bin\matchpoint-complete.exe; DestDir: {app}\bin; Components: matchpoint; Flags: overwritereadonly ;Allard: commented this line as match-n-shift is not in the SDK (yet) -Source: FILES\bin\matchpoint.exe; DestDir: {app}\bin; Components: matchpoint; Flags: overwritereadonly -Source: FILES\bin\Panomatic.exe; DestDir: {app}\bin; Components: p_matic; Flags: overwritereadonly -Source: FILES\bin\PanomaticNOSSE.exe; DestDir: {app}\bin; Components: p_matic_NOSSE; Flags: overwritereadonly - -; enblend/enfuse executables -Source: FILES\bin\collect_data_enblend.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\collect_data_enfuse.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\enblend.exe; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\enblend_droplet.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\enblend_droplet_360.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\enfuse.exe; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\enfuse_align_droplet.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\enfuse_auto_droplet.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\enfuse_droplet.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\enfuse_droplet_360.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\exiftool_enblend_args.txt; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\exiftool_enfuse_args.txt; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -Source: FILES\bin\unique_filename.bat; DestDir: {app}\bin; Components: enblend; Flags: overwritereadonly -; panotools executables -Source: FILES\bin\PTblender.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTcrop.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTinfo.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTmasker.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTmender.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTOptimizer.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTroller.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTtiff2psd.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTtiffdump.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly -Source: FILES\bin\PTuncrop.exe; DestDir: {app}\bin; Components: panotools; Flags: overwritereadonly - -; install redirect URL to welcome page -Source: url.txt; DestDir: {app}; DestName: test.url; Flags: deleteafterinstall; Attribs: hidden -; documentation -; check why fulla.html and nona.txt are in doc and not in doc/hugin -Source: FILES\doc\enblend\*; DestDir: {app}\doc\enblend; Components: enblend; Flags: overwritereadonly recursesubdirs -Source: FILES\doc\hugin\*; DestDir: {app}\doc\hugin; Components: core; Flags: overwritereadonly recursesubdirs -Source: FILES\doc\panotools\*; DestDir: {app}\doc\panotools; Components: panotools; Flags: overwritereadonly recursesubdirs -; autopano docs -Source: FILES\doc\autopano-sift-C\*; DestDir: {app}\doc\autopano-sift-C; Components: ap_p ap_c; Flags: overwritereadonly recursesubdirs -; hugin's UI and languages -Source: FILES\share\hugin\*; DestDir: {app}\share\hugin; Components: core; Attribs: hidden; Flags: overwritereadonly recursesubdirs -; hugin's translations -Source: FILES\share\locale\*; DestDir: {app}\share\locale; Components: translations; Attribs: hidden; Flags: overwritereadonly recursesubdirs -; release notes for this installer -Source: Release_Notes.txt; DestDir: {app}\doc; DestName: Release Notes.txt; Components: core; Flags: isreadme overwritereadonly - -[InstallDelete] -; processed as first step of installation -; these delete instructions are to get rid of legacy files -; remove the old release notes files if it exists -Type: files; Name: {app}\doc\win_release_notes.txt -; remove autopano VBS as it is no longer supported -Type: files; Name: {app}\bin\autopano-c-complete.vbs -; remove wrongly installed locale files -Type: filesandordirs; Name: {app}\share\ca_ES -Type: filesandordirs; Name: {app}\share\cs_CZ -Type: filesandordirs; Name: {app}\share\de -Type: filesandordirs; Name: {app}\share\es -Type: filesandordirs; Name: {app}\share\fr -Type: filesandordirs; Name: {app}\share\hu -Type: filesandordirs; Name: {app}\share\it -Type: filesandordirs; Name: {app}\share\ja -Type: filesandordirs; Name: {app}\share\nl -Type: filesandordirs; Name: {app}\share\pl -Type: filesandordirs; Name: {app}\share\pt_BR -Type: filesandordirs; Name: {app}\share\ru -Type: filesandordirs; Name: {app}\share\sk -Type: filesandordirs; Name: {app}\share\sv -Type: filesandordirs; Name: {app}\share\uk -Type: filesandordirs; Name: {app}\share\zh_CN -; add Bruno's UK_en - -[Registry] -; file associations -; register extension .pto with internal name HuginProject (must be unique) -Root: HKCR; Subkey: .pto; ValueType: string; ValueName: ; ValueData: HuginProject; Flags: uninsdeletevalue -; set Hugin Project File to be the file type as shown in Explorer -Root: HKCR; Subkey: HuginProject; ValueType: string; ValueName: ; ValueData: Hugin Project File; Flags: uninsdeletevalue -; set the icon -Root: HKCR; Subkey: HuginProject\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\hugin.exe,0 -; specify the command to execute on double-click -Root: HKCR; Subkey: HuginProject\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\hugin.exe"" ""%1""" -; check if it is worth it to register other App Paths -Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\Hugin.exe; ValueType: string; ValueName: ; ValueData: {app}\bin\hugin.exe; Flags: uninsdeletekey -; delete registry entry completely on uninstall - put settings *after* this, else they will be removed -Root: HKCU; Subkey: Software\hugin; Flags: deletekey; Tasks: delete_settings -; could add here default preference, one registry key at a time. -; choice of autopano. 0=Kolor, 1=SIFT-C -; no more ap_vbs component -Root: HKCU; Subkey: Software\hugin\AutoPano; ValueType: dword; ValueName: Type; ValueData: 1; Components: ap_p ap_c; Tasks: default_settings -; which SIFT-C? 0=default, 1=custom -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: dword; ValueName: AutopanoExeCustom; ValueData: 1; Components: ap_p ap_c; Tasks: default_settings -; executable to point to -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: AutopanoExe; ValueData: {app}\bin\Panomatic.exe; Components: p_matic; Tasks: default_settings -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: AutopanoExe; ValueData: {app}\bin\PanomaticNOSSE.exe; Components: p_matic_NOSSE; Tasks: default_settings -;Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: AutopanoExe; ValueData: {app}\bin\match-n-shift.exe; Components: matchnshift matchnshift_ap; Tasks: default_settings -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: AutopanoExe; ValueData: {app}\bin\autopano.exe; Components: ap_p; Tasks: default_settings -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: AutopanoExe; ValueData: {app}\bin\matchpoint.exe; Components: matchpoint; Tasks: default_settings -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: AutopanoExe; ValueData: {app}\bin\autopano-sift-c.exe; Components: ap_c; Tasks: default_settings -; arguments -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: Args; ValueData: -o %o %i; Components: p_matic p_matic_NOSSE; Tasks: default_settings -;Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: Args; ValueData: -f %f -v %v -c -p %p -o %o %i; Components: matchnshift_ap; Tasks: default_settings -;Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: Args; ValueData: --matchpoint -f %f -v %v -c -p %p -o %o %i; Components: matchnshift; Tasks: default_settings -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: Args; ValueData: --noransac --points %p --output %o %i; Components: ap_p matchpoint; Tasks: default_settings -Root: HKCU; Subkey: Software\hugin\AutoPanoSift; ValueType: string; ValueName: Args; ValueData: --maxmatches %p %o %i; Components: ap_c; Tasks: default_settings - -; by itself a task does nothing, it needs ot be linked to other installation entries -[Tasks] -Name: modifypath; Description: Add application directory to your system path; GroupDescription: System:; Flags: unchecked -Name: delete_settings; Description: Clean Slate? (Deletes previous settings); GroupDescription: System:; Flags: unchecked -Name: default_settings; Description: Set Default Settings? (partially implemented); GroupDescription: System: -Name: quicklaunch; Description: Create Quick Launch Icon; GroupDescription: Additional icons:; Flags: unchecked -Name: desktop; Description: Create desktop icons; GroupDescription: Additional icons: -Name: desktop\user; Description: only for the current user; GroupDescription: Additional icons:; Flags: exclusive unchecked -Name: desktop\user\hugin; Description: Hugin; GroupDescription: Additional icons:; Flags: unchecked -Name: desktop\user\enblend; Description: Enblend Droplets; GroupDescription: Additional icons:; Flags: unchecked -Name: desktop\user\enfuse; Description: Enfuse Droplets; GroupDescription: Additional icons:; Flags: unchecked -Name: desktop\common; Description: for all users; GroupDescription: Additional icons:; Flags: exclusive -Name: desktop\common\hugin; Description: Hugin; GroupDescription: Additional icons: -Name: desktop\common\enblend; Description: Enblend Droplets; GroupDescription: Additional icons: -Name: desktop\common\enfuse; Description: Enfuse Droplets; GroupDescription: Additional icons: -Name: programfiles; Description: Create additional entries in Program Files menu; GroupDescription: Additional icons: - -[Icons] -; desktop for current user -Name: {userdesktop}\Hugin; Filename: {app}\bin\hugin.exe; Tasks: desktop\user\hugin -; desktop for all users -Name: {commondesktop}\Hugin; Filename: {app}\bin\hugin.exe; Tasks: desktop\common\hugin -; quick-launch -Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Hugin; Filename: {app}\bin\hugin.exe; Tasks: quicklaunch -; Program Files Group -Name: {group}\Hugin; Filename: {app}\bin\hugin.exe -Name: {group}\Homepage; Filename: http://hugin.sf.net/; Tasks: programfiles -Name: {group}\News; Filename: http://panospace.wordpress.com/; Tasks: programfiles -Name: {group}\nona_gui; Filename: {app}\bin\nona_gui.exe; Tasks: programfiles -Name: {group}\Hugin_stitch_project; Filename: {app}\bin\hugin_stitch_project.exe; Tasks: programfiles -Name: {group}\uninstall; Filename: {uninstallexe}; Tasks: programfiles -Name: {group}\Documentation; Filename: {app}\doc -; Enfuse droplets for current user -Name: {userdesktop}\Enfuse; Filename: {app}\bin\enfuse_droplet.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\user\enfuse -Name: {userdesktop}\Enfuse360; Filename: {app}\bin\enfuse_droplet_360.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\user\enfuse -Name: {userdesktop}\EnfuseAlign; Filename: {app}\bin\enfuse_align_droplet.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\user\enfuse -Name: {userdesktop}\EnfuseAuto; Filename: {app}\bin\enfuse_auto_droplet.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\user\enfuse -; Enblend droplets for current user -Name: {userdesktop}\Enblend; Filename: {app}\bin\enblend_droplet.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\user\enblend -Name: {userdesktop}\Enblend360; Filename: {app}\bin\enblend_droplet_360.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\user\enblend -; Enfuse droplets for all users -Name: {commondesktop}\Enfuse; Filename: {app}\bin\enfuse_droplet.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\common\enfuse -Name: {commondesktop}\Enfuse360; Filename: {app}\bin\enfuse_droplet_360.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\common\enfuse -Name: {commondesktop}\EnfuseAlign; Filename: {app}\bin\enfuse_align_droplet.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\common\enfuse -Name: {commondesktop}\EnfuseAuto; Filename: {app}\bin\enfuse_auto_droplet.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\user\enfuse -; Enblend droplets for all users -Name: {commondesktop}\Enblend; Filename: {app}\bin\enblend_droplet.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\common\enblend -Name: {commondesktop}\Enblend360; Filename: {app}\bin\enblend_droplet_360.bat; WorkingDir: {app}\bin; Components: enblend; Tasks: desktop\common\enblend - -[Code] -function ModPathDir(): TArrayOfString; -var - Dir: TArrayOfString; -begin - setArrayLength(Dir,1) - Dir[0] := ExpandConstant('{app}') + '\bin\'; - Result := Dir; -end; -#include "modpath.iss" - -[Run] -; install counter -Filename: {app}\test.url; Flags: shellexec -; here it would also be possible to launch the execution of post-install VBS scripts -Filename: {app}\bin\hugin.exe; Description: Launch hugin; Flags: nowait postinstall skipifsilent unchecked Deleted: hugin/trunk/platforms/windows/installer/hugin.iss =================================================================== --- hugin/trunk/platforms/windows/installer/hugin.iss 2010-01-18 17:51:29 UTC (rev 4912) +++ hugin/trunk/platforms/windows/installer/hugin.iss 2010-01-18 17:59:52 UTC (rev 4913) @@ -1,288 +0,0 @@ -; Hugin InnoSetup Installer File -; (C) 2008 Yuval Levy, licensed under GPL V2 -; if possible, let the Make process edit AppVerName to have a proper, automated SVN numbering -; make sure that the Make process copies this file from platforms/windows/msi to INSTALL/ -; and that it also copes the files win_installer_readme.txt and win_release_notes.txt to INSTALL/ -; prior to running it with the Inno Setup Compiler 5.2.2 - -[Setup] -AppName=Hugin -; ApId is checked to determine wheter to append to a particular existing uninstall log -; keep it the same for updates of the same installation -AppId=Hugin_alpha_builds -AppVerName=Hugin 0.7.0.@HUGIN_WC_REVISION@SVN-@HUGIN_BUILDER@ -AppPublisher=Yuv -AppPublisherURL=http://panospace.wordpress.com/ -AppVersion=0.7.0.@HUGIN_WC_REVISION@SVN-@HUGIN_BUILDER@ -AppSupportURL=http://tech.groups.yahoo.com/group/PanoToolsNG/ -AppUpdatesURL=http://groups.google.com/group/hugin-ptx -; necessary to create file associations -ChangesAssociations=yes -; necessary to edit system path -ChangesEnvironment=yes -; should default to yes, but reports indicate that the entry was not created by the previous installer -CreateUninstallRegKey=yes -; default yes, but for updaters better no. play with it -UpdateUninstallLogAppName=yes -DefaultDirName={pf}\Hugin -DefaultGroupName=Hugin -; AllowNoIcons does not affect entries in the Tasks section that have their own checkboxes -AllowNoIcons=yes -; show list of types only to reduce complexity unless customizing -AlwaysShowComponentsList=no -LicenseFile=installer_license.txt -PrivilegesRequired=poweruser -UsePreviousAppDir=yes -; HOOK to run a VBS (theoretically to check if an app is running: AppMutex. See Documentation if you want to use it -; Uninstall stuff made nicer -UninstallDisplayIcon={app}\bin\hugin.exe,0 -; cosmetic stuff -AppCopyright=Copyright (C) 2004-2008 Pablo d'Angelo -FlatComponentsList=No -; might not work as the example was with a file.ico -SetupIconFile=hugin.ico -WizardSmallImageFile=smallimage.bmp -WizardImageStretch=no -WizardImageFile=wizardimage.bmp -; compression: solid compression only recommended for smaller (<100MB) -; test it to see if it is significantly better -Compression=lzma/ultra64 -SolidCompression=yes - - -[Types] -Name: "default"; Description: "Default installation (Autopano-SIFT-C)" -Name: "full"; Description: "Full installation" -Name: "enblend"; Description: "Enblend/Enfuse and helper files/droplets only" -Name: "photoshop"; Description: "Photoshop Plugins only (not available yet)" -Name: "gimp"; Description: "Gimp Plugins only (not available yet)" -Name: "custom"; Description: "Custom installation (recommended for testing)"; Flags: iscustom - -[Components] -Name: "core"; Description: "Hugin"; Types: default full custom; Flags: fixed -Name: "translations"; Description: "Hugin Language Pack"; Types: default full custom; -Name: "enblend"; Description: "Enblend/Enfuse"; Types: default full enblend custom; -;Name: "matchnshift"; Description: "Match-n-Shift w. Matchpoint (EXPERIMENTAL)"; Types: full custom; -Name: "matchnshift_ap"; Description: "Match-n-Shift w. Autopano (Patent issues in the USA!)"; Types: full custom; -Name: "ap_p"; Description: "Autopano-C-Complete (Patent issues in the USA!)"; Types: full custom; -Name: "ap_c"; Description: "Autopano-SIFT-C (Patent issues in the USA!)"; Types: default custom; -Name: "matchpoint"; Description: "Matchpoint (EXPERIMENTAL)"; Types: full custom; -Name: "p_matic"; Description: "Panomatic-0.9.4 (Patent issues in the USA!)"; Types: full custom; -Name: "p_matic_NOSSE"; Description: "Panomatic-0.9.4 NO SSE (older CPUs)"; Types: full custom; -Name: "panotools"; Description: "Panotools Command Line Tools"; Types: default full custom; -Name: "photoshop"; Description: "Photoshop Plugins (N/A yet)"; Types: full photoshop custom; -Name: "gimp"; Description: "Gimp Plugins (N/A yet)"; Types: full gimp custom; - -; not necessary (if the directory is not empty) but clean -[Dirs] -; bin is not read-only because we may want to customize the droplets -Name: "{app}\bin" -Name: "{app}\doc"; -Name: "{app}\share"; Attribs: hidden - -; for wildcards to apply to subfolders, set flag recursesubdirs -; initially copied only the there subfolders recursively -; but to assign files to different components I need a finer grained description -[Files] -; hugin executables -Source: "FILES\bin\align_image_stack.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\autooptimiser.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\basename.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\cp.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\echo.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\exiftool.exe"; DestDir: "{app}\bin"; Components: core enblend; Flags: overwritereadonly -Source: "FILES\bin\fulla.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\hugin.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\hugin_hdrmerge.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\hugin_stitch_project.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\make.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\nona.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\nona_gui.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\rm.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\sh.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\uname.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\vig_optimize.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\celeste_standalone.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\PTBatcher"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\PTBatcherGUI"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly - -; autopano-sift-c executables -Source: "FILES\bin\autopano.exe"; DestDir: "{app}\bin"; Components: matchnshift_ap ap_p; Flags: overwritereadonly -Source: "FILES\bin\generatekeys.exe"; DestDir: "{app}\bin"; Components: matchnshift_ap ap_p; Flags: overwritereadonly -Source: "FILES\bin\autopano-sift-c.exe"; DestDir: "{app}\bin"; Components: ap_c; Flags: overwritereadonly -Source: "FILES\bin\autopano-c-complete.exe"; DestDir: "{app}\bin"; Components: ap_p; Flags: overwritereadonly -Source: "FILES\bin\match-n-shift.exe"; DestDir: "{app}\bin"; Components: matchnshift matchnshift_ap; Flags: overwritereadonly -Source: "FILES\bin\perl58.dll"; DestDir: "{app}\bin"; Components: matchnshift matchnshift_ap ap_p matchpoint; Flags: overwritereadonly -Source: "FILES\bin\matchpoint-complete.exe"; DestDir: "{app}\bin"; Components: matchpoint; Flags: overwritereadonly -Source: "FILES\bin\matchpoint.exe"; DestDir: "{app}\bin"; Components: matchpoint matchnshift; Flags: overwritereadonly -Source: "FILES\bin\Panomatic.exe"; DestDir: "{app}\bin"; Components: p_matic; Flags: overwritereadonly -Source: "FILES\bin\PanomaticNOSSE.exe"; DestDir: "{app}\bin"; Components: p_matic_NOSSE; Flags: overwritereadonly - -; enblend/enfuse executables -Source: "FILES\bin\collect_data_enblend.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\collect_data_enfuse.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enblend.exe"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enblend_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enblend_droplet_360.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse.exe"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse_align_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse_auto_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse_droplet_360.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\exiftool_enblend_args.txt"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\exiftool_enfuse_args.txt"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\unique_filename.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -; panotools executables -Source: "FILES\bin\PTblender.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTcrop.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTinfo.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTmasker.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTmender.exe"; DestDir: "{app}\bin"; Components: matchnshift matchnshift_ap panotools; Flags: overwritereadonly -Source: "FILES\bin\PTOptimizer.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTroller.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTtiff2psd.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTtiffdump.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTuncrop.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly - -; install redirect URL to welcome page -Source: "url.txt"; DestDir: "{app}"; DestName: "test.url"; Flags: deleteafterinstall; Attribs: hidden -; documentation -; check why fulla.html and nona.txt are in doc and not in doc/hugin -Source: "FILES\doc\enblend\*"; DestDir: "{app}\doc\enblend"; Components: enblend; Flags: overwritereadonly recursesubdirs -Source: "FILES\doc\hugin\*"; DestDir: "{app}\doc\hugin"; Components: core; Flags: overwritereadonly recursesubdirs -Source: "FILES\doc\panotools\*"; DestDir: "{app}\doc\panotools"; Components: panotools; Flags: overwritereadonly recursesubdirs -; autopano docs -Source: "FILES\doc\autopano-sift-C\*"; DestDir: "{app}\doc\autopano-sift-C"; Components: matchnshift matchnshift_ap ap_p ap_c; Flags: overwritereadonly recursesubdirs -; hugin's UI and languages -Source: "FILES\share\hugin\*"; DestDir: "{app}\share\hugin"; Components: core; Attribs: hidden; Flags: overwritereadonly recursesubdirs -; hugin's translations -Source: "FILES\share\locale\*"; DestDir: "{app}\share\locale"; Components: translations; Attribs: hidden; Flags: overwritereadonly recursesubdirs -; release notes for this installer -Source: "Release_Notes.txt"; DestDir: "{app}\doc"; DestName: "Release Notes.txt"; Components: core; Flags: isreadme overwritereadonly - -[InstallDelete] -; processed as first step of installation -; these delete instructions are to get rid of legacy files -; remove the old release notes files if it exists -Type: files; Name: "{app}\doc\win_release_notes.txt"; -; remove autopano VBS as it is no longer supported -Type: files; Name: "{app}\bin\autopano-c-complete.vbs"; -; remove wrongly installed locale files -Type: filesandordirs; Name: "{app}\share\ca_ES"; -Type: filesandordirs; Name: "{app}\share\cs_CZ"; -Type: filesandordirs; Name: "{app}\share\de"; -Type: filesandordirs; Name: "{app}\share\es"; -Type: filesandordirs; Name: "{app}\share\fr"; -Type: filesandordirs; Name: "{app}\share\hu"; -Type: filesandordirs; Name: "{app}\share\it"; -Type: filesandordirs; Name: "{app}\share\ja"; -Type: filesandordirs; Name: "{app}\share\nl"; -Type: filesandordirs; Name: "{app}\share\pl"; -Type: filesandordirs; Name: "{app}\share\pt_BR"; -Type: filesandordirs; Name: "{app}\share\ru"; -Type: filesandordirs; Name: "{app}\share\sk"; -Type: filesandordirs; Name: "{app}\share\sv"; -Type: filesandordirs; Name: "{app}\share\uk"; -Type: filesandordirs; Name: "{app}\share\zh_CN"; -; add Bruno's UK_en - -[Registry] -; file associations -; register extension .pto with internal name HuginProject (must be unique) -Root: HKCR; Subkey: ".pto"; ValueType: string; ValueName: ""; ValueData: "HuginProject"; Flags: uninsdeletevalue -; set Hugin Project File to be the file type as shown in Explorer -Root: HKCR; Subkey: "HuginProject"; ValueType: string; ValueName: ""; ValueData: "Hugin Project File"; Flags: uninsdeletevalue -; set the icon -Root: HKCR; Subkey: "HuginProject\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\hugin.exe,0" -; specify the command to execute on double-click -Root: HKCR; Subkey: "HuginProject\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\hugin.exe"" ""%1""" -; check if it is worth it to register other App Paths -Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\Hugin.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\hugin.exe"; Flags: uninsdeletekey -; delete registry entry completely on uninstall - put settings *after* this, else they will be removed -Root: HKCU; Subkey: "Software\hugin"; Flags: deletekey; Tasks: "delete_settings" -; could add here default preference, one registry key at a time. -; choice of autopano. 0=Kolor, 1=SIFT-C -; no more ap_vbs component -Root: HKCU; Subkey: "Software\hugin\AutoPano"; ValueType: dword; ValueName: "Type"; ValueData: 1; Components: ap_p ap_c; Tasks: "default_settings" -; which SIFT-C? 0=default, 1=custom -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: dword; ValueName: "AutopanoExeCustom"; ValueData: 1; Components: matchnshift ap_p ap_c; Tasks: "default_settings" -; executable to point to -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\Panomatic.exe"; Components: p_matic; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\PanomaticNOSSE.exe"; Components: p_matic_NOSSE; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\match-n-shift.exe"; Components: matchnshift matchnshift_ap; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\autopano-c-complete.exe"; Components: ap_p; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\matchpoint-complete.exe"; Components: matchpoint; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "AutopanoExe"; ValueData: "{app}\bin\autopano-sift-c.exe"; Components: ap_c; Tasks: "default_settings" -; arguments -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "-o %o %i"; Components: p_matic p_matic_NOSSE; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "-f %f -v %v -c -p %p -o %o %i"; Components: matchnshift_ap; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "--matchpoint -f %f -v %v -c -p %p -o %o %i"; Components: matchnshift; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "--noransac --points %p --output %o %i"; Components: ap_p matchpoint; Tasks: "default_settings" -Root: HKCU; Subkey: "Software\hugin\AutoPanoSift"; ValueType: string; ValueName: "Args"; ValueData: "--maxmatches %p %o %i"; Components: ap_c; Tasks: "default_settings" - -; by itself a task does nothing, it needs ot be linked to other installation entries -[Tasks] -Name: "modifypath"; Description: "Add application directory to your system path"; GroupDescription: "System:"; Flags: unchecked; -Name: "delete_settings"; Description: "Clean Slate? (Deletes previous settings)"; GroupDescription: "System:"; Flags: unchecked; -Name: "default_settings"; Description: "Set Default Settings? (partially implemented)"; GroupDescription: "System:"; -Name: "quicklaunch"; Description: "Create Quick Launch Icon"; GroupDescription: "Additional icons:"; Flags: unchecked -Name: "desktop"; Description: "Create desktop icons"; GroupDescription: "Additional icons:"; -Name: "desktop\user"; Description: "only for the current user"; GroupDescription: "Additional icons:"; Flags: exclusive unchecked -Name: "desktop\user\hugin"; Description: "Hugin"; GroupDescription: "Additional icons:"; Flags: unchecked -Name: "desktop\user\enblend"; Description: "Enblend Droplets"; GroupDescription: "Additional icons:"; Flags: unchecked -Name: "desktop\user\enfuse"; Description: "Enfuse Droplets"; GroupDescription: "Additional icons:"; Flags: unchecked -Name: "desktop\common"; Description: "for all users"; GroupDescription: "Additional icons:"; Flags: exclusive -Name: "desktop\common\hugin"; Description: "Hugin"; GroupDescription: "Additional icons:"; -Name: "desktop\common\enblend"; Description: "Enblend Droplets"; GroupDescription: "Additional icons:"; -Name: "desktop\common\enfuse"; Description: "Enfuse Droplets"; GroupDescription: "Additional icons:"; -Name: "programfiles"; Description: "Create additional entries in Program Files menu"; GroupDescription: "Additional icons:"; - -[Icons] -; desktop for current user -Name: "{userdesktop}\Hugin"; Filename: "{app}\bin\hugin.exe"; Tasks: desktop\user\hugin -; desktop for all users -Name: "{commondesktop}\Hugin"; Filename: "{app}\bin\hugin.exe"; Tasks: desktop\common\hugin -; quick-launch -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Hugin"; Filename: "{app}\bin\hugin.exe"; Tasks: quicklaunch -; Program Files Group -Name: "{group}\Hugin"; Filename: "{app}\bin\hugin.exe" -Name: "{group}\Homepage"; Filename: "http://hugin.sf.net/"; Tasks: programfiles -Name: "{group}\News"; Filename: "http://panospace.wordpress.com/"; Tasks: programfiles -Name: "{group}\nona_gui"; Filename: "{app}\bin\nona_gui.exe"; Tasks: programfiles -Name: "{group}\Hugin_stitch_project"; Filename: "{app}\bin\hugin_stitch_project.exe"; Tasks: programfiles -Name: "{group}\uninstall"; Filename: "{uninstallexe}"; Tasks: programfiles -Name: "{group}\Documentation"; Filename: "{app}\doc"; -; Enfuse droplets for current user -Name: "{userdesktop}\Enfuse"; Filename: "{app}\bin\enfuse_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse -Name: "{userdesktop}\Enfuse360"; Filename: "{app}\bin\enfuse_droplet_360.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse -Name: "{userdesktop}\EnfuseAlign"; Filename: "{app}\bin\enfuse_align_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse -Name: "{userdesktop}\EnfuseAuto"; Filename: "{app}\bin\enfuse_auto_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse -; Enblend droplets for current user -Name: "{userdesktop}\Enblend"; Filename: "{app}\bin\enblend_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enblend -Name: "{userdesktop}\Enblend360"; Filename: "{app}\bin\enblend_droplet_360.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enblend -; Enfuse droplets for all users -Name: "{commondesktop}\Enfuse"; Filename: "{app}\bin\enfuse_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enfuse -Name: "{commondesktop}\Enfuse360"; Filename: "{app}\bin\enfuse_droplet_360.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enfuse -Name: "{commondesktop}\EnfuseAlign"; Filename: "{app}\bin\enfuse_align_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enfuse -Name: "{commondesktop}\EnfuseAuto"; Filename: "{app}\bin\enfuse_auto_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\user\enfuse -; Enblend droplets for all users -Name: "{commondesktop}\Enblend"; Filename: "{app}\bin\enblend_droplet.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enblend -Name: "{commondesktop}\Enblend360"; Filename: "{app}\bin\enblend_droplet_360.bat"; WorkingDir: "{app}\bin"; Components: enblend; Tasks: desktop\common\enblend - -[Code] -function ModPathDir(): TArrayOfString; -var - Dir: TArrayOfString; -begin - setArrayLength(Dir,1) - Dir[0] := ExpandConstant('{app}') + '\bin\'; - Result := Dir; -end; -#include "modpath.iss" - -[Run] -; install counter -Filename: "{app}\test.url"; Flags: shellexec -; here it would also be possible to launch the execution of post-install VBS scripts -Filename: "{app}\bin\hugin.exe"; Description: "Launch hugin"; Flags: nowait postinstall skipifsilent unchecked - Deleted: hugin/trunk/platforms/windows/installer/hugin_no_patents.iss =================================================================== --- hugin/trunk/platforms/windows/installer/hugin_no_patents.iss 2010-01-18 17:51:29 UTC (rev 4912) +++ hugin/trunk/platforms/windows/installer/hugin_no_patents.iss 2010-01-18 17:59:52 UTC (rev 4913) @@ -1,260 +0,0 @@ -; Hugin InnoSetup Installer File -; (C) 2008 Yuval Levy, licensed under GPL V2 -; if possible, let the Make process edit AppVerName to have a proper, automated SVN numbering -; make sure that the Make process copies this file from platforms/windows/msi to INSTALL/ -; and that it also copes the files win_installer_readme.txt and win_release_notes.txt to INSTALL/ -; prior to running it with the Inno Setup Compiler 5.2.2 - -[Setup] -AppName=Hugin -; ApId is checked to determine wheter to append to a particular existing uninstall log -; keep it the same for updates of the same installation -AppId=Hugin_alpha_builds -AppVerName=Hugin 0.7.0.@HUGIN_WC_REVISION@SVN-@HUGIN_BUILDER@ -AppPublisher=@HUGIN_BUILDER@ -AppPublisherURL=http://panospace.wordpress.com/ -AppVersion=0.7.0.@HUGIN_WC_REVISION@SVN-@HUGIN_BUILDER@ -AppSupportURL=http://tech.groups.yahoo.com/group/PanoToolsNG/ -AppUpdatesURL=http://groups.google.com/group/hugin-ptx -; necessary to create file associations -ChangesAssociations=yes -; necessary to edit system path -ChangesEnvironment=yes -; should default to yes, but reports indicate that the entry was not created by the previous installer -CreateUninstallRegKey=yes -; default yes, but for updaters better no. play with it -UpdateUninstallLogAppName=yes -DefaultDirName={pf}\Hugin -DefaultGroupName=Hugin -; AllowNoIcons does not affect entries in the Tasks section that have their own checkboxes -AllowNoIcons=yes -; show list of types only to reduce complexity unless customizing -AlwaysShowComponentsList=no -LicenseFile=installer_license.txt -PrivilegesRequired=poweruser -UsePreviousAppDir=yes -; HOOK to run a VBS (theoretically to check if an app is running: AppMutex. See Documentation if you want to use it -; Uninstall stuff made nicer -UninstallDisplayIcon={app}\bin\hugin.exe,0 -; cosmetic stuff -AppCopyright=Copyright (C) 2004-2008 Pablo d'Angelo -FlatComponentsList=No -; might not work as the example was with a file.ico -SetupIconFile=hugin.ico -WizardSmallImageFile=smallimage.bmp -WizardImageStretch=no -WizardImageFile=wizardimage.bmp -; compression: solid compression only recommended for smaller (<100MB) -; test it to see if it is significantly better -Compression=lzma/ultra64 -SolidCompression=yes - - -[Types] -Name: "default"; Description: "Default installation" -Name: "full"; Description: "Full installation" -Name: "enblend"; Description: "Enblend/Enfuse and helper files/droplets only" -Name: "photoshop"; Description: "Photoshop Plugins only (not available yet)" -Name: "gimp"; Description: "Gimp Plugins only (not available yet)" -Name: "custom"; Description: "Custom installation (recommended for testing)"; Flags: iscustom - -[Components] -Name: "core"; Description: "Hugin"; Types: default full custom; Flags: fixed -Name: "translations"; Description: "Hugin Language Pack"; Types: default full custom; -Name: "enblend"; Description: "Enblend/Enfuse"; Types: default full enblend custom; -Name: "ap_mockup"; Description: "drop-in Autopano Replacement"; Types: default full custom; -Name: "panotools"; Description: "Panotools Command Line Tools"; Types: default full custom; -Name: "photoshop"; Description: "Photoshop Plugins (N/A yet)"; Types: full photoshop custom; -Name: "gimp"; Description: "Gimp Plugins (N/A yet)"; Types: full gimp custom; - -; not necessary (if the directory is not empty) but clean -[Dirs] -; bin is not read-only because we may want to customize the droplets -Name: "{app}\bin" -Name: "{app}\doc"; -Name: "{app}\share"; Attribs: hidden - -; for wildcards to apply to subfolders, set flag recursesubdirs -; initially copied only the there subfolders recursively -; but to assign files to different components I need a finer grained description -[Files] -; hugin executables -Source: "FILES\bin\align_image_stack.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\autooptimiser.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\basename.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\cp.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\echo.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\exiftool.exe"; DestDir: "{app}\bin"; Components: core enblend; Flags: overwritereadonly -Source: "FILES\bin\fulla.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\hugin.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\hugin_hdrmerge.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\hugin_stitch_project.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\make.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\nona.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\nona_gui.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\rm.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\sh.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\uname.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\vig_optimize.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\celeste_standalone.exe"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\PTBatcher"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -Source: "FILES\bin\PTBatcherGUI"; DestDir: "{app}\bin"; Components: core; Flags: overwritereadonly -; autopano-sift-c executables -Source: "FILES\bin\autopano-noop.exe"; DestDir: "{app}\bin"; Components: ap_mockup; Flags: overwritereadonly - -; enblend/enfuse executables -Source: "FILES\bin\collect_data_enblend.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\collect_data_enfuse.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enblend.exe"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enblend_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enblend_droplet_360.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse.exe"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse_align_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse_auto_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse_droplet.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\enfuse_droplet_360.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\exiftool_enblend_args.txt"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\exiftool_enfuse_args.txt"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -Source: "FILES\bin\unique_filename.bat"; DestDir: "{app}\bin"; Components: enblend; Flags: overwritereadonly -; panotools executables -Source: "FILES\bin\PTblender.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTcrop.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTinfo.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTmasker.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTmender.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTOptimizer.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTroller.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTtiff2psd.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTtiffdump.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -Source: "FILES\bin\PTuncrop.exe"; DestDir: "{app}\bin"; Components: panotools; Flags: overwritereadonly -; install redirect URL to welcome page -Source: "url.txt"; DestDir: "{app}"; DestName: "test.url"; Flags: deleteafterinstall; Attribs: hidden -; documentation -; check why fulla.html and nona.txt are in doc and not in doc/hugin -Source: "FILES\doc\enblend\*"; DestDir: "{app}\doc\enblend"; Components: enblend; Flags: overwritereadonly recursesubdirs -Source: "FILES\doc\hugin\*"; DestDir: "{app}\doc\hugin"; Components: core; Flags: overwritereadonly recursesubdirs -Source: "FILES\doc\panotools\*"; DestDir: "{app}\doc\panotools"; Components: panotools; Flags: overwritereadonly recursesubdirs -; hugin's UI and languages -Source: "FILES\share\hugin\*"; DestDir: "{app}\share\hugin"; Components: core; Attribs: hidden; Flags: overwritereadonly recursesubdirs -; hugin's translations -Source: "FILES\share\locale\*"; DestDir: "{app}\share\locale"; Components: translations; Attribs: hidden; Flags: overwritereadonly recursesubdirs -; release notes for this installer -Source: "Release_Notes.txt"; DestDir: "{app}\doc"; DestName: "Release Notes.txt"; Components: core; Flags: isreadme overwritereadonly - -[InstallDelete] -; processed as first step of installation -; these delete instructions are to get rid of legacy file... [truncated message content] |
From: <da...@us...> - 2010-01-22 20:05:00
|
Revision: 4928 http://hugin.svn.sourceforge.net/hugin/?rev=4928&view=rev Author: dangelo Date: 2010-01-22 20:04:41 +0000 (Fri, 22 Jan 2010) Log Message: ----------- panotrafo: Remove references to cpclean from doc & comments. Modified Paths: -------------- hugin/trunk/doc/pano_trafo.pod hugin/trunk/src/tools/pano_trafo.cpp Modified: hugin/trunk/doc/pano_trafo.pod =================================================================== --- hugin/trunk/doc/pano_trafo.pod 2010-01-22 13:06:51 UTC (rev 4927) +++ hugin/trunk/doc/pano_trafo.pod 2010-01-22 20:04:41 UTC (rev 4928) @@ -8,7 +8,7 @@ =head1 DESCRIPTION -B<cpclean> reads image coordiates (x y) from standard input and +B<pano_trafo> reads image coordiates (x y) from standard input and prints the corresponding panorama coordinates to standard output. =head1 OPTIONS Modified: hugin/trunk/src/tools/pano_trafo.cpp =================================================================== --- hugin/trunk/src/tools/pano_trafo.cpp 2010-01-22 13:06:51 UTC (rev 4927) +++ hugin/trunk/src/tools/pano_trafo.cpp 2010-01-22 20:04:41 UTC (rev 4928) @@ -1,12 +1,10 @@ // -*- c-basic-offset: 4 -*- -/** @file cpclean.cpp +/** @file panotrafo.cpp * - * @brief program to remove wrong control points by statistical method - * - * the algorithm is based on ptoclean by Bruno Postle + * @brief Transform between image <-> panorama coordinates * - * @author Thomas Modes + * @author Pablo d'Angelo * * $Id: cpclean.cpp 4822 2009-12-19 23:17:06Z brunopostle $ * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-01-31 14:10:14
|
Revision: 4951 http://hugin.svn.sourceforge.net/hugin/?rev=4951&view=rev Author: stativ Date: 2010-01-31 14:10:06 +0000 (Sun, 31 Jan 2010) Log Message: ----------- Fix storing of image cache upper bound when cache is set to > 2047MB. Patch by Ryan Sleevi. Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-01-31 10:17:22 UTC (rev 4950) +++ hugin/trunk/CMakeLists.txt 2010-01-31 14:10:06 UTC (rev 4951) @@ -233,9 +233,8 @@ ENDIF(MSGFMT_FOUND) ## -## LAPACK (optional, enable by -DENABLE_LAPACK=YES) +## LAPACK (optional, enable by -DENABLE_LAPACK=YES ## -option (ENABLE_LAPACK "Use lapack based solver in levmar" OFF) IF(ENABLE_LAPACK) FIND_PACKAGE(LAPACK) Modified: hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2010-01-31 10:17:22 UTC (rev 4950) +++ hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2010-01-31 14:10:06 UTC (rev 4951) @@ -717,7 +717,7 @@ ///// /// MISC // cache - cfg->Write(wxT("/ImageCache/UpperBound"), MY_G_SPIN_VAL("prefs_cache_UpperBound") << 20); + cfg->Write(wxT("/ImageCache/UpperBound"), (long) MY_G_SPIN_VAL("prefs_cache_UpperBound") << 20); // number of threads cfg->Write(wxT("/Nona/NumberOfThreads"), MY_G_SPIN_VAL("prefs_nona_NumberOfThreads")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2010-02-27 20:36:06
|
Revision: 5030 http://hugin.svn.sourceforge.net/hugin/?rev=5030&view=rev Author: harryvanderwolf Date: 2010-02-27 20:35:57 +0000 (Sat, 27 Feb 2010) Log Message: ----------- [OSX] correct MaskLoadDialog.h and XCode project after svn commit 5014 Modified Paths: -------------- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj hugin/trunk/src/hugin1/hugin/MaskLoadDialog.h Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-02-27 11:57:19 UTC (rev 5029) +++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj 2010-02-27 20:35:57 UTC (rev 5030) @@ -871,6 +871,8 @@ 57EA97D90C3A940500E4965E /* RotatePanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA97D70C3A940500E4965E /* RotatePanorama.cpp */; }; 57EA97DA0C3A940500E4965E /* RotatePanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA97D80C3A940500E4965E /* RotatePanorama.h */; }; 57FD5826101B3E7C0065B9E9 /* CPDetectorConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FD5825101B3E7B0065B9E9 /* CPDetectorConfig.cpp */; }; + 730B1AEA1139B2B30014462B /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */; }; + 730B1AEB1139B2B30014462B /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */; }; 7329278810E4A7AE00D3C8CB /* image_variables.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329278310E4A7AE00D3C8CB /* image_variables.h */; }; 7329278910E4A7AE00D3C8CB /* ImageVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329278410E4A7AE00D3C8CB /* ImageVariable.h */; }; 7329278A10E4A7AE00D3C8CB /* ImageVariableGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7329278510E4A7AE00D3C8CB /* ImageVariableGroup.cpp */; }; @@ -3135,6 +3137,8 @@ 57FD5825101B3E7B0065B9E9 /* CPDetectorConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPDetectorConfig.cpp; sourceTree = "<group>"; }; 57FD5827101B3E840065B9E9 /* CPDetectorConfig_default.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDetectorConfig_default.h; sourceTree = "<group>"; }; 57FD5828101B3E840065B9E9 /* CPDetectorConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDetectorConfig.h; sourceTree = "<group>"; }; + 730B1AE81139B2B20014462B /* MaskLoadDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MaskLoadDialog.h; path = ../src/hugin1/hugin/MaskLoadDialog.h; sourceTree = SOURCE_ROOT; }; + 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MaskLoadDialog.cpp; path = ../src/hugin1/hugin/MaskLoadDialog.cpp; sourceTree = SOURCE_ROOT; }; 7329278310E4A7AE00D3C8CB /* image_variables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image_variables.h; sourceTree = "<group>"; }; 7329278410E4A7AE00D3C8CB /* ImageVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageVariable.h; sourceTree = "<group>"; }; 7329278510E4A7AE00D3C8CB /* ImageVariableGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageVariableGroup.cpp; sourceTree = "<group>"; }; @@ -5342,6 +5346,8 @@ 57FC3ABD0675E43600C3E0AC = { isa = PBXGroup; children = ( + 730B1AE81139B2B20014462B /* MaskLoadDialog.h */, + 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */, 738A7749112B4869004E3612 /* Mask.cpp */, 738A774A112B4869004E3612 /* Mask.h */, 738A773A112B4507004E3612 /* MaskEditorPanel.cpp */, @@ -7921,6 +7927,7 @@ 732927B010E4C15700D3C8CB /* PreviewLayoutLinesTool.cpp in Sources */, 738A773E112B4508004E3612 /* MaskEditorPanel.cpp in Sources */, 738A773F112B4508004E3612 /* MaskImageCtrl.cpp in Sources */, + 730B1AEA1139B2B30014462B /* MaskLoadDialog.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8061,6 +8068,7 @@ 739193B31119FC73007D96F4 /* PreviewLayoutLinesTool.cpp in Sources */, 738A7740112B4508004E3612 /* MaskEditorPanel.cpp in Sources */, 738A7741112B4508004E3612 /* MaskImageCtrl.cpp in Sources */, + 730B1AEB1139B2B30014462B /* MaskLoadDialog.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: hugin/trunk/src/hugin1/hugin/MaskLoadDialog.h =================================================================== --- hugin/trunk/src/hugin1/hugin/MaskLoadDialog.h 2010-02-27 11:57:19 UTC (rev 5029) +++ hugin/trunk/src/hugin1/hugin/MaskLoadDialog.h 2010-02-27 20:35:57 UTC (rev 5030) @@ -29,6 +29,7 @@ #define _MASKLOADDIALOG_H #include "panoinc_WX.h" +#include "panoinc.h" #include <PT/Panorama.h> #include <base_wx/ImageCache.h> #include <hugin/MaskImageCtrl.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-03-01 06:19:06
|
Revision: 5038 http://hugin.svn.sourceforge.net/hugin/?rev=5038&view=rev Author: tmodes Date: 2010-03-01 06:18:55 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Modified makefile generation on windows (it's using now GNUmake and cmd.exe) Modified Paths: -------------- hugin/trunk/CMakeModules/win_bundle.cmake hugin/trunk/src/hugin1/base_wx/RunStitchPanel.cpp hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp hugin/trunk/src/hugin_base/hugin_utils/platform.h Modified: hugin/trunk/CMakeModules/win_bundle.cmake =================================================================== --- hugin/trunk/CMakeModules/win_bundle.cmake 2010-03-01 06:17:23 UTC (rev 5037) +++ hugin/trunk/CMakeModules/win_bundle.cmake 2010-03-01 06:18:55 UTC (rev 5038) @@ -84,21 +84,14 @@ INSTALL(FILES ${ENBLEND_EXECUTABLES} DESTINATION ${BINDIR}) INSTALL(FILES ${ENBLEND_DOC_FILES} DESTINATION doc/enblend) - # find path to UnxUtils and install required files - FIND_PATH(UnxUtils_DIR UnxUtilsDist.html - ${SOURCE_BASE_DIR}/UnxUtils - DOC "Location of UnxUtils (http://sf.net/projects/unxutils) files" + # find path to gnu make + FIND_PATH(GNUMake_DIR make.exe + ${SOURCE_BASE_DIR}/Make-3.81/Release + DOC "Location of gnu make" NO_DEFAULT_PATH) - - INSTALL(FILES ${UnxUtils_DIR}/usr/local/wbin/make.exe - ${UnxUtils_DIR}/usr/local/wbin/basename.exe - ${UnxUtils_DIR}/usr/local/wbin/cp.exe - ${UnxUtils_DIR}/usr/local/wbin/rm.exe - ${UnxUtils_DIR}/usr/local/wbin/echo.exe - ${UnxUtils_DIR}/usr/local/wbin/uname.exe - ${UnxUtils_DIR}/bin/sh.exe - DESTINATION ${BINDIR}) - + INSTALL(FILES ${GNUMake_DIR}/make.exe + DESTINATION ${BINDIR}) + # install exiftool FIND_PATH(EXIFTOOL_EXE_DIR exiftool.exe ${SOURCE_BASE_DIR}/tools Modified: hugin/trunk/src/hugin1/base_wx/RunStitchPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/RunStitchPanel.cpp 2010-03-01 06:17:23 UTC (rev 5037) +++ hugin/trunk/src/hugin1/base_wx/RunStitchPanel.cpp 2010-03-01 06:18:55 UTC (rev 5038) @@ -235,8 +235,8 @@ DEBUG_DEBUG("Overwrite existing images!"); } -#ifdef WIN32 - wxString args = wxT("-f ") + wxQuoteString(m_currentMakefn) + wxT(" all clean"); +#if defined __WXMSW__ + wxString args = wxT("-f ") + wxQuoteFilename(m_currentMakefn) + wxT(" test all clean"); #else wxString args = wxT("-f ") + wxQuoteString(m_currentMakefn) + wxT(" test all clean"); #endif @@ -254,6 +254,12 @@ cmd += wxT(" ") + args; #elif defined __FreeBSD__ wxString cmd = wxT("gmake ") + args; +#elif defined __WXMSW__ + wxString cmdExe; + if(!wxGetEnv(wxT("ComSpec"),&cmdExe)) + cmdExe=wxT("cmd"); + wxString cmd = cmdExe + wxString::Format(wxT(" /C \"chcp %d >NUL && "),GetACP())+ + wxT("\"") + getExePath(wxTheApp->argv[0])+wxT("\\make\" ") + args + wxT("\""); #else wxString cmd = wxT("make ") + args; #endif Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2010-03-01 06:17:23 UTC (rev 5037) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2010-03-01 06:18:55 UTC (rev 5038) @@ -138,6 +138,19 @@ return images; } +/* write make file line for checking, if progCommand can be runned + prints progName on command line */ +void checkProg(std::ostream& o,const std::string& progName, const std::string& progCommand) +{ +#ifdef _WINDOWS + o << "\t@echo Checking " << progName << "..." << endl + << "\t" << progCommand << " > NUL 2>&1 && echo " << progName << " is ok || echo " + << progName << " failed" << endl; +#else + o << "\t@echo -n 'Checking " << progName << "...'" << endl + << "\t" << progCommand << " > /dev/null 2>&1 && echo '[OK]' || echo '[FAILED]'" << endl; +#endif +}; void PanoramaMakefileExport::createMakefile(const PanoramaData& pano, const UIntSet& rimages, @@ -158,12 +171,6 @@ setlocale(LC_NUMERIC,"C"); #endif -#ifdef UNIX_LIKE - std::string NULL_DEVICE("/dev/null"); -#else // WINDOWS - std::string NULL_DEVICE("NUL"); -#endif - // output only images in current ROI UIntSet images = getImagesinROI(pano,rimages); @@ -195,6 +202,12 @@ #endif } +#ifdef _WINDOWS + o << "# Force using cmd.exe" << endl + << "SHELL=" << getenv("ComSpec") << endl <<endl; + +#endif + o << endl << endl << "# Tool configuration" << endl @@ -208,7 +221,11 @@ << "ENFUSE=" << quoteStringShell(progs.enfuse) << endl << "SMARTBLEND=" << quoteStringShell(progs.smartblend) << endl << "HDRMERGE=" << quoteStringShell(progs.hdrmerge) << endl +#ifdef _WINDOWS + << "RM=del" << endl +#else << "RM=rm" << endl +#endif #ifdef COULD_EXECUTE_EXIFTOOL_WITH_PERL << "EXIFTOOL=" << (executeWithPerl? perlCommand+" " : "") << quoteStringShell(progs.exiftool) << endl #else @@ -763,8 +780,7 @@ // test remapper switch(opts.remapper) { case PanoramaOptions::NONA: - o << "\t@echo -n 'Checking nona...'" << endl - << "\t@-$(NONA) --help > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + checkProg(o,"nona","@-$(NONA) --help"); break; case PanoramaOptions::PTMENDER: break; @@ -772,27 +788,21 @@ // test blender switch(opts.blendMode) { case PanoramaOptions::ENBLEND_BLEND: - o << "\t@echo -n 'Checking enblend...'" << endl - << "\t@-$(ENBLEND) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + checkProg(o,"enblend","@-$(ENBLEND) -h"); break; case PanoramaOptions::PTBLENDER_BLEND: - o << "\t@echo -n 'Checking PTblender...'" << endl - << "\t@-$(PTBLENDER) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + checkProg(o,"PTblender","@-$(PTBLENDER) -h"); break; case PanoramaOptions::SMARTBLEND_BLEND: - o << "\t@echo -n 'Checking smartblend...'" << endl - << "\t@-$(SMARTBLEND) > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + checkProg(o,"smartblend","@-$(SMARTBLEND)"); break; } // test enfuse - o << "\t@echo -n 'Checking enfuse...'" << endl - << "\t@-$(ENFUSE) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + checkProg(o,"enfuse","@-$(ENFUSE) -h"); // test hugin_hdrmerge - o << "\t@echo -n 'Checking hugin_hdrmerge...'" << endl - << "\t@-$(HDRMERGE) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + checkProg(o,"hugin_hdrmerge","@-$(HDRMERGE) -h"); // test exiftool - o << "\t@echo -n 'Checking exiftool...'" << endl - << "\t@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl; + checkProg(o,"exiftool","@-$(EXIFTOOL) -ver"); // test rm /* Needs to be replaced by a test that creates and deletes a file in the TEMP dir o << "\t@echo -n 'Checking rm...'" << endl Modified: hugin/trunk/src/hugin_base/hugin_utils/platform.h =================================================================== --- hugin/trunk/src/hugin_base/hugin_utils/platform.h 2010-03-01 06:17:23 UTC (rev 5037) +++ hugin/trunk/src/hugin_base/hugin_utils/platform.h 2010-03-01 06:18:55 UTC (rev 5038) @@ -84,7 +84,27 @@ return ret; } - +#ifdef _WINDOWS + /// utility function; replaces backslash with slash + template <class str> + str replaceBackslash(const str & arg) + { + str ret(arg); + size_t idx = 0; + do + { + idx = ret.find(str("\\"),idx); + if (idx != str::npos) + { + ret.replace(idx, 1, str("/")); + idx++; + } + } + while (idx != str::npos); + return ret; + }; +#endif + /** Try to escape special chars on windows and linux. * * @BUG: I'm quite sure that this routine doesn't replace @@ -119,9 +139,8 @@ { #ifdef WIN32 // Do not quote backslash,: and ~ on win32. - // It seems to be handled well by sh.exe from unixutils - // Escape ^. It shouldn't be necessary, but otherwise folders starting with ^ will not work - return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#=^")), str("$"), str("$")); + // we only need to escape hash (#) and $, all other chars are handled by quoting with " " + return str("\"")+quoteStringInternal(quoteStringInternal(replaceBackslash(arg),str("\\"),str("#")), str("$"), str("$"))+str("\""); #else return quoteStringInternal(quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:=")), str("$"), str("$")); #endif @@ -135,8 +154,7 @@ { #ifdef WIN32 // Do not escape colon in windows because it causes problems with absolute paths - // Escape ^. It shouldn't be necessary, but otherwise folders starting with ^ will not work - return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #=^")), str("$"), str("$")); + return quoteStringInternal(quoteStringInternal(replaceBackslash(arg), str("\\"), str(" #=")), str("$"), str("$")); #else return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #:=")), str("$"), str("$")); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-03-21 14:27:52
|
Revision: 5076 http://hugin.svn.sourceforge.net/hugin/?rev=5076&view=rev Author: tmodes Date: 2010-03-21 14:27:39 +0000 (Sun, 21 Mar 2010) Log Message: ----------- Added option to build Hugin with dynamic libs on windows (disabled by default because this requires to rebuild all dependecies as dynamic libs) Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindExiv2.cmake hugin/trunk/CMakeModules/FindGLEW.cmake hugin/trunk/CMakeModules/FindGLUT.cmake hugin/trunk/CMakeModules/FindJPEG.cmake hugin/trunk/CMakeModules/FindPNG.cmake hugin/trunk/CMakeModules/FindTIFF.cmake hugin/trunk/CMakeModules/FindZLIB.cmake hugin/trunk/CMakeModules/win_bundle.cmake hugin/trunk/src/celeste/CMakeLists.txt hugin/trunk/src/celeste/Celeste.cpp hugin/trunk/src/celeste/Celeste.h hugin/trunk/src/celeste/CelesteGlobals.h hugin/trunk/src/celeste/Utilities.h hugin/trunk/src/foreign/ANN/ANN.h hugin/trunk/src/foreign/ANN/CMakeLists.txt hugin/trunk/src/foreign/vigra/vigra/config.hxx hugin/trunk/src/foreign/vigra/vigra/diff2d.hxx hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt hugin/trunk/src/hugin1/base_wx/CMakeLists.txt hugin/trunk/src/hugin1/base_wx/ImageCache.h hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp hugin/trunk/src/hugin1/base_wx/PTWXDlg.h hugin/trunk/src/hugin1/base_wx/RunStitchPanel.h hugin/trunk/src/hugin1/base_wx/huginConfig.h hugin/trunk/src/hugin1/base_wx/platform.h hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp hugin/trunk/src/hugin1/hugin/GLViewer.cpp hugin/trunk/src/hugin1/hugin/MeshManager.cpp hugin/trunk/src/hugin1/hugin/PreviewDifferenceTool.cpp hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp hugin/trunk/src/hugin1/hugin/TextureManager.cpp hugin/trunk/src/hugin_base/CMakeLists.txt hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h hugin/trunk/src/hugin_base/algorithms/basic/CalculateCPStatistics.h hugin/trunk/src/hugin_base/algorithms/basic/CalculateMeanExposure.h hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalROI.h hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalScale.h hugin/trunk/src/hugin_base/algorithms/basic/RotatePanorama.h hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.h hugin/trunk/src/hugin_base/algorithms/control_points/CleanCP.h hugin/trunk/src/hugin_base/algorithms/nona/CalculateFOV.h hugin/trunk/src/hugin_base/algorithms/nona/CenterHorizontally.h hugin/trunk/src/hugin_base/algorithms/nona/ComputeImageROI.h hugin/trunk/src/hugin_base/algorithms/nona/FitPanorama.h hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h hugin/trunk/src/hugin_base/algorithms/optimizer/ImageGraph.h hugin/trunk/src/hugin_base/algorithms/optimizer/PTOptimizer.h hugin/trunk/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h hugin/trunk/src/hugin_base/algorithms/point_sampler/PointSampler.h hugin/trunk/src/hugin_base/appbase/DocumentData.h hugin/trunk/src/hugin_base/appbase/ProgressDisplay.h hugin/trunk/src/hugin_base/appbase/ProgressDisplayOld.h hugin/trunk/src/hugin_base/appbase/ProgressReporterOld.h hugin/trunk/src/hugin_base/hugin_math/Matrix3.h hugin/trunk/src/hugin_base/hugin_math/hugin_math.h hugin/trunk/src/hugin_base/hugin_utils/platform.h hugin/trunk/src/hugin_base/hugin_utils/utils.h hugin/trunk/src/hugin_base/huginapp/CachedImageRemapper.h hugin/trunk/src/hugin_base/huginapp/ImageCache.h hugin/trunk/src/hugin_base/nona/SpaceTransform.h hugin/trunk/src/hugin_base/nona/Stitcher.h hugin/trunk/src/hugin_base/panodata/ControlPoint.h hugin/trunk/src/hugin_base/panodata/DestPanoImage.h hugin/trunk/src/hugin_base/panodata/ImageVariable.h hugin/trunk/src/hugin_base/panodata/ImageVariableGroup.h hugin/trunk/src/hugin_base/panodata/ImageVariableTranslate.h hugin/trunk/src/hugin_base/panodata/Lens.h hugin/trunk/src/hugin_base/panodata/Mask.h hugin/trunk/src/hugin_base/panodata/PTScriptParsing.h hugin/trunk/src/hugin_base/panodata/Panorama.h hugin/trunk/src/hugin_base/panodata/PanoramaData.h hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h hugin/trunk/src/hugin_base/panodata/PanoramaVariable.h hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h hugin/trunk/src/hugin_base/panodata/StandardImageVariableGroups.h hugin/trunk/src/hugin_base/panotools/PanoToolsInterface.h hugin/trunk/src/hugin_base/panotools/PanoToolsOptimizerWrapper.h hugin/trunk/src/hugin_base/panotools/PanoToolsUtils.h hugin/trunk/src/hugin_base/vigra_ext/Correlation.h hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.cpp hugin/trunk/src/hugin_base/vigra_ext/MultiThreadOperations.h hugin/trunk/src/hugin_base/vigra_ext/emor.h hugin/trunk/src/tools/nona.cpp Added Paths: ----------- hugin/trunk/src/hugin_shared.h Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076) @@ -74,6 +74,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/vigra ) include_directories( ${CMAKE_SOURCE_DIR}/src/celeste ) include_directories( ${CMAKE_BINARY_DIR}/src/celeste ) +include_directories( ${CMAKE_SOURCE_DIR}/src ) # this function is not available on some systems, notably FreeBSD and Windows include(CheckFunctionExists) @@ -97,6 +98,12 @@ FIND_PACKAGE(PkgConfig) ENDIF (UNIX) +IF(WIN32) + set(HUGIN_SHARED "0" CACHE STRING "Build shared internal libraries" ) +ELSE(WIN32) + set(HUGIN_SHARED "1" CACHE STRING "Build shared internal libraries" ) +ENDIF(WIN32) + # # Setup windows search paths for dependencies # @@ -172,7 +179,11 @@ FIND_PACKAGE(OpenGL) IF(WIN32) IF(NOT GLUT_ROOT_PATH) - SET(GLUT_ROOT_PATH ${SOURCE_BASE_DIR}/glut) + IF(${HUGIN_SHARED}) + SET(GLUT_ROOT_PATH ${SOURCE_BASE_DIR}/freeglut-2.6.0) + ELSE(${HUGIN_SHARED}) + SET(GLUT_ROOT_PATH ${SOURCE_BASE_DIR}/glut) + ENDIF(${HUGIN_SHARED}) ENDIF(NOT GLUT_ROOT_PATH) ENDIF(WIN32) FIND_PACKAGE(GLUT) @@ -207,11 +218,18 @@ # Now it is a cache variable you can edit in cmakesetup --TKS # IF( NOT Boost_root_suffix ) - SET( Boost_root_suffix _1_39_0 CACHE STRING "suffix of boost root dir." FORCE ) + SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE ) ENDIF( NOT Boost_root_suffix ) IF(WIN32) - SET(Boost_USE_STATIC_LIBS ON) + IF(${HUGIN_SHARED}) + SET(Boost_USE_STATIC_LIBS OFF) + # ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) + # ADD_DEFINITIONS(-D_DLL) + ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB) + ELSE(${HUGIN_SHARED}) + SET(Boost_USE_STATIC_LIBS ON) + ENDIF(${HUGIN_SHARED}) # If BOOST_ROOT was defined in the environment, use it. if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") set(BOOST_ROOT $ENV{BOOST_ROOT}) @@ -272,7 +290,6 @@ # allow user to specify lib suffix set(LIB_SUFFIX "" CACHE STRING "Define suffix of lib directory name (32/64)" ) -set(HUGIN_SHARED "1" CACHE STRING "Build shared internal libraries" ) IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") MESSAGE("Building in Debug mode, resulting programs will be SLOW") @@ -327,9 +344,14 @@ MESSAGE("-- Using shared internal libraries") ELSE (UNIX) - # no shared libs DLL on windows. The code is just - # not set up for that.. - ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) + IF (${HUGIN_SHARED}) + ADD_DEFINITIONS(-DVIGRA_DLL) + ADD_DEFINITIONS(-DOPENEXR_DLL) + ADD_DEFINITIONS(-DHugin_shared) + SET(HUGIN_SHARED_LIBS 1) + ELSE(${HUGIN_SHARED}) + ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) + ENDIF(${HUGIN_SHARED}) # Windows installer packaging related stuff # unfortunately, CMake/CPack does not support Warsetup directly. @@ -351,6 +373,7 @@ # "Linking to lib file: libboost_thread-vc90-mt-s-1_37.lib" # This can be used to determine on which boost libraries Hugin depend on #ADD_DEFINITIONS(/DBOOST_LIB_DIAGNOSTIC) + IF(NOT ${HUGIN_SHARED}) # compile everything for the static C runtime FOREACH(TYPE C CXX) # makefiles use blank configuration @@ -374,6 +397,7 @@ "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" CACHE STRING "for MSVC" FORCE ) + ENDIF(NOT ${HUGIN_SHARED}) ENDIF(MSVC) ENDIF (UNIX) Modified: hugin/trunk/CMakeModules/FindExiv2.cmake =================================================================== --- hugin/trunk/CMakeModules/FindExiv2.cmake 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeModules/FindExiv2.cmake 2010-03-21 14:27:39 UTC (rev 5076) @@ -79,18 +79,32 @@ include(FindLibraryWithDebug) - find_library_with_debug(EXIV2_LIBRARIES - WIN32_DEBUG_POSTFIX d - NAMES exiv2 libexiv2 - PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib - ) + IF(${HUGIN_SHARED}) + find_library_with_debug(EXIV2_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES exiv2 libexiv2 + PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL + ) - find_library_with_debug(EXIV2EXPAT_LIBRARIES - WIN32_DEBUG_POSTFIX d - NAMES libexpat - PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib - ) + find_library_with_debug(EXIV2EXPAT_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES libexpat + PATHS ${SOURCE_BASE_DIR}/expat-2.0.1/win32/bin/Release + ) + ELSE(${HUGIN_SHARED}) + find_library_with_debug(EXIV2_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES exiv2 libexiv2 + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib + ) + find_library_with_debug(EXIV2EXPAT_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES libexpat + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib + ) + ENDIF(${HUGIN_SHARED}) + SET(EXIV2_LIBRARIES ${EXIV2_LIBRARIES} ${EXIV2EXPAT_LIBRARIES}) include(FindPackageHandleStandardArgs) Modified: hugin/trunk/CMakeModules/FindGLEW.cmake =================================================================== --- hugin/trunk/CMakeModules/FindGLEW.cmake 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeModules/FindGLEW.cmake 2010-03-21 14:27:39 UTC (rev 5076) @@ -6,7 +6,11 @@ IF(WIN32) FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS ${SOURCE_BASE_DIR}/glew/include) # for dynamic build, it's glew32.lib and the dll must be copied into hugin's bin folder + IF(${HUGIN_SHARED}) + SET(GLEW_LIBRARIES ${SOURCE_BASE_DIR}/glew/lib/glew32.lib) + ELSE(${HUGIN_SHARED}) SET(GLEW_LIBRARIES ${SOURCE_BASE_DIR}/glew/lib/glew32s.lib) + ENDIF(${HUGIN_SHARED}) ELSE(WIN32) FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS /usr/include /usr/local/include) FIND_LIBRARY(GLEW_LIBRARIES GLEW PATHS /usr/lib /usr/local/lib) Modified: hugin/trunk/CMakeModules/FindGLUT.cmake =================================================================== --- hugin/trunk/CMakeModules/FindGLUT.cmake 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeModules/FindGLUT.cmake 2010-03-21 14:27:39 UTC (rev 5076) @@ -17,6 +17,7 @@ ${GLUT_ROOT_PATH} ${GLUT_ROOT_PATH}/Release ${GLUT_ROOT_PATH}/lib + ${GLUT_ROOT_PATH}/VisualStudio2008/Release ) ELSE (WIN32) Modified: hugin/trunk/CMakeModules/FindJPEG.cmake =================================================================== --- hugin/trunk/CMakeModules/FindJPEG.cmake 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeModules/FindJPEG.cmake 2010-03-21 14:27:39 UTC (rev 5076) @@ -17,6 +17,7 @@ FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h /usr/local/include /usr/include + ${SOURCE_BASE_DIR}/jpeg-8 ${wxWidgets_ROOT_DIR}/src/jpeg ) @@ -25,7 +26,7 @@ find_library_with_debug(JPEG_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES jpeg libjpeg wxjpeg - PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/jpeg-8/Release ${SOURCE_BASE_DIR}/jpeg-8/lib ${wxWidgets_LIB_DIR} ) Modified: hugin/trunk/CMakeModules/FindPNG.cmake =================================================================== --- hugin/trunk/CMakeModules/FindPNG.cmake 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeModules/FindPNG.cmake 2010-03-21 14:27:39 UTC (rev 5076) @@ -24,13 +24,14 @@ FIND_PATH(PNG_INCLUDE_DIR png.h /usr/local/include /usr/include + ${SOURCE_BASE_DIR}/lpng140 ${wxWidgets_ROOT_DIR}/src/png ) find_library_with_debug(PNG_LIBRARIES WIN32_DEBUG_POSTFIX d - NAMES png libpng wxpng - PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} + NAMES png libpng libpng14 wxpng + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR} ) include(FindPackageHandleStandardArgs) Modified: hugin/trunk/CMakeModules/FindTIFF.cmake =================================================================== --- hugin/trunk/CMakeModules/FindTIFF.cmake 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeModules/FindTIFF.cmake 2010-03-21 14:27:39 UTC (rev 5076) @@ -17,6 +17,7 @@ FIND_PATH(TIFF_INCLUDE_DIR tiff.h /usr/local/include /usr/include + ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff ${SOURCE_BASE_DIR}/tiff-4.0.0alpha/libtiff ${wxWidgets_ROOT_DIR}/src/tiff @@ -24,14 +25,27 @@ include(FindLibraryWithDebug) -find_library_with_debug(TIFF_LIBRARIES - WIN32_DEBUG_POSTFIX d - NAMES tiff libtiff wxtiff - PATHS /usr/lib /usr/local/lib - ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff - ${SOURCE_BASE_DIR}/tiff-4.0.0alpha/libtiff - ${wxWidgets_LIB_DIR} -) +IF(WIN32 AND ${HUGIN_SHARED}) +# on windows the libtiff library contains a static lib libtiff +# and the import library libtiff_i for dynamic build + find_library(TIFF_LIBRARIES + NAMES libtiff_i + PATHS /usr/lib /usr/local/lib + ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff + ) +MESSAGE(STATUS "Searching dll ${TIFF_LIBRARIES}") +ELSE(WIN32 AND ${HUGIN_SHARED}) + find_library_with_debug(TIFF_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES tiff libtiff wxtiff + PATHS /usr/lib /usr/local/lib + ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff + ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff + ${SOURCE_BASE_DIR}/tiff-4.0.0alpha/libtiff + ${wxWidgets_LIB_DIR} + ) +MESSAGE(STATUS "Searching static ${TIFF_LIBRARIES}") +ENDIF(WIN32 AND ${HUGIN_SHARED}) include(FindPackageHandleStandardArgs) Modified: hugin/trunk/CMakeModules/FindZLIB.cmake =================================================================== --- hugin/trunk/CMakeModules/FindZLIB.cmake 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeModules/FindZLIB.cmake 2010-03-21 14:27:39 UTC (rev 5076) @@ -23,6 +23,7 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h /usr/local/include /usr/include + ${SOURCE_BASE_DIR}/zlib ${wxWidgets_ROOT_DIR}/src/zlib ) @@ -30,8 +31,8 @@ find_library_with_debug(ZLIB_LIBRARIES WIN32_DEBUG_POSTFIX d - NAMES z zlib wxzlib - PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} + NAMES z zlib zlib1 wxzlib + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/zlib ${wxWidgets_LIB_DIR} ) Modified: hugin/trunk/CMakeModules/win_bundle.cmake =================================================================== --- hugin/trunk/CMakeModules/win_bundle.cmake 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/CMakeModules/win_bundle.cmake 2010-03-21 14:27:39 UTC (rev 5076) @@ -20,10 +20,17 @@ ${SOURCE_BASE_DIR}/libpano/tools "${SOURCE_BASE_DIR}/libpano/pano13/tools/Release CMD/Win32" ${SOURCE_BASE_DIR}/libpano/tools/Release + ${SOURCE_BASE_DIR}/libpano13/bin DOC "Location of pano13 executables" NO_DEFAULT_PATH) FILE(GLOB PANO13_EXECUTABLES ${PANO13_EXE_DIR}/*.exe) INSTALL(FILES ${PANO13_EXECUTABLES} DESTINATION ${BINDIR}) + IF(${HUGIN_SHARED}) + FIND_FILE(PANO13_DLL pano13.dll + PATHS ${SOURCE_BASE_DIR}/libpano13/lib + ) + INSTALL(FILES ${PANO13_DLL} DESTINATION ${BINDIR}) + ENDIF(${HUGIN_SHARED}) # TODO: install documentation for panotools? FIND_PATH(PANO13_SRC_DIR filter.h @@ -112,5 +119,64 @@ FILE(GLOB AP_SIFT_MAN ${AP_SIFT_DIR}/share/man/man*/*) INSTALL(FILES ${AP_SIFT_MAN} DESTINATION doc/autopano-sift-C) + # now install all necessary DLL + IF(${HUGIN_SHARED}) + FIND_FILE(TIFF_DLL + NAMES libtiff.dll + PATHS ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff + ) + FIND_FILE(JPEG_DLL + NAMES jpeg.dll + PATHS ${SOURCE_BASE_DIR}/jpeg-8/Release + ) + FIND_FILE(PNG_DLL + NAMES libpng14.dll + PATHS ${SOURCE_BASE_DIR}/lpng140/lib + ) + FIND_FILE(ZLIB_DLL + NAMES zlib1.dll + PATHS ${SOURCE_BASE_DIR}/zlib + NO_SYSTEM_ENVIRONMENT_PATH + ) + FIND_PATH(OPENEXR_BIN_DIR Half.dll + ${SOURCE_BASE_DIR}/Deploy/bin/Release + DOC "Location of OpenEXR libraries" + NO_DEFAULT_PATH + ) + FILE(GLOB OPENEXR_DLL ${OPENEXR_BIN_DIR}/*.dll) + FILE(GLOB BOOST_THREAD_DLL ${Boost_LIBRARY_DIRS}/boost_thread*.dll) + FIND_FILE(EXIV2_DLL + NAMES exiv2.dll + PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL + ) + FIND_FILE(LIBEXPAT_DLL + NAMES libexpat.dll + PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL + ) + FIND_FILE(GLEW_DLL + NAMES glew32.dll + PATHS ${SOURCE_BASE_DIR}/glew/bin + ) + FIND_FILE(GLUT_DLL + NAMES glut.dll freeglut.dll + PATHS ${SOURCE_BASE_DIR}/freeglut-2.6.0/VisualStudio2008/Release ${SOURCE_BASE_DIR}/glut/Release + ) + # hand tuned dll, so that only necesarry dll are install and not all wxWidgets DLL to save space + FIND_FILE(WXWIDGETS_DLL1 NAMES wxbase28u_vc_custom.dll PATHS ${wxWidgets_LIB_DIR}) + FIND_FILE(WXWIDGETS_DLL2 NAMES wxmsw28u_core_vc_custom.dll PATHS ${wxWidgets_LIB_DIR}) + FIND_FILE(WXWIDGETS_DLL3 NAMES wxmsw28u_xrc_vc_custom.dll PATHS ${wxWidgets_LIB_DIR}) + FIND_FILE(WXWIDGETS_DLL4 NAMES wxmsw28u_adv_vc_custom.dll PATHS ${wxWidgets_LIB_DIR}) + FIND_FILE(WXWIDGETS_DLL5 NAMES wxmsw28u_gl_vc_custom.dll PATHS ${wxWidgets_LIB_DIR}) + FIND_FILE(WXWIDGETS_DLL6 NAMES wxmsw28u_html_vc_custom.dll PATHS ${wxWidgets_LIB_DIR}) + FIND_FILE(WXWIDGETS_DLL7 NAMES wxbase28u_xml_vc_custom.dll PATHS ${wxWidgets_LIB_DIR}) + + INSTALL(FILES ${TIFF_DLL} ${JPEG_DLL} ${PNG_DLL} ${ZLIB_DLL} ${OPENEXR_DLL} + ${BOOST_THREAD_DLL} ${EXIV2_DLL} ${LIBEXPAT_DLL} ${GLEW_DLL} ${GLUT_DLL} + ${WXWIDGETS_DLL1} ${WXWIDGETS_DLL2} ${WXWIDGETS_DLL2} ${WXWIDGETS_DLL3} + ${WXWIDGETS_DLL3} ${WXWIDGETS_DLL4} ${WXWIDGETS_DLL5} ${WXWIDGETS_DLL6} + ${WXWIDGETS_DLL7} + DESTINATION ${BINDIR} + ) + ENDIF(${HUGIN_SHARED}) ENDIF(WIN32) Modified: hugin/trunk/src/celeste/CMakeLists.txt =================================================================== --- hugin/trunk/src/celeste/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/celeste/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076) @@ -74,7 +74,11 @@ ADD_LIBRARY(celeste SHARED ${CELESTE_SRC}) TARGET_LINK_LIBRARIES(celeste huginbasewx ${common_libs}) set_target_properties(celeste PROPERTIES VERSION ${HUGIN_LIB_VERSION}) - install(TARGETS celeste DESTINATION ${LIBDIR}) + IF(WIN32) + install(TARGETS celeste RUNTIME DESTINATION ${BINDIR}) + ELSE(WIN32) + install(TARGETS celeste DESTINATION ${LIBDIR}) + ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) # messages are quite obtrusive in windows cmakesetup.exe IF (NOT WIN32) Modified: hugin/trunk/src/celeste/Celeste.cpp =================================================================== --- hugin/trunk/src/celeste/Celeste.cpp 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/celeste/Celeste.cpp 2010-03-21 14:27:39 UTC (rev 5076) @@ -31,6 +31,7 @@ #include "Gabor.h" #include "Utilities.h" #include "CelesteGlobals.h" +#include "Celeste.h" #include "svm.h" #include <stdio.h> Modified: hugin/trunk/src/celeste/Celeste.h =================================================================== --- hugin/trunk/src/celeste/Celeste.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/celeste/Celeste.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -22,13 +22,14 @@ #ifndef __CELESTE__ #define __CELESTE__ +#include <hugin_shared.h> #include "svm.h" #include <string> #include <vector> using namespace std; -void get_gabor_response(string&,unsigned int&,string&,double&,string&,vector<double>&); +IMPEX void get_gabor_response(string&,unsigned int&,string&,double&,string&,vector<double>&); #endif Modified: hugin/trunk/src/celeste/CelesteGlobals.h =================================================================== --- hugin/trunk/src/celeste/CelesteGlobals.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/celeste/CelesteGlobals.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -21,19 +21,20 @@ #ifndef GLOBALS_H #define GLOBALS_H +#include <hugin_shared.h> extern bool kSaveFilter; extern bool kVerbosity; -extern int gRadius; -extern float gS; -extern int gA; -extern int gF; -extern float gL; -extern float gU; -extern int gNumLocs; -extern int **gLocations; -extern int spacing; -extern int resize_dimension; +extern IMPEX int gRadius; +extern IMPEX float gS; +extern IMPEX int gA; +extern IMPEX int gF; +extern IMPEX float gL; +extern IMPEX float gU; +extern IMPEX int gNumLocs; +extern IMPEX int **gLocations; +extern IMPEX int spacing; +extern IMPEX int resize_dimension; #endif Modified: hugin/trunk/src/celeste/Utilities.h =================================================================== --- hugin/trunk/src/celeste/Utilities.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/celeste/Utilities.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -28,6 +28,7 @@ #ifndef __UTILITIES__ #define __UTILITIES__ +#include <hugin_shared.h> #include <fstream> #include <iostream> #include <stdio.h> @@ -41,39 +42,39 @@ kRight }; -void Permute( int* array, size_t size ); -int cmp(const void *s1, const void *s2); // for qsort() function +IMPEX void Permute( int* array, size_t size ); +IMPEX int cmp(const void *s1, const void *s2); // for qsort() function -float Heavyside( float a ); +IMPEX float Heavyside( float a ); -float Sigmoid( float act ); -float Sigmoid( float beta, float a_pot ); -float Sigmoid( float beta, float a_pot, float thresh ); +IMPEX float Sigmoid( float act ); +IMPEX float Sigmoid( float beta, float a_pot ); +IMPEX float Sigmoid( float beta, float a_pot, float thresh ); -int **CreateMatrix( int val, int row, int col ); -void ResetMatrix( int ** matrix, int val, int row, int col ); -void DisposeMatrix( int** matrix, int row ); +IMPEX int **CreateMatrix( int val, int row, int col ); +IMPEX void ResetMatrix( int ** matrix, int val, int row, int col ); +IMPEX void DisposeMatrix( int** matrix, int row ); -float **CreateMatrix( float val, int row, int col ); -void ResetMatrix( float ** matrix, float val, int row, int col ); -void DisposeMatrix( float** matrix, int row ); +IMPEX float **CreateMatrix( float val, int row, int col ); +IMPEX void ResetMatrix( float ** matrix, float val, int row, int col ); +IMPEX void DisposeMatrix( float** matrix, int row ); -float ReturnDistance( float *pat1, float *pat2, int size ); +IMPEX float ReturnDistance( float *pat1, float *pat2, int size ); -void GetStreamDefaults( void ); -void AdjustStream( ostream &os, int precision, int width, int pos, bool trailers ); -void SetStreamDefaults( ostream &os ); +IMPEX void GetStreamDefaults( void ); +IMPEX void AdjustStream( ostream &os, int precision, int width, int pos, bool trailers ); +IMPEX void SetStreamDefaults( ostream &os ); -void SkipComments( ifstream* infile ); -void FileCreateError( char* filename ); -void FileOpenError( char* filename ); +IMPEX void SkipComments( ifstream* infile ); +IMPEX void FileCreateError( char* filename ); +IMPEX void FileOpenError( char* filename ); -double SafeAbs( double val1, double val2 ); -float SafeAbs( float val1, float val2 ); -int SafeAbs( int val1, int val2 ); -double SafeAbs( double val ); -float SafeAbs( float val ); -int SafeAbs( int val ); +IMPEX double SafeAbs( double val1, double val2 ); +IMPEX float SafeAbs( float val1, float val2 ); +IMPEX int SafeAbs( int val1, int val2 ); +IMPEX double SafeAbs( double val ); +IMPEX float SafeAbs( float val ); +IMPEX int SafeAbs( int val ); #endif Modified: hugin/trunk/src/foreign/ANN/ANN.h =================================================================== --- hugin/trunk/src/foreign/ANN/ANN.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/foreign/ANN/ANN.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -58,8 +58,8 @@ #define ANN_H // dangelo: only DLL if set to SHARED CMakeLists.txt file -#if WIN32 -#if huginANN_EXPORTS +#if WIN32 && defined Hugin_shared +#ifdef huginANN_EXPORTS //---------------------------------------------------------------------- // For Microsoft Visual C++, externally accessible symbols must be // explicitly indicated with DLL_API, which is somewhat like "extern." @@ -74,18 +74,14 @@ // this macro as being exported. //---------------------------------------------------------------------- - #ifdef DLL_EXPORTS - #define DLL_API __declspec(dllexport) - #else - #define DLL_API __declspec(dllimport) - #endif + #define DLL_API __declspec(dllexport) #else - #define DLL_API + #define DLL_API __declspec(dllimport) #endif +#else //---------------------------------------------------------------------- // DLL_API is ignored for all other systems //---------------------------------------------------------------------- -#else #define DLL_API #endif Modified: hugin/trunk/src/foreign/ANN/CMakeLists.txt =================================================================== --- hugin/trunk/src/foreign/ANN/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/foreign/ANN/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076) @@ -12,7 +12,11 @@ IF (${HUGIN_SHARED_LIBS}) add_library(huginANN SHARED ${ANN_SRC} ${ANN_HEADERS}) set_target_properties(huginANN PROPERTIES VERSION ${HUGIN_LIB_VERSION}) - install(TARGETS huginANN DESTINATION ${LIBDIR}) + IF(WIN32) + install(TARGETS huginANN RUNTIME DESTINATION ${BINDIR}) + ELSE(WIN32) + install(TARGETS huginANN DESTINATION ${LIBDIR}) + ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) add_library(huginANN STATIC ${ANN_SRC} ${ANN_HEADERS}) ENDIF (${HUGIN_SHARED_LIBS}) Modified: hugin/trunk/src/foreign/vigra/vigra/config.hxx =================================================================== --- hugin/trunk/src/foreign/vigra/vigra/config.hxx 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/foreign/vigra/vigra/config.hxx 2010-03-21 14:27:39 UTC (rev 5076) @@ -104,7 +104,11 @@ #define VIGRA_NEED_BIN_STREAMS #ifdef VIGRA_DLL - #define VIGRA_EXPORT __declspec(dllexport) + #ifdef huginvigraimpex_EXPORTS + #define VIGRA_EXPORT __declspec(dllexport) + #else + #define VIGRA_EXPORT __declspec(dllimport) + #endif #elif defined(VIGRA_STATIC_LIB) #define VIGRA_EXPORT #else Modified: hugin/trunk/src/foreign/vigra/vigra/diff2d.hxx =================================================================== --- hugin/trunk/src/foreign/vigra/vigra/diff2d.hxx 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/foreign/vigra/vigra/diff2d.hxx 2010-03-21 14:27:39 UTC (rev 5076) @@ -182,7 +182,7 @@ <b>\#include</b> "<a href="diff2d_8hxx-source.html">vigra/utilities.hxx</a>"<br> Namespace: vigra */ -class Diff2D +class VIGRA_EXPORT Diff2D { public: /** The iterator's value type: a coordinate. @@ -480,7 +480,7 @@ <b>\#include</b> "<a href="diff2d_8hxx-source.html">vigra/utilities.hxx</a>"<br> Namespace: vigra */ -class Size2D : public Diff2D +class VIGRA_EXPORT Size2D : public Diff2D { public: /** Default Constructor. Init point at position (0,0) @@ -590,7 +590,7 @@ <b>\#include</b> "<a href="diff2d_8hxx-source.html">vigra/utilities.hxx</a>"<br> Namespace: vigra */ -class Point2D : public Diff2D +class VIGRA_EXPORT Point2D : public Diff2D { public: /** The iterator's value type: a coordinate. @@ -870,7 +870,7 @@ <b>\#include</b> "<a href="diff2d_8hxx-source.html">vigra/utilities.hxx</a>"<br> Namespace: vigra */ -class Rect2D +class VIGRA_EXPORT Rect2D { Point2D upperLeft_, lowerRight_; Modified: hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt =================================================================== --- hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076) @@ -8,7 +8,11 @@ IF (${HUGIN_SHARED_LIBS}) add_library(huginvigraimpex SHARED ${VIGRA_IMPEX_SRC} ${VIGRA_IMPEX_HEADER}) set_target_properties(huginvigraimpex PROPERTIES VERSION ${HUGIN_LIB_VERSION}) - install(TARGETS huginvigraimpex DESTINATION ${LIBDIR}) + IF(WIN32) + install(TARGETS huginvigraimpex RUNTIME DESTINATION ${BINDIR}) + ELSE(WIN32) + install(TARGETS huginvigraimpex DESTINATION ${LIBDIR}) + ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC} ${VIGRA_IMPEX_HEADER}) ENDIF (${HUGIN_SHARED_LIBS}) Modified: hugin/trunk/src/hugin1/base_wx/CMakeLists.txt =================================================================== --- hugin/trunk/src/hugin1/base_wx/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076) @@ -7,11 +7,16 @@ RunStitchPanel.h ) -IF ($HUGIN_SHARED_LIBS) +IF (${HUGIN_SHARED_LIBS}) add_library(huginbasewx SHARED ${HUGIN_WX_BASE_SRC} ${HUGIN_WX_BASE_HEADER}) - set_target_properties(huginbasewx VERSION ${HUGIN_LIB_VERSION}) - install(TARGETS huginbasewx DESTINATION ${LIBDIR}) -ELSE ($HUGIN_SHARED_LIBS) + target_link_libraries(huginbasewx ${wxWidgets_LIBRARIES} huginbase ${common_libs}) + set_target_properties(huginbasewx PROPERTIES VERSION ${HUGIN_LIB_VERSION}) + IF(WIN32) + install(TARGETS huginbasewx RUNTIME DESTINATION ${BINDIR}) + ELSE(WIN32) + install(TARGETS huginbasewx DESTINATION ${LIBDIR}) + ENDIF(WIN32) +ELSE (${HUGIN_SHARED_LIBS}) add_library(huginbasewx STATIC ${HUGIN_WX_BASE_SRC} ${HUGIN_WX_BASE_HEADER}) -ENDIF ($HUGIN_SHARED_LIBS) +ENDIF (${HUGIN_SHARED_LIBS}) Modified: hugin/trunk/src/hugin1/base_wx/ImageCache.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/ImageCache.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/ImageCache.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -24,6 +24,7 @@ #ifndef _IMAGECACHE_H #define _IMAGECACHE_H +#include <hugin_shared.h> #include <map> #include <panoinc_WX.h> #include <PT/RemappedPanoImage.h> @@ -43,7 +44,7 @@ using HuginBase::ImageCache; using HuginBase::SmallRemappedImageCache; -wxImage imageCacheEntry2wxImage(ImageCache::EntryPtr e); +WXIMPEX wxImage imageCacheEntry2wxImage(ImageCache::EntryPtr e); #else Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -27,11 +27,13 @@ #ifndef _MYEXTERNALCMDEXECDIALOG__H #define _MYEXTERNALCMDEXECDIALOG__H +#include <hugin_shared.h> + const int HUGIN_EXIT_CODE_CANCELLED = -255; class MyExternalCmdExecDialog; class HuginPipedProcess; -int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent, wxString title); +WXIMPEX int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent, wxString title); //#define HUGIN_EXEC_LISTBOX 1 Modified: hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -24,6 +24,7 @@ #ifndef _MYPROGRESSDIALOG_H #define _MYPROGRESSDIALOG_H +#include <hugin_shared.h> #include "panoinc.h" #include "panoinc_WX.h" @@ -31,7 +32,7 @@ -class ProgressReporterDialog : public utils::ProgressReporter, public wxProgressDialog +class WXIMPEX ProgressReporterDialog : public utils::ProgressReporter, public wxProgressDialog { public: ProgressReporterDialog(double maxProgress, const wxString& title, const wxString& message, @@ -65,7 +66,7 @@ * * Also allows cancellation */ -class MyProgressDialog : public wxProgressDialog, public utils::MultiProgressDisplay +class WXIMPEX MyProgressDialog : public wxProgressDialog, public utils::MultiProgressDisplay { public: /** ctor. Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2010-03-21 14:27:39 UTC (rev 5076) @@ -27,6 +27,7 @@ #include <config.h> #include "panoinc.h" #include "panoinc_WX.h" +#include "PTWXDlg.h" extern "C" { #include <pano13/filter.h> Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -24,8 +24,10 @@ #ifndef _PTWXDLG_H #define _PTWXDLG_H -void registerPTWXDlgFcn(wxWindow *parent=NULL); -void deregisterPTWXDlgFcn(); +#include <hugin_shared.h> +WXIMPEX void registerPTWXDlgFcn(wxWindow *parent=NULL); +WXIMPEX void deregisterPTWXDlgFcn(); + #endif // _PTWXDLG_H Modified: hugin/trunk/src/hugin1/base_wx/RunStitchPanel.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/RunStitchPanel.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/RunStitchPanel.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -27,6 +27,7 @@ #ifndef RUN_STITCH_FRAME_H #define RUN_STITCH_FRAME_H +#include <hugin_shared.h> #include <vector> #include <set> #include <functional> @@ -39,7 +40,7 @@ #include "MyExternalCmdExecDialog.h" -struct StitchProjectEntry +struct WXIMPEX StitchProjectEntry { StitchProjectEntry(wxString script, wxString output) : scriptFile(script), outputPrefix(output), finished(false), @@ -53,7 +54,7 @@ bool error; }; -class RunStitchPanel: public wxPanel +class WXIMPEX RunStitchPanel: public wxPanel { public: RunStitchPanel(wxWindow * parent); Modified: hugin/trunk/src/hugin1/base_wx/huginConfig.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/huginConfig.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/huginConfig.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -27,7 +27,7 @@ #ifndef _Hgn1_huginConfig_H #define _Hgn1_huginConfig_H - +#include <hugin_shared.h> #include <panoinc_WX.h> #include "PT/Panorama.h" @@ -37,7 +37,7 @@ struct PTPrograms : public HuginBase::PanoramaMakefileExport::PTPrograms {}; } -PT::PTPrograms getPTProgramsConfig(wxString huginRoot, wxConfigBase * config); +WXIMPEX PT::PTPrograms getPTProgramsConfig(wxString huginRoot, wxConfigBase * config); /** get the path to the directory where the currently running executable is * stored. @@ -46,8 +46,8 @@ * Unix. * */ -wxString getExePath(wxString argv0); +WXIMPEX wxString getExePath(wxString argv0); -void updateHuginConfig(wxConfigBase * config); +WXIMPEX void updateHuginConfig(wxConfigBase * config); #endif Modified: hugin/trunk/src/hugin1/base_wx/platform.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/platform.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/base_wx/platform.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -27,6 +27,7 @@ #ifndef HUGIN1_BASE_PLATFORM_H #define HUGIN1_BASE_PLATFORM_H +#include <hugin_shared.h> #include "panoinc_WX.h" #include <config.h> @@ -60,8 +61,8 @@ #endif //__WXMAC__ /** returns all invalid characters for the filename (mainly characters, which does not work with gnu make) */ -const wxString getInvalidCharacters(); +WXIMPEX const wxString getInvalidCharacters(); /** returns true, if the given strings contains invalid characters */ -bool containsInvalidCharacters(const wxString stringToTest); +WXIMPEX bool containsInvalidCharacters(const wxString stringToTest); #endif Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp 2010-03-21 14:27:39 UTC (rev 5076) @@ -31,7 +31,9 @@ #include <config.h> +#if !defined Hugin_shared || !defined _WINDOWS #define GLEW_STATIC +#endif #include <GL/glew.h> #include "panoinc_WX.h" Modified: hugin/trunk/src/hugin1/hugin/GLViewer.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/GLViewer.cpp 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/hugin/GLViewer.cpp 2010-03-21 14:27:39 UTC (rev 5076) @@ -25,7 +25,9 @@ #include "panoinc.h" #include <config.h> +#if !defined Hugin_shared || !defined _WINDOWS #define GLEW_STATIC +#endif #include <GL/glew.h> #include <base_wx/platform.h> #include <wx/settings.h> Modified: hugin/trunk/src/hugin1/hugin/MeshManager.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MeshManager.cpp 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/hugin/MeshManager.cpp 2010-03-21 14:27:39 UTC (rev 5076) @@ -22,7 +22,9 @@ #include <wx/wx.h> #include <wx/platform.h> +#if !defined Hugin_shared || !defined _WINDOWS #define GLEW_STATIC +#endif #include <GL/glew.h> #ifdef __WXMAC__ Modified: hugin/trunk/src/hugin1/hugin/PreviewDifferenceTool.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreviewDifferenceTool.cpp 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/hugin/PreviewDifferenceTool.cpp 2010-03-21 14:27:39 UTC (rev 5076) @@ -21,7 +21,9 @@ #include "PreviewDifferenceTool.h" #include <config.h> +#if !defined Hugin_shared || !defined _WINDOWS #define GLEW_STATIC +#endif #include <GL/glew.h> #include <wx/platform.h> #ifdef __WXMAC__ Modified: hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp 2010-03-21 14:27:39 UTC (rev 5076) @@ -32,7 +32,9 @@ #include <wx/platform.h> //multitexture feature requires glew on some systems +#if !defined Hugin_shared || !defined _WINDOWS #define GLEW_STATIC +#endif #include <GL/glew.h> #ifdef __WXMAC__ Modified: hugin/trunk/src/hugin1/hugin/TextureManager.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/TextureManager.cpp 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin1/hugin/TextureManager.cpp 2010-03-21 14:27:39 UTC (rev 5076) @@ -41,7 +41,9 @@ // The OpenGL Extension wrangler libray will find extensions and the latest // supported OpenGL version on all platforms. +#if !defined Hugin_shared || !defined _WINDOWS #define GLEW_STATIC +#endif #include <GL/glew.h> #include <wx/platform.h> Modified: hugin/trunk/src/hugin_base/CMakeLists.txt =================================================================== --- hugin/trunk/src/hugin_base/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076) @@ -65,6 +65,7 @@ SET(HUGIN_BASE_HEADER algorithm/PanoramaAlgorithm.h +algorithm/StitcherAlgorithm.h algorithms/nona/NonaFileStitcher.h algorithms/nona/NonaImageStitcher.h algorithms/basic/CalculateCPStatistics.h @@ -128,7 +129,11 @@ add_library(huginbase SHARED ${HUGIN_BASE_SRC} ${HUGIN_BASE_HEADER}) target_link_libraries(huginbase ${Boost_LIBRARIES}) set_target_properties(huginbase PROPERTIES VERSION ${HUGIN_LIB_VERSION}) - install(TARGETS huginbase DESTINATION ${LIBDIR}) + IF(WIN32) + install(TARGETS huginbase RUNTIME DESTINATION ${BINDIR}) + ELSE(WIN32) + install(TARGETS huginbase DESTINATION ${LIBDIR}) + ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) add_library(huginbase STATIC ${HUGIN_BASE_SRC} ${HUGIN_BASE_HEADER}) ENDIF (${HUGIN_SHARED_LIBS}) @@ -138,4 +143,4 @@ TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES} ${GLEW_LIBRARIES} - ${OPENGL_LIBRARIES}) + ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}) Modified: hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h =================================================================== --- hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -31,6 +31,7 @@ #ifndef _ALGORITHM_PANORAMAALGORITHM_H #define _ALGORITHM_PANORAMAALGORITHM_H +#include <hugin_shared.h> #include <appbase/ProgressDisplay.h> @@ -42,7 +43,7 @@ /** * */ - class PanoramaAlgorithm + class IMPEX PanoramaAlgorithm { protected: @@ -114,7 +115,7 @@ /** * */ - class TimeConsumingPanoramaAlgorithm : public PanoramaAlgorithm + class IMPEX TimeConsumingPanoramaAlgorithm : public PanoramaAlgorithm { protected: Modified: hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h =================================================================== --- hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -35,6 +35,7 @@ #include <algorithm/PanoramaAlgorithm.h> +#include <hugin_shared.h> #include <vigra/impex.hxx> #include <panodata/PanoramaData.h> @@ -43,7 +44,7 @@ /// Just a conceptual base class... - class StitcherAlgorithm : public TimeConsumingPanoramaAlgorithm + class IMPEX StitcherAlgorithm : public TimeConsumingPanoramaAlgorithm { public: @@ -82,7 +83,7 @@ /// stitch to file output - class ImageStitcherAlgorithm : public StitcherAlgorithm + class IMPEX ImageStitcherAlgorithm : public StitcherAlgorithm { public: @@ -111,7 +112,7 @@ /// stitch to file output - class FileOutputStitcherAlgorithm : public StitcherAlgorithm + class IMPEX FileOutputStitcherAlgorithm : public StitcherAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/basic/CalculateCPStatistics.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/basic/CalculateCPStatistics.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/basic/CalculateCPStatistics.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #ifndef _BASICALGORITHMS_CALCULATECPSTSTISTICS_H #define _BASICALGORITHMS_CALCULATECPSTSTISTICS_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> @@ -34,7 +35,7 @@ /// just some common implementation; probably not so useful -class CalculateCPStatistics : public PanoramaAlgorithm +class IMPEX CalculateCPStatistics : public PanoramaAlgorithm { protected: @@ -94,7 +95,7 @@ -class CalculateCPStatisticsError : public CalculateCPStatistics +class IMPEX CalculateCPStatisticsError : public CalculateCPStatistics { public: Modified: hugin/trunk/src/hugin_base/algorithms/basic/CalculateMeanExposure.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/basic/CalculateMeanExposure.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/basic/CalculateMeanExposure.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #ifndef _BASICALGORITHMS_CALCULATEMEANEXPOSURE_H #define _BASICALGORITHMS_CALCULATEMEANEXPOSURE_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> @@ -33,7 +34,7 @@ namespace HuginBase { -class CalculateMeanExposure : public PanoramaAlgorithm +class IMPEX CalculateMeanExposure : public PanoramaAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalROI.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalROI.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalROI.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #define _BASICALGORITHMS_CALCULATEOPTIMALROI_H +#include <hugin_shared.h> #include <panotools/PanoToolsInterface.h> #include <algorithm/PanoramaAlgorithm.h> @@ -36,7 +37,7 @@ namespace HuginBase { -class CalculateOptimalROI : public PanoramaAlgorithm +class IMPEX CalculateOptimalROI : public PanoramaAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalScale.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalScale.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalScale.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -27,6 +27,7 @@ #ifndef _BASICALGORITHMS_CALCULATEOPTIMALSCALE_H #define _BASICALGORITHMS_CALCULATEOPTIMALSCALE_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> #include <panodata/PanoramaData.h> @@ -36,7 +37,7 @@ namespace HuginBase { -class CalculateOptimalScale : public PanoramaAlgorithm +class IMPEX CalculateOptimalScale : public PanoramaAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/basic/RotatePanorama.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/basic/RotatePanorama.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/basic/RotatePanorama.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #ifndef _BASICALGORITHMS_ROTATEPANORAMA_H #define _BASICALGORITHMS_ROTATEPANORAMA_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> #include <panodata/PanoramaData.h> @@ -34,7 +35,7 @@ namespace HuginBase { -class RotatePanorama : public PanoramaAlgorithm +class IMPEX RotatePanorama : public PanoramaAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,13 +26,14 @@ #ifndef _BASICALGORITHMS_STRAIGHTENPANORAMA_H #define _BASICALGORITHMS_STRAIGHTENPANORAMA_H +#include <hugin_shared.h> #include <algorithms/basic/RotatePanorama.h> namespace HuginBase { -class StraightenPanorama : public RotatePanorama +class IMPEX StraightenPanorama : public RotatePanorama { public: Modified: hugin/trunk/src/hugin_base/algorithms/control_points/CleanCP.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/control_points/CleanCP.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/control_points/CleanCP.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -30,6 +30,7 @@ #ifndef _CLEANCP_H #define _CLEANCP_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> #include <panodata/Panorama.h> #include <algorithms/optimizer/PTOptimizer.h> @@ -41,12 +42,12 @@ @param pano panorama which should be used @param n determines, how big the deviation from mean should be to determine wrong control points, default 2.0 @return set which contains control points with error > mean+n*sigma */ -UIntSet getCPoutsideLimit_pair(Panorama pano, double n=2.0); +IMPEX UIntSet getCPoutsideLimit_pair(Panorama pano, double n=2.0); /** optimises the whole panorama and removes all control points with error > mean+n*sigma @param pano panorama which should be used @param n determines, how big the deviation from mean should be to determine wrong control points, default 2.0 @return set which contains control points with error > mean+n*sigma */ -UIntSet getCPoutsideLimit(Panorama pano, double n=2.0); +IMPEX UIntSet getCPoutsideLimit(Panorama pano, double n=2.0); } // namespace #endif // _H Modified: hugin/trunk/src/hugin_base/algorithms/nona/CalculateFOV.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/nona/CalculateFOV.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/nona/CalculateFOV.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #ifndef _BASICALGORITHMS_CALCULATECFOV_H #define _BASICALGORITHMS_CALCULATECFOV_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> #include <panodata/PanoramaData.h> @@ -34,7 +35,7 @@ namespace HuginBase { -class CalculateFOV : public PanoramaAlgorithm +class IMPEX CalculateFOV : public PanoramaAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/nona/CenterHorizontally.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/nona/CenterHorizontally.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/nona/CenterHorizontally.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #ifndef _CENTERHORIZONTALLY_H #define _CENTERHORIZONTALLY_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> @@ -33,7 +34,7 @@ namespace HuginBase { -class CenterHorizontally : public PanoramaAlgorithm +class IMPEX CenterHorizontally : public PanoramaAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/nona/ComputeImageROI.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/nona/ComputeImageROI.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/nona/ComputeImageROI.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #ifndef _COMPUTE_IMAGE_ROI_H #define _COMPUTE_IMAGE_ROI_H +#include <hugin_shared.h> #include <vigra/diff2d.hxx> #include <algorithm/PanoramaAlgorithm.h> #include <panodata/Panorama.h> @@ -35,9 +36,9 @@ namespace HuginBase { -vigra::Rect2D estimateOutputROI(const PanoramaData & pano, const PanoramaOptions & opts, unsigned i); +IMPEX vigra::Rect2D estimateOutputROI(const PanoramaData & pano, const PanoramaOptions & opts, unsigned i); -class ComputeImageROI : public PanoramaAlgorithm +class IMPEX ComputeImageROI : public PanoramaAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/nona/FitPanorama.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/nona/FitPanorama.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/nona/FitPanorama.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #ifndef _FITPANORAMA_H #define _FITPANORAMA_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> @@ -33,7 +34,7 @@ namespace HuginBase { -class CalculateFitPanorama : public PanoramaAlgorithm +class IMPEX CalculateFitPanorama : public PanoramaAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -31,6 +31,7 @@ #ifndef _NONAFILESTITCHER_H #define _NONAFILESTITCHER_H +#include <hugin_shared.h> #include <algorithm/StitcherAlgorithm.h> namespace HuginBase { @@ -39,7 +40,7 @@ /** This class will use the stitchPanorama function of nona. The filename * may be automatically modified preserving only the basename. */ - class NonaFileOutputStitcher : public FileOutputStitcherAlgorithm + class IMPEX NonaFileOutputStitcher : public FileOutputStitcherAlgorithm { public: Modified: hugin/trunk/src/hugin_base/algorithms/optimizer/ImageGraph.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/optimizer/ImageGraph.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/optimizer/ImageGraph.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -24,6 +24,8 @@ #ifndef _PANODATA_IMAGEGRAPH_H #define _PANODATA_IMAGEGRAPH_H +#include <hugin_shared.h> + #ifdef MAC_OS_X // In the case boost got error with macro "check()", uncomment following two lines. //#include <AssertMacros.h> @@ -57,9 +59,9 @@ * more control points * */ -void createCPGraph(const PanoramaData& pano, CPGraph & graph); +IMPEX void createCPGraph(const PanoramaData& pano, CPGraph & graph); -int findCPComponents(const CPGraph & graph, +IMPEX int findCPComponents(const CPGraph & graph, CPComponents & comp); Modified: hugin/trunk/src/hugin_base/algorithms/optimizer/PTOptimizer.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/optimizer/PTOptimizer.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/optimizer/PTOptimizer.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -30,6 +30,7 @@ #include <algorithm/PanoramaAlgorithm.h> +#include <hugin_shared.h> #include <set> #include <boost/graph/breadth_first_search.hpp> #include <panodata/PanoramaData.h> @@ -38,7 +39,7 @@ /// - class PTOptimizer : public PanoramaAlgorithm + class IMPEX PTOptimizer : public PanoramaAlgorithm { public: @@ -63,7 +64,7 @@ /// - class AutoOptimise : public PTOptimizer + class IMPEX AutoOptimise : public PTOptimizer { public: @@ -119,7 +120,7 @@ }; /// - class SmartOptimizerStub + class IMPEX SmartOptimizerStub { public: /// @@ -141,7 +142,7 @@ static OptimizeVector createOptVars(const PanoramaData& optPano, int mode, unsigned anchorImg=0); }; - class SmartOptimise : public PTOptimizer, protected SmartOptimizerStub + class IMPEX SmartOptimise : public PTOptimizer, protected SmartOptimizerStub { public: Modified: hugin/trunk/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -24,6 +24,7 @@ #ifndef _PHOTOMETRIC_OPTIMIZER_H_ #define _PHOTOMETRIC_OPTIMIZER_H_ +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> #include <algorithms/optimizer/PTOptimizer.h> @@ -35,7 +36,7 @@ namespace HuginBase { - class PhotometricOptimizer : public TimeConsumingPanoramaAlgorithm + class IMPEX PhotometricOptimizer : public TimeConsumingPanoramaAlgorithm { public: @@ -130,7 +131,7 @@ - class SmartPhotometricOptimizer : public PhotometricOptimizer, protected SmartOptimizerStub + class IMPEX SmartPhotometricOptimizer : public PhotometricOptimizer, protected SmartOptimizerStub { public: /// local optimize definition. Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -25,6 +25,7 @@ #ifndef _BASICALGORITHM_PANORAMAMAKEFILEEXPORT_H #define _BASICALGORITHM_PANORAMAMAKEFILEEXPORT_H +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> #include <panodata/PanoramaData.h> @@ -34,11 +35,11 @@ namespace HuginBase { /// -std::vector<UIntSet> getHDRStacks(const PanoramaData & pano, UIntSet allImgs); -std::vector<UIntSet> getExposureLayers(const PanoramaData & pano, UIntSet allImgs); -UIntSet getImagesinROI (const PanoramaData& pano, const UIntSet activeImages); +IMPEX std::vector<UIntSet> getHDRStacks(const PanoramaData & pano, UIntSet allImgs); +IMPEX std::vector<UIntSet> getExposureLayers(const PanoramaData & pano, UIntSet allImgs); +IMPEX UIntSet getImagesinROI (const PanoramaData& pano, const UIntSet activeImages); -class PanoramaMakefileExport : public PanoramaAlgorithm +class IMPEX PanoramaMakefileExport : public PanoramaAlgorithm { public: /// Modified: hugin/trunk/src/hugin_base/algorithms/point_sampler/PointSampler.h =================================================================== --- hugin/trunk/src/hugin_base/algorithms/point_sampler/PointSampler.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/algorithms/point_sampler/PointSampler.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -26,6 +26,7 @@ #include <ctime> +#include <hugin_shared.h> #include <algorithm/PanoramaAlgorithm.h> #include <boost/random.hpp> @@ -38,7 +39,7 @@ namespace HuginBase { - class PointSampler : public TimeConsumingPanoramaAlgorithm + class IMPEX PointSampler : public TimeConsumingPanoramaAlgorithm { protected: /// Modified: hugin/trunk/src/hugin_base/appbase/DocumentData.h =================================================================== --- hugin/trunk/src/hugin_base/appbase/DocumentData.h 2010-03-20 19:11:46 UTC (rev 5075) +++ hugin/trunk/src/hugin_base/appbase/DocumentData.h 2010-03-21 14:27:39 UTC (rev 5076) @@ -32,14 +32,14 @@ #define _APPBASE_DOCUMENTDATA_H #include <string> +#include <hugin_shared.h> - namespace AppBase { /** * */ -class DocumentData +class IMPEX DocumentData { public: Modified: hugin/trunk/src/hugin_base/appbase/ProgressDisplay.h =================================================================== --- hugin/trunk/src/hugin_base/appbase/ProgressDisplay.h 2010-03-20 19:11:46 UTC (rev 5075) +++ ... [truncated message content] |
From: <tm...@us...> - 2010-05-08 18:31:07
|
Revision: 5147 http://hugin.svn.sourceforge.net/hugin/?rev=5147&view=rev Author: tmodes Date: 2010-05-08 18:31:01 +0000 (Sat, 08 May 2010) Log Message: ----------- Update CMake for new versions of wxWidgets and exiv (Windows only) Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindExiv2.cmake hugin/trunk/CMakeModules/win_bundle.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-05-08 13:04:49 UTC (rev 5146) +++ hugin/trunk/CMakeLists.txt 2010-05-08 18:31:01 UTC (rev 5147) @@ -121,7 +121,11 @@ SET( SOURCE_BASE_DIR ${work} CACHE FILEPATH "parent dir of hugin source root" ) # wxWidgets - SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) + IF(NOT wxWidgets_ROOT_SUFFIX) + SET( wxWidgets_ROOT_SUFFIX 2.8.10 CACHE STRING "version of wxWidgets." FORCE ) + ENDIF(NOT wxWidgets_ROOT_SUFFIX) + + SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-${wxWidgets_ROOT_SUFFIX}) # GLEW moved to FildGLEW.cmake module # SET(GLEW_INCLUDE_DIR ${SOURCE_BASE_DIR}/glew/include) # for dynamic build, it's glew32.lib and the dll must be copied into hugin's bin folder Modified: hugin/trunk/CMakeModules/FindExiv2.cmake =================================================================== --- hugin/trunk/CMakeModules/FindExiv2.cmake 2010-05-08 13:04:49 UTC (rev 5146) +++ hugin/trunk/CMakeModules/FindExiv2.cmake 2010-05-08 18:31:01 UTC (rev 5147) @@ -71,6 +71,7 @@ /usr/local/include /usr/include ${SOURCE_BASE_DIR}/exiv2/msvc/include + ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/include ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/include ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/include ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/include @@ -83,7 +84,7 @@ find_library_with_debug(EXIV2_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES exiv2 libexiv2 - PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL + PATHS ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL ) find_library_with_debug(EXIV2EXPAT_LIBRARIES @@ -95,13 +96,13 @@ find_library_with_debug(EXIV2_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES exiv2 libexiv2 - PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ) find_library_with_debug(EXIV2EXPAT_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES libexpat - PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ) ENDIF(${HUGIN_SHARED}) Modified: hugin/trunk/CMakeModules/win_bundle.cmake =================================================================== --- hugin/trunk/CMakeModules/win_bundle.cmake 2010-05-08 13:04:49 UTC (rev 5146) +++ hugin/trunk/CMakeModules/win_bundle.cmake 2010-05-08 18:31:01 UTC (rev 5147) @@ -152,12 +152,12 @@ FILE(GLOB BOOST_THREAD_DLL ${Boost_LIBRARY_DIRS}/boost_thread*.dll) FIND_FILE(EXIV2_DLL NAMES exiv2.dll - PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL + PATHS ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL NO_SYSTEM_ENVIRONMENT_PATH ) FIND_FILE(LIBEXPAT_DLL NAMES libexpat.dll - PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL + PATHS ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL NO_SYSTEM_ENVIRONMENT_PATH ) FIND_FILE(GLEW_DLL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-05-13 09:01:34
|
Revision: 5152 http://hugin.svn.sourceforge.net/hugin/?rev=5152&view=rev Author: tmodes Date: 2010-05-13 09:01:25 +0000 (Thu, 13 May 2010) Log Message: ----------- Improved finding in cmake for Freeglut 2.6.0 and Exiv 0.19 under Windows Modified Paths: -------------- hugin/trunk/CMakeLists.txt hugin/trunk/CMakeModules/FindExiv2.cmake hugin/trunk/CMakeModules/FindGLUT.cmake Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-05-11 17:13:39 UTC (rev 5151) +++ hugin/trunk/CMakeLists.txt 2010-05-13 09:01:25 UTC (rev 5152) @@ -181,15 +181,6 @@ ## OpenGL and GLEW FIND_PACKAGE(OpenGL) -IF(WIN32) - IF(NOT GLUT_ROOT_PATH) - IF(${HUGIN_SHARED}) - SET(GLUT_ROOT_PATH ${SOURCE_BASE_DIR}/freeglut-2.6.0) - ELSE(${HUGIN_SHARED}) - SET(GLUT_ROOT_PATH ${SOURCE_BASE_DIR}/glut) - ENDIF(${HUGIN_SHARED}) - ENDIF(NOT GLUT_ROOT_PATH) -ENDIF(WIN32) FIND_PACKAGE(GLUT) FIND_PACKAGE(GLEW) IF(NOT OPENGL_FOUND) Modified: hugin/trunk/CMakeModules/FindExiv2.cmake =================================================================== --- hugin/trunk/CMakeModules/FindExiv2.cmake 2010-05-11 17:13:39 UTC (rev 5151) +++ hugin/trunk/CMakeModules/FindExiv2.cmake 2010-05-13 09:01:25 UTC (rev 5152) @@ -104,6 +104,17 @@ NAMES libexpat PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ) + + # since exiv 0.19, xmpsdk needs explicit linked in static build + find_library_with_debug(XMP_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES xmpsdk + PATHS ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib + ) + IF(XMP_LIBRARIES) + SET(EXIV2_LIBRARIES ${EXIV2_LIBRARIES} ${XMP_LIBRARIES}) + ENDIF(XMP_LIBRARIES) + ENDIF(${HUGIN_SHARED}) SET(EXIV2_LIBRARIES ${EXIV2_LIBRARIES} ${EXIV2EXPAT_LIBRARIES}) Modified: hugin/trunk/CMakeModules/FindGLUT.cmake =================================================================== --- hugin/trunk/CMakeModules/FindGLUT.cmake 2010-05-11 17:13:39 UTC (rev 5151) +++ hugin/trunk/CMakeModules/FindGLUT.cmake 2010-05-13 09:01:25 UTC (rev 5152) @@ -9,16 +9,22 @@ IF (WIN32) FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h - PATHS ${GLUT_ROOT_PATH} - ${GLUT_ROOT_PATH}/include ) - FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32 freeglut + PATHS ${SOURCE_BASE_DIR}/freeglut-2.6.0/include + ${SOURCE_BASE_DIR}/glut/include + ) + FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32 freeglut freeglut_static PATHS ${OPENGL_LIBRARY_DIR} - ${GLUT_ROOT_PATH} - ${GLUT_ROOT_PATH}/Release - ${GLUT_ROOT_PATH}/lib - ${GLUT_ROOT_PATH}/VisualStudio2008/Release + ${SOURCE_BASE_DIR}/glut/Release + ${SOURCE_BASE_DIR}/glut/lib + ${SOURCE_BASE_DIR}/glut/lib/Release + ${SOURCE_BASE_DIR}/freeglut-2.6.0/VisualStudio2008/Release + ${SOURCE_BASE_DIR}/freeglut-2.6.0/VisualStudio2008Static/Release ) + + IF(NOT ${HUGIN_SHARED}) + ADD_DEFINITIONS(-DFREEGLUT_STATIC) + ENDIF() ELSE (WIN32) IF (APPLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |