forked from pool/hugin
60 lines
2.6 KiB
Diff
60 lines
2.6 KiB
Diff
|
Index: src/Panorama/PanoramaMemento.cpp
|
||
|
|
================================================================================
|
||
|
|
--- src/foreign/vigra_impex/jpeg.cxx
|
||
|
|
+++ src/foreign/vigra_impex/jpeg.cxx
|
||
|
|
@@ -81,9 +81,10 @@
|
||
|
|
desc.magicStrings[0][2] = '\377';
|
||
|
|
|
||
|
|
// init file extensions
|
||
|
|
- desc.fileExtensions.resize(2);
|
||
|
|
+ desc.fileExtensions.resize(3);
|
||
|
|
desc.fileExtensions[0] = "jpg";
|
||
|
|
desc.fileExtensions[1] = "jpeg";
|
||
|
|
+ desc.fileExtensions[2] = "jpe";
|
||
|
|
|
||
|
|
desc.bandNumbers.resize(2);
|
||
|
|
desc.bandNumbers[0] = 1;
|
||
|
|
--- src/hugin/LensPanel.cpp
|
||
|
|
+++ src/hugin/LensPanel.cpp
|
||
|
|
@@ -709,7 +709,8 @@
|
||
|
|
// check file extension
|
||
|
|
wxFileName file(wxString(pano.getImage(imgNr).getFilename().c_str(), *wxConvCurrent));
|
||
|
|
if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 ||
|
||
|
|
- file.GetExt().CmpNoCase(wxT("jpeg")) == 0 )
|
||
|
|
+ file.GetExt().CmpNoCase(wxT("jpeg")) == 0 ||
|
||
|
|
+ file.GetExt().CmpNoCase(wxT("jpe")) == 0 )
|
||
|
|
{
|
||
|
|
double c=0;
|
||
|
|
initLensFromFile(pano.getImage(imgNr).getFilename().c_str(), c, lens);
|
||
|
|
--- src/hugin/MainFrame.cpp
|
||
|
|
+++ src/hugin/MainFrame.cpp
|
||
|
|
@@ -93,6 +93,8 @@
|
||
|
|
wxFileName file(filenames[0]);
|
||
|
|
|
||
|
|
if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 ||
|
||
|
|
+ file.GetExt().CmpNoCase(wxT("jpeg")) == 0 ||
|
||
|
|
+ file.GetExt().CmpNoCase(wxT("jpe")) == 0 ||
|
||
|
|
file.GetExt().CmpNoCase(wxT("tif")) == 0 ||
|
||
|
|
file.GetExt().CmpNoCase(wxT("tiff")) == 0 ||
|
||
|
|
file.GetExt().CmpNoCase(wxT("png")) == 0 ||
|
||
|
|
@@ -614,7 +616,7 @@
|
||
|
|
// get the global config object
|
||
|
|
wxConfigBase* config = wxConfigBase::Get();
|
||
|
|
|
||
|
|
- wxString wildcard (_("All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg)|*.jpg;*.JPG|All files (*)|*"));
|
||
|
|
+ wxString wildcard (_("All Image files|*.jpg;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files|*.jpg;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE|All files (*)|*"));
|
||
|
|
wxFileDialog dlg(this,_("Add images"),
|
||
|
|
config->Read(wxT("actualPath"),wxT("")), wxT(""),
|
||
|
|
wildcard, wxOPEN|wxMULTIPLE , wxDefaultPosition);
|
||
|
|
--- src/Panorama/PanoramaMemento.cpp
|
||
|
|
+++ src/Panorama/PanoramaMemento.cpp
|
||
|
|
@@ -269,7 +269,7 @@
|
||
|
|
}
|
||
|
|
setImageSize(vigra::Size2D(width, height));
|
||
|
|
|
||
|
|
- if (ext != "JPG" && ext != "JPEG") {
|
||
|
|
+ if (ext != "JPG" && ext != "JPEG" && ext != "JPE") {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|