You can subscribe to this list here.
2005 |
Jan
(84) |
Feb
(83) |
Mar
(36) |
Apr
(15) |
May
(250) |
Jun
(81) |
Jul
(29) |
Aug
(62) |
Sep
(22) |
Oct
(13) |
Nov
(62) |
Dec
(30) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(67) |
Feb
(68) |
Mar
(149) |
Apr
(51) |
May
(8) |
Jun
(23) |
Jul
(87) |
Aug
(132) |
Sep
(9) |
Oct
(1) |
Nov
(22) |
Dec
(163) |
2007 |
Jan
(74) |
Feb
(71) |
Mar
(2) |
Apr
(121) |
May
(57) |
Jun
(168) |
Jul
(151) |
Aug
(73) |
Sep
(4) |
Oct
(91) |
Nov
(30) |
Dec
(38) |
2008 |
Jan
(178) |
Feb
(159) |
Mar
(49) |
Apr
(65) |
May
(43) |
Jun
(56) |
Jul
(99) |
Aug
(132) |
Sep
(71) |
Oct
(57) |
Nov
(42) |
Dec
(11) |
2009 |
Jan
(40) |
Feb
(74) |
Mar
(80) |
Apr
(45) |
May
(86) |
Jun
(76) |
Jul
(160) |
Aug
(170) |
Sep
(227) |
Oct
(161) |
Nov
(49) |
Dec
(108) |
2010 |
Jan
(108) |
Feb
(82) |
Mar
(62) |
Apr
(33) |
May
(60) |
Jun
(38) |
Jul
(46) |
Aug
(69) |
Sep
(157) |
Oct
(123) |
Nov
(130) |
Dec
(154) |
2011 |
Jan
(138) |
Feb
(112) |
Mar
(128) |
Apr
(4) |
May
(86) |
Jun
(81) |
Jul
(128) |
Aug
(98) |
Sep
(69) |
Oct
(32) |
Nov
(50) |
Dec
(41) |
2012 |
Jan
(10) |
Feb
(6) |
Mar
(17) |
Apr
(10) |
May
(67) |
Jun
(57) |
Jul
(41) |
Aug
(54) |
Sep
(17) |
Oct
(15) |
Nov
(34) |
Dec
(45) |
2013 |
Jan
(62) |
Feb
(47) |
Mar
(71) |
Apr
(25) |
May
(11) |
Jun
|
Jul
|
Aug
|
Sep
(57) |
Oct
|
Nov
(1) |
Dec
|
2014 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(3) |
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Douglas W. <dwi...@us...> - 2005-02-02 10:14:55
|
Update of /cvsroot/hugin/hugin/src/hugin/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21431/src/hugin/po Modified Files: de.po fr.po hugin.pot it.po pl.po Log Message: Update translations (new strings) Index: pl.po =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/pl.po,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- pl.po 1 Feb 2005 05:11:40 -0000 1.28 +++ pl.po 2 Feb 2005 10:14:35 -0000 1.29 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hugin 0.4\n" "Report-Msgid-Bugs-To: pab...@we...\n" -"POT-Creation-Date: 2005-01-30 20:52+0200\n" +"POT-Creation-Date: 2005-02-02 08:07+0200\n" "PO-Revision-Date: 2005-01-31 08:09+0100\n" "Last-Translator: Pablo d'Angelo <pab...@we...>\n" "Language-Team: Polish <pl...@li...>\n" @@ -26,11 +26,13 @@ #: src/hugin/AutoCtrlPointCreator.cpp:102 [...1611 lines suppressed...] @@ -2664,8 +2621,12 @@ msgstr "¦rednia (1)" #: src/hugin/xrc/ptstitcher_panel.xrs:27 -msgid "approximate remapping, faster but slightly less accurate. Fast should work well with usual panos, Medium even with morphed panos" -msgstr "remapowanie przybli¿one, szybsze, ale nieco mniej dok³adne. Szybkie powinno dzia³aæ dobrze z normalnymi panoramami, ¦rednie nawet z morfowanymi" +msgid "" +"approximate remapping, faster but slightly less accurate. Fast should work " +"well with usual panos, Medium even with morphed panos" +msgstr "" +"remapowanie przybli¿one, szybsze, ale nieco mniej dok³adne. Szybkie powinno " +"dzia³aæ dobrze z normalnymi panoramami, ¦rednie nawet z morfowanymi" #: src/hugin/xrc/ptstitcher_panel.xrs:34 msgid "Multiple TIFF with masks" @@ -2726,4 +2687,3 @@ #: src/hugin/xrc/run_stitcher_frame.xrs:3 msgid "Abort" msgstr "Anuluj" - Index: it.po =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/it.po,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- it.po 1 Feb 2005 05:11:40 -0000 1.18 +++ it.po 2 Feb 2005 10:14:35 -0000 1.19 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hugin 0.4\n" "Report-Msgid-Bugs-To: pab...@we...\n" -"POT-Creation-Date: 2005-01-30 20:52+0200\n" +"POT-Creation-Date: 2005-02-02 08:07+0200\n" "PO-Revision-Date: 2005-01-31 08:08+0100\n" "Last-Translator: Pablo d'Angelo <pab...@we...>\n" "Language-Team: Italian <tp...@li...>\n" @@ -46,12 +46,9 @@ msgid "Select autopano program / frontend script" msgstr "" [...1493 lines suppressed...] +#: src/hugin/xrc/preview_frame.xrs:20 src/hugin/xrc/ptstitcher_panel.xrs:14 #: src/hugin/xrc/ptstitcher_panel.xrs:24 msgid "None" msgstr "" @@ -2549,7 +2470,9 @@ msgstr "" #: src/hugin/xrc/ptstitcher_panel.xrs:27 -msgid "approximate remapping, faster but slightly less accurate. Fast should work well with usual panos, Medium even with morphed panos" +msgid "" +"approximate remapping, faster but slightly less accurate. Fast should work " +"well with usual panos, Medium even with morphed panos" msgstr "" #: src/hugin/xrc/ptstitcher_panel.xrs:34 @@ -2611,4 +2534,3 @@ #: src/hugin/xrc/run_stitcher_frame.xrs:3 msgid "Abort" msgstr "" - Index: de.po =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/de.po,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- de.po 1 Feb 2005 05:11:39 -0000 1.61 +++ de.po 2 Feb 2005 10:14:33 -0000 1.62 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pab...@we...\n" -"POT-Creation-Date: 2005-01-30 20:52+0200\n" +"POT-Creation-Date: 2005-02-02 08:07+0200\n" "PO-Revision-Date: 2005-01-31 08:08+0100\n" "Last-Translator: Pablo d'Angelo <pab...@we...>\n" "Language-Team: deutsch <de...@li...>\n" @@ -52,12 +52,9 @@ msgid "Select autopano program / frontend script" msgstr "Wählen sie das Autopano Programm / Oberflächenskript" [...1645 lines suppressed...] @@ -2680,8 +2639,12 @@ msgstr "Medium (1)" #: src/hugin/xrc/ptstitcher_panel.xrs:27 -msgid "approximate remapping, faster but slightly less accurate. Fast should work well with usual panos, Medium even with morphed panos" -msgstr "Neuzusammensetzen einschätzen. Schneller, aber weniger genau. Schneller müßte für normale Panoramen funktionieren, Medium für verzerrten Panoramen." +msgid "" +"approximate remapping, faster but slightly less accurate. Fast should work " +"well with usual panos, Medium even with morphed panos" +msgstr "" +"Neuzusammensetzen einschätzen. Schneller, aber weniger genau. Schneller " +"müßte für normale Panoramen funktionieren, Medium für verzerrten Panoramen." #: src/hugin/xrc/ptstitcher_panel.xrs:34 msgid "Multiple TIFF with masks" @@ -2742,4 +2705,3 @@ #: src/hugin/xrc/run_stitcher_frame.xrs:3 msgid "Abort" msgstr "Abbrechen" - Index: fr.po =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/fr.po,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- fr.po 1 Feb 2005 05:11:40 -0000 1.25 +++ fr.po 2 Feb 2005 10:14:34 -0000 1.26 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: pab...@we...\n" -"POT-Creation-Date: 2005-01-30 20:52+0200\n" +"POT-Creation-Date: 2005-02-02 08:07+0200\n" "PO-Revision-Date: 2005-01-30 11:50+0100\n" "Last-Translator: \n" "Language-Team: <en...@li...>\n" @@ -50,9 +50,9 @@ msgid "Select autopano program / frontend script" msgstr "Choisir le programme autopano / script frontal" -#: src/hugin/AutoCtrlPointCreator.cpp:146 src/hugin/PreferencesDialog.cpp:160 -#: src/hugin/PreferencesDialog.cpp:176 src/hugin/PreferencesDialog.cpp:192 -#: src/hugin/PreferencesDialog.cpp:208 src/hugin/RunOptimizerFrame.cpp:108 +#: src/hugin/AutoCtrlPointCreator.cpp:146 src/hugin/PreferencesDialog.cpp:173 +#: src/hugin/PreferencesDialog.cpp:189 src/hugin/PreferencesDialog.cpp:205 +#: src/hugin/PreferencesDialog.cpp:221 src/hugin/RunOptimizerFrame.cpp:108 #: src/hugin/RunStitcherFrame.cpp:88 msgid "Executables (*.exe)|*.exe" msgstr "Exécutables (*.exe)|*.exe" @@ -177,7 +177,7 @@ msgid "autopano failure" msgstr "Échec d'autopano" -#: src/hugin/AutoCtrlPointCreator.cpp:319 src/hugin/PreferencesDialog.cpp:224 +#: src/hugin/AutoCtrlPointCreator.cpp:319 src/hugin/PreferencesDialog.cpp:237 msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd" msgstr "Exécutables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd" @@ -541,7 +541,7 @@ msgid "Adding Image" msgstr "Ajoute une image" -#: src/hugin/MainFrame.cpp:236 +#: src/hugin/MainFrame.cpp:247 msgid "" "Fatal installation error\n" "The xrc directory was not found.\n" @@ -551,11 +551,11 @@ "Répertoire xrc introuvable.\n" "Veuillez vous assurer qu'il se trouve dans le même répertoire que hugin.exe" -#: src/hugin/MainFrame.cpp:331 +#: src/hugin/MainFrame.cpp:342 msgid "Started" msgstr "Lancé" -#: src/hugin/MainFrame.cpp:427 +#: src/hugin/MainFrame.cpp:438 msgid "" "The panorama has been changed\n" "Save changes?" @@ -563,52 +563,52 @@ "Le panorama a été modifié\n" "Enregistrer les modifications ?" -#: src/hugin/MainFrame.cpp:427 +#: src/hugin/MainFrame.cpp:438 msgid "Save Panorama?" msgstr "Enregistrer le panorama ?" -#: src/hugin/MainFrame.cpp:442 +#: src/hugin/MainFrame.cpp:453 msgid "forced close" msgstr "Fermeture forcée" -#: src/hugin/MainFrame.cpp:474 +#: src/hugin/MainFrame.cpp:485 #, c-format msgid "saved project %s" msgstr "Projet %s enregistré" -#: src/hugin/MainFrame.cpp:483 +#: src/hugin/MainFrame.cpp:494 msgid "Save project file" msgstr "Enregistrer le fichier de projet" -#: src/hugin/MainFrame.cpp:485 +#: src/hugin/MainFrame.cpp:496 msgid "Project files (*.pto)|*.pto|All files (*.*)|*.*" msgstr "Fichiers de projets (*.pto)|*.pto|Tous les fichiers (*.*)|*.*" -#: src/hugin/MainFrame.cpp:498 +#: src/hugin/MainFrame.cpp:509 msgid "Save PTStitcher script file" msgstr "Enregistrer le fichier script PTStitcher" -#: src/hugin/MainFrame.cpp:500 +#: src/hugin/MainFrame.cpp:511 msgid "PTStitcher files (*.txt)|*.txt" msgstr "Fichiers PTStitcher (*.txt)|*.txt" -#: src/hugin/MainFrame.cpp:524 +#: src/hugin/MainFrame.cpp:535 msgid "Open project: " msgstr "Ouverture du projet : " -#: src/hugin/MainFrame.cpp:536 +#: src/hugin/MainFrame.cpp:547 msgid "Project opened" msgstr "Projet ouvert" -#: src/hugin/MainFrame.cpp:546 +#: src/hugin/MainFrame.cpp:557 msgid "Error opening project: " msgstr "Erreur lors de l'ouverture du projet : " -#: src/hugin/MainFrame.cpp:564 +#: src/hugin/MainFrame.cpp:575 msgid "Open project file" msgstr "Ouverture du fichier de projet" -#: src/hugin/MainFrame.cpp:566 +#: src/hugin/MainFrame.cpp:577 msgid "" "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files " "(*.*)|*.*" @@ -616,11 +616,11 @@ "Fichiers de Projet (*.pto,*.ptp,*.pts,*oto)|*.pto;*ptp;*.pts;*.oto;|Tous les " "fichiers (*.*)|*.*" -#: src/hugin/MainFrame.cpp:574 +#: src/hugin/MainFrame.cpp:585 msgid "Open project: cancel" msgstr "Ouverture du projet : abandon" -#: src/hugin/MainFrame.cpp:596 src/include/hugin/wxPanoCommand.h:141 +#: src/hugin/MainFrame.cpp:607 src/include/hugin/wxPanoCommand.h:141 msgid "" "Image files (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image files " "(*.tif)|*.tif;*.TIF|All files (*.*)|*.*" @@ -628,27 +628,27 @@ "Fichiers image (*.jpg)|*.jpg;*.JPG|Fichiers image (*.png);*.png;*.PNG|" "Fichiers image (*.tif)|*.tif;*.TIF|Tous les fichiers (*.*)|*.*" -#: src/hugin/MainFrame.cpp:597 src/include/hugin/wxPanoCommand.h:142 +#: src/hugin/MainFrame.cpp:608 src/include/hugin/wxPanoCommand.h:142 msgid "Add images" msgstr "Ajouter des images" -#: src/hugin/MainFrame.cpp:641 +#: src/hugin/MainFrame.cpp:652 msgid "Add Image: cancel" msgstr "Ajout d'images : abandon" -#: src/hugin/MainFrame.cpp:884 +#: src/hugin/MainFrame.cpp:941 msgid "hugin - FAQ" msgstr "Hugin - FAQ" -#: src/hugin/MainFrame.cpp:963 +#: src/hugin/MainFrame.cpp:1020 msgid "Fine-tuning all points" msgstr "Ajuster précisément tous les points" -#: src/hugin/MainFrame.cpp:965 +#: src/hugin/MainFrame.cpp:1022 msgid "Finetuning" msgstr "Ajustement précis" -#: src/hugin/MainFrame.cpp:1049 +#: src/hugin/MainFrame.cpp:1106 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -678,7 +678,7 @@ "Utiliser la liste des points de contrôle (F3) pour afficher tous les points " "du projet actuel.\n" -#: src/hugin/MainFrame.cpp:1051 +#: src/hugin/MainFrame.cpp:1108 msgid "Fine-tune result" msgstr "Résultat de l'ajustement précis" @@ -950,47 +950,70 @@ msgid "Create panorama image" msgstr "Créer une image panoramique" -#: src/hugin/PreferencesDialog.cpp:92 +#: src/hugin/PreferencesDialog.cpp:104 msgid "Select one" msgstr "Sélectionner" -#: src/hugin/PreferencesDialog.cpp:93 +#: src/hugin/PreferencesDialog.cpp:105 msgid "System default" msgstr "Langue par défaut du système" -#: src/hugin/PreferencesDialog.cpp:94 +#: src/hugin/PreferencesDialog.cpp:106 +#, fuzzy +msgid "English" +msgstr "Polonais" + +#: src/hugin/PreferencesDialog.cpp:107 msgid "German" msgstr "Allemand" -#: src/hugin/PreferencesDialog.cpp:95 +#: src/hugin/PreferencesDialog.cpp:108 msgid "French" msgstr "Français" -#: src/hugin/PreferencesDialog.cpp:96 +#: src/hugin/PreferencesDialog.cpp:109 msgid "Polish" msgstr "Polonais" -#: src/hugin/PreferencesDialog.cpp:97 +#: src/hugin/PreferencesDialog.cpp:110 msgid "Italian" msgstr "Italien" -#: src/hugin/PreferencesDialog.cpp:157 +#: src/hugin/PreferencesDialog.cpp:170 msgid "Select PTStitcher" msgstr "Sélectionner PTStitcher" -#: src/hugin/PreferencesDialog.cpp:173 src/hugin/RunOptimizerFrame.cpp:106 +#: src/hugin/PreferencesDialog.cpp:186 src/hugin/RunOptimizerFrame.cpp:106 msgid "Select PTOptimizer" msgstr "Sélectionner PTOptimizer" -#: src/hugin/PreferencesDialog.cpp:189 +#: src/hugin/PreferencesDialog.cpp:202 msgid "Select Enblend" msgstr "Sélectionner Enblend" -#: src/hugin/PreferencesDialog.cpp:205 src/hugin/PreferencesDialog.cpp:221 -#: src/hugin/xrc/pref_dialog.xrs:47 +#: src/hugin/PreferencesDialog.cpp:218 src/hugin/PreferencesDialog.cpp:234 +#: src/hugin/xrc/pref_dialog.xrs:48 msgid "Select Autopano" msgstr "Sélectionner Autopano" +#: src/hugin/PreferencesDialog.cpp:251 +#, fuzzy +msgid "Panotools details" +msgstr "Panotools" + +#: src/hugin/PreferencesDialog.cpp:290 +#, fuzzy +msgid "Could not load dll" +msgstr "Impossible d'ouvrir " + +#: src/hugin/PreferencesDialog.cpp:290 +msgid "panoinfo" +msgstr "" + +#: src/hugin/PreferencesDialog.cpp:521 +msgid "Unknown Version" +msgstr "" + #: src/hugin/PreviewFrame.cpp:74 msgid "Panorama preview" msgstr "Aperçu du panorama" @@ -1124,7 +1147,7 @@ msgstr "Stratégie %d, itération %d, distance moyenne %f" #: src/hugin/RunOptimizerFrame.cpp:293 src/hugin/xrc/edit_text.xrs:3 -#: src/hugin/xrc/pref_dialog.xrs:67 +#: src/hugin/xrc/pref_dialog.xrs:68 msgid "Cancel" msgstr "Abandonner" @@ -1397,7 +1420,7 @@ msgid "Close" msgstr "Fermer" -#: src/hugin/xrc/image_center.xrs:1 src/hugin/xrc/pref_dialog.xrs:66 +#: src/hugin/xrc/image_center.xrs:1 src/hugin/xrc/pref_dialog.xrs:67 #: src/hugin/xrc/run_optimizer_frame.xrs:2 msgid "Apply" msgstr "Appliquer" @@ -1959,7 +1982,7 @@ msgid "Preview panorama" msgstr "Aperçu du panorama" -#: src/hugin/xrc/main_tool.xrs:26 src/hugin/xrc/pref_dialog.xrs:44 +#: src/hugin/xrc/main_tool.xrs:26 src/hugin/xrc/pref_dialog.xrs:45 #: src/hugin/xrc/preview_frame.xrs:1 msgid "Preview" msgstr "Aperçu" @@ -2270,7 +2293,7 @@ msgid "Preferences - hugin" msgstr "Préférences - Hugin" -#: src/hugin/xrc/pref_dialog.xrs:2 +#: src/hugin/xrc/pref_dialog.xrs:2 src/hugin/xrc/pref_dialog.xrs:11 msgid "Panotools" msgstr "Panotools" @@ -2283,8 +2306,8 @@ msgstr "PTStitcher :" #: src/hugin/xrc/pref_dialog.xrs:5 src/hugin/xrc/pref_dialog.xrs:7 -#: src/hugin/xrc/pref_dialog.xrs:52 src/hugin/xrc/pref_dialog.xrs:56 -#: src/hugin/xrc/pref_dialog.xrs:62 +#: src/hugin/xrc/pref_dialog.xrs:53 src/hugin/xrc/pref_dialog.xrs:57 +#: src/hugin/xrc/pref_dialog.xrs:63 msgid "..." msgstr "..." @@ -2304,43 +2327,43 @@ msgid "Panotools:" msgstr "Panotools :" -#: src/hugin/xrc/pref_dialog.xrs:11 +#: src/hugin/xrc/pref_dialog.xrs:12 msgid "Details" msgstr "Détails" -#: src/hugin/xrc/pref_dialog.xrs:12 +#: src/hugin/xrc/pref_dialog.xrs:13 msgid "Finetune" msgstr "Ajustement précis" -#: src/hugin/xrc/pref_dialog.xrs:13 +#: src/hugin/xrc/pref_dialog.xrs:14 msgid "Basic Settings" msgstr "Configuration de base" -#: src/hugin/xrc/pref_dialog.xrs:14 +#: src/hugin/xrc/pref_dialog.xrs:15 msgid "Patch width:" msgstr "Largeur des éléments :" -#: src/hugin/xrc/pref_dialog.xrs:15 src/hugin/xrc/pref_dialog.xrs:19 +#: src/hugin/xrc/pref_dialog.xrs:16 src/hugin/xrc/pref_dialog.xrs:20 msgid "pixels" msgstr "pixels" -#: src/hugin/xrc/pref_dialog.xrs:16 +#: src/hugin/xrc/pref_dialog.xrs:17 msgid "Search area width:" msgstr "Largeur de la zone de recherche :" -#: src/hugin/xrc/pref_dialog.xrs:17 +#: src/hugin/xrc/pref_dialog.xrs:18 msgid "percent of image width" msgstr "pourcent de la largeur de l'image" -#: src/hugin/xrc/pref_dialog.xrs:18 +#: src/hugin/xrc/pref_dialog.xrs:19 msgid "Local search area width:" msgstr "Largeur de la zone de recherche locale :" -#: src/hugin/xrc/pref_dialog.xrs:20 +#: src/hugin/xrc/pref_dialog.xrs:21 msgid "Correlation Threshold:" msgstr "Seuil de corrélation :" -#: src/hugin/xrc/pref_dialog.xrs:21 +#: src/hugin/xrc/pref_dialog.xrs:22 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -2348,11 +2371,11 @@ "0 : pas de similitude\n" "1 : maximum de similitude" -#: src/hugin/xrc/pref_dialog.xrs:22 +#: src/hugin/xrc/pref_dialog.xrs:23 msgid "Peak Curvature Threshold:" msgstr "Seuil de courbure des pics :" -#: src/hugin/xrc/pref_dialog.xrs:23 +#: src/hugin/xrc/pref_dialog.xrs:24 msgid "" "0: no peak\n" " 0.2: distinctive peak" @@ -2360,69 +2383,69 @@ "0 : pas de pic\n" "0.2 : pic distinctif" -#: src/hugin/xrc/pref_dialog.xrs:24 +#: src/hugin/xrc/pref_dialog.xrs:25 msgid "Rotation search" msgstr "Recherche par rotation" -#: src/hugin/xrc/pref_dialog.xrs:25 +#: src/hugin/xrc/pref_dialog.xrs:26 msgid "Enable rotation search (slower, but more accurate)" msgstr "Utiliser la recherche par rotation (plus lente mais plus précise)" -#: src/hugin/xrc/pref_dialog.xrs:26 +#: src/hugin/xrc/pref_dialog.xrs:27 msgid "Start angle:" msgstr "Angle de départ :" -#: src/hugin/xrc/pref_dialog.xrs:27 src/hugin/xrc/pref_dialog.xrs:29 +#: src/hugin/xrc/pref_dialog.xrs:28 src/hugin/xrc/pref_dialog.xrs:30 msgid "degrees" msgstr "degrés" -#: src/hugin/xrc/pref_dialog.xrs:28 +#: src/hugin/xrc/pref_dialog.xrs:29 msgid "Stop angle:" msgstr "Angle de fin :" -#: src/hugin/xrc/pref_dialog.xrs:30 +#: src/hugin/xrc/pref_dialog.xrs:31 msgid "Steps:" msgstr "Pas :" -#: src/hugin/xrc/pref_dialog.xrs:31 +#: src/hugin/xrc/pref_dialog.xrs:32 msgid "Misc" msgstr "Divers" -#: src/hugin/xrc/pref_dialog.xrs:32 +#: src/hugin/xrc/pref_dialog.xrs:33 msgid "Memory usage" msgstr "Utilisation de la mémoire" -#: src/hugin/xrc/pref_dialog.xrs:33 +#: src/hugin/xrc/pref_dialog.xrs:34 msgid "Image cache memory:" msgstr "Mémoire cache d'image :" -#: src/hugin/xrc/pref_dialog.xrs:34 +#: src/hugin/xrc/pref_dialog.xrs:35 msgid "Keep fullsize images in memory, until this limit is exceeded" msgstr "" "Garder en mémoire les images de pleine taille jusqu'à ce que la limite soit " "atteinte" -#: src/hugin/xrc/pref_dialog.xrs:35 +#: src/hugin/xrc/pref_dialog.xrs:36 msgid "MB" msgstr "Mo" -#: src/hugin/xrc/pref_dialog.xrs:36 +#: src/hugin/xrc/pref_dialog.xrs:37 msgid "User Interface" msgstr "Interface utilisateur" -#: src/hugin/xrc/pref_dialog.xrs:37 +#: src/hugin/xrc/pref_dialog.xrs:38 msgid "Language" msgstr "Langue" -#: src/hugin/xrc/pref_dialog.xrs:38 +#: src/hugin/xrc/pref_dialog.xrs:39 msgid "requires restarting hugin" msgstr "nécessite de redémarrer hugin" -#: src/hugin/xrc/pref_dialog.xrs:39 +#: src/hugin/xrc/pref_dialog.xrs:40 msgid "Cursor Type" msgstr "Type de curseur" -#: src/hugin/xrc/pref_dialog.xrs:40 +#: src/hugin/xrc/pref_dialog.xrs:41 msgid "" "available on linux only\n" "requires restarting hugin" @@ -2430,51 +2453,51 @@ "disponible uniquement sous linux\n" "nécessite de redémarrer hugin" -#: src/hugin/xrc/pref_dialog.xrs:41 +#: src/hugin/xrc/pref_dialog.xrs:42 msgid "File options" msgstr "Options du fichier" -#: src/hugin/xrc/pref_dialog.xrs:42 +#: src/hugin/xrc/pref_dialog.xrs:43 msgid "Tempdir:" msgstr "Répertoire temporaire :" -#: src/hugin/xrc/pref_dialog.xrs:43 +#: src/hugin/xrc/pref_dialog.xrs:44 msgid "leave empty for OS default" msgstr "laisser blanc pour utiliser la valeur par défaut du système" -#: src/hugin/xrc/pref_dialog.xrs:45 +#: src/hugin/xrc/pref_dialog.xrs:46 msgid "Show Druid (requires restarting hugin)" msgstr "Afficher l'assistant (nécessite de redémarrer hugin)" -#: src/hugin/xrc/pref_dialog.xrs:46 src/hugin/xrc/pref_dialog.xrs:54 +#: src/hugin/xrc/pref_dialog.xrs:47 src/hugin/xrc/pref_dialog.xrs:55 msgid "Autopano" msgstr "Autopano" -#: src/hugin/xrc/pref_dialog.xrs:48 +#: src/hugin/xrc/pref_dialog.xrs:49 msgid "Autopano (by A. Jenny)" msgstr "Autopano (par A. Jenny)" -#: src/hugin/xrc/pref_dialog.xrs:49 +#: src/hugin/xrc/pref_dialog.xrs:50 msgid "Autopano-SIFT (by S. Nowozin)" msgstr "Autopano-Sift (par S. Nowozin)" -#: src/hugin/xrc/pref_dialog.xrs:50 +#: src/hugin/xrc/pref_dialog.xrs:51 msgid "Autopano-SIFT" msgstr "Autopano-Sift" -#: src/hugin/xrc/pref_dialog.xrs:51 +#: src/hugin/xrc/pref_dialog.xrs:52 msgid "Autopano-SIFT:" msgstr "Autopano-Sift :" -#: src/hugin/xrc/pref_dialog.xrs:53 src/hugin/xrc/pref_dialog.xrs:57 +#: src/hugin/xrc/pref_dialog.xrs:54 src/hugin/xrc/pref_dialog.xrs:58 msgid "Arguments:" msgstr "Arguments :" -#: src/hugin/xrc/pref_dialog.xrs:55 +#: src/hugin/xrc/pref_dialog.xrs:56 msgid "Autopano:" msgstr "Autopano :" -#: src/hugin/xrc/pref_dialog.xrs:58 +#: src/hugin/xrc/pref_dialog.xrs:59 #, c-format msgid "" "following patterns will be subsituted before running:\n" @@ -2489,31 +2512,31 @@ "%i -- fichiers image\n" "%namefile -- fichier contenantant les noms des fichiers images" -#: src/hugin/xrc/pref_dialog.xrs:59 +#: src/hugin/xrc/pref_dialog.xrs:60 msgid "Enblend" msgstr "Enblend" -#: src/hugin/xrc/pref_dialog.xrs:60 +#: src/hugin/xrc/pref_dialog.xrs:61 msgid "Enblend Options" msgstr "Options d'Enblend" -#: src/hugin/xrc/pref_dialog.xrs:61 +#: src/hugin/xrc/pref_dialog.xrs:62 msgid "Enblend:" msgstr "Enblend :" -#: src/hugin/xrc/pref_dialog.xrs:63 +#: src/hugin/xrc/pref_dialog.xrs:64 msgid "Additional Arguments:" msgstr "Arguments supplémentaires :" -#: src/hugin/xrc/pref_dialog.xrs:64 +#: src/hugin/xrc/pref_dialog.xrs:65 msgid "Do not set -w and -o arguments, they are set by hugin" msgstr "Ne pas positionner les arguments -w et -o, ce sera fait par hugin" -#: src/hugin/xrc/pref_dialog.xrs:65 +#: src/hugin/xrc/pref_dialog.xrs:66 msgid "Ok" msgstr "Valider" -#: src/hugin/xrc/pref_dialog.xrs:68 +#: src/hugin/xrc/pref_dialog.xrs:69 msgid "Load Defaults" msgstr "Chargement des valeurs par défaut" Index: hugin.pot =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/hugin.pot,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- hugin.pot 1 Feb 2005 05:11:40 -0000 1.23 +++ hugin.pot 2 Feb 2005 10:14:35 -0000 1.24 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pab...@we...\n" -"POT-Creation-Date: 2005-01-30 20:52+0200\n" +"POT-Creation-Date: 2005-02-02 08:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -46,9 +46,9 @@ msgid "Select autopano program / frontend script" msgstr "" -#: src/hugin/AutoCtrlPointCreator.cpp:146 src/hugin/PreferencesDialog.cpp:160 -#: src/hugin/PreferencesDialog.cpp:176 src/hugin/PreferencesDialog.cpp:192 -#: src/hugin/PreferencesDialog.cpp:208 src/hugin/RunOptimizerFrame.cpp:108 +#: src/hugin/AutoCtrlPointCreator.cpp:146 src/hugin/PreferencesDialog.cpp:173 +#: src/hugin/PreferencesDialog.cpp:189 src/hugin/PreferencesDialog.cpp:205 +#: src/hugin/PreferencesDialog.cpp:221 src/hugin/RunOptimizerFrame.cpp:108 #: src/hugin/RunStitcherFrame.cpp:88 msgid "Executables (*.exe)|*.exe" msgstr "" @@ -155,7 +155,7 @@ msgid "autopano failure" msgstr "" -#: src/hugin/AutoCtrlPointCreator.cpp:319 src/hugin/PreferencesDialog.cpp:224 +#: src/hugin/AutoCtrlPointCreator.cpp:319 src/hugin/PreferencesDialog.cpp:237 msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd" msgstr "" @@ -502,105 +502,105 @@ msgid "Adding Image" msgstr "" -#: src/hugin/MainFrame.cpp:236 +#: src/hugin/MainFrame.cpp:247 msgid "" "Fatal installation error\n" "The xrc directory was not found.\n" "Please ensure it is placed in the same directory as hugin.exe" msgstr "" -#: src/hugin/MainFrame.cpp:331 +#: src/hugin/MainFrame.cpp:342 msgid "Started" msgstr "" -#: src/hugin/MainFrame.cpp:427 +#: src/hugin/MainFrame.cpp:438 msgid "" "The panorama has been changed\n" "Save changes?" msgstr "" -#: src/hugin/MainFrame.cpp:427 +#: src/hugin/MainFrame.cpp:438 msgid "Save Panorama?" msgstr "" -#: src/hugin/MainFrame.cpp:442 +#: src/hugin/MainFrame.cpp:453 msgid "forced close" msgstr "" -#: src/hugin/MainFrame.cpp:474 +#: src/hugin/MainFrame.cpp:485 #, c-format msgid "saved project %s" msgstr "" -#: src/hugin/MainFrame.cpp:483 +#: src/hugin/MainFrame.cpp:494 msgid "Save project file" msgstr "" -#: src/hugin/MainFrame.cpp:485 +#: src/hugin/MainFrame.cpp:496 msgid "Project files (*.pto)|*.pto|All files (*.*)|*.*" msgstr "" -#: src/hugin/MainFrame.cpp:498 +#: src/hugin/MainFrame.cpp:509 msgid "Save PTStitcher script file" msgstr "" -#: src/hugin/MainFrame.cpp:500 +#: src/hugin/MainFrame.cpp:511 msgid "PTStitcher files (*.txt)|*.txt" msgstr "" -#: src/hugin/MainFrame.cpp:524 +#: src/hugin/MainFrame.cpp:535 msgid "Open project: " msgstr "" -#: src/hugin/MainFrame.cpp:536 +#: src/hugin/MainFrame.cpp:547 msgid "Project opened" msgstr "" -#: src/hugin/MainFrame.cpp:546 +#: src/hugin/MainFrame.cpp:557 msgid "Error opening project: " msgstr "" -#: src/hugin/MainFrame.cpp:564 +#: src/hugin/MainFrame.cpp:575 msgid "Open project file" msgstr "" -#: src/hugin/MainFrame.cpp:566 +#: src/hugin/MainFrame.cpp:577 msgid "" "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files " "(*.*)|*.*" msgstr "" -#: src/hugin/MainFrame.cpp:574 +#: src/hugin/MainFrame.cpp:585 msgid "Open project: cancel" msgstr "" -#: src/hugin/MainFrame.cpp:596 src/include/hugin/wxPanoCommand.h:141 +#: src/hugin/MainFrame.cpp:607 src/include/hugin/wxPanoCommand.h:141 msgid "" "Image files (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image files " "(*.tif)|*.tif;*.TIF|All files (*.*)|*.*" msgstr "" -#: src/hugin/MainFrame.cpp:597 src/include/hugin/wxPanoCommand.h:142 +#: src/hugin/MainFrame.cpp:608 src/include/hugin/wxPanoCommand.h:142 msgid "Add images" msgstr "" -#: src/hugin/MainFrame.cpp:641 +#: src/hugin/MainFrame.cpp:652 msgid "Add Image: cancel" msgstr "" -#: src/hugin/MainFrame.cpp:884 +#: src/hugin/MainFrame.cpp:941 msgid "hugin - FAQ" msgstr "" -#: src/hugin/MainFrame.cpp:963 +#: src/hugin/MainFrame.cpp:1020 msgid "Fine-tuning all points" msgstr "" -#: src/hugin/MainFrame.cpp:965 +#: src/hugin/MainFrame.cpp:1022 msgid "Finetuning" msgstr "" -#: src/hugin/MainFrame.cpp:1049 +#: src/hugin/MainFrame.cpp:1106 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -616,7 +616,7 @@ "Use the Control Point list (F3) to see all point of the current project\n" msgstr "" -#: src/hugin/MainFrame.cpp:1051 +#: src/hugin/MainFrame.cpp:1108 msgid "Fine-tune result" msgstr "" @@ -832,47 +832,67 @@ msgid "Create panorama image" msgstr "" -#: src/hugin/PreferencesDialog.cpp:92 +#: src/hugin/PreferencesDialog.cpp:104 msgid "Select one" msgstr "" -#: src/hugin/PreferencesDialog.cpp:93 +#: src/hugin/PreferencesDialog.cpp:105 msgid "System default" msgstr "" -#: src/hugin/PreferencesDialog.cpp:94 +#: src/hugin/PreferencesDialog.cpp:106 +msgid "English" +msgstr "" + +#: src/hugin/PreferencesDialog.cpp:107 msgid "German" msgstr "" -#: src/hugin/PreferencesDialog.cpp:95 +#: src/hugin/PreferencesDialog.cpp:108 msgid "French" msgstr "" -#: src/hugin/PreferencesDialog.cpp:96 +#: src/hugin/PreferencesDialog.cpp:109 msgid "Polish" msgstr "" -#: src/hugin/PreferencesDialog.cpp:97 +#: src/hugin/PreferencesDialog.cpp:110 msgid "Italian" msgstr "" -#: src/hugin/PreferencesDialog.cpp:157 +#: src/hugin/PreferencesDialog.cpp:170 msgid "Select PTStitcher" msgstr "" -#: src/hugin/PreferencesDialog.cpp:173 src/hugin/RunOptimizerFrame.cpp:106 +#: src/hugin/PreferencesDialog.cpp:186 src/hugin/RunOptimizerFrame.cpp:106 msgid "Select PTOptimizer" msgstr "" -#: src/hugin/PreferencesDialog.cpp:189 +#: src/hugin/PreferencesDialog.cpp:202 msgid "Select Enblend" msgstr "" -#: src/hugin/PreferencesDialog.cpp:205 src/hugin/PreferencesDialog.cpp:221 -#: src/hugin/xrc/pref_dialog.xrs:47 +#: src/hugin/PreferencesDialog.cpp:218 src/hugin/PreferencesDialog.cpp:234 +#: src/hugin/xrc/pref_dialog.xrs:48 msgid "Select Autopano" msgstr "" +#: src/hugin/PreferencesDialog.cpp:251 +msgid "Panotools details" +msgstr "" + +#: src/hugin/PreferencesDialog.cpp:290 +msgid "Could not load dll" +msgstr "" + +#: src/hugin/PreferencesDialog.cpp:290 +msgid "panoinfo" +msgstr "" + +#: src/hugin/PreferencesDialog.cpp:521 +msgid "Unknown Version" +msgstr "" + #: src/hugin/PreviewFrame.cpp:74 msgid "Panorama preview" msgstr "" @@ -1006,7 +1026,7 @@ msgstr "" #: src/hugin/RunOptimizerFrame.cpp:293 src/hugin/xrc/edit_text.xrs:3 -#: src/hugin/xrc/pref_dialog.xrs:67 +#: src/hugin/xrc/pref_dialog.xrs:68 msgid "Cancel" msgstr "" @@ -1249,7 +1269,7 @@ msgid "Close" msgstr "" -#: src/hugin/xrc/image_center.xrs:1 src/hugin/xrc/pref_dialog.xrs:66 +#: src/hugin/xrc/image_center.xrs:1 src/hugin/xrc/pref_dialog.xrs:67 #: src/hugin/xrc/run_optimizer_frame.xrs:2 msgid "Apply" msgstr "" @@ -1799,7 +1819,7 @@ msgid "Preview panorama" msgstr "" -#: src/hugin/xrc/main_tool.xrs:26 src/hugin/xrc/pref_dialog.xrs:44 +#: src/hugin/xrc/main_tool.xrs:26 src/hugin/xrc/pref_dialog.xrs:45 #: src/hugin/xrc/preview_frame.xrs:1 msgid "Preview" msgstr "" @@ -2102,7 +2122,7 @@ msgid "Preferences - hugin" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:2 +#: src/hugin/xrc/pref_dialog.xrs:2 src/hugin/xrc/pref_dialog.xrs:11 msgid "Panotools" msgstr "" @@ -2115,8 +2135,8 @@ msgstr "" #: src/hugin/xrc/pref_dialog.xrs:5 src/hugin/xrc/pref_dialog.xrs:7 -#: src/hugin/xrc/pref_dialog.xrs:52 src/hugin/xrc/pref_dialog.xrs:56 -#: src/hugin/xrc/pref_dialog.xrs:62 +#: src/hugin/xrc/pref_dialog.xrs:53 src/hugin/xrc/pref_dialog.xrs:57 +#: src/hugin/xrc/pref_dialog.xrs:63 msgid "..." msgstr "" @@ -2136,169 +2156,169 @@ msgid "Panotools:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:11 +#: src/hugin/xrc/pref_dialog.xrs:12 msgid "Details" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:12 +#: src/hugin/xrc/pref_dialog.xrs:13 msgid "Finetune" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:13 +#: src/hugin/xrc/pref_dialog.xrs:14 msgid "Basic Settings" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:14 +#: src/hugin/xrc/pref_dialog.xrs:15 msgid "Patch width:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:15 src/hugin/xrc/pref_dialog.xrs:19 +#: src/hugin/xrc/pref_dialog.xrs:16 src/hugin/xrc/pref_dialog.xrs:20 msgid "pixels" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:16 +#: src/hugin/xrc/pref_dialog.xrs:17 msgid "Search area width:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:17 +#: src/hugin/xrc/pref_dialog.xrs:18 msgid "percent of image width" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:18 +#: src/hugin/xrc/pref_dialog.xrs:19 msgid "Local search area width:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:20 +#: src/hugin/xrc/pref_dialog.xrs:21 msgid "Correlation Threshold:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:21 +#: src/hugin/xrc/pref_dialog.xrs:22 msgid "" "0: no similarity\n" "1: maximum similarity" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:22 +#: src/hugin/xrc/pref_dialog.xrs:23 msgid "Peak Curvature Threshold:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:23 +#: src/hugin/xrc/pref_dialog.xrs:24 msgid "" "0: no peak\n" " 0.2: distinctive peak" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:24 +#: src/hugin/xrc/pref_dialog.xrs:25 msgid "Rotation search" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:25 +#: src/hugin/xrc/pref_dialog.xrs:26 msgid "Enable rotation search (slower, but more accurate)" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:26 +#: src/hugin/xrc/pref_dialog.xrs:27 msgid "Start angle:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:27 src/hugin/xrc/pref_dialog.xrs:29 +#: src/hugin/xrc/pref_dialog.xrs:28 src/hugin/xrc/pref_dialog.xrs:30 msgid "degrees" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:28 +#: src/hugin/xrc/pref_dialog.xrs:29 msgid "Stop angle:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:30 +#: src/hugin/xrc/pref_dialog.xrs:31 msgid "Steps:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:31 +#: src/hugin/xrc/pref_dialog.xrs:32 msgid "Misc" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:32 +#: src/hugin/xrc/pref_dialog.xrs:33 msgid "Memory usage" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:33 +#: src/hugin/xrc/pref_dialog.xrs:34 msgid "Image cache memory:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:34 +#: src/hugin/xrc/pref_dialog.xrs:35 msgid "Keep fullsize images in memory, until this limit is exceeded" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:35 +#: src/hugin/xrc/pref_dialog.xrs:36 msgid "MB" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:36 +#: src/hugin/xrc/pref_dialog.xrs:37 msgid "User Interface" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:37 +#: src/hugin/xrc/pref_dialog.xrs:38 msgid "Language" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:38 +#: src/hugin/xrc/pref_dialog.xrs:39 msgid "requires restarting hugin" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:39 +#: src/hugin/xrc/pref_dialog.xrs:40 msgid "Cursor Type" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:40 +#: src/hugin/xrc/pref_dialog.xrs:41 msgid "" "available on linux only\n" "requires restarting hugin" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:41 +#: src/hugin/xrc/pref_dialog.xrs:42 msgid "File options" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:42 +#: src/hugin/xrc/pref_dialog.xrs:43 msgid "Tempdir:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:43 +#: src/hugin/xrc/pref_dialog.xrs:44 msgid "leave empty for OS default" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:45 +#: src/hugin/xrc/pref_dialog.xrs:46 msgid "Show Druid (requires restarting hugin)" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:46 src/hugin/xrc/pref_dialog.xrs:54 +#: src/hugin/xrc/pref_dialog.xrs:47 src/hugin/xrc/pref_dialog.xrs:55 msgid "Autopano" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:48 +#: src/hugin/xrc/pref_dialog.xrs:49 msgid "Autopano (by A. Jenny)" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:49 +#: src/hugin/xrc/pref_dialog.xrs:50 msgid "Autopano-SIFT (by S. Nowozin)" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:50 +#: src/hugin/xrc/pref_dialog.xrs:51 msgid "Autopano-SIFT" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:51 +#: src/hugin/xrc/pref_dialog.xrs:52 msgid "Autopano-SIFT:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:53 src/hugin/xrc/pref_dialog.xrs:57 +#: src/hugin/xrc/pref_dialog.xrs:54 src/hugin/xrc/pref_dialog.xrs:58 msgid "Arguments:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:55 +#: src/hugin/xrc/pref_dialog.xrs:56 msgid "Autopano:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:58 +#: src/hugin/xrc/pref_dialog.xrs:59 #, c-format msgid "" "following patterns will be subsituted before running:\n" @@ -2308,31 +2328,31 @@ "%namefile -- file that contains image filenames" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:59 +#: src/hugin/xrc/pref_dialog.xrs:60 msgid "Enblend" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:60 +#: src/hugin/xrc/pref_dialog.xrs:61 msgid "Enblend Options" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:61 +#: src/hugin/xrc/pref_dialog.xrs:62 msgid "Enblend:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:63 +#: src/hugin/xrc/pref_dialog.xrs:64 msgid "Additional Arguments:" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:64 +#: src/hugin/xrc/pref_dialog.xrs:65 msgid "Do not set -w and -o arguments, they are set by hugin" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:65 +#: src/hugin/xrc/pref_dialog.xrs:66 msgid "Ok" msgstr "" -#: src/hugin/xrc/pref_dialog.xrs:68 +#: src/hugin/xrc/pref_dialog.xrs:69 msgid "Load Defaults" msgstr "" |
From: Douglas W. <dwi...@us...> - 2005-02-02 10:08:48
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20259/src/hugin Modified Files: MainFrame.cpp PreferencesDialog.cpp Log Message: Don't add images already added when using time series. Index: PreferencesDialog.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- PreferencesDialog.cpp 1 Feb 2005 22:25:16 -0000 1.17 +++ PreferencesDialog.cpp 2 Feb 2005 10:08:39 -0000 1.18 @@ -350,7 +350,6 @@ { sprintf(str1, "Comment:\t%s\n", sResult ); strcat(str2 ,str1); - DEBUG_TRACE("PTVERSION_NAME_COMMENT" << wxString(str2, *wxConvCurrent).mb_str()); } if((pfQFString) (PTVERSION_NAME_LEGALCOPYRIGHT, sResult, sizeof(sResult)/sizeof(sResult[0]) )) @@ -367,7 +366,6 @@ { sprintf(str1, "Optimizer Error:\t%s\n", iResult? "dist sphere" : "dist rect" ); strcat(str2 ,str1); - DEBUG_TRACE("PTVERSION_NAME_LEGALCOPYRIGHT" << wxString(str2, *wxConvCurrent).mb_str()); } } Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- MainFrame.cpp 1 Feb 2005 13:05:34 -0000 1.129 +++ MainFrame.cpp 2 Feb 2005 10:08:39 -0000 1.130 @@ -620,7 +620,7 @@ dlg.SetFilterIndex(2); else if (img_ext == wxT("all")) dlg.SetFilterIndex(3); - DEBUG_TRACE ( img_ext ) + DEBUG_TRACE ( "Image extention: " << img_ext.mb_str() ) // call the file dialog if (dlg.ShowModal() == wxID_OK) { @@ -652,7 +652,7 @@ SetStatusText( _("Add Image: cancel")); } - DEBUG_TRACE ( wxString::Format(wxT("img_ext: %d"), dlg.GetFilterIndex()) ) + DEBUG_TRACE ( wxString::Format(wxT("img_ext: %d"), dlg.GetFilterIndex()).mb_str() ) // save the image extension switch ( dlg.GetFilterIndex() ) { case 0: config->Write(wxT("lastImageType"), wxT("jpg")); break; @@ -684,6 +684,7 @@ } WX_DECLARE_STRING_HASH_MAP(time_t, StringToPointerHash); +WX_DECLARE_STRING_HASH_MAP(int, StringToFlagHash); struct sortbytime { @@ -710,9 +711,11 @@ // If no images already loaded, offer user a chance to pick one. int images = pano.getNrOfImages(); + DEBUG_TRACE("Number of images: " << images); if (!images) { OnAddImages(event); images = pano.getNrOfImages(); + DEBUG_TRACE("No images: " << images); if (!images) return; } @@ -721,6 +724,7 @@ // Collect potential image-mates. StringToPointerHash filenames; + StringToFlagHash preloaded; while (images) { --images; @@ -729,7 +733,7 @@ const PanoImage& image = pano.getImage(images); std::string filename = image.getFilename(); wxString file(filename.c_str(), *wxConvCurrent); - filenames[file] = 0; + preloaded[file] = 1; // Glob for all files of same type in same directory. wxString name(filename.c_str(), *wxConvCurrent); @@ -738,8 +742,8 @@ while (!file.IsEmpty()) { // Associated with a NULL dummy timestamp for now. - filenames[file] = 0; - file = ::wxFindNextFile(); + filenames[file] = 0; + file = ::wxFindNextFile(); } } @@ -753,11 +757,11 @@ { wxString file = found->first; // Check the time if it's got a camera EXIF timestamp. - time_t stamp = ReadJpegTime(file.mb_str()); - if (stamp) { + time_t stamp = ReadJpegTime(file.mb_str()); + if (stamp) { filenames[file] = stamp; timeMap[(const char *)file.mb_str()] = stamp; - } + } } //TODO: sorting the filenames keys by timestamp would be useful @@ -772,6 +776,8 @@ for (found = filenames.begin(); found != filenames.end(); found++) { wxString recruit = found->first; + if (preloaded[recruit] == 1) + continue; time_t pledge = filenames[recruit]; if (!pledge) continue; @@ -792,7 +798,7 @@ if (abs(pledge - stamp) < maxtimediff) { // Load this file, and remember it. - DEBUG_TRACE("Recruited " << recruit.c_str()); + DEBUG_TRACE("Recruited " << recruit.mb_str()); std::string file = (const char *)recruit.mb_str(); filesv.push_back(file); // Don't recruit it again. |
From: Douglas W. <dwi...@us...> - 2005-02-02 09:55:24
|
Update of /cvsroot/hugin/hugin/src/hugin/xrc/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17675/src/hugin/xrc/data Modified Files: FAQ.html Log Message: Fix FAQ grammar and links Index: FAQ.html =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/data/FAQ.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- FAQ.html 1 Feb 2005 05:11:41 -0000 1.8 +++ FAQ.html 2 Feb 2005 09:55:10 -0000 1.9 @@ -2,13 +2,13 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>hugin Frequenty Asked Questions</title> +<title>hugin Frequently Asked Questions</title> <!--#include virtual="/ssi/css.html"--> </head> <body> <!--#include virtual="/ssi/menu.html"--> <div class="content"> -<h1>hugin Frequenty Asked Questions</h1> +<h1>hugin Frequently Asked Questions</h1> <p><strong>This document contains answers to questions that have been asked by users on the <a @@ -57,13 +57,13 @@ <h3> Common problems encountered while creating a panorama</h3> <ul> <li> - <a href="#problems_curvedhorizon">In my panorama the horizon is curved, how to straighten it?</a> + <a href="#problems_curvedhorizon">In my panorama, the horizon is curved. How do I straighten it?</a> </li> <li> - <a href="#problems_circledpano">When optimizing my 360 degree panorama it results in a circle instead of a hfov-360 panorama. How to make hugin recognize its a 360 degree one?</a> + <a href="#problems_circledpano">When optimizing my 360 degree panorama it results in a circle instead of a hfov-360 panorama. How do I make hugin recognize it's a 360 degree panorama?</a> </li> <li> - <a href="#problmes_blackblends">There are dark blends between two images, how to remove them?</a> + <a href="#problmes_blackblends">There are dark blends between two images, how do I remove them?</a> </li> </ul> @@ -71,7 +71,7 @@ <h3> Panorama Postprocessing </h3> <ul> <li> - <a href="#pano_gimp_layers">How do I produce a layered panorama , but gimp can't read the PSD?</a> + <a href="#pano_gimp_layers">How do I produce a layered panorama if the GIMP can't read a PSD?</a> </li> </ul> @@ -87,7 +87,7 @@ necessary (minor) changes to hugin and pano tools. </p> -<h4><a href="#top" name="#g_enblend_fail">Enblend 2.1 does not work with hugin? (windows only)</a></h4> +<h4><a href="#top" name="g_enblend_fail">Enblend 2.1 does not work with hugin? (windows only)</a></h4> <p> Enblend 2.1 cannot read the TIFF files created by hugin and nona. </p> @@ -125,8 +125,7 @@ will try to select the point in the other image. </li> <li> If its the first point in this pair, click near the same - feature on the right image. - Otherwise, the second point is placed and fine tuned + feature on the right image. The second point will be placed and fine tuned automatically. </li> <li> If you are not happy with the placement, both points @@ -154,7 +153,7 @@ will try to select the point in the other image. </li> <li> If its the first point in this pair, click near the same - feature on the right image. The point is placed and + feature on the right image. The point will be placed and fine tuned automatically. </li> <li> If you are not happy with the placement, both points @@ -164,7 +163,7 @@ </li> <li> When the points are on the same feature, press the right mouse button, or press the "a" key to add the - control point pair. It will then be shown in list + control point pair. It will then be shown in the list below the image. </li> </ul> @@ -181,7 +180,7 @@ <h3> Common problems encountered while creating a panorama</h3> -<h4><a href="#top" name="problems_curvedhorizon">In my panorama the horizon is curved, how to straighten it?</a></h4> +<h4><a href="#top" name="problems_curvedhorizon">In my panorama, the horizon is curved. How do I straighten it?</a></h4> <p> If the panorama looks nice but the horizon is curved, there are two ways to improve the image and straighten the horizon. First, try optimizing the view @@ -216,8 +215,8 @@ one line. </p> <h4><a href="#top" name="problems_circledpano">When optimizing my 360 degree -panorama it results in a circle instead of a hfov-360 panorama. How to make -hugin recognize its a 360 degree one?</a></h4> +panorama it results in a circle instead of a hfov-360 panorama. How do I make +hugin recognize it's a 360 degree panorama?</a></h4> <p> In some 360 degree panoramas you might encounter an optimization like this: <center><img src="problem-circle.jpg" alt="360 degree panorama invalidly @@ -249,13 +248,13 @@ and roll and view optimizations. For the "yaw" box, select every picture but the first. Then optimize. Now you should land at a pretty good first estimate, which you can check in the preview tab after updating the -preview. With this rought estimate, you can apply the normal "Position +preview. With this rough estimate, you can apply the normal "Position and View" optimization now. <br><br> If it still has some circles, you can try to set and optimize the pitch, too. </p> <h4><a href="#top" name="problmes_blackblends">There are dark blends between -two images, how to remove them?</a></h4> +two images, how do I remove them?</a></h4> <p> If there are visible black zones between two source images in the final output image but they are not visible in the preview, the most likely reason for that @@ -273,18 +272,16 @@ <h3> Panorama Postprocessing </h3> -<h4><a href="#top" name="pano_gimp_layers">I want to use gimp to tweak the seams of my image, but gimp can't read the PSD?</a></h4> +<h4><a href="#top" name="pano_gimp_layers">I want to use the GIMP to tweak the seams of my image, but the GIMP can't read a PSD format file.</a></h4> <p> - Unfortunately, <a href="http://www.gimp.org">The GIMP</a> can't read the PSD files - generated by PTStitcher, and the multiple tiff output it cumbersome to use. There are two possiblilites to work around this: + Unfortunately, <a href="http://www.gimp.org">The GIMP</a> can't read PSD formatted files + generated by PTStitcher, and the multiple tiff output it produces is cumbersome to use. There are two possiblilites to work around this: </p> <ol> <li> <p> Use our experimental stitcher, nona, to output to a multiple - tiff format. Unfortunately I haven't come around to compile a - windows .exe for it yet, but Alexandre is working on it. - Just follow the following procedure: + tiff format. Just follow the following procedure: </p> <ul> <li> @@ -311,7 +308,7 @@ supported by nona, you can also use <a href="http://www.vierpi.de/tif2xcf.html">tif2xcf</a>, to combine the multiple TIFF output into a multilayer XCF. </p> <p> - Important: PTStitcher does not create the output files, if the output file + <b>Important:</b> PTStitcher does not create the output files, if the output file contains an .tif extension. So, specify only the basename, without the extension. </p> |
From: Pablo d'A. <da...@us...> - 2005-02-01 22:27:38
|
Update of /cvsroot/hugin/hugin/src/nona_gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31823/nona_gui Modified Files: nona_gui.vcproj Log Message: more updates in the MSVC build system Index: nona_gui.vcproj =================================================================== RCS file: /cvsroot/hugin/hugin/src/nona_gui/nona_gui.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nona_gui.vcproj 31 Jan 2005 23:22:31 -0000 1.1 +++ nona_gui.vcproj 1 Feb 2005 22:26:37 -0000 1.2 @@ -282,7 +282,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../include;../foreign;"..\..\..\libs\wxWindows\lib\mswud"" - PreprocessorDefinitions="DEBUG;WIN32;_DEBUG;__WXDEBUG__;WINVER=0x0400;STRICT;UNICODE;__WXMSW__" + PreprocessorDefinitions="DEBUG;WIN32;_DEBUG;__WXDEBUG__;WINVER=0x0400;STRICT;UNICODE;__WXMSW__;wxUSE_UNICODE=1" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/XrcDemoVC.pch" @@ -297,7 +297,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib pano12.lib" + AdditionalDependencies="unicows.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexud.lib pano12.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" @@ -349,7 +349,7 @@ Optimization="1" InlineFunctionExpansion="2" AdditionalIncludeDirectories="../include;../foreign;"..\..\..\libs\wxWindows\lib\mswu"" - PreprocessorDefinitions="NDEBUG;WIN32;__WXMSW__;WINVER=0x0400;STRICT;UNICODE" + PreprocessorDefinitions="NDEBUG;WIN32;__WXMSW__;WINVER=0x0400;STRICT;UNICODE;wxUSE_UNICODE=1" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -364,7 +364,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib pano12.lib" + AdditionalDependencies="unicows.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib regexu.lib pano12.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" |
From: Pablo d'A. <da...@us...> - 2005-02-01 22:27:17
|
Update of /cvsroot/hugin/hugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31823 Modified Files: Hugin.sln Log Message: more updates in the MSVC build system Index: Hugin.sln =================================================================== RCS file: /cvsroot/hugin/hugin/src/Hugin.sln,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Hugin.sln 31 Jan 2005 22:52:20 -0000 1.7 +++ Hugin.sln 1 Feb 2005 22:26:20 -0000 1.8 @@ -50,6 +50,16 @@ ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nona", "tools\nona.vcproj", "{FADF17E6-3037-47E7-B556-DE1112D3237A}" + ProjectSection(ProjectDependencies) = postProject + {E974EF12-9647-400A-AF30-1D0E70D1C32C} = {E974EF12-9647-400A-AF30-1D0E70D1C32C} + {621C0B14-F003-4961-8D14-7A1679087977} = {621C0B14-F003-4961-8D14-7A1679087977} + {609891D5-B1A9-43E3-9B61-AD53D6008158} = {609891D5-B1A9-43E3-9B61-AD53D6008158} + {609891D5-B1A9-43E3-9B63-AD53D6008158} = {609891D5-B1A9-43E3-9B63-AD53D6008158} + {609891D5-B1A9-43E3-9B66-AD53D6008158} = {609891D5-B1A9-43E3-9B66-AD53D6008158} + {609891D5-B1A9-43E3-9B67-AD53D6008158} = {609891D5-B1A9-43E3-9B67-AD53D6008158} + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -190,23 +200,15 @@ {E974EF12-9647-400A-AF30-1D0E70D1C32C}.Release Unicode.ActiveCfg = Release Unicode|Win32 {E974EF12-9647-400A-AF30-1D0E70D1C32C}.Release Unicode.Build.0 = Release Unicode|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug.ActiveCfg = Debug|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug.Build.0 = Debug|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL.ActiveCfg = Debug|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL.Build.0 = Debug|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug Static.ActiveCfg = Debug|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug Static.Build.0 = Debug|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug Unicode.ActiveCfg = Debug|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug Unicode.Build.0 = Debug|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release.ActiveCfg = Release|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release.Build.0 = Release|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL.ActiveCfg = Release MSVS|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL.Build.0 = Release MSVS|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release MSVS.ActiveCfg = Release MSVS|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release MSVS.Build.0 = Release MSVS|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release Static.ActiveCfg = Release MSVS|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release Static.Build.0 = Release MSVS|Win32 {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release Unicode.ActiveCfg = Release Unicode|Win32 - {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release Unicode.Build.0 = Release Unicode|Win32 {4FB29EEF-EE8C-4204-B272-FD88FBB4326D}.Debug.ActiveCfg = Debug|Win32 {4FB29EEF-EE8C-4204-B272-FD88FBB4326D}.Debug.Build.0 = Debug|Win32 {4FB29EEF-EE8C-4204-B272-FD88FBB4326D}.Debug DLL.ActiveCfg = Debug DLL|Win32 @@ -243,6 +245,24 @@ {621C0B14-F003-4961-8D14-7A1679087977}.Release Static.Build.0 = Release|Win32 {621C0B14-F003-4961-8D14-7A1679087977}.Release Unicode.ActiveCfg = Release Unicode|Win32 {621C0B14-F003-4961-8D14-7A1679087977}.Release Unicode.Build.0 = Release Unicode|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Debug.ActiveCfg = Debug|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Debug.Build.0 = Debug|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Debug DLL.ActiveCfg = Debug|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Debug DLL.Build.0 = Debug|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Debug Static.ActiveCfg = Debug|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Debug Static.Build.0 = Debug|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Debug Unicode.ActiveCfg = Debug|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Debug Unicode.Build.0 = Debug|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release.ActiveCfg = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release.Build.0 = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release DLL.ActiveCfg = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release DLL.Build.0 = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release MSVS.ActiveCfg = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release MSVS.Build.0 = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release Static.ActiveCfg = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release Static.Build.0 = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release Unicode.ActiveCfg = Release|Win32 + {FADF17E6-3037-47E7-B556-DE1112D3237A}.Release Unicode.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection |
From: Pablo d'A. <da...@us...> - 2005-02-01 22:27:11
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31823/hugin Modified Files: hugin.vcproj Log Message: more updates in the MSVC build system Index: hugin.vcproj =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/hugin.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- hugin.vcproj 31 Jan 2005 22:52:21 -0000 1.8 +++ hugin.vcproj 1 Feb 2005 22:26:39 -0000 1.9 @@ -283,7 +283,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../include;../foreign;"..\..\..\libs\wxWindows\lib\mswud"" - PreprocessorDefinitions="DEBUG;WIN32;_DEBUG;__WXDEBUG__;WINVER=0x0400;STRICT;UNICODE;__WXMSW__" + PreprocessorDefinitions="DEBUG;WIN32;_DEBUG;__WXDEBUG__;WINVER=0x0400;STRICT;UNICODE;__WXMSW__;wxUSE_UNICODE=1" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/XrcDemoVC.pch" @@ -298,7 +298,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib pano12.lib" + AdditionalDependencies="unicows.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexud.lib pano12.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" @@ -350,7 +350,7 @@ Optimization="1" InlineFunctionExpansion="2" AdditionalIncludeDirectories="../include;../foreign;"..\..\..\libs\wxWindows\lib\mswu"" - PreprocessorDefinitions="NDEBUG;WIN32;__WXMSW__;WINVER=0x0400;STRICT;UNICODE" + PreprocessorDefinitions="NDEBUG;WIN32;__WXMSW__;WINVER=0x0400;STRICT;UNICODE;wxUSE_UNICODE=1" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -365,7 +365,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib pano12.lib" + AdditionalDependencies="unicows.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib regexu.lib pano12.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" |
From: Pablo d'A. <da...@us...> - 2005-02-01 22:25:47
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31533/hugin Modified Files: PreferencesDialog.cpp Log Message: added unicode compatible strings Index: PreferencesDialog.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- PreferencesDialog.cpp 1 Feb 2005 20:28:22 -0000 1.16 +++ PreferencesDialog.cpp 1 Feb 2005 22:25:16 -0000 1.17 @@ -284,10 +284,10 @@ bool bSuccess = true; #ifdef __WXMSW__ - hDll = LoadLibrary("pano12.dll"); + hDll = LoadLibrary(_T("pano12.dll")); if(!hDll) { - MessageBox((HWND)NULL, "Could not load dll", "panoinfo", MB_ICONEXCLAMATION); + MessageBox((HWND)NULL, _("Could not load dll"), _("panoinfo"), MB_ICONEXCLAMATION); bSuccess = false; goto cleanup; } |
From: Pablo d'A. <da...@us...> - 2005-02-01 22:19:50
|
Update of /cvsroot/hugin/hugin/src/Panorama In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30091/Panorama Modified Files: PanoramaMemento.cpp Log Message: hfov calculation works with portrait and landscape images Index: PanoramaMemento.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/Panorama/PanoramaMemento.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- PanoramaMemento.cpp 20 Jan 2005 19:20:43 -0000 1.53 +++ PanoramaMemento.cpp 1 Feb 2005 22:19:20 -0000 1.54 @@ -134,25 +134,27 @@ double Lens::getFocalLength() const { - FDiff2D ssize; - double HFOV = const_map_get(variables,"v").getValue(); + double HFOV = const_map_get(variables,"v").getValue(); +#if 0 if (isLandscape()) { ssize = m_sensorSize; } else { ssize.y = m_sensorSize.x; ssize.x = m_sensorSize.y; } +#endif switch (m_projectionFormat) { case RECTILINEAR: - return (ssize.x/2.0) / tan(HFOV/180.0*M_PI/2); + return (m_sensorSize.x/2.0) / tan(HFOV/180.0*M_PI/2); break; case CIRCULAR_FISHEYE: case FULL_FRAME_FISHEYE: - // same projection, equal area projection - return ssize.x / (HFOV/180*M_PI); + // same projection equation for both fisheye types, + // assume equal area projection. + return m_sensorSize.x / (HFOV/180*M_PI); break; default: // TODO: add formulas for other projections @@ -163,23 +165,23 @@ void Lens::setFocalLength(double fl) { - FDiff2D ssize; - +#if 0 if (isLandscape()) { ssize = m_sensorSize; } else { ssize.y = m_sensorSize.x; ssize.x = m_sensorSize.y; } +#endif double hfov=map_get(variables, "v").getValue(); switch (m_projectionFormat) { case RECTILINEAR: - hfov = 2*atan((ssize.x/2.0)/fl) * 180.0/M_PI; + hfov = 2*atan((m_sensorSize.x/2.0)/fl) * 180.0/M_PI; break; case CIRCULAR_FISHEYE: case FULL_FRAME_FISHEYE: - hfov = ssize.x / fl * 180/M_PI; + hfov = m_sensorSize.x / fl * 180/M_PI; default: // TODO: add formulas for other projections DEBUG_WARN("Focal length calculations only supported with rectilinear and fisheye images"); @@ -194,6 +196,7 @@ double d = sqrt(36.0*36.0 + 24.0*24.0) / factor; double r = (double)m_imageSize.x / m_imageSize.y; + // calculate the sensor width and height that fit the ratio // the ratio is determined by the size of our image. m_sensorSize.x = d / sqrt(1 + 1/(r*r)); @@ -268,6 +271,11 @@ } else if (exif.FocalLength35mm > 0 && exif.FocalLength > 0) { cropFactor = exif.FocalLength35mm / exif.FocalLength; focalLength = exif.FocalLength; + } else if (exif.FocalLength35mm > 0 && cropFactor <= 0) { + // do not ask for crop factor, even if we will store an invalid sensor size. + // currenty the sensor size (just the ratio) is not used anywhere. + cropFactor = 1; + focalLength = exif.FocalLength35mm; } else if (exif.FocalLength > 0 || exif.FocalLength35mm > 0 ) { // no complete specification found.. ask the user for sensor/chip size, or crop factor if (cropFactor > 0) { @@ -793,6 +801,7 @@ } l.setImageSize(vigra::Size2D(PTGUILens.width, PTGUILens.height)); l.setCropFactor(1); + l.setProjection((Lens::LensProjectionFormat) PTGUILens.f); lenses.push_back(l); } |
From: Pablo d'A. <da...@us...> - 2005-02-01 21:58:12
|
Update of /cvsroot/hugin/hugin/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25613 Modified Files: hugin.nsi Log Message: added nona & prepared for beta2 Index: hugin.nsi =================================================================== RCS file: /cvsroot/hugin/hugin/utils/hugin.nsi,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- hugin.nsi 31 Jan 2005 22:52:23 -0000 1.4 +++ hugin.nsi 1 Feb 2005 21:57:57 -0000 1.5 @@ -1,7 +1,8 @@ ;-------------------------------- -!define HUGIN_VERSION "0.5 beta1" +!define HUGIN_VERSION "0.5 beta2" !define DISPLAY_NAME "Hugin ${HUGIN_VERSION}" +!define MSVC_DLLS ;!define HAVE_MINGW ;!define NEED_MINGW ;!define HUGIN_EXPERIMENTAL_TOOLS @@ -18,9 +19,9 @@ Name "${DISPLAY_NAME}" !ifdef HUGIN_ALLINONE -OutFile "hugin-0.5_beta1_allinone_setup.exe" +OutFile "hugin-0.5_beta2_allinone_setup.exe" !else -OutFile "hugin-0.5_beta1_setup.exe" +OutFile "hugin-0.5_beta2_setup.exe" !endif Caption "${DISPLAY_NAME}" @@ -88,15 +89,20 @@ File "VIGRA_LICENSE.txt" File "AUTHORS.txt" File "README_WINDOWS.txt" + File "nona.exe" File "nona_gui.exe" File "panoglview.exe" SetOutPath "$INSTDIR\locale" File /r "locale\*" SetOutPath "$INSTDIR\xrc" File /r "xrc\*" +!ifdef MSVC_DLLS + File msvcp71.dll + File msvcr71.dll + File unicows.dll +!endif !ifdef HUGIN_EXPERIMENTAL_TOOLS File "automatch.exe" - File "nona.exe" File "autooptimiser.exe" File "autopano_old.exe" File "panosifter.exe" |
From: Pablo d'A. <da...@us...> - 2005-02-01 21:54:00
|
Update of /cvsroot/hugin/hugin/src/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24660 Modified Files: nona.cpp Added Files: nona.vcproj Log Message: updated help text and added MSCV project --- NEW FILE: nona.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="nona" ProjectGUID="{FADF17E6-3037-47E7-B556-DE1112D3237A}" Keyword="Win32Proj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="Debug" IntermediateDirectory="Debug" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../include;../foreign;..\..\..\libs\getopt\include" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="4"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="pngd.lib zlibd.lib jpegd.lib tiffd.lib pano12.lib" OutputFile="$(OutDir)/nona.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/nona.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="Release" IntermediateDirectory="Release" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="../include;../foreign;..\..\..\libs\getopt\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="png.lib zlib.lib jpeg.lib tiff.lib pano12.lib" OutputFile="$(OutDir)/nona.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> <ProjectReference ReferencedProjectIdentifier="{621C0B14-F003-4961-8D14-7A1679087977}" Name="getopt"/> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File RelativePath=".\nona.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> Index: nona.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/tools/nona.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- nona.cpp 27 Oct 2004 18:12:56 -0000 1.14 +++ nona.cpp 1 Feb 2005 21:53:25 -0000 1.15 @@ -31,7 +31,11 @@ #include <vigra/error.hxx> #include <vigra/impex.hxx> -#include <unistd.h> +#ifdef WIN32 + #include <getopt.h> +#else + #include <unistd.h> +#endif #include "panoinc.h" #include "PT/Stitcher.h" @@ -50,38 +54,31 @@ << " is quite simple, no seam feathering is done." << std::endl << " all interpolators of panotools are supported" << std::endl << std::endl - << " the \"TIFF_mask\" output will produce a multilayer TIFF file" << std::endl + << " The following output formats (n option of panotools p script line)" << std::endl + << " are supported:"<< std::endl << std::endl - << "Usage: " << name << " [options] -o output project_file" << std::endl - << std::endl - << " [options] can be: " << std::endl - << " -r # save tiff files with ROI (saves a lot of space, " << std::endl - << " but doesn't work with most programs. " << std::endl - << " The Gimp 2.0 can handle these files" << std::endl - << std::endl; - + << " JPG, TIFF, PNG : Single image formats without feathered blending:"<< std::endl + << " TIFF_m : multiple tiff files"<< std::endl + << " TIFF_multilayer : Multilayer tiff files, readable by The Gimp 2.0" << std::endl + << std::endl + << "Usage: " << name << " [options] -o output project_file" << std::endl; } int main(int argc, char *argv[]) { // parse arguments - const char * optstring = "rho:"; + const char * optstring = "ho:"; int c; opterr = 0; string basename; - bool tiffROI = false; - while ((c = getopt (argc, argv, optstring)) != -1) switch (c) { case 'o': basename = optarg; break; - case 'r': - tiffROI = true; - break; case '?': case 'h': usage(argv[0]); @@ -119,7 +116,6 @@ } PanoramaOptions opts = pano.getOptions(); - opts.tiff_saveROI = tiffROI; // check for some options |
From: Douglas W. <dwi...@us...> - 2005-02-01 20:29:44
|
Update of /cvsroot/hugin/hugin/src/hugin/xrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5879/src/hugin/xrc Modified Files: pref_dialog.xrc Log Message: Add panotools info to the preferences dialog Index: pref_dialog.xrc =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/pref_dialog.xrc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- pref_dialog.xrc 28 Jan 2005 21:13:10 -0000 1.7 +++ pref_dialog.xrc 1 Feb 2005 20:28:23 -0000 1.8 @@ -82,7 +82,7 @@ </object> <object class="sizeritem"> <object class="wxStaticText" name="prefs_panotools_version"> - <label></label> + <label>Panotools</label> </object> <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> <border>5</border> |
From: Douglas W. <dwi...@us...> - 2005-02-01 20:29:15
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5879/src/hugin Modified Files: PreferencesDialog.cpp Log Message: Add panotools info to the preferences dialog Index: PreferencesDialog.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- PreferencesDialog.cpp 31 Jan 2005 07:39:00 -0000 1.15 +++ PreferencesDialog.cpp 1 Feb 2005 20:28:22 -0000 1.16 @@ -28,6 +28,16 @@ #include "panoinc_WX.h" #include "panoinc.h" +#ifndef WIN32 +#include <dlfcn.h> +#else +#include <windows.h> +#endif + +extern "C" { +#include <pano12/version.h> +#include <pano12/queryfeature.h> +} #include "common/wxPlatform.h" @@ -43,6 +53,7 @@ #define MY_SPIN_VAL(id, val) { XRCCTRL(*this, id, wxSpinCtrl)->SetValue(val); }; #define MY_BOOL_VAL(id, val) { XRCCTRL(*this, id, wxCheckBox)->SetValue(val); }; #define MY_CHOICE_VAL(id, val) { XRCCTRL(*this, id, wxChoice)->SetSelection(val); }; +#define MY_STATIC_VAL(id, val) { XRCCTRL(*this, id, wxStaticText)->SetLabel(val); }; #define MY_G_STR_VAL(id) XRCCTRL(*this, id, wxTextCtrl)->GetValue() #define MY_G_SPIN_VAL(id) XRCCTRL(*this, id, wxSpinCtrl)->GetValue() @@ -62,6 +73,7 @@ EVT_BUTTON(XRCID("prefs_AutoPanoKolorExe_select"), PreferencesDialog::OnAutopanoKolorExe) EVT_BUTTON(XRCID("prefs_AutoPanoSIFTExe_select"), PreferencesDialog::OnAutopanoSiftExe) EVT_BUTTON(XRCID("prefs_load_defaults"), PreferencesDialog::OnDefaults) + EVT_BUTTON(XRCID("prefs_panotools_details"), PreferencesDialog::OnPTDetails) EVT_CHECKBOX(XRCID("prefs_ft_RotationSearch"), PreferencesDialog::OnRotationCheckBox) // EVT_CLOSE(RunOptimizerFrame::OnClose) END_EVENT_TABLE() @@ -233,13 +245,181 @@ } } +void PreferencesDialog::OnPTDetails(wxCommandEvent & e) +{ + DEBUG_TRACE("Panotools Details Requested:\n" << m_PTDetails.mb_str()); + wxMessageDialog dlg(this, m_PTDetails, _("Panotools details"), wxOK); + dlg.ShowModal(); +} void PreferencesDialog::EnableRotationCtrls(bool enable) { XRCCTRL(*this, "prefs_ft_rot_panel", wxPanel)->Enable(enable); } +typedef int (*PROC_QF) (int ,char** ,Tp12FeatureType* ); +typedef int (*PROC_QFNUM) (void); +typedef int (*PROC_QFINT) (const char *, int *); +typedef int (*PROC_QFDOUBLE) (const char *, double *); +typedef int (*PROC_QFSTRING) (const char *, char *, const int); + +bool PreferencesDialog::GetPanoVersion() +{ +#ifdef __WXMSW__ + HINSTANCE hDll = NULL; +#else + void *hDll = NULL; +#endif + PROC_QF pfQF = NULL; + PROC_QFNUM pfQFNum = NULL; + PROC_QFINT pfQFInt = NULL; + PROC_QFDOUBLE pfQFDouble = NULL; + PROC_QFSTRING pfQFString = NULL; + + int iResult; + double dResult; + char sResult[256]; + char str1[1000]; + char str2[10000]; + bool bSuccess = true; + +#ifdef __WXMSW__ + hDll = LoadLibrary("pano12.dll"); + if(!hDll) + { + MessageBox((HWND)NULL, "Could not load dll", "panoinfo", MB_ICONEXCLAMATION); + bSuccess = false; + goto cleanup; + } + pfQF = (PROC_QF) GetProcAddress( hDll, "queryFeatures" ); + pfQFNum = (PROC_QFNUM) GetProcAddress( hDll, "queryFeatureCount" ); + pfQFInt = (PROC_QFINT) GetProcAddress( hDll, "queryFeatureInt" ); + pfQFDouble = (PROC_QFDOUBLE) GetProcAddress( hDll, "queryFeatureDouble" ); + pfQFString = (PROC_QFSTRING) GetProcAddress( hDll, "queryFeatureString" ); +#else + hDll = dlopen("libpano12.so.0", RTLD_NOW); + if(!hDll) + { + hDll = dlopen("libpano12.so", RTLD_NOW); + if(!hDll) + { + printf("Could not load pano12"); + bSuccess = false; + goto cleanup; + } + } + + pfQF = (PROC_QF) dlsym( hDll, "queryFeatures" ); + pfQFNum = (PROC_QFNUM) dlsym( hDll, "queryFeatureCount" ); + pfQFInt = (PROC_QFINT) dlsym( hDll, "queryFeatureInt" ); + pfQFDouble = (PROC_QFDOUBLE) dlsym( hDll, "queryFeatureDouble" ); + pfQFString = (PROC_QFSTRING) dlsym( hDll, "queryFeatureString" ); +#endif + str2[0] = '\0'; + if(!pfQF) + { + strcat(str2 ,"Error: The 'queryFeatures' function not present\n"); + } + if(!pfQFNum) + { + strcat(str2 ,"Error: The 'queryFeatureCount' function not present\n"); + } + if(!pfQFString) + { + strcat(str2 ,"Error: The 'queryFeatureString' function not present\n"); + } + if(!pfQFInt) + { + strcat(str2 ,"Error: The 'queryFeatureInt' function not present\n"); + } + if(!pfQFDouble) + { + strcat(str2 ,"Error: The 'queryFeatureDouble' function not present\n"); + } + + + if(pfQFString) + { + if((pfQFString) (PTVERSION_NAME_FILEVERSION, sResult, sizeof(sResult)/sizeof(sResult[0]) )) + { + m_PTVersion = wxString(sResult, *wxConvCurrent); + } + + if((pfQFString) (PTVERSION_NAME_COMMENT, sResult, sizeof(sResult)/sizeof(sResult[0]) )) + { + sprintf(str1, "Comment:\t%s\n", sResult ); + strcat(str2 ,str1); + DEBUG_TRACE("PTVERSION_NAME_COMMENT" << wxString(str2, *wxConvCurrent).mb_str()); + } + + if((pfQFString) (PTVERSION_NAME_LEGALCOPYRIGHT, sResult, sizeof(sResult)/sizeof(sResult[0]) )) + { + sprintf(str1, "Copyright:\t%s\n\n", sResult ); + strcat(str2 ,str1); + } + + } + + if(pfQFInt) + { + if((pfQFInt) ("CPErrorIsDistSphere", &iResult )) + { + sprintf(str1, "Optimizer Error:\t%s\n", iResult? "dist sphere" : "dist rect" ); + strcat(str2 ,str1); + DEBUG_TRACE("PTVERSION_NAME_LEGALCOPYRIGHT" << wxString(str2, *wxConvCurrent).mb_str()); + } + } + + if(pfQFDouble) + { + if((pfQFDouble) ("MaxFFOV", &dResult )) + { + sprintf(str1, "Max FoV:\t\t%f\n\n", dResult ); + strcat(str2 ,str1); + } + + } + + if(pfQFNum && pfQF && pfQFString) + { + int i,bufsize,numfeatures; + char *name; + char *value; + Tp12FeatureType type; + + strcat(str2 ,"Feature List:\n\n"); + + numfeatures = pfQFNum(); + for(i=0; i < numfeatures;i++) + { + pfQF(i, &name, &type); + bufsize = pfQFString(name, NULL, 0)+1; + value = (char*)malloc(bufsize); + pfQFString(name, value, bufsize); + + sprintf(str1, " %s: %s\n", name, value); + strcat(str2 ,str1); + + free(value); + } + } + // use wxConvLocal to deal with the copyright symbols used by panotools + m_PTDetails = wxString(str2, wxConvLocal); + +cleanup: + if (bSuccess) + { +#ifdef __WXMSW__ + FreeLibrary(hDll); +#else + dlclose(hDll); +#endif + return true; + } else { + return false; + } +} void PreferencesDialog::UpdateDisplayData() { @@ -330,7 +510,16 @@ wxT(HUGIN_ENBLEND_EXE))); MY_STR_VAL("prefs_enblend_EnblendArgs", cfg->Read(wxT("/Enblend/EnblendArgs"), wxT(HUGIN_ENBLEND_ARGS))); - + ///// + /// Display Panotools version if we can + if (GetPanoVersion()) + { + MY_STATIC_VAL("prefs_panotools_version", m_PTVersion); + XRCCTRL(*this, "prefs_panotools_details", wxButton)->Enable(); + } else + { + MY_STATIC_VAL("prefs_panotools_version", _("Unknown Version")); + } } void PreferencesDialog::UpdateConfigData() |
From: Douglas W. <dwi...@us...> - 2005-02-01 20:29:14
|
Update of /cvsroot/hugin/hugin/src/include/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5879/src/include/hugin Modified Files: PreferencesDialog.h Log Message: Add panotools info to the preferences dialog Index: PreferencesDialog.h =================================================================== RCS file: /cvsroot/hugin/hugin/src/include/hugin/PreferencesDialog.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PreferencesDialog.h 16 Nov 2004 19:34:19 -0000 1.2 +++ PreferencesDialog.h 1 Feb 2005 20:28:41 -0000 1.3 @@ -62,13 +62,17 @@ void OnClose(wxCloseEvent& event); void OnPTStitcherExe(wxCommandEvent & e); void OnPTOptimizerExe(wxCommandEvent & e); + void OnPTDetails(wxCommandEvent & e); void OnEnblendExe(wxCommandEvent & e); void OnAutopanoSiftExe(wxCommandEvent & e); void OnAutopanoKolorExe(wxCommandEvent & e); void EnableRotationCtrls(bool enable); + bool GetPanoVersion(); private: - + wxString m_PTVersion; + wxString m_PTDetails; + DECLARE_EVENT_TABLE() }; |
From: Douglas W. <dwi...@us...> - 2005-02-01 13:05:52
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26784/src/hugin Modified Files: MainFrame.cpp Log Message: Add support for multi-lingual 'about' dialog Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- MainFrame.cpp 1 Feb 2005 11:45:51 -0000 1.128 +++ MainFrame.cpp 1 Feb 2005 13:05:34 -0000 1.129 @@ -831,7 +831,27 @@ { DEBUG_TRACE(""); wxDialog dlg; + wxString strFile; + wxString langCode; + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("about_dlg")); + + //if the language is not default, load custom About file (if exists) + langCode = huginApp::Get()->GetLocale().GetName().Left(2).Lower(); + DEBUG_TRACE("Lang Code: " << langCode.mb_str()); + if(langCode != wxString(wxT("en"))) + { +#ifdef UNICODE + strFile = m_xrcPrefix + wxT("data/about_") + langCode + wxT("-UTF8.htm"); +#else + strFile = m_xrcPrefix + wxT("data/about_") + langCode + wxT(".htm"); +#endif + if(wxFile::Exists(strFile)) + { + DEBUG_TRACE("Using About: " << strFile.mb_str()); + XRCCTRL(dlg,"about_html",wxHtmlWindow)->LoadPage(strFile); + } + } dlg.ShowModal(); } |
From: Douglas W. <dwi...@us...> - 2005-02-01 11:45:59
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7414/src/hugin Modified Files: MainFrame.cpp Log Message: Ensure non-ansi characters in tips and FAQ display correctly Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- MainFrame.cpp 1 Feb 2005 05:50:08 -0000 1.127 +++ MainFrame.cpp 1 Feb 2005 11:45:51 -0000 1.128 @@ -860,7 +860,11 @@ DEBUG_TRACE("Tip index: " << nValue); if(langCode != wxString(wxT("en"))) { +#ifdef UNICODE + strFile = m_xrcPrefix + wxT("data/tips_") + langCode + wxT("-UTF8.txt"); +#else strFile = m_xrcPrefix + wxT("data/tips_") + langCode + wxT(".txt"); +#endif if(wxFile::Exists(strFile)) bTipsExist = true; } @@ -890,8 +894,30 @@ { DEBUG_TRACE(""); wxDialog dlg; + wxString strFile; + wxString langCode; + bool bFAQExists; + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("help_dlg")); - XRCCTRL(dlg,"help_html",wxHtmlWindow)->LoadPage(m_xrcPrefix + wxT("data/FAQ.html")); + + //if the language is not default, load custom FAQ file (if exists) + langCode = huginApp::Get()->GetLocale().GetName().Left(2).Lower(); + DEBUG_TRACE("Lang Code: " << langCode.mb_str()); + if(langCode != wxString(wxT("en"))) + { +#ifdef UNICODE + strFile = m_xrcPrefix + wxT("data/FAQ_") + langCode + wxT("-UTF8.html"); +#else + strFile = m_xrcPrefix + wxT("data/FAQ_") + langCode + wxT(".html"); +#endif + if(wxFile::Exists(strFile)) + bFAQExists = true; + } + if(!bFAQExists) + strFile = m_xrcPrefix + wxT("data/FAQ.html"); //load default file + + DEBUG_TRACE("Using FAQ: " << strFile.mb_str()); + XRCCTRL(dlg,"help_html",wxHtmlWindow)->LoadPage(strFile); dlg.SetTitle(_("hugin - FAQ")); dlg.ShowModal(); } |
From: Douglas W. <dwi...@us...> - 2005-02-01 11:45:59
|
Update of /cvsroot/hugin/hugin/src/hugin/xrc/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7414/src/hugin/xrc/data Added Files: tips_fr-UTF8.txt Log Message: Ensure non-ansi characters in tips and FAQ display correctly --- NEW FILE: tips_fr-UTF8.txt --- (This appears to be a binary file; contents omitted.) |
From: Douglas W. <dwi...@us...> - 2005-02-01 05:50:20
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25735/src/hugin Modified Files: MainFrame.cpp Log Message: Only make path absolute if it is currently relative Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- MainFrame.cpp 1 Feb 2005 05:11:39 -0000 1.126 +++ MainFrame.cpp 1 Feb 2005 05:50:08 -0000 1.127 @@ -176,12 +176,17 @@ // do not try to transform into an absolute path under windows. // (hugin is started with an absolute path there anyway). { - // make sure the path is absolute to avoid problems if the cwd is changed - wxFileName fn(m_xrcPrefix + wxT("/about.xrc")); - fn.MakeAbsolute(); + // make sure the path is absolute to avoid problems if the cwd is changed + wxFileName fn(m_xrcPrefix + wxT("/about.xrc")); + if (fn.IsRelative()) + { + fn.MakeAbsolute(); + } + m_xrcPrefix = fn.GetPath() + wxT("/"); } -#endif +#else m_xrcPrefix = m_xrcPrefix + wxT("/"); +#endif DEBUG_TRACE("XRC prefix set to: " << m_xrcPrefix.mb_str()); /* start: Mac bundle code by Ippei*/ |
From: Douglas W. <dwi...@us...> - 2005-02-01 05:12:19
|
Update of /cvsroot/hugin/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17174 Modified Files: AUTHORS Log Message: Spelling corrections Index: AUTHORS =================================================================== RCS file: /cvsroot/hugin/hugin/AUTHORS,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- AUTHORS 31 Jan 2005 22:52:18 -0000 1.9 +++ AUTHORS 1 Feb 2005 05:11:38 -0000 1.10 @@ -11,7 +11,7 @@ Translators Marek Januszewski <sp...@we...> polish translation - Jean-Luc Coulon frensh translation + Jean-Luc Coulon french translation Panoglview was written by Fabial Wetzel |
From: Douglas W. <dwi...@us...> - 2005-02-01 05:11:53
|
Update of /cvsroot/hugin/hugin/src/hugin/xrc/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17174/src/hugin/xrc/data Modified Files: FAQ.html Log Message: Spelling corrections Index: FAQ.html =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/data/FAQ.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- FAQ.html 26 Jan 2005 22:13:22 -0000 1.7 +++ FAQ.html 1 Feb 2005 05:11:41 -0000 1.8 @@ -276,7 +276,7 @@ <h4><a href="#top" name="pano_gimp_layers">I want to use gimp to tweak the seams of my image, but gimp can't read the PSD?</a></h4> <p> Unfortunately, <a href="http://www.gimp.org">The GIMP</a> can't read the PSD files - generated by PTSticher, and the multiple tiff output it cumbersome to use. There are two possiblilites to work around this: + generated by PTStitcher, and the multiple tiff output it cumbersome to use. There are two possiblilites to work around this: </p> <ol> <li> @@ -295,7 +295,7 @@ <p> This will will produce a multi_layer.tif file, that contains all remapped images, cropped to their bounding box. This will - save a lot of space, compared to a "traditional" PTSticher + save a lot of space, compared to a "traditional" PTStitcher layered output file, where all layers have the full panorama size. </p> <p> @@ -307,11 +307,11 @@ <li> <p> - If this is to cumbersome or you need PTSticher features not + If this is to cumbersome or you need PTStitcher features not supported by nona, you can also use <a href="http://www.vierpi.de/tif2xcf.html">tif2xcf</a>, to combine the multiple TIFF output into a multilayer XCF. </p> <p> - Important: PTSticher does not create the output files, if the output file + Important: PTStitcher does not create the output files, if the output file contains an .tif extension. So, specify only the basename, without the extension. </p> |
From: Douglas W. <dwi...@us...> - 2005-02-01 05:11:51
|
Update of /cvsroot/hugin/hugin/src/hugin/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17174/src/hugin/po Modified Files: de.po fr.po hugin.pot it.po pl.po Log Message: Spelling corrections Index: pl.po =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/pl.po,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- pl.po 31 Jan 2005 07:39:01 -0000 1.27 +++ pl.po 1 Feb 2005 05:11:40 -0000 1.28 @@ -600,12 +600,12 @@ msgstr "Pliki projektów (*.pto)|*.pto|Wszystkie pliki (*.*)|*.*" #: src/hugin/MainFrame.cpp:498 -msgid "Save PTSticher script file" +msgid "Save PTStitcher script file" msgstr "Zapisz plik skryptu PTStitcher" #: src/hugin/MainFrame.cpp:500 -msgid "PTSticher files (*.txt)|*.txt" -msgstr "Pliki PTSticher'a (*.txt)|*.txt" +msgid "PTStitcher files (*.txt)|*.txt" +msgstr "Pliki PTStitcher'a (*.txt)|*.txt" #: src/hugin/MainFrame.cpp:524 msgid "Open project: " @@ -1798,7 +1798,7 @@ msgstr "Zapisz obecny projekt do nowego pliku" #: src/hugin/xrc/main_menu.xrs:10 -msgid "&Write PTSticher script" +msgid "&Write PTStitcher script" msgstr "Zapisz skrypt PT&Stitchera" #: src/hugin/xrc/main_menu.xrs:11 Index: it.po =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/it.po,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- it.po 31 Jan 2005 07:39:01 -0000 1.17 +++ it.po 1 Feb 2005 05:11:40 -0000 1.18 @@ -574,11 +574,11 @@ msgstr "" #: src/hugin/MainFrame.cpp:498 -msgid "Save PTSticher script file" +msgid "Save PTStitcher script file" msgstr "" #: src/hugin/MainFrame.cpp:500 -msgid "PTSticher files (*.txt)|*.txt" +msgid "PTStitcher files (*.txt)|*.txt" msgstr "" #: src/hugin/MainFrame.cpp:524 @@ -1697,7 +1697,7 @@ msgstr "" #: src/hugin/xrc/main_menu.xrs:10 -msgid "&Write PTSticher script" +msgid "&Write PTStitcher script" msgstr "" #: src/hugin/xrc/main_menu.xrs:11 Index: de.po =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/de.po,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- de.po 31 Jan 2005 07:39:01 -0000 1.60 +++ de.po 1 Feb 2005 05:11:39 -0000 1.61 @@ -611,12 +611,12 @@ msgstr "Projekt Dateien (*.pto)|*.pto|Alle Dateien (*.*)|*.*" #: src/hugin/MainFrame.cpp:498 -msgid "Save PTSticher script file" +msgid "Save PTStitcher script file" msgstr "PTStitcher Skript Datei speichern" #: src/hugin/MainFrame.cpp:500 -msgid "PTSticher files (*.txt)|*.txt" -msgstr "PTSticher Dateien (*.txt)|*.txt" +msgid "PTStitcher files (*.txt)|*.txt" +msgstr "PTStitcher Dateien (*.txt)|*.txt" #: src/hugin/MainFrame.cpp:524 msgid "Open project: " @@ -1809,7 +1809,7 @@ msgstr "Projekt unter neuem Namen speicheren" #: src/hugin/xrc/main_menu.xrs:10 -msgid "&Write PTSticher script" +msgid "&Write PTStitcher script" msgstr "P&TStitcher Skript schreiben" #: src/hugin/xrc/main_menu.xrs:11 Index: fr.po =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/fr.po,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- fr.po 31 Jan 2005 19:12:10 -0000 1.24 +++ fr.po 1 Feb 2005 05:11:40 -0000 1.25 @@ -585,11 +585,11 @@ msgstr "Fichiers de projets (*.pto)|*.pto|Tous les fichiers (*.*)|*.*" #: src/hugin/MainFrame.cpp:498 -msgid "Save PTSticher script file" +msgid "Save PTStitcher script file" msgstr "Enregistrer le fichier script PTStitcher" #: src/hugin/MainFrame.cpp:500 -msgid "PTSticher files (*.txt)|*.txt" +msgid "PTStitcher files (*.txt)|*.txt" msgstr "Fichiers PTStitcher (*.txt)|*.txt" #: src/hugin/MainFrame.cpp:524 @@ -1780,7 +1780,7 @@ msgstr "Enregistrer le projet en cours dans un nouveau fichier" #: src/hugin/xrc/main_menu.xrs:10 -msgid "&Write PTSticher script" +msgid "&Write PTStitcher script" msgstr "É&crire un script PTStitcher" #: src/hugin/xrc/main_menu.xrs:11 Index: hugin.pot =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/po/hugin.pot,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- hugin.pot 30 Jan 2005 19:03:48 -0000 1.22 +++ hugin.pot 1 Feb 2005 05:11:40 -0000 1.23 @@ -541,11 +541,11 @@ msgstr "" #: src/hugin/MainFrame.cpp:498 -msgid "Save PTSticher script file" +msgid "Save PTStitcher script file" msgstr "" #: src/hugin/MainFrame.cpp:500 -msgid "PTSticher files (*.txt)|*.txt" +msgid "PTStitcher files (*.txt)|*.txt" msgstr "" #: src/hugin/MainFrame.cpp:524 @@ -1624,7 +1624,7 @@ msgstr "" #: src/hugin/xrc/main_menu.xrs:10 -msgid "&Write PTSticher script" +msgid "&Write PTStitcher script" msgstr "" #: src/hugin/xrc/main_menu.xrs:11 |
From: Douglas W. <dwi...@us...> - 2005-02-01 05:11:51
|
Update of /cvsroot/hugin/hugin/src/hugin/xrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17174/src/hugin/xrc Modified Files: main_menu.xrc Log Message: Spelling corrections Index: main_menu.xrc =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/main_menu.xrc,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- main_menu.xrc 28 Jan 2005 21:12:10 -0000 1.19 +++ main_menu.xrc 1 Feb 2005 05:11:40 -0000 1.20 @@ -24,7 +24,7 @@ <help>Save current project to a new file</help> </object> <object class="wxMenuItem" name="action_save_as_ptstitcher"> - <label>&Write PTSticher script</label> + <label>&Write PTStitcher script</label> <help>Write current project to a PTStitcher compatible script file, useful for batch processing</help> </object> <object class="separator"/> |
From: Douglas W. <dwi...@us...> - 2005-02-01 05:11:51
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17174/src/hugin Modified Files: MainFrame.cpp Log Message: Spelling corrections Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- MainFrame.cpp 31 Jan 2005 07:39:00 -0000 1.125 +++ MainFrame.cpp 1 Feb 2005 05:11:39 -0000 1.126 @@ -501,13 +501,13 @@ { DEBUG_TRACE(""); wxFileDialog dlg(this, - _("Save PTSticher script file"), + _("Save PTStitcher script file"), wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")), wxT(""), - _("PTSticher files (*.txt)|*.txt"), + _("PTStitcher files (*.txt)|*.txt"), wxSAVE, wxDefaultPosition); if (dlg.ShowModal() == wxID_OK) { wxString fname = dlg.GetPath(); - // the project file is just a PTSticher script... + // the project file is just a PTStitcher script... wxFileName scriptName = fname; std::ofstream script(scriptName.GetFullPath().mb_str()); pano.printStitcherScript(script, pano.getOptions()); |
From: Pablo d'A. <da...@us...> - 2005-01-31 23:22:40
|
Update of /cvsroot/hugin/hugin/src/nona_gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30017 Added Files: nona_gui.vcproj Log Message: project file to build nona_gui with msvc --- NEW FILE: nona_gui.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="nona_gui" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release DLL|Win32" OutputDirectory=".\ReleaseDLL" IntermediateDirectory=".\ReleaseDLL" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../../include,../../../contrib/include,../../../lib/mswdll" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\ReleaseDLL/XrcDemoVC.pch" AssemblerListingLocation=".\ReleaseDLL/" ObjectFile=".\ReleaseDLL/" ProgramDataBaseFileName=".\ReleaseDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib wxxrc.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=""..\..\..\libs\wxWindows\lib";..\..\..\libs\libpano\pano12" IgnoreDefaultLibraryNames="libc.lib,libci.lib" ProgramDatabaseFile=".\ReleaseDLL/xmldemo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\ReleaseDLL/XrcDemoVC.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="2057"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../include;../foreign;"..\..\..\libs\wxWindows\lib\mswd"" PreprocessorDefinitions="DEBUG;WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT" RuntimeLibrary="3" BufferSecurityCheck="TRUE" PrecompiledHeaderFile=".\Debug/XrcDemoVC.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib pano12.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=""..\..\..\libs\wxWindows\lib";..\..\..\libs\libpano\pano12" IgnoreDefaultLibraryNames="libcd.lib,libcid.lib,msvcrt.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/xmldemo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Debug/XrcDemoVC.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="2057" AdditionalIncludeDirectories=""..\..\..\libs\wxWindows\include""/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug DLL|Win32" OutputDirectory=".\DebugDLL" IntermediateDirectory=".\DebugDLL" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../include,../../../contrib/include,../../../lib/mswdlld" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1" RuntimeLibrary="3" PrecompiledHeaderFile=".\DebugDLL/XrcDemoVC.pch" AssemblerListingLocation=".\DebugDLL/" ObjectFile=".\DebugDLL/" ProgramDataBaseFileName=".\DebugDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib wxxrcd.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=""..\..\..\libs\wxWindows\lib";..\..\..\libs\libpano\pano12" IgnoreDefaultLibraryNames="libcd.lib,libcid.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\DebugDLL/xmldemo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\DebugDLL/XrcDemoVC.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="2057"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="1" InlineFunctionExpansion="2" AdditionalIncludeDirectories="../include;../foreign;"..\..\..\libs\wxWindows\lib\msw"" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/XrcDemoVC.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib pano12.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=""..\..\..\libs\wxWindows\lib";..\..\..\libs\libpano\pano12" IgnoreDefaultLibraryNames="libc.lib,libci.lib,msvcrtd.lib" ProgramDatabaseFile=".\Release/xmldemo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Release/XrcDemoVC.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="2057" AdditionalIncludeDirectories=""..\..\..\libs\wxWindows\include""/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug Unicode|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../include;../foreign;"..\..\..\libs\wxWindows\lib\mswud"" PreprocessorDefinitions="DEBUG;WIN32;_DEBUG;__WXDEBUG__;WINVER=0x0400;STRICT;UNICODE;__WXMSW__" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/XrcDemoVC.pch" AssemblerListingLocation=".\Debug Unicode" ObjectFile=".\Debug Unicode/" ProgramDataBaseFileName=".\Debug Unicode/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib pano12.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="" IgnoreDefaultLibraryNames="libcd.lib,libcid.lib,msvcrt.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug Unicode/xmldemo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Debug/XrcDemoVC.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="2057" AdditionalIncludeDirectories=""..\..\..\libs\wxWindows\include""/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release Unicode|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" Optimization="1" InlineFunctionExpansion="2" AdditionalIncludeDirectories="../include;../foreign;"..\..\..\libs\wxWindows\lib\mswu"" PreprocessorDefinitions="NDEBUG;WIN32;__WXMSW__;WINVER=0x0400;STRICT;UNICODE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/XrcDemoVC.pch" AssemblerListingLocation=".\Release Unicode/" ObjectFile=".\Release Unicode/" ProgramDataBaseFileName=".\Release Unicode/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib pano12.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\libs\libpano\pano12" IgnoreDefaultLibraryNames="libc.lib,libci.lib,msvcrtd.lib" ProgramDatabaseFile=".\Release/xmldemo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Release/XrcDemoVC.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool" Description="Installing to temporary folder" CommandLine="vc_hugin_inst.bat" ExcludedFromBuild="TRUE"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="2057" AdditionalIncludeDirectories=""..\..\..\libs\wxWindows\include""/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter=""> <File RelativePath="..\hugin\MyProgressDialog.cpp"> </File> <File RelativePath=".\nona_gui.cpp"> </File> </Filter> <Filter Name="Header Files" Filter=""> </Filter> <Filter Name="Resource Files" Filter=""> <File RelativePath=".\nona_gui_rc.rc"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> |
From: Pablo d'A. <da...@us...> - 2005-01-31 22:53:09
|
Update of /cvsroot/hugin/hugin/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21303/utils Modified Files: hugin.nsi Log Message: updates for windows build Index: hugin.nsi =================================================================== RCS file: /cvsroot/hugin/hugin/utils/hugin.nsi,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- hugin.nsi 2 Nov 2004 18:24:57 -0000 1.3 +++ hugin.nsi 31 Jan 2005 22:52:23 -0000 1.4 @@ -1,8 +1,10 @@ ;-------------------------------- -!define HUGIN_VERSION "0.4 beta" +!define HUGIN_VERSION "0.5 beta1" !define DISPLAY_NAME "Hugin ${HUGIN_VERSION}" -!define HAVE_MINGW +;!define HAVE_MINGW +;!define NEED_MINGW +;!define HUGIN_EXPERIMENTAL_TOOLS ;!define HUGIN_ALLINONE ;-------------------------------- @@ -16,15 +18,15 @@ Name "${DISPLAY_NAME}" !ifdef HUGIN_ALLINONE -OutFile "hugin-0.4_beta_allinone_setup.exe" +OutFile "hugin-0.5_beta1_allinone_setup.exe" !else -OutFile "hugin-0.4_beta_setup.exe" +OutFile "hugin-0.5_beta1_setup.exe" !endif Caption "${DISPLAY_NAME}" # [Licence Attributes] LicenseText "Hugin is distributed under the GNU General Public License :" -LicenseData "LICENCE" +LicenseData "LICENCE.txt" # [Directory Selection] InstallDir "$PROGRAMFILES\hugin" @@ -57,7 +59,7 @@ # [Pages] - !insertmacro MUI_PAGE_LICENSE "LICENCE" + !insertmacro MUI_PAGE_LICENSE "LICENCE.txt" !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES @@ -81,23 +83,29 @@ SectionIn RO SetOutPath "$INSTDIR" + File "hugin.exe" + File "LICENCE.txt" + File "VIGRA_LICENSE.txt" + File "AUTHORS.txt" + File "README_WINDOWS.txt" + File "nona_gui.exe" + File "panoglview.exe" + SetOutPath "$INSTDIR\locale" + File /r "locale\*" + SetOutPath "$INSTDIR\xrc" + File /r "xrc\*" +!ifdef HUGIN_EXPERIMENTAL_TOOLS File "automatch.exe" + File "nona.exe" File "autooptimiser.exe" File "autopano_old.exe" - File "hugin.exe" - File "LICENCE" - File "mingwm10.dll" - File "nona.exe" - File "nona_gui.exe" File "panosifter.exe" File "sift_keypoints.exe" File "zhang_undistort.exe" - File "jpeg62.dll" - File "libpng12.dll" - File "libtiff3.dll" - File "zlib1.dll" - File "panoglview.exe" - +!endif +!ifdef HUGIN_NEED_MINGW + File "mingwm10.dll" +!endif !ifdef HUGIN_ALLINONE File "pano12.dll" File "PTStitcher.exe" @@ -110,10 +118,6 @@ WriteRegStr HKCU "Software\hugin\Panotools" "PTOptimizerExe" "$INSTDIR\PTOptimizer.exe" !endif - SetOutPath "$INSTDIR\locale" - File /r "locale\*" - SetOutPath "$INSTDIR\xrc" - File /r "xrc\*" ; Write the installation path into the registry WriteRegStr HKLM SOFTWARE\Hugin "Install_Dir" "$INSTDIR" @@ -147,6 +151,7 @@ CreateDirectory "$0\Hugin" SetOutPath $INSTDIR CreateShortCut "$0\Hugin\Hugin.lnk" "$INSTDIR\hugin.exe" + CreateShortCut "$0\Hugin\nona_gui.lnk" "$INSTDIR\nona_gui.exe" CreateShortCut "$0\Hugin\PanoGLView.lnk" "$INSTDIR\panoglview.exe" CreateShortCut "$0\Hugin\Uninstall Hugin.lnk" "$INSTDIR\uninstall.exe" SectionEnd @@ -160,9 +165,15 @@ Section "Associate .pto files with Hugin" StrCpy $0 $INSTDIR\hugin.exe WriteRegStr HKCR ".pto" "" "Hugin.pto" + WriteRegStr HKCR ".oto" "" "Hugin.pto" WriteRegStr HKCR "Hugin.pto" "" "Hugin Project File" WriteRegStr HKCR "Hugin.pto\DefaultIcon" "" '$0,0' WriteRegStr HKCR "Hugin.pto\Shell\Open\Command" "" '$0 "%1"' + + StrCpy $0 $INSTDIR\nona_gui.exe + WriteRegStr HKCR ".pto" "" "nona_gui.pto" + WriteRegStr HKCR "nona_gui.pto\DefaultIcon" "" '$0,0' + WriteRegStr HKCR "nona_gui.pto\Shell\Open\Command" "" '$0 "%1"' Call RefreshShellIcons SectionEnd @@ -174,23 +185,26 @@ ShowUninstDetails show Section "Uninstall" - Delete "$INSTDIR\automatch.exe" - Delete "$INSTDIR\autooptimiser.exe" - Delete "$INSTDIR\autopano_old.exe" Delete "$INSTDIR\hugin.exe" Delete "$INSTDIR\LICENCE" - Delete "$INSTDIR\mingwm10.dll" Delete "$INSTDIR\nona.exe" Delete "$INSTDIR\nona_gui.exe" + Delete "$INSTDIR\panoglview.exe" + Delete "$INSTDIR\uninstall.exe" + RMDir /r "$INSTDIR\locale" + RMDir /r "$INSTDIR\xrc" + RMDir "$INSTDIR" +!ifdef HUGIN_NEED_MINGW + File "mingwm10.dll" +!endif +!ifdef HUGIN_EXPERIMENTAL_TOOLS + Delete "$INSTDIR\automatch.exe" + Delete "$INSTDIR\autooptimiser.exe" + Delete "$INSTDIR\autopano_old.exe" Delete "$INSTDIR\panosifter.exe" Delete "$INSTDIR\sift_keypoints.exe" Delete "$INSTDIR\zhang_undistort.exe" - Delete "$INSTDIR\jpeg62.dll" - Delete "$INSTDIR\libpng12.dll" - Delete "$INSTDIR\libtiff3.dll" - Delete "$INSTDIR\zlib1.dll" - Delete "$INSTDIR\panoglview.exe" - Delete "$INSTDIR\uninstall.exe" +!endif !ifdef HUGIN_ALLINONE Delete "$INSTDIR\pano12.dll" @@ -200,15 +214,12 @@ Delete "$INSTDIR\enblend.exe" !endif - RMDir /r "$INSTDIR\locale" - RMDir /r "$INSTDIR\xrc" - - RMDir "$INSTDIR" ; Remove icons ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin\Backup" \ "Shortcuts" Delete "$0\Hugin\Hugin.lnk" + Delete "$0\Hugin\nona_gui.lnk" Delete "$0\Hugin\Uninstall Hugin.lnk" RMDir "$0\Hugin" SetShellVarContext current @@ -220,7 +231,9 @@ ; Remove file association DeleteRegKey HKCR ".pto" + DeleteRegKey HKCR ".oto" DeleteRegKey HKCR "Hugin.pto" + DeleteRegKey HKCR "nona_gui.pto" Call un.RefreshShellIcons SectionEnd |
From: Pablo d'A. <da...@us...> - 2005-01-31 22:53:09
|
Update of /cvsroot/hugin/hugin/src/nona_gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21303/src/nona_gui Modified Files: nona_gui.cpp Log Message: updates for windows build Index: nona_gui.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/nona_gui/nona_gui.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- nona_gui.cpp 14 Nov 2004 09:30:49 -0000 1.14 +++ nona_gui.cpp 31 Jan 2005 22:52:22 -0000 1.15 @@ -24,7 +24,7 @@ * */ -#include <config.h> +#include "config.h" #include "panoinc_WX.h" #include <wx/cmdline.h> |