Hugin

Update of /cvsroot/hugin/hugin/mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11791

Modified Files:
	autopano-complete-mac.sh 
Log Message:
Oliver Beckstein has hacked around the problem with spaces in the path.

Index: autopano-complete-mac.sh
===================================================================
RCS file: /cvsroot/hugin/hugin/mac/autopano-complete-mac.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- autopano-complete-mac.sh	9 Jun 2005 22:45:43 -0000	1.6
+++ autopano-complete-mac.sh	26 Jul 2005 16:50:33 -0000	1.7
@@ -1,7 +1,11 @@
 #!/bin/bash
-
+# Time-stamp: <2005-07-24 22:05:26 oliver>
 # by Pablo d'Angelo <pablo.dangelo@...>
 # modified by Ippei UKAI <ippei_ukai@...> for HuginOSX
+# Oliver Beckstein 2005-07-24 <orbeckst@...>
+# - dirty hack to handle filenames with spaces 
+#   (better: reimplement in perl/python)
+
 
 set -e
 
@@ -11,6 +15,23 @@
     exit 1
 }
 
+# dirty hack to protect whitespace in filenames
+# replace temporarily with ' ' -> '__SPACE__'
+# (the same trick is later used to get quotes where they are supposed to be)
+_SPACE='__SPACE__';
+_QUOTE='__QUOTE__';
+
+function protect_space () {
+    local a="${1}"
+    echo "${a}" | sed -e "s| |${_SPACE}|g";
+}
+
+function unprotect_space () {
+    local a="${1}"
+    echo "${a}" | sed -e "s|${_SPACE}| |g";
+}
+
+
 MONO=$(which mono)
 if [ "$MONO" = "" -o ! -x "$MONO" ]
 then 
@@ -20,8 +41,9 @@
 fi
 
 # Set this to the directory you installed autopano-sift into, for example
-#AUTOPANO_PATH="/Users/ippei/Download/HuginOSX/autopano-sift"
-# Do not use a trailing backslash. If the executeables are within your path
+#AUTOPANO_PATH="/usr/local/lib/autopano-sift/bin"
+
+# Do not use a trailing backslash. If the executebles are within your path
 # (recommended, you can leave the line below).
 #AUTOPANO_PATH=$(dirname $(which generatekeys-sd.exe))
 AUTOPANO_PATH=`dirname "$0"`/autopano-sift
@@ -54,6 +76,16 @@
 #	exit 1
 #fi
 
+
+# dirty hack to protect space in filenames
+protected_args="";
+for a in "$@"; do
+    a=`protect_space "${a}"`;
+    protected_args="${protected_args} ${a}";
+done 
+
+set -- ${protected_args}
+
 #args=`getopt o:a:s:p:nch $*`
 args=`getopt o:s:p:nch $*`
 set -- $args
@@ -68,7 +100,7 @@
 
 while true ; do
         case "$1" in
-                -o) PANOFILE=$2; shift 2;;
+                -o) PANOFILE="`unprotect_space $2`"; shift 2;;
 #                -a) AUTOPANO_PATH=$2; shift 2;;
                 -s) SIZE=$2; shift 2;;
                 -p) POINTS=$2; shift 2 ;;
@@ -91,26 +123,44 @@
 if [ ! -f "$AUTOPANO_PATH/autopano.exe" ]
 then echo error "Cannot locate autopano.exe in $AUTOPANO_PATH"; myexit; fi
 
+# DEBUGGING: set -x
+# bring back space only when filename complete 
+# (bash quoting sucks---rewrite in perl or whatever)
 KEYFILES=""
 for arg do
-        FILENAME=$(basename $arg).key.gz
+        FILENAME="$(basename $arg).key.gz"
+	# keep space-protected filenames in KEYFILES 
+        # (unprotect only when needed at end):
 	KEYFILES="$KEYFILES $FILENAME"
-	if [ -f $FILENAME ]; then
+	# unprotect filenames which are needed NOW:
+	FILENAME="`unprotect_space ${FILENAME}`"
+	arg="`unprotect_space ${arg}`"
+	if [ -f "$FILENAME" ]; then
 		if [ $CLEAN -ne 0 ]; then
-            echo "$MONO \"$AUTOPANO_PATH/generatekeys-sd.exe\" $arg $FILENAME $SIZE"
-			$MONO "$AUTOPANO_PATH/generatekeys-sd.exe" $arg $FILENAME $SIZE
+		    echo "$MONO \"$AUTOPANO_PATH/generatekeys-sd.exe\" \"$arg\" \"$FILENAME\" $SIZE"
+		    $MONO "$AUTOPANO_PATH/generatekeys-sd.exe" "$arg" "$FILENAME" $SIZE
 		else
 			echo "Using previously generated keypoint file: $FILENAME"
 		fi
 	else
-		echo "$MONO \"$AUTOPANO_PATH/generatekeys-sd.exe\" $arg $FILENAME $SIZE"
-		$MONO "$AUTOPANO_PATH/generatekeys-sd.exe" $arg $FILENAME $SIZE
+		echo "$MONO \"$AUTOPANO_PATH/generatekeys-sd.exe\" \"$arg\" \"$FILENAME\" $SIZE"
+		$MONO "$AUTOPANO_PATH/generatekeys-sd.exe" "$arg" "$FILENAME" $SIZE
 	fi
 done
 
-echo "keyfiles: $KEYFILES"
+echo "keyfiles (space protected): $KEYFILES"
 ARG="--ransac $RANSAC --maxmatches $POINTS";
-echo "$MONO \"$AUTOPANO_PATH/autopano.exe\" $ARG $PANOFILE $KEYFILES"
-$MONO "$AUTOPANO_PATH/autopano.exe" $ARG $PANOFILE $KEYFILES
+echo "$MONO \"$AUTOPANO_PATH/autopano.exe\" $ARG \"$PANOFILE\" $KEYFILES"
+
+# splice in KEYFILES with spaces
+cmd="$MONO \"$AUTOPANO_PATH/autopano.exe\" $ARG \"$PANOFILE\""
+keys=""
+# use __QUOTE__ and __SPACE__ to build final commandline
+for k in ${KEYFILES}; do
+    keys="${keys} ${_QUOTE}${k}${_QUOTE}"
+done;
+cmd=`echo "${cmd} ${keys}" | sed -e "s|${_QUOTE}|\"|g" -e "s|${_SPACE}| |g"`
+echo "Final command: '${cmd}"
+eval "${cmd}" 
 
 sleep 3;

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4193/src/hugin

Modified Files:
	CPEditorPanel.cpp 
Log Message:
added newline at end


Index: CPEditorPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/CPEditorPanel.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- CPEditorPanel.cpp	25 Jun 2005 21:13:42 -0000	1.104
+++ CPEditorPanel.cpp	26 Jul 2005 06:07:44 -0000	1.105
@@ -278,7 +278,7 @@
 	sashPos = m_cp_splitter->GetSashPosition();
 #ifdef __WXMSW__
 	// Work around a bug in GetSashPosition/SetSashPosition on wxMSW when the
-	// splitter is housed in a wxNotebook. We adjust the sash position by the 
+	// splitter is housed in a wxNotebook. We adjust the sash position by the
 	// height of the notebook tabs
     wxSize sz = m_cp_splitter->GetSize();
     wxSize szp = m_cp_splitter->GetParent()->GetParent()->GetParent()->GetClientSize();
@@ -326,7 +326,7 @@
 #endif
     m_cp_splitter_img->SplitVertically( leftWindow, rightWindow );
 	m_cp_splitter_img->SetMinimumPaneSize(20);
-    
+
     // setup splitter between images and bottom row.
     leftWindow = XRCCTRL(*this, "cp_editor_split_top", wxPanel);
     DEBUG_ASSERT(leftWindow);
@@ -1148,7 +1148,7 @@
       m_leftChoice->Enable();
       m_rightChoice->Enable();
 #endif
-      
+
   	  // FIXME: lets hope that nobody holds references to these images..
       ImageCache::getInstance().softFlush();
 
@@ -1400,7 +1400,7 @@
         if(width != -1)
             m_cpList->SetColumnWidth(j, width);
     }
-    
+
     m_cpList->Show();
 }
 
@@ -2059,4 +2059,4 @@
 {
     int colNum = e.GetColumn();
     wxConfigBase::Get()->Write( wxString::Format(wxT("/CPEditorPanel/ColumnWidth%d"),colNum), m_cpList->GetColumnWidth(colNum) );
-}
\ No newline at end of file
+}

Update of /cvsroot/hugin/hugin/src/Panorama
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3789/src/Panorama

Modified Files:
	PanoramaMemento.cpp Panorama.cpp 
Log Message:
nona: added support for selecting tiff compression.


Index: Panorama.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/Panorama.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- Panorama.cpp	28 May 2005 16:42:10 -0000	1.89
+++ Panorama.cpp	26 Jul 2005 06:05:17 -0000	1.90
@@ -135,6 +135,22 @@
     return true;
 }
 
+bool PT::getPTStringParamColon(std::string & output, const std::string & line, const std::string & parameter)
+{
+    std::string::size_type p;
+    if ((p=line.find(std::string(" ") + parameter + ":")) == std::string::npos) {
+        DEBUG_INFO("could not find string param " << parameter
+                    << " in line: " << line);
+        return false;
+    }
+    p += 3;
+    std::string::size_type e = line.find(" ",p);
+    DEBUG_DEBUG("p:" << p << " e:" << e);
+    output = line.substr(p,e-p);
+    DEBUG_DEBUG("output: ##" << output << "##");
+    return true;
+}
+
 bool PT::getDoubleParam(double & d, const std::string & line, const std::string & name)
 {
     std::string s;
@@ -331,7 +347,7 @@
 FDiff2D Panorama::calcFOV() const
 {
     Size2D panoSize(360,180);
-    
+
     // remap into minature pano.
     PanoramaOptions opts;
     opts.HFOV=360;
@@ -362,7 +378,7 @@
     ul.x = DBL_MAX;
     ul.y = DBL_MAX;
     lr.x = -DBL_MAX;
-    lr.y = -DBL_MAX;  
+    lr.y = -DBL_MAX;
     for (int v=0; v< 180; v++) {
         for (int h=0; h < 360; h++) {
             if (panoAlpha(h,v)) {
@@ -394,7 +410,7 @@
 void Panorama::centerHorizontically()
 {
     Size2D panoSize(360,180);
-    
+
     // remap into minature pano.
     PanoramaOptions opts;
     opts.HFOV=360;
@@ -431,15 +447,15 @@
                 curColOccupied = true;
             }
         }
-        if (colOccupied && (! curColOccupied) || 
-            (!colOccupied) && curColOccupied ) 
+        if (colOccupied && (! curColOccupied) ||
+            (!colOccupied) && curColOccupied )
         {
             // change in position, save point.
             borders.push_back(h-180);
             colOccupied = curColOccupied;
         }
     }
-    
+
 
     size_t lastidx = borders.size() -1;
     if (lastidx == -1) {
@@ -1253,7 +1269,7 @@
         }
         (*it).image1Nr = n1;
         (*it).image2Nr = n2;
-    }    
+    }
 
     // update panorama options
     if (state.options.colorReferenceImage == img1) {

Index: PanoramaMemento.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/PanoramaMemento.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- PanoramaMemento.cpp	28 May 2005 16:42:11 -0000	1.57
+++ PanoramaMemento.cpp	26 Jul 2005 06:05:17 -0000	1.58
@@ -605,13 +605,42 @@
             // n"JPEG q80"
             getPTStringParam(format,line,"n");
             int t = format.find(' ');
-            // FIXME. add argument parsing for output formats
+ 
             options.outputFormat = options.getFormatFromName(format.substr(0,t));
-            // "parse" jpg quality
-            unsigned int q = format.find('q',t);
-            if (q != string::npos) {
-                DEBUG_DEBUG("found jpg quality: " << format.substr(q+1));
-                options.quality = utils::lexical_cast<int, string>(format.substr(q+1));
+
+            // parse output format options.
+            switch (options.outputFormat)
+            {
+            case PanoramaOptions::JPEG:
+                {
+                    // "parse" jpg quality
+                    int q;
+                    if (getIntParam(q, format, "q") ) {
+                        options.quality = (int) q;
+                    }
+                }
+                break;
+            case PanoramaOptions::TIFF:
+            case PanoramaOptions::TIFF_m:
+            case PanoramaOptions::TIFF_mask:
+            case PanoramaOptions::TIFF_multilayer:
+            case PanoramaOptions::TIFF_multilayer_mask:
+                {
+                    // parse tiff compression mode
+                    std::string comp;
+                    if (getPTStringParamColon(comp, format, "c")) {
+                        if (comp == "NONE" || comp == "LZW" ||
+                            comp == "DEFLATE") 
+                        {
+                            options.tiffCompression = comp;
+                        } else {
+                            DEBUG_WARN("No valid tiff compression found");
+                        }
+                    }
+                }
+                break;
+            default:
+                break;
             }
 
             int cRefImg = 0;

Update of /cvsroot/hugin/hugin/src/include/vigra_ext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3789/src/include/vigra_ext

Modified Files:
	tiffUtils.h 
Log Message:
nona: added support for selecting tiff compression.


Index: tiffUtils.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/vigra_ext/tiffUtils.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tiffUtils.h	24 Nov 2004 18:39:05 -0000	1.9
+++ tiffUtils.h	26 Jul 2005 06:05:16 -0000	1.10
@@ -55,6 +55,7 @@
  */
 inline void createTiffDirectory(vigra::TiffImage * tiff, const std::string & pagename,
 				const std::string & documentname,
+                                const std::string comp,
 				uint16 page, uint16 nImg,
 				vigra::Diff2D offset)
 {
@@ -62,9 +63,9 @@
     // create a new directory for our image
     // hopefully I didn't forget too much stuff..
     // TIFF tag reference at http://www.awaresystems.be/imaging/tiff/tifftags.html
-    
+
     // FIXME: Should not create a new directory unless this is a new layer since TIFFOpen
-    //        already creates a new directory and this breaks some windows builds. 
+    //        already creates a new directory and this breaks some windows builds.
     //        Maybe move the create into the multilayer stuff
     //        or write a createMultiTiffDirectory?
     //TIFFCreateDirectory (tiff);
@@ -87,8 +88,20 @@
     TIFFSetField (tiff, TIFFTAG_PAGENAME, pagename.c_str() );
     //
     TIFFSetField (tiff, TIFFTAG_IMAGEDESCRIPTION, "stitched with hugin");
-    // FIXME: what should this be set to? 
-    TIFFSetField(tiff, TIFFTAG_COMPRESSION, COMPRESSION_ADOBE_DEFLATE);
+    // FIXME: what should this be set to?
+    
+    // set compression
+    unsigned short tiffcomp;
+    if ( comp == "JPEG" )
+        tiffcomp = COMPRESSION_OJPEG;
+    else if ( comp == "LZW" )
+        tiffcomp = COMPRESSION_LZW;
+    else if ( comp == "DEFLATE" )
+        tiffcomp = COMPRESSION_DEFLATE;
+    else
+        tiffcomp = COMPRESSION_NONE;
+    
+    TIFFSetField(tiff, TIFFTAG_COMPRESSION, tiffcomp);
 }
 
 
@@ -176,7 +189,7 @@
     TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, sampleformat);
     TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
     TIFFSetField(tiff, TIFFTAG_ROWSPERSTRIP, 1);
-		      
+		
     // for alpha stuff, do not uses premultilied data
     // We do not want to throw away data & accuracy by premultiplying
     uint16 nextra_samples = 1;

Update of /cvsroot/hugin/hugin/src/include/PT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3789/src/include/PT

Modified Files:
	Stitcher.h PanoramaMemento.h Panorama.h 
Log Message:
nona: added support for selecting tiff compression.


Index: PanoramaMemento.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/PanoramaMemento.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- PanoramaMemento.h	26 May 2005 22:11:39 -0000	1.45
+++ PanoramaMemento.h	26 Jul 2005 06:05:17 -0000	1.46
@@ -211,7 +211,7 @@
 
     /** try to read image information from file */
     bool initFromFile(const std::string & filename, double &cropFactor);
-    
+
 //    double isLandscape() const {
 //        return sensorRatio >=1;
 //    }
@@ -354,6 +354,7 @@
           width(3000),
           outfile("panorama.JPG"),outputFormat(JPEG),
           quality(90),
+          tiffCompression("none"),
 	  tiff_saveROI(false),
           colorCorrection(NONE), colorReferenceImage(0),
           gamma(1.0), interpolator(vigra_ext::INTERP_CUBIC),
@@ -370,6 +371,7 @@
             width = 3000;
             outfile = "panorama.JPG";
             quality = 90;
+            tiffCompression = "none";
 	    tiff_saveROI = false;
             colorCorrection = NONE;
             colorReferenceImage = 0;
@@ -419,6 +421,7 @@
     // jpeg options
     int quality;
     // TIFF options
+    std::string tiffCompression;
     bool tiff_saveROI;
 
     ColorCorrection colorCorrection;

Index: Panorama.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/Panorama.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Panorama.h	26 May 2005 22:11:39 -0000	1.41
+++ Panorama.h	26 Jul 2005 06:05:17 -0000	1.42
@@ -77,6 +77,8 @@
 bool getPTStringParam(std::string & output, const std::string & line,
 	              const std::string & parameter);
 
+bool getPTStringParamColon(std::string & output, const std::string & line, const std::string & parameter);
+
 bool getDoubleParam(double & d, const std::string & line, const std::string & name);
 
 bool getPTDoubleParam(double & value, int & link,

Index: Stitcher.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/Stitcher.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Stitcher.h	5 May 2005 21:25:12 -0000	1.25
+++ Stitcher.h	26 Jul 2005 06:05:17 -0000	1.26
@@ -101,7 +101,7 @@
     double alphaScale;
     bool circCrop = pano.getLens(pano.getImage(imgNr).getLensNr()).getProjection() == Lens::CIRCULAR_FISHEYE;
     estimateImageRect(Size2D(opts.width, opts.getHeight()), srcSize,
-                      imgOpts.docrop, imgOpts.cropRect, circCrop,  
+                      imgOpts.docrop, imgOpts.cropRect, circCrop,
                       transf,
                       imageRect, miniAlpha, alphaScale);
 
@@ -114,12 +114,14 @@
         vigra_ext::createTiffDirectory(tiff,
                                        img.getFilename(),
                                        m_basename,
+                                       opts.tiffCompression,
                                        imgNr+1, nImg,
                                        imageRect.upperLeft());
     } else {
         vigra_ext::createTiffDirectory(tiff,
                                        img.getFilename(),
                                        m_basename,
+                                       opts.tiffCompression,
                                        imgNr+1, nImg,
                                        vigra::Diff2D(0,0));
 }
@@ -274,6 +276,7 @@
             vigra_ext::createTiffDirectory(tiff,
                                            Base::m_pano.getImage(imgNr).getFilename(),
                                            m_basename,
+                                           opts.tiffCompression,
                                            imgNr+1, nImg,
                                            vigra::Diff2D(0,0));
             vigra_ext::createAlphaTiffImage(srcImageRange(complete),
@@ -353,6 +356,7 @@
         vigra_ext::createTiffDirectory(m_tiff,
                                        Base::m_pano.getImage(imgNr).getFilename(),
                                        Base::m_basename,
+                                       opts.tiffCompression,
                                        imgNr+1, nImg, remapped.boundingBox().upperLeft());
         vigra_ext::createAlphaTiffImage(vigra::srcImageRange(remapped.m_image),
                                         vigra::maskImage(remapped.m_mask),

Update of /cvsroot/hugin/hugin/src/foreign/vigra_impex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3556/src/foreign/vigra_impex

Modified Files:
	pnm.cxx 
Log Message:
added support for 16 bit ppm files (generated by dcraw)


Index: pnm.cxx
===================================================================
RCS file: /cvsroot/hugin/hugin/src/foreign/vigra_impex/pnm.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pnm.cxx	27 Oct 2004 18:12:51 -0000	1.2
+++ pnm.cxx	26 Jul 2005 06:03:25 -0000	1.3
@@ -31,8 +31,8 @@
 
 namespace vigra {
 
-    typedef short int16_t;
-    typedef int   int32_t;
+    typedef unsigned short uint16_t;
+    typedef unsigned int   uint32_t;
 
     CodecDesc PnmCodecFactory::getCodecDesc() const
     {
@@ -44,8 +44,8 @@
         // init pixel types
         desc.pixelTypes.resize(3);
         desc.pixelTypes[0] = "UINT8";
-        desc.pixelTypes[1] = "INT16";
-        desc.pixelTypes[2] = "INT32";
+        desc.pixelTypes[1] = "UINT16";
+        desc.pixelTypes[2] = "UINT32";
 
         // init compression types
         desc.compressionTypes.resize(3);
@@ -120,6 +120,10 @@
         void read_bilevel_raw_scanline();
         void read_raw_scanline();
 
+        void read_raw_scanline_uchar();
+        void read_raw_scanline_ushort();
+        void read_raw_scanline_uint();
+
         // skip whitespace and comment blocks
         void skip();
 
@@ -196,6 +200,19 @@
 
     void PnmDecoderImpl::read_raw_scanline()
     {
+        if ( pixeltype == std::string("UINT8") ) {
+            read_raw_scanline_uchar();
+        }
+        if ( pixeltype == std::string("UINT16") ) {
+            read_raw_scanline_ushort();
+        }
+        if ( pixeltype == std::string("UINT32") ) {
+            read_raw_scanline_uint();
+        }
+    }
+
+    void PnmDecoderImpl::read_raw_scanline_uchar()
+    {
         // XXX implement this also for other pixel types than unsigned char
 
         // cast the bands to the correct type
@@ -206,6 +223,50 @@
         stream.read( reinterpret_cast< char * >(cbands.data()),
                      width * components );
     }
+    
+    void PnmDecoderImpl::read_raw_scanline_ushort()
+    {
+        // XXX implement this also for other pixel types than unsigned char
+
+        // cast the bands to the correct type
+        typedef void_vector< unsigned short > vector_type;
+        vector_type & cbands = reinterpret_cast< vector_type & >(bands);
+
+        // read and store, need to swap bytes.
+        byteorder bo( "big endian" );
+        read_array( stream, bo, reinterpret_cast< uint16_t * >(cbands.data()),
+                    width * components );
+        /*
+        uint16_t * ptr = reinterpret_cast< uint16_t * >(cbands.data());
+        uint16_t tmp;
+        for (int i=0; i < width * components; i++) {            
+            stream.read(reinterpret_cast< char * >(&tmp), 2);
+            *ptr = ntohs(tmp);
+            ptr++;
+        }
+*/
+//        stream.read( reinterpret_cast< char * >(cbands.data()),
+//                     width * components * 2 );
+    }
+
+    void PnmDecoderImpl::read_raw_scanline_uint()
+    {
+        // XXX implement this also for other pixel types than unsigned char
+
+        // cast the bands to the correct type
+        typedef void_vector< unsigned int > vector_type;
+        vector_type & cbands = reinterpret_cast< vector_type & >(bands);
+
+
+        byteorder bo( "big endian" );
+        read_array( stream, bo, reinterpret_cast< uint32_t * >(cbands.data()),
+                    width * components );
+        
+        // read and store
+//        stream.read( reinterpret_cast< char * >(cbands.data()),
+//                     width * components * 4 );
+    }
+    
 
     // reads the header.
     PnmDecoderImpl::PnmDecoderImpl( const std::string & filename )
@@ -301,9 +362,9 @@
 	if ( bits <= 8 )
             pixeltype = "UINT8";
 	else if ( bits <= 15 )
-            pixeltype = "INT16";
+            pixeltype = "UINT16";
 	else if ( bits <= 31 )
-            pixeltype = "INT32";
+            pixeltype = "UINT32";
 	else
             vigra_precondition( false,
                                 "the file's maxval field is too large" );
@@ -311,9 +372,9 @@
 	// adjust the buffer size
 	if ( pixeltype == "UINT8" )
             bands.resize( width * components );
-	else if ( pixeltype == "INT16" )
+	else if ( pixeltype == "UINT16" )
             bands.resize( width * components * 2 );
-	else if ( pixeltype == "INT32" )
+	else if ( pixeltype == "UINT32" )
             bands.resize( width * components * 4 );
 
 #ifdef DEBUG
@@ -373,13 +434,13 @@
             const bands_type & bands
                 = static_cast< const bands_type & >(pimpl->bands);
             return bands.data() + band;
-        } else if ( pimpl->pixeltype == "INT16" ) {
-            typedef void_vector<int16_t> bands_type;
+        } else if ( pimpl->pixeltype == "UINT16" ) {
+            typedef void_vector<uint16_t> bands_type;
             const bands_type & bands
                 = static_cast< const bands_type & >(pimpl->bands);
             return bands.data() + band;
-        } else if ( pimpl->pixeltype == "INT32" ) {
-            typedef void_vector<int32_t> bands_type;
+        } else if ( pimpl->pixeltype == "UINT32" ) {
+            typedef void_vector<uint32_t> bands_type;
             const bands_type & bands
                 = static_cast< const bands_type & >(pimpl->bands);
             return bands.data() + band;
@@ -547,10 +608,10 @@
         if ( pimpl->pixeltype == "UINT8" )
             pimpl->bands.resize( pimpl->height * pimpl->width
                                  * pimpl->components );
-        else if ( pimpl->pixeltype == "INT16" )
+        else if ( pimpl->pixeltype == "UINT16" )
             pimpl->bands.resize( 2 * pimpl->height * pimpl->width
                                  * pimpl->components );
-        else if ( pimpl->pixeltype == "INT32" )
+        else if ( pimpl->pixeltype == "UINT32" )
             pimpl->bands.resize( 4 * pimpl->height * pimpl->width
                                  * pimpl->components );
     }
@@ -563,13 +624,13 @@
             bands_type & bands
                 = static_cast< bands_type & >(pimpl->bands);
             return bands.data() + pimpl->scanline * row_stride + band;
-        } else if ( pimpl->pixeltype == "INT16" ) {
-            typedef void_vector<int16_t> bands_type;
+        } else if ( pimpl->pixeltype == "UINT16" ) {
+            typedef void_vector<uint16_t> bands_type;
             bands_type & bands
                 = static_cast< bands_type & >(pimpl->bands);
             return bands.data() + pimpl->scanline * row_stride + band;
-        } else if ( pimpl->pixeltype == "INT32" ) {
-            typedef void_vector<int32_t> bands_type;
+        } else if ( pimpl->pixeltype == "UINT32" ) {
+            typedef void_vector<uint32_t> bands_type;
             bands_type & bands
                 = static_cast< bands_type & >(pimpl->bands);
             return bands.data() + pimpl->scanline * row_stride + band;
@@ -618,11 +679,11 @@
             stream << std::endl; // separate lines with a newline
           }
 
-        } else if ( pixeltype == "INT16" ) {
+        } else if ( pixeltype == "UINT16" ) {
 
-          typedef void_vector<int16_t> vector_type;
+          typedef void_vector<uint16_t> vector_type;
           vector_type & cbands = static_cast< vector_type & >(bands);
-          int16_t * iter = cbands.data();
+          uint16_t * iter = cbands.data();
           for( unsigned int i = 0; i < height; ++i ) {
             for ( unsigned int j = 0; j < width; ++j ) {
               for ( unsigned int k = 0; k < components; ++k ) {
@@ -635,11 +696,11 @@
             stream << std::endl; // separate lines with a newline
           }
 
-        } else if ( pixeltype == "INT32" ) {
+        } else if ( pixeltype == "UINT32" ) {
 
-          typedef void_vector<int32_t> vector_type;
+          typedef void_vector<uint32_t> vector_type;
           vector_type & cbands = static_cast< vector_type & >(bands);
-          int32_t * iter = cbands.data();
+          uint32_t * iter = cbands.data();
           for( unsigned int i = 0; i < height; ++i ) {
             for ( unsigned int j = 0; j < width; ++j ) {
               for ( unsigned int k = 0; k < components; ++k ) {
@@ -687,10 +748,10 @@
             stream.write( reinterpret_cast< char * >(cbands.data()),
                           height * width * components );
 
-        } else if ( pixeltype == "INT16" ) {
+        } else if ( pixeltype == "UINT16" ) {
 
             // cast the bands to the correct type
-            typedef void_vector<int16_t> vector_type;
+            typedef void_vector<uint16_t> vector_type;
             vector_type & cbands = static_cast< vector_type & >(bands);
 
             // write and store
@@ -721,10 +782,10 @@
                 for( unsigned char * iter = cbands.begin();
                      iter < cbands.end(); ++iter )
                     if ( *iter > maxval ) maxval = *iter;
-            } else if ( pimpl->pixeltype == "INT16" ) {
-                void_vector<int16_t> & cbands
-                    = static_cast< void_vector<int16_t> & >(pimpl->bands);
-                for( int16_t * iter = cbands.begin();
+            } else if ( pimpl->pixeltype == "UINT16" ) {
+                void_vector<uint16_t> & cbands
+                    = static_cast< void_vector<uint16_t> & >(pimpl->bands);
+                for( uint16_t * iter = cbands.begin();
                      iter < cbands.end(); ++iter )
                     if ( *iter > maxval ) maxval = *iter;
             }

Update of /cvsroot/hugin/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26306

Modified Files:
	configure.ac 
Log Message:
forgot to remove reference to keypoints directory


Index: configure.ac
===================================================================
RCS file: /cvsroot/hugin/hugin/configure.ac,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- configure.ac	18 Jul 2005 21:22:13 -0000	1.23
+++ configure.ac	19 Jul 2005 06:53:11 -0000	1.24
@@ -252,7 +252,6 @@
                  src/hugin/xrc/Makefile
                  src/hugin/xrc/data/Makefile
                  src/jhead/Makefile
-                 src/keypoints/Makefile
                  src/nona_gui/Makefile
 		 src/nona_gui/po/Makefile.in
                  src/tools/Makefile])

Update of /cvsroot/hugin/hugin/src/nona_gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11379/src/nona_gui

Modified Files:
	nona_gui.vcproj 
Log Message:
autoconf/make files ware not updated completely after removal of obselete code


Index: nona_gui.vcproj
===================================================================
RCS file: /cvsroot/hugin/hugin/src/nona_gui/nona_gui.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nona_gui.vcproj	5 May 2005 21:31:34 -0000	1.4
+++ nona_gui.vcproj	18 Jul 2005 21:22:14 -0000	1.5
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../include;../foreign;&quot;..\..\..\libs\wxWindows\lib\mswd&quot;"
+				AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\mswd;..\..\..\libs\wxWidgets\include"
 				PreprocessorDefinitions="DEBUG;WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				RuntimeLibrary="1"
 				BufferSecurityCheck="TRUE"
@@ -37,11 +37,11 @@
 				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"
+				AdditionalDependencies="wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib pano12.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib"
 				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\..\libs\wxWindows\lib&quot;;..\..\..\libs\libpano\pano12"
+				AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib,msvcrt.lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/xmldemo.pdb"
@@ -65,7 +65,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="&quot;..\..\..\libs\wxWindows\include&quot;"/>
+				AdditionalIncludeDirectories="&quot;..\..\..\libs\wxWidgets\include&quot;"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -88,7 +88,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="../include;../foreign;&quot;..\..\..\libs\wxWindows\lib\msw&quot;"
+				AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\msw;..\..\..\libs\wxWidgets\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -104,11 +104,11 @@
 				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"
+				AdditionalDependencies="wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib pano12.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib"
 				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\..\libs\wxWindows\lib&quot;;..\..\..\libs\libpano\pano12"
+				AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12"
 				IgnoreDefaultLibraryNames=""
 				ProgramDatabaseFile=".\Release/xmldemo.pdb"
 				SubSystem="2"
@@ -131,7 +131,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="&quot;..\..\..\libs\wxWindows\include&quot;"/>
+				AdditionalIncludeDirectories="&quot;..\..\..\libs\wxWidgets\include&quot;"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -154,7 +154,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="../include;../foreign;&quot;..\..\..\libs\wxWindows\lib\mswu&quot;"
+				AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\mswu;..\..\..\libs\wxWidgets\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;__WXMSW__;WINVER=0x0400;STRICT;UNICODE;wxUSE_UNICODE=1"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -170,11 +170,11 @@
 				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 regexu.lib pano12.lib"
+				AdditionalDependencies="wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib pano12.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib"
 				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\libs\libpano\pano12"
+				AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12"
 				IgnoreDefaultLibraryNames=""
 				ProgramDatabaseFile=".\Release/xmldemo.pdb"
 				SubSystem="2"
@@ -200,7 +200,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="&quot;..\..\..\libs\wxWindows\include&quot;"/>
+				AdditionalIncludeDirectories="&quot;..\..\..\libs\wxWidgets\include&quot;"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11379/src/hugin

Modified Files:
	ImagesList.cpp LensPanel.cpp 
Log Message:
autoconf/make files ware not updated completely after removal of obselete code


Index: LensPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/LensPanel.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- LensPanel.cpp	18 May 2005 12:50:21 -0000	1.82
+++ LensPanel.cpp	18 Jul 2005 21:22:14 -0000	1.83
@@ -282,7 +282,8 @@
     {
         // need to check, since the m_selectedImages list might still be in an old state
         if (*it < pano.getNrOfImages()) {
-            m_selectedLenses.insert(pano.getImage(*it).getLensNr());
+            unsigned int lNr = pano.getImage(*it).getLensNr();
+            m_selectedLenses.insert(lNr);
         }
     }
     // we need to do something if the image we are editing has changed.
@@ -307,7 +308,8 @@
              it != m_selectedLenses.end(); ++it)
         {
             // get lens from pano
-            Lens lens = pano.getLens(*it);
+            unsigned int lNr = *it;
+            Lens lens = pano.getLens(lNr);
             // uses enum Lens::LensProjectionFormat from PanoramaMemento.h
             int var = XRCCTRL(*this, "lens_val_projectionFormat",
                               wxComboBox)->GetSelection();

Index: ImagesList.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/ImagesList.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ImagesList.cpp	10 Jun 2005 23:12:36 -0000	1.33
+++ ImagesList.cpp	18 Jul 2005 21:22:14 -0000	1.34
@@ -240,7 +240,7 @@
 void ImagesList::OnItemSelected ( wxListEvent & e )
 {
     DEBUG_TRACE(e.GetIndex());
-    if(e.GetIndex() == -1) return;
+    if(e.GetIndex() < 0) return;
     selectedItems.insert((int)e.GetIndex());
     // allow other parents to receive this event, only if its
     // generated by the user, and not during an automatic update
@@ -253,7 +253,7 @@
 void ImagesList::OnItemDeselected ( wxListEvent & e )
 {
     DEBUG_TRACE(e.GetIndex());
-    if(e.GetIndex() == -1) return;
+    if(e.GetIndex() < 0) return;
     selectedItems.erase((int)e.GetIndex());
     // allow other parents to receive this event, only if its
     // generated by the user, and not during an automatic update

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11379/src/include/hugin

Modified Files:
	config_defaults.h 
Log Message:
autoconf/make files ware not updated completely after removal of obselete code


Index: config_defaults.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/config_defaults.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- config_defaults.h	26 May 2005 20:25:00 -0000	1.16
+++ config_defaults.h	18 Jul 2005 21:22:14 -0000	1.17
@@ -53,7 +53,7 @@
 
 // GUI defaults
 #define HUGIN_LANGUAGE                        wxLANGUAGE_DEFAULT
-// sort by filename
+// sort by filename (1), sort by date (2)
 #define HUGIN_GUI_SORT_NEW_IMG_ON_ADD         1l
 
 // Program defaults

Update of /cvsroot/hugin/hugin/src/build_msvc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11379/src/build_msvc

Modified Files:
	Hugin.sln 
Log Message:
autoconf/make files ware not updated completely after removal of obselete code


Index: Hugin.sln
===================================================================
RCS file: /cvsroot/hugin/hugin/src/build_msvc/Hugin.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Hugin.sln	16 May 2005 19:19:38 -0000	1.1
+++ Hugin.sln	18 Jul 2005 21:22:13 -0000	1.2
@@ -1,8 +1,4 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vigra_ext", "..\vigra_ext\vigra_ext.vcproj", "{609891D5-B1A9-43E3-9B67-AD53D6008158}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Panorama", "..\Panorama\Panorama.vcproj", "{609891D5-B1A9-43E3-9B66-AD53D6008158}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -13,7 +9,6 @@
 		{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
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jhead", "..\jhead\jhead.vcproj", "{E974EF12-9647-400A-AF30-1D0E70D1C32C}"
@@ -31,7 +26,6 @@
 		{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
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nona", "..\tools\nona.vcproj", "{FADF17E6-3037-47E7-B556-DE1112D3237A}"
@@ -41,7 +35,6 @@
 		{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
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\common\common.vcproj", "{609891D5-B1A9-43E3-9B61-AD53D6008158}"
@@ -63,12 +56,6 @@
 		Release Unicode = Release Unicode
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{609891D5-B1A9-43E3-9B67-AD53D6008158}.Debug.ActiveCfg = Debug|Win32
-		{609891D5-B1A9-43E3-9B67-AD53D6008158}.Debug.Build.0 = Debug|Win32
-		{609891D5-B1A9-43E3-9B67-AD53D6008158}.Release.ActiveCfg = Release|Win32
-		{609891D5-B1A9-43E3-9B67-AD53D6008158}.Release.Build.0 = Release|Win32
-		{609891D5-B1A9-43E3-9B67-AD53D6008158}.Release Unicode.ActiveCfg = Release Unicode|Win32
-		{609891D5-B1A9-43E3-9B67-AD53D6008158}.Release Unicode.Build.0 = Release Unicode|Win32
 		{609891D5-B1A9-43E3-9B66-AD53D6008158}.Debug.ActiveCfg = Debug|Win32
 		{609891D5-B1A9-43E3-9B66-AD53D6008158}.Debug.Build.0 = Debug|Win32
 		{609891D5-B1A9-43E3-9B66-AD53D6008158}.Release.ActiveCfg = Release|Win32

Update of /cvsroot/hugin/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11379

Modified Files:
	Makefile.am configure.ac 
Log Message:
autoconf/make files ware not updated completely after removal of obselete code


Index: configure.ac
===================================================================
RCS file: /cvsroot/hugin/hugin/configure.ac,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- configure.ac	20 May 2005 15:03:21 -0000	1.22
+++ configure.ac	18 Jul 2005 21:22:13 -0000	1.23
@@ -253,11 +253,9 @@
                  src/hugin/xrc/data/Makefile
                  src/jhead/Makefile
                  src/keypoints/Makefile
-                 src/klt/Makefile
                  src/nona_gui/Makefile
 		 src/nona_gui/po/Makefile.in
-                 src/tools/Makefile
-                 src/vigra_ext/Makefile])
+                 src/tools/Makefile])
 
 AC_SUBST(ac_aux_dir)
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	18 May 2005 13:16:03 -0000	1.5
+++ Makefile.am	18 Jul 2005 21:22:13 -0000	1.6
@@ -5,5 +5,5 @@
 	rm -rf `find $(distdir)/admin $(distdir)/utils $(distdir)/m4 $(distdir)/mac -name CVS`
 	rm -rf `find $(distdir)/admin $(distdir)/utils $(distdir)/m4 $(distdir)/mac -name .cvsignore`
 
-EXTRA_DIST = admin m4 mac utils bootstrap BUGS LICENCE LICENCE_SIFT windows_compile.txt windows_DOT_NET_compile.txt
+EXTRA_DIST = admin m4 mac utils bootstrap BUGS LICENCE LICENCE_VIGRA LICENCE_JHEAD windows_DOT_NET_compile.txt

Update of /cvsroot/hugin/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21173

Modified Files:
	TODO 
Added Files:
	LICENCE_JHEAD LICENCE_VIGRA 
Removed Files:
	windows_compile.txt 
Log Message:
Added licence files for JHEAD, move VIGRA_LICENCE

--- windows_compile.txt DELETED ---

--- NEW FILE: LICENCE_VIGRA ---
The VIGRA Artistic License
==========================
(modeled after the Perl Artistic License)


Preamble
--------

The intent of this document is to state the conditions under which 
VIGRA may be copied, such that the author maintains some
semblance of artistic control over the development of the library,
while giving the users of the library the right to use and
distribute VIGRA in a more-or-less customary fashion, plus the
right to make reasonable modifications.


Definitions
-----------

"Copyright Holder" of the VIGRA library is 
Ullrich Koethe, Cognitive Systems Group, University of Hamburg, Germany.

"Library" refers to the collection of files distributed by the
Copyright Holder under the name "VIGRA" (including this 
LICENSE file and all accompanying documentation), and derivatives of that 
collection of files created through textual modification.

"Standard Version" refers to the Library if it has not been
modified, or has been modified in accordance with the wishes of the
Copyright Holder as specified below.

"You" is you, if you're thinking about using, copying, modifying or
distributing this Library.

"Freely Available" means that no fee is charged for the item.
It also means that recipients of the item may redistribute it 
under the same conditions they received it.

"Reasonable copying fee" is whatever you can justify on the basis
of media cost, duplication charges, time of people involved, and so
on. (You will not be required to justify it to the Copyright Holder,
but only to the computing community at large as a market that must
bear the fee.)


License terms
-------------

1. You may make and give away verbatim copies of the 
   Standard Version of this Library without restriction, provided that
   you duplicate all of the original copyright notices, this license,
   and associated disclaimers. 

2. The Standard Version of the Library may be distributed as part
   of a collection of software, provided no more than a reasonable
   copying fee is charged for the software collection.

3. You may apply bug fixes and portability fixes
   derived from the Public Domain or from the Copyright Holder. A
   Library modified in such a way shall still be considered the
   Standard Version.

4. You may otherwise modify your copy of this Library in any way,
   provided that you insert a prominent notice in each changed file
   stating how and when you changed that file, and provided that you do
   at least ONE of the following:

    a. place your modifications in the Public Domain or otherwise
       make them Freely Available, for example by allowing the Copyright 
       Holder to include your modifications in the Standard Version of 
       the Library.

    b. use the modified Library only within your corporation or
       organization. 

    c. make other distribution arrangements with the Copyright
       Holder.

5. You may distribute programs which use this Library
   in object code or executable form without restriction.

6. Any object code generated as a result of using this Library 
   does not fall under the copyright of this Library, but
   belongs to whomever generated it, and may be sold commercially.

7. The name of the Copyright Holder or the Library may not be used to 
   endorse or promote products derived from this software without 
   specific prior written permission.

8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR
   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

   IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, 
   INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES
   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
   OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY
   THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE
   OR PERFORMANCE OF THIS LIBRARY.

Index: TODO
===================================================================
RCS file: /cvsroot/hugin/hugin/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TODO	30 May 2003 10:42:34 -0000	1.2
+++ TODO	18 Jul 2005 12:29:27 -0000	1.3
@@ -1,21 +1 @@
-this is very unfinished.. do a grep FIXME on all sourcefile to get more TODO's ;)
-
-- parsing of optimizer results
-- control point selector
-- control point editor
-- panorama output properties
-
-after initial release.
-
-- (semi) automatic control point creator
-
-- rewrite of Panorama/* classes
-  - move intelligence into Panorama class
-    - fine grained change notifications, reduce unnessecary updates.
-      (DAG change manager from GOF book?)
-  - move all optimizeable variables into a Variables class.
-  - provide a separate OptimizeSettings class, that tells wich
-    variables should be optimized... so that the optimization
-    is 
-
-  - relative path in project files
\ No newline at end of file
+Use the sourceforge site for TODO tasks.
\ No newline at end of file

--- NEW FILE: LICENCE_JHEAD ---
Liscence:

    Jhead is public domain software - that is, you can do whatever you want
    with it, and include it software that is licensesed under the GNU or the
    BSD license, or whatever other licence you chose, including proprietary
    closed source licenses.  Although not part of the liscense, I do expect
    common courtesy, please.

    If you do integrate the code into some software of yours, I'd appreciate
    knowing about it though.

Update of /cvsroot/hugin/hugin/src/nona_gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/nona_gui

Modified Files:
	Makefile.am 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/src/nona_gui/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	29 Oct 2004 11:47:48 -0000	1.6
+++ Makefile.am	18 Jul 2005 12:06:01 -0000	1.7
@@ -26,7 +26,7 @@
 nona_gui_SOURCES = nona_gui.cpp $(WIN_SRC)
 
 nona_gui_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la \
-                   ${top_builddir}/src/jhead/libjhead.la ${top_builddir}/src/vigra_ext/libvigra_ext.la \
+                   ${top_builddir}/src/jhead/libjhead.la \
 		   ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la ${top_builddir}/src/hugin/libhuginwxutils.la
 
 EXTRA_DIST       = nona_gui_rc.rc

Update of /cvsroot/hugin/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016

Modified Files:
	AUTHORS README README_WINDOWS windows_DOT_NET_compile.txt 
Removed Files:
	LICENCE_SIFT 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


Index: README
===================================================================
RCS file: /cvsroot/hugin/hugin/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README	3 Jul 2004 09:41:42 -0000	1.6
+++ README	18 Jul 2005 12:05:57 -0000	1.7
@@ -9,33 +9,25 @@
  - nona, a simple replacement for PTStitcher (doesn't support most
    features of PTStitcher, but is several times faster, opensource and
    will be extended in the future).
-
- - autopano, creates hugin project files, for single row panoramas.
-
- - panosifter, creates hugin project files, from arbitrary images,
-   uses a simple matching algorithm and a sift featue detector
-   [only works on linux right now.]
+ 
+ - nona_gui, nona with a graphical progress bar.
 
  - autooptimiser, optimise a panorama pairwise, starting from an
    anchor image. cmd line version of the pairwise mode in hugin
 
- - keypoints, an implementation of the SIFT feature detection algorithm.
-    Beware, it's licenced under a special LICENCE found in the SIFT_LICENCE
-    file, due to a possible patent on the SIFT algorithm.
+These programs are build on top of the panorama tools library,
+http://panotools.sf.net
 
 The following external programs are highly recommended:
 
-1. panotools
-2. enblend
+1. enblend
+2. autopano or autopano-sift
     
 hugin can be used to stitch multiple images together. The resulting image can
 span 360 degrees. Another common use is the creation of very high resolution
 pictures by combining multiple images.
 
-It uses the Panorama Tools (http://www.path.unimelb.edu.au/~dersch/)
-as backend, to create high quality images
-
-see our homepage for more information: http://hugin.sf.net
+See http://hugin.sf.net for more information an tutorials.
 
 typical use:
 
@@ -46,17 +38,6 @@
 5. set output parameters and stich images together.
 
 
-Knowledge of Panorama Tools is needed to use hugin.
-Good introductions are the tutorials from PTGUI and PTAssembler.
-The steps are approximately the same.
-
-Some links to get you started:
-
-http://hugin.sf.net
-http://www.tawbaware.com/ptasmblr.htm
-http://www.ptgui.org
-http://www.nic.fi/~juhe/ptbcbgui/
-http://www.bigbenpublishing.com.au/
-
 Please use the ptx mailing list if you have questions or suggestions:
 ptx@... (or http://www.email-lists.org/mailman/listinfo/ptx)
+

Index: README_WINDOWS
===================================================================
RCS file: /cvsroot/hugin/hugin/README_WINDOWS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README_WINDOWS	31 Jan 2005 22:52:19 -0000	1.1
+++ README_WINDOWS	18 Jul 2005 12:05:57 -0000	1.2
@@ -6,34 +6,31 @@
  - hugin, The main program, a GUI for the panorama tools suite
    and some programs included here.
 
- - nona_gui, a simple replacement for PTStitcher (doesn't all
-   features of PTStitcher, but is opensource and
+ - nona, a simple replacement for PTStitcher (doesn't support most
+   features of PTStitcher, but is several times faster, opensource and
    will be extended in the future).
+ 
+ - nona_gui, nona with a graphical progress bar.
 
- - panoglviewer, a fast hardware accelerated viewer for spherical
-    panoramas.
-
-Please visit the hugin website for documentation and tutorials:
-
-                   http://hugin.sf.net
+ - autooptimiser, optimise a panorama pairwise, starting from an
+   anchor image. cmd line version of the pairwise mode in hugin
+   
+ - panoglviewer, a fast OpenGL accelerated viewer for spherical
+   panoramas.
 
+These programs are build on top of the panorama tools library,
+http://panotools.sf.net
 
 The following external programs are highly recommended:
 
-1. panotools
-2. enblend
-3. autopano or autopano-sift
+1. enblend
+2. autopano or autopano-sift
     
 hugin can be used to stitch multiple images together. The resulting image can
 span 360 degrees. Another common use is the creation of very high resolution
 pictures by combining multiple images.
 
-It uses the Panorama Tools (http://www.path.unimelb.edu.au/~dersch/)
-as backend, to create high quality images
-
-See our homepage for more information, documentation and tutorials.
- 
-   http://hugin.sf.net
+See http://hugin.sf.net for more information an tutorials.
 
 typical use:
 
@@ -44,17 +41,6 @@
 5. set output parameters and stich images together.
 
 
-Knowledge of Panorama Tools is needed to use hugin.
-Good introductions are the tutorials from PTGUI and PTAssembler.
-The steps are approximately the same.
-
-Some links to get you started:
-
-http://hugin.sf.net
-http://www.tawbaware.com/ptasmblr.htm
-http://www.ptgui.org
-http://www.nic.fi/~juhe/ptbcbgui/
-http://www.bigbenpublishing.com.au/
-
 Please use the ptx mailing list if you have questions or suggestions:
 ptx@... (or http://www.email-lists.org/mailman/listinfo/ptx)
+

Index: windows_DOT_NET_compile.txt
===================================================================
RCS file: /cvsroot/hugin/hugin/windows_DOT_NET_compile.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- windows_DOT_NET_compile.txt	16 May 2005 19:17:41 -0000	1.3
+++ windows_DOT_NET_compile.txt	18 Jul 2005 12:05:57 -0000	1.4
@@ -29,7 +29,3 @@
 
 7. Open hugin/src/Hugin.sln and compile.
 
-8. If you want to run hugin from the debugger, the xrc folder needs to be copied to
-   the directory where hugin is located, else hugin won't find its ressources, icons
-   and xrc layout files.
-   For example copy it from hugin/src/hugin/xrc to hugin/src/hugin/Debug/xrc

--- LICENCE_SIFT DELETED ---

Index: AUTHORS
===================================================================
RCS file: /cvsroot/hugin/hugin/AUTHORS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- AUTHORS	1 Feb 2005 05:11:38 -0000	1.10
+++ AUTHORS	18 Jul 2005 12:05:56 -0000	1.11
@@ -2,11 +2,12 @@
    Pablo d'Angelo <pablo.dangelo@...>
 Authors:
    Kai-Uwe Behrmann <ku.b@...>               gui, panoviewer adds
+   Douglas Wilkins                              packaging, translation
+                                                bugfixes
    Ed Halley                                    gui, documentation
-   Douglas Wilkins                                 packaging, translation
-                                                bugfixes fixes
    Bruno Postle                                 packaging, website,
                                                 documentation
+   Alexandre Jenny                              SpaceTransform class
    Luca Vascon                                  splash screen, icons
 
 Translators

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/hugin

Modified Files:
	ImagesPanel.cpp Makefile.am 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	22 May 2005 02:35:23 -0000	1.14
+++ Makefile.am	18 Jul 2005 12:05:57 -0000	1.15
@@ -35,7 +35,7 @@
 hugin_LDFLAGS  = $(WX_LIBS) $(GTK_LIBS) $(LIB_TIFF) $(LIB_PNG) $(LIB_JPEG) $(LIB_ZLIB) $(LIB_PANO)
 hugin_LDADD    = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la \
 	             ${top_builddir}/src/jhead/libjhead.la ${top_builddir}/src/common/libcommon.la  \
-	             ${top_builddir}/src/vigra_ext/libvigra_ext.la libhuginwxutils.la
+	             libhuginwxutils.la
 noinst_HEADERS = win_prep.h
 
 desktopdir = $(datadir)/applications

Index: ImagesPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/ImagesPanel.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- ImagesPanel.cpp	26 May 2005 22:11:37 -0000	1.87
+++ ImagesPanel.cpp	18 Jul 2005 12:05:57 -0000	1.88
@@ -31,8 +31,8 @@
 
 #include <map>
 
-#include <vigra_ext/PointMatching.h>
-#include <vigra_ext/LoweSIFT.h>
+//#include <vigra_ext/PointMatching.h>
+//#include <vigra_ext/LoweSIFT.h>
 
 #include "hugin/ImagesPanel.h"
 #include "hugin/CommandHistory.h"
@@ -188,7 +188,7 @@
 
 }
 
-// We need to override the default handling of size events because the 
+// We need to override the default handling of size events because the
 // sizers set the virtual size but not the actual size. We reverse
 // the standard handling and fit the child to the parent rather than
 // fitting the parent around the child

Update of /cvsroot/hugin/hugin/src/hugin/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/hugin/po

Modified Files:
	ru.po 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


Index: ru.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/ru.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ru.po	16 Jun 2005 20:39:49 -0000	1.1
+++ ru.po	18 Jul 2005 12:05:57 -0000	1.2
@@ -87,11 +87,13 @@
 
 #: src/hugin/AutoCtrlPointCreator.cpp:238
 #, c-format
-msgid "Please use  %namefile or %i to specify the input files for autopano-sift"
+msgid ""
+"Please use  %namefile or %i to specify the input files for autopano-sift"
 msgstr ""
 
 #: src/hugin/AutoCtrlPointCreator.cpp:280
-msgid "Select the directory where autopano-sift's .Net executables can be found."
+msgid ""
+"Select the directory where autopano-sift's .Net executables can be found."
 msgstr ""
 
 #: src/hugin/AutoCtrlPointCreator.cpp:286
@@ -259,8 +261,8 @@
 "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
 "%0.3f %0.3f "
 msgstr ""
-"Точка настроена, угол: %.0f градусов, коэфф. корреляции: %0.3f, кривизна: "
-"%0.3f %0.3f "
+"Точка настроена, угол: %.0f градусов, коэфф. корреляции: %0.3f, кривизна: %"
+"0.3f %0.3f "
 
 #: src/hugin/CPEditorPanel.cpp:956
 #, c-format
@@ -670,8 +672,9 @@
 "BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff|JPEG files (*.jpg)|*.jpg;*.JPG|All "
 "files (*.*)|*.*"
 msgstr ""
-"Все файлы изображений|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*."
-"BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff|JPEG files (*.jpg)|*.jpg;*.JPG|Все файлы (*.*)|*.*"
+"Все файлы изображений|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*."
+"bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff|JPEG files (*.jpg)|*.jpg;*."
+"JPG|Все файлы (*.*)|*.*"
 
 #: src/hugin/MainFrame.cpp:644 src/include/hugin/wxPanoCommand.h:181
 msgid "Add images"
@@ -1237,7 +1240,8 @@
 msgstr ""
 
 #: src/hugin/xrc/anchor_orientation.xrs:2
-msgid "Set Yaw and Pitch with left mouse button. Use right mouse button to set roll"
+msgid ""
+"Set Yaw and Pitch with left mouse button. Use right mouse button to set roll"
 msgstr ""
 
 #: src/hugin/xrc/anchor_orientation.xrs:3
@@ -1486,7 +1490,9 @@
 msgid ""
 "use currently selected image as anchor image. That is, do not optimize the "
 "(complete) position of this image."
-msgstr "Использовать текущую фотографию как исходную, не оптимизировать её расположение."
+msgstr ""
+"Использовать текущую фотографию как исходную, не оптимизировать её "
+"расположение."
 
 #: src/hugin/xrc/images_panel.xrs:13 src/hugin/xrc/images_panel-2.5.xrs:13
 msgid "Adjust the anchor spot..."
@@ -1504,7 +1510,9 @@
 
 #: src/hugin/xrc/images_panel.xrs:16 src/hugin/xrc/images_panel-2.5.xrs:16
 msgid "use the currently selected images as color correction anchor image"
-msgstr "Использовать выбранные фотографии как прицепленные фотографии с цветокоррекцией"
+msgstr ""
+"Использовать выбранные фотографии как прицепленные фотографии с "
+"цветокоррекцией"
 
 #: src/hugin/xrc/images_panel.xrs:17 src/hugin/xrc/images_panel-2.5.xrs:17
 msgid "Feature Matching (Autopano)"
@@ -1524,7 +1532,9 @@
 
 #: src/hugin/xrc/images_panel.xrs:21 src/hugin/xrc/images_panel-2.5.xrs:21
 msgid "Run external autopano program on the selected images"
-msgstr "Запустить внешнюю программу создания контрольных точек в выбранных фотографиях"
+msgstr ""
+"Запустить внешнюю программу создания контрольных точек в выбранных "
+"фотографиях"
 
 #: src/hugin/xrc/images_panel.xrs:22 src/hugin/xrc/images_panel-2.5.xrs:22
 msgid "Remove Points"
@@ -1718,7 +1728,8 @@
 
 #: src/hugin/xrc/lens_panel.xrs:51 src/hugin/xrc/lens_panel-2.5.xrs:42
 msgid "Create a new lens and assign it to selected images"
-msgstr "Создать новое описание объектива и применить его к выбранным фотографиям"
+msgstr ""
+"Создать новое описание объектива и применить его к выбранным фотографиям"
 
 #: src/hugin/xrc/lens_panel.xrs:52 src/hugin/xrc/lens_panel-2.5.xrs:43
 msgid "Change lens"
@@ -1808,7 +1819,9 @@
 msgid ""
 "Write current project to a PTStitcher compatible script file, useful for "
 "batch processing"
-msgstr "Записать текущий проект в файл сценария, совместимый с PTStitcher для последующей пакетной обработки файлов"
+msgstr ""
+"Записать текущий проект в файл сценария, совместимый с PTStitcher для "
+"последующей пакетной обработки файлов"
 
 #: src/hugin/xrc/main_menu.xrs:12
 msgid "&Preferences"
@@ -1850,7 +1863,9 @@
 msgid ""
 "Runs fine-tune on all control points. useful for projects created with other "
 "tools, like PTGui or PTAssembler"
-msgstr "Запустить точную подстройку всех контрольных точек, что полезно при работе с проектами, созданными другими программами вроде PTGui или PTAssembler"
+msgstr ""
+"Запустить точную подстройку всех контрольных точек, что полезно при работе с "
+"проектами, созданными другими программами вроде PTGui или PTAssembler"
 
 #: src/hugin/xrc/main_menu.xrs:22
 msgid "&Optimize"
@@ -2281,7 +2296,8 @@
 msgstr "Панорама"
 
 #: src/hugin/xrc/pano_panel-2.5.xrs:2
-msgid "Projection (f):"
+#, fuzzy
+msgid "projection (f):"
 msgstr "Проекция (f):"
 
 #: src/hugin/xrc/pano_panel-2.5.xrs:8
@@ -2712,4 +2728,3 @@
 #: src/hugin/xrc/run_stitcher_frame.xrs:3
 msgid "Abort"
 msgstr "Прервать"
-

Update of /cvsroot/hugin/hugin/src/makefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/makefiles

Removed Files:
	.cvsignore Makefile.template config.mk.tmpl rules.mk 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


--- .cvsignore DELETED ---

--- rules.mk DELETED ---

--- Makefile.template DELETED ---

--- config.mk.tmpl DELETED ---

Update of /cvsroot/hugin/hugin/src/keypoints
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/keypoints

Removed Files:
	.cvsignore LICENSE Makefile.am ScaleSpace.cpp 
	ScaleSpaceTools.cpp sift_keypoints.cpp 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


--- .cvsignore DELETED ---

--- ScaleSpace.cpp DELETED ---

--- sift_keypoints.cpp DELETED ---

--- LICENSE DELETED ---

--- ScaleSpaceTools.cpp DELETED ---

--- Makefile.am DELETED ---

Update of /cvsroot/hugin/hugin/src/vigra_ext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/vigra_ext

Removed Files:
	LoweSIFT.cpp PointMatching.cpp 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


--- LoweSIFT.cpp DELETED ---

--- PointMatching.cpp DELETED ---

Update of /cvsroot/hugin/hugin/src/klt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/klt

Removed Files:
	.cvsignore Makefile.am convolve.c error.c klt.c klt_util.c 
	pnmio.c pyramid.c selectGoodFeatures.c storeFeatures.c 
	trackFeatures.c track_saved.c writeFeatures.c 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


--- .cvsignore DELETED ---

--- klt_util.c DELETED ---

--- klt.c DELETED ---

--- convolve.c DELETED ---

--- pnmio.c DELETED ---

--- error.c DELETED ---

--- pyramid.c DELETED ---

--- trackFeatures.c DELETED ---

--- storeFeatures.c DELETED ---

--- selectGoodFeatures.c DELETED ---

--- writeFeatures.c DELETED ---

--- track_saved.c DELETED ---

--- Makefile.am DELETED ---

Update of /cvsroot/hugin/hugin/src/include/vigra_ext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/include/vigra_ext

Removed Files:
	LoweSIFT.h PhaseCorrelation.h PointMatching.h 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


--- PointMatching.h DELETED ---

--- PhaseCorrelation.h DELETED ---

--- LoweSIFT.h DELETED ---

Update of /cvsroot/hugin/hugin/src/include/keypoints
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/include/keypoints

Removed Files:
	ScaleSpace.h algo4sift.hxx 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


--- algo4sift.hxx DELETED ---

--- ScaleSpace.h DELETED ---

Update of /cvsroot/hugin/hugin/src/include/klt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/include/klt

Removed Files:
	base.h convolve.h error.h klt.h klt_util.h pnmio.h pyramid.h 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


--- pnmio.h DELETED ---

--- error.h DELETED ---

--- klt.h DELETED ---

--- klt_util.h DELETED ---

--- pyramid.h DELETED ---

--- convolve.h DELETED ---

--- base.h DELETED ---

Update of /cvsroot/hugin/hugin/src/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16016/src/tools

Modified Files:
	Makefile.am 
Removed Files:
	autopano.cpp panosifter.cpp 
Log Message:
Removed obselete programs and sources with questionable licences
(KLT, and buggy sift implementation)


--- autopano.cpp DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/src/tools/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	28 Jan 2005 20:04:56 -0000	1.8
+++ Makefile.am	18 Jul 2005 12:06:01 -0000	1.9
@@ -6,7 +6,7 @@
 AM_LDFLAGS  = $(LIB_JPEG) $(LIB_TIFF) $(LIB_PANO)
 
 #bin_PROGRAMS = nona autopano_old panosifter autooptimiser zhang_undistort
-bin_PROGRAMS = nona panosifter autooptimiser zhang_undistort
+bin_PROGRAMS = nona autooptimiser zhang_undistort
 
 nona_SOURCES = nona.cpp
 nona_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la \
@@ -19,23 +19,23 @@
 #                       ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la ${top_builddir}/src/jhead/libjhead.la \
 #		       ${top_builddir}/src/klt/libklt.la
 
-automatch_SOURCES = automatch.cpp
-automatch_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la \
-	                ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la ${top_builddir}/src/jhead/libjhead.la \
-				    ${top_builddir}/src/klt/libklt.la
+#automatch_SOURCES = automatch.cpp
+#automatch_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la \
+#	                ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la ${top_builddir}/src/jhead/libjhead.la \
+#				    ${top_builddir}/src/klt/libklt.la
 
-panosifter_SOURCES = panosifter.cpp
-panosifter_CFLAGS  = $(PNG_FLAGS) $(ZLIB_FLAGS)
-panosifter_LDFLAGS = $(LIB_PNG) $(LIB_ZLIB)
-panosifter_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la ${top_builddir}/src/vigra_ext/libvigra_ext.la \
-	                 ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la ${top_builddir}/src/jhead/libjhead.la \
-				     ${top_builddir}/src/klt/libklt.la
+#panosifter_SOURCES = panosifter.cpp
+#panosifter_CFLAGS  = $(PNG_FLAGS) $(ZLIB_FLAGS)
+#panosifter_LDFLAGS = $(LIB_PNG) $(LIB_ZLIB)
+#panosifter_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la ${top_builddir}/src/vigra_ext/libvigra_ext.la \
+#	                 ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la ${top_builddir}/src/jhead/libjhead.la \
+#				     ${top_builddir}/src/klt/libklt.la
 
 autooptimiser_SOURCES =  autooptimiser.cpp
-autooptimiser_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la ${top_builddir}/src/vigra_ext/libvigra_ext.la \
+autooptimiser_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la \
 	                    ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la ${top_builddir}/src/jhead/libjhead.la
 
 zhang_undistort_SOURCES = zhang_undistort.cpp
-zhang_undistort_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la ${top_builddir}/src/vigra_ext/libvigra_ext.la \
+zhang_undistort_LDADD   = ${top_builddir}/src/Panorama/libpanorama.la ${top_builddir}/src/common/libcommon.la \
 	                      ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la ${top_builddir}/src/jhead/libjhead.la
 

--- panosifter.cpp DELETED ---