From b8e86ddb931e36db0e66d759dbbde198eaa210f6 Mon Sep 17 00:00:00 2001 From: scuri Date: Wed, 24 Jun 2009 03:59:24 +0000 Subject: *** empty log message *** --- html/en/history.html | 2 +- include/im_lib.h | 10 +-- mak.vc9/glut_capture.vcproj | 85 ------------------- mak.vc9/im.sln | 62 ++++++++++++-- mak.vc9/im.vcproj | 76 ----------------- mak.vc9/im_copy.vcproj | 113 +++++++++++++++++++++++++ mak.vc9/im_info.vcproj | 113 +++++++++++++++++++++++++ mak.vc9/im_view.vcproj | 113 +++++++++++++++++++++++++ mak.vc9/im_wmv.vcproj | 2 +- test/glut_capture.vcproj | 160 ----------------------------------- test/im_copy.cpp | 2 +- test/im_copy.vcproj | 191 ----------------------------------------- test/im_info.vcproj | 186 ---------------------------------------- test/im_view.c | 4 +- test/im_view.mak | 4 +- test/im_view.vcproj | 201 -------------------------------------------- 16 files changed, 406 insertions(+), 918 deletions(-) delete mode 100644 mak.vc9/glut_capture.vcproj create mode 100644 mak.vc9/im_copy.vcproj create mode 100644 mak.vc9/im_info.vcproj create mode 100644 mak.vc9/im_view.vcproj delete mode 100644 test/glut_capture.vcproj delete mode 100644 test/im_copy.vcproj delete mode 100644 test/im_info.vcproj delete mode 100644 test/im_view.vcproj diff --git a/html/en/history.html b/html/en/history.html index a8037f6..fad1877 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -11,7 +11,7 @@

History of Changes

CVS (14/Jun/2009)

Version 3.4.2 (24/Jun/2009)

Fixed: AVI format when reading 32 and 16 bpp frames.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- @@ -90,79 +87,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - diff --git a/mak.vc9/im_copy.vcproj b/mak.vc9/im_copy.vcproj new file mode 100644 index 0000000..3271a14 --- /dev/null +++ b/mak.vc9/im_copy.vcproj @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/im_info.vcproj b/mak.vc9/im_info.vcproj new file mode 100644 index 0000000..3ef1fb3 --- /dev/null +++ b/mak.vc9/im_info.vcproj @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/im_view.vcproj b/mak.vc9/im_view.vcproj new file mode 100644 index 0000000..4881ad3 --- /dev/null +++ b/mak.vc9/im_view.vcproj @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/im_wmv.vcproj b/mak.vc9/im_wmv.vcproj index ebcaff0..775fcc3 100644 --- a/mak.vc9/im_wmv.vcproj +++ b/mak.vc9/im_wmv.vcproj @@ -42,7 +42,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/im_copy.cpp b/test/im_copy.cpp index 6663a32..5b4c8cd 100644 --- a/test/im_copy.cpp +++ b/test/im_copy.cpp @@ -53,7 +53,7 @@ int main(int argc, char* argv[]) return 0; } - imFormatRegisterAVI(); +// imFormatRegisterAVI(); // imFormatRegisterWMV(); void* data = NULL; diff --git a/test/im_copy.vcproj b/test/im_copy.vcproj deleted file mode 100644 index c2e9102..0000000 --- a/test/im_copy.vcproj +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/im_info.vcproj b/test/im_info.vcproj deleted file mode 100644 index 76d7eac..0000000 --- a/test/im_info.vcproj +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/im_view.c b/test/im_view.c index 2ec8fac..e271394 100644 --- a/test/im_view.c +++ b/test/im_view.c @@ -147,13 +147,13 @@ static Ihandle* CreateDialog(void) return iup_dialog; } -#include "im_format_avi.h" +//#include "im_format_avi.h" int main(int argc, char* argv[]) { Ihandle* dlg; - imFormatRegisterAVI(); + //imFormatRegisterAVI(); IupOpen(&argc, &argv); dlg = CreateDialog(); diff --git a/test/im_view.mak b/test/im_view.mak index 6d4e8f7..45e4363 100644 --- a/test/im_view.mak +++ b/test/im_view.mak @@ -6,11 +6,9 @@ SRC = im_view.c USE_CD = Yes USE_IUPCONTROLS = Yes -USE_IUP = Yes +USE_IUP3 = Yes USE_IM = Yes IM = .. -IMINC := $(IM)/include -IMLIB := $(IM)/lib/$(TEC_UNAME) USE_STATIC = Yes diff --git a/test/im_view.vcproj b/test/im_view.vcproj deleted file mode 100644 index 458793d..0000000 --- a/test/im_view.vcproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3