slight touches before 1.0

git-svn-id: https://code.ros.org/svn/opencv/trunk@911 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/3rdparty/readme.txt b/opencv/3rdparty/readme.txt
index 9dfa5a375e488d91c8932c2c1281b5c87e17d119..67d9e83e4cfcf5b1bbf9f6e76757cc3ffde143aa 100644 (file)
--- a/opencv/3rdparty/readme.txt
+++ b/opencv/3rdparty/readme.txt
@@ -52,7 +52,7 @@ jasper-1.701.0 - JasPer is a collection of software
              The JasPer license can be found in src/libjasper.
              
              OpenCV on Windows uses pre-built libjasper library
-             (libs/libjasper*). To get the latest source code,
+             (lib/libjasper*). To get the latest source code,
              please, visit the project homepage:
              http://www.ece.uvic.ca/~mdadams/jasper/
 
@@ -67,12 +67,19 @@ openexr-1.4.0 - OpenEXR is a high dynamic-range (HDR) image file format develope
 
              The project homepage: http://www.openexr.com/
 
-             OpenCV on Windows uses pre-built libraries from openexr package:
-             half.lib, iex.lib, ilmimf.lib ilmthread.lib imath.lib
-
-             In the distributed highgui*.dll the format is not supported, because
-             of limitations of the used compiler (MSVC6).
-             To add the support to highgui, rebuilt it with VS2005.
+             OpenCV on Windows does not include openexr codec by default.
+             To add it, you will need to recompile highgui with OpenEXR support
+             using VS.NET2003 or VS.NET2005 (MSVC6 can not compile it):
+             1) download binaries (e.g. openexr-1.4.0-vs2005.zip)
+                from the official site.
+             2) copy
+                half.lib, iex.lib, ilmimf.lib ilmthread.lib imath.lib to
+                _graphics/lib
+             3) copy include/openexr/*.h to _graphics/include/openexr
+             4) open _make/opencv.sln
+             5) in highgui/_highgui.h uncomment
+                #define HAVE_ILMIMF 1
+             6) build debug/release configurations of highgui.
 
 ------------------------------------------------------------------------------------
 

diff --git a/opencv/ChangeLog b/opencv/ChangeLog
index c6d510596c4a64b5eda74937eeea5dddb005e187..90749948d015b21c6ffa1ec7e2c4c19cf33fc9aa 100644 (file)
--- a/opencv/ChangeLog
+++ b/opencv/ChangeLog
@@ -1,5 +1,59 @@
 =============================================================================
-                      OpenCV RC1, August 11, 2006
+                      OpenCV 1.0, October 18, 2006
+=============================================================================
+
+>>> New functionality/features: <<<
+
+  - General:
+    * Windows installation package now includes precompiled Python module
+    * Borland C++ (v5.6+) makefiles added (see _make\make_all_bc.mak)
+
+  - CV:
+    * Inpainting was added, see samples/c/inpaint.cpp
+      (thanks to Alexander Kibkalo and Alexey Kalinichenko)
+
+  - MLL:
+    * Boosted tree classifiers added, see MLL reference manual
+
+  - HighGUI:
+    * Jpeg2000 and EXR support in highgui using JasPer and OpenEXR (thanks to Nils Hasler)
+      OpenEXR is not built-in to highgui on Windows by default. See
+      otherlibs/_graphics/readme.txt.
+    * >8-bit image input/output for PNG, Jpeg2000 and OpenEXR (thanks to Nils Hasler)
+    * Updated CMUcamera wrapper.
+    * Several V4L2 improvements and fixes
+  
+  - New samples (opencv/samples):
+    * Camera calibration sample: calibrate.cpp
+    * Inpainting sample: inpaint.cpp
+    * Letter recognition using the existing database with
+      random trees/boosted trees/neural nets: leter_recog.cpp
+    * A few new Python samples.
+
+  - Tests:
+    * Most old cv tests have been rewritten/converted to use cxts instead of trs.
+      TRS is not used by the tests anymore.
+    
+>>> Bug fixes: <<<
+     Many thanks to everybody who submitted bug reports and/or provided the patches!
+
+     * Incorrect normalization in cvFindFundamentalMat (SF #1550855)
+     * Occasional cvGetQuadrangleSubPix crashes (SF #1549168)
+     * Occasional cvCalcOpticalFlowPyrLK crashes
+     * Internal GCC 3.x error in cvFloor/cvCeil (SF #1546657)
+     * Several Python-related bugs (SF #1570109, SF #1572800, SF #1543593)
+     * Bugs in contour processing/rendering (SF #1550889, 
+     * x86-64 related bugs (SF #1526133, SF #1527997)
+     * OpenCV dispatcher tried to load old versions of IPP (pre 4.x)
+       that caused many failures (see SF #1555093, for example)
+     * Inaccurate results in some cases in cvFitEllipse, cvFitLine, cvHoughCircles.
+     * Severe bug in Bayesian classifier, broken regression tree in MLL
+     * Numeric values in XML/YAML were emitted/parsed incorrectly
+       on some non-US locales in Linux
+     * ...
+
+=============================================================================
+                      OpenCV 1.0 RC1, August 11, 2006
 =============================================================================
 
 >>> New functionality/features: <<<

diff --git a/opencv/utils/opencv.iss b/opencv/utils/opencv.iss
index 7e1d462369a7f32ee1d89c8a70f8809334dfe95e..1e147a26de969084b1dfac268fbd85363dde3ae6 100644 (file)
--- a/opencv/utils/opencv.iss
+++ b/opencv/utils/opencv.iss
@@ -2,7 +2,7 @@
 
 [Setup]
 AppName=Intel(R) Open Source Computer Vision Library
-AppVerName=Intel(R) Open Source Computer Vision Library 1.0rc1
+AppVerName=Intel(R) Open Source Computer Vision Library 1.0
 AppCopyright=Copyright (C) 2000-2006 Intel Corporation
 DefaultDirName={pf}\OpenCV
 DefaultGroupName=OpenCV
@@ -50,8 +50,10 @@ Name: "{app}\data\haarcascades"
 Name: "{app}\otherlibs"
 Name: "{app}\otherlibs\_graphics"
 Name: "{app}\otherlibs\_graphics\include"
+Name: "{app}\otherlibs\_graphics\include\jasper"
 Name: "{app}\otherlibs\_graphics\lib"
 Name: "{app}\otherlibs\_graphics\src"
+Name: "{app}\otherlibs\_graphics\src\libjasper"
 Name: "{app}\otherlibs\_graphics\src\libjpeg"
 Name: "{app}\otherlibs\_graphics\src\libpng"
 Name: "{app}\otherlibs\_graphics\src\libtiff"
@@ -219,13 +221,18 @@ Source: "otherlibs\Makefile.*"; DestDir: "{app}\otherlibs"
 
 ; graphic libraries
 Source: "otherlibs\_graphics\include\*.h"; DestDir: "{app}\otherlibs\_graphics\include"
+Source: "otherlibs\_graphics\include\jasper\*.h"; DestDir: "{app}\otherlibs\_graphics\include\jasper"
 Source: "otherlibs\_graphics\lib\*.a"; DestDir: "{app}\otherlibs\_graphics\lib"
-Source: "otherlibs\_graphics\lib\*.lib"; DestDir: "{app}\otherlibs\_graphics\lib"
+Source: "otherlibs\_graphics\lib\lib*.lib"; DestDir: "{app}\otherlibs\_graphics\lib"
+Source: "otherlibs\_graphics\lib\zlib*.lib"; DestDir: "{app}\otherlibs\_graphics\lib"
 Source: "otherlibs\_graphics\readme.txt"; DestDir: "{app}\otherlibs\_graphics"
 
 Source: "otherlibs\_graphics\src\*.dsw"; DestDir: "{app}\otherlibs\_graphics\src"
 Source: "otherlibs\_graphics\src\*.sln"; DestDir: "{app}\otherlibs\_graphics\src"
 
+Source: "otherlibs\_graphics\src\libjasper\readme"; DestDir: "{app}\otherlibs\_graphics\src\libjasper"
+Source: "otherlibs\_graphics\src\libjasper\license"; DestDir: "{app}\otherlibs\_graphics\src\libjasper"
+
 Source: "otherlibs\_graphics\src\libjpeg\*.c"; DestDir: "{app}\otherlibs\_graphics\src\libjpeg"
 Source: "otherlibs\_graphics\src\libjpeg\*.h"; DestDir: "{app}\otherlibs\_graphics\src\libjpeg"
 Source: "otherlibs\_graphics\src\libjpeg\*.dsp"; DestDir: "{app}\otherlibs\_graphics\src\libjpeg"
@@ -464,14 +471,13 @@ Source: "apps\HaarTraining\doc\*.htm*"; DestDir: "{app}\apps\HaarTraining\doc"
 Source: "bin\cvinfo.exe"; DestDir: "{app}\bin"
 Source: "bin\cvtest.exe"; DestDir: "{app}\bin"
 Source: "bin\cxcoretest.exe"; DestDir: "{app}\bin"
-Source: "bin\cxcore099.dll"; DestDir: "{app}\bin"
-Source: "bin\cv099.dll"; DestDir: "{app}\bin"
-Source: "bin\highgui099.dll"; DestDir: "{app}\bin"
-Source: "bin\cvaux099.dll"; DestDir: "{app}\bin"
-Source: "bin\ml099.dll"; DestDir: "{app}\bin"
+Source: "bin\cxcore100.dll"; DestDir: "{app}\bin"
+Source: "bin\cv100.dll"; DestDir: "{app}\bin"
+Source: "bin\highgui100.dll"; DestDir: "{app}\bin"
+Source: "bin\cvaux100.dll"; DestDir: "{app}\bin"
+Source: "bin\ml100.dll"; DestDir: "{app}\bin"
 Source: "bin\cxts001.dll"; DestDir: "{app}\bin"
-Source: "bin\trs.dll"; DestDir: "{app}\bin"
-Source: "bin\cvcam099.dll"; DestDir: "{app}\bin"
+Source: "bin\cvcam100.dll"; DestDir: "{app}\bin"
 Source: "bin\haartraining.exe"; DestDir: "{app}\bin"
 Source: "bin\createsamples.exe"; DestDir: "{app}\bin"
 Source: "bin\performance.exe"; DestDir: "{app}\bin"
@@ -504,7 +510,6 @@ Source: "lib\ml.lib"; DestDir: "{app}\lib"
 Source: "lib\cvhaartraining.lib"; DestDir: "{app}\lib"
 Source: "lib\cxts.lib"; DestDir: "{app}\lib"
 Source: "lib\cvcam.lib"; DestDir: "{app}\lib"
-Source: "lib\trs.lib"; DestDir: "{app}\lib"
 
 [Icons]
 Name: "{group}\OpenCV Workspace MSVC6"; Filename: "{app}\_make\opencv.dsw"