*** empty log message ***

4 files changed, 21 insertions, 24 deletions

diff --git a/include/im_lib.h b/include/im_lib.h
index 80330cc..d6115a5 100644
--- a/include/im_lib.h
+++ b/include/im_lib.h
@@ -31,7 +31,7 @@ extern "C" {
  */
 #define IM_AUTHOR "Antonio Scuri"
 #define IM_COPYRIGHT "Copyright (C) 1994-2008 Tecgraf, PUC-Rio."
-#define IM_VERSION "3.4.0"
+#define IM_VERSION "3.4"
 #define IM_VERSION_NUMBER 304000
 #define IM_VERSION_DATE "2008/10/14"
 #define IM_DESCRIPTION "Image Representation, Storage, Capture and Processing"
@@ -39,7 +39,7 @@ extern "C" {
 /** @} */
 
 
-/** Returns the library current version. Returns the definition IM_VERSION.
+/** Returns the library current version. Returns the definition IM_VERSION plus the bug fix number.
  *
  * \verbatim im.Version() -> version: string [in Lua 5] \endverbatim
  * \ingroup lib */
@@ -51,7 +51,7 @@ const char* imVersion(void);
  * \ingroup lib */
 const char* imVersionDate(void);
 
-/** Returns the library current version number. Returns the definition IM_VERSION_NUMBER. \n
+/** Returns the library current version number. Returns the definition IM_VERSION_NUMBER plus the bug fix number. \n
  * Can be compared in run time with IM_VERSION_NUMBER to compare compiled and linked versions of the library.
  *
  * \verbatim im.VersionNumber() -> version: number [in Lua 5] \endverbatim
diff --git a/mak.vc9/im.sln b/mak.vc9/im.sln
index 2a854ee..e748276 100644
--- a/mak.vc9/im.sln
+++ b/mak.vc9/im.sln
@@ -26,11 +26,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imlua_process5", "imlua_pro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "im_ecw", "im_ecw.vcproj", "{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imlab", "..\..\imlab\mak.vc9\imlab.vcproj", "{C0E4757A-8A78-48C1-B507-E2A95AA18B25}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5A761929-07C3-48BD-8E4A-B37EC5C72C42} = {5A761929-07C3-48BD-8E4A-B37EC5C72C42}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -110,14 +105,6 @@ Global
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Release|Win32.Build.0 = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Release|x64.ActiveCfg = Debug|Win32
-		{C0E4757A-8A78-48C1-B507-E2A95AA18B25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C0E4757A-8A78-48C1-B507-E2A95AA18B25}.Debug|Win32.Build.0 = Debug|Win32
-		{C0E4757A-8A78-48C1-B507-E2A95AA18B25}.Debug|x64.ActiveCfg = Debug|x64
-		{C0E4757A-8A78-48C1-B507-E2A95AA18B25}.Debug|x64.Build.0 = Debug|x64
-		{C0E4757A-8A78-48C1-B507-E2A95AA18B25}.Release|Win32.ActiveCfg = Release|Win32
-		{C0E4757A-8A78-48C1-B507-E2A95AA18B25}.Release|Win32.Build.0 = Release|Win32
-		{C0E4757A-8A78-48C1-B507-E2A95AA18B25}.Release|x64.ActiveCfg = Release|x64
-		{C0E4757A-8A78-48C1-B507-E2A95AA18B25}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/im_lib.cpp b/src/im_lib.cpp
index 66ded68..1c81536 100644
--- a/src/im_lib.cpp
+++ b/src/im_lib.cpp
@@ -2,7 +2,7 @@
  * \brief Library Management
  *
  * See Copyright Notice in im_lib.h
- * $Id: im_lib.cpp,v 1.1 2008/10/17 06:10:16 scuri Exp $
+ * $Id: im_lib.cpp,v 1.2 2008/12/11 19:02:49 scuri Exp $
  */
 
 #include <stdlib.h>
@@ -10,17 +10,21 @@
 
 #include "im_lib.h"
 
-static char *iVersion = "TECVERID.str:IM:LIB:"IM_VERSION;
+/* This appears only here to avoid changing the iup.h header fo bug fixes */
+#define IM_VERSION_FIX ""
+#define IM_VERSION_FIX_NUMBER 0
+
+static char *iVersion = "TECVERID.str:IM:LIB:" IM_VERSION IM_VERSION_FIX;
 
 const char iIdent[] =
-  "$IM: " IM_VERSION " " IM_COPYRIGHT " $\n"
+  "$IM: " IM_VERSION IM_VERSION_FIX " " IM_COPYRIGHT " $\n"
   "$URL: www.tecgraf.puc-rio.br/im $\n";
 
 const char* imVersion(void)
 {                  
 	 (void)iVersion;
 	 (void)iIdent;
-   return IM_VERSION;
+   return IM_VERSION IM_VERSION_FIX;
 }
 
 const char* imVersionDate(void)
@@ -30,5 +34,5 @@ const char* imVersionDate(void)
 
 int imVersionNumber(void)
 {
-  return IM_VERSION_NUMBER;
+  return IM_VERSION_NUMBER+IM_VERSION_FIX_NUMBER;
 }
diff --git a/src/lua5/imlua.c b/src/lua5/imlua.c
index 7d39ee7..7e5c328 100644
--- a/src/lua5/imlua.c
+++ b/src/lua5/imlua.c
@@ -2,7 +2,7 @@
  * \brief IM Lua 5 Binding
  *
  * See Copyright Notice in im_lib.h
- * $Id: imlua.c,v 1.1 2008/10/17 06:16:32 scuri Exp $
+ * $Id: imlua.c,v 1.2 2008/12/11 19:02:49 scuri Exp $
  */
 
 #include <string.h>
@@ -185,8 +185,6 @@ static const imlua_constant im_constants[] = {
 
   { "_AUTHOR",  0, IM_AUTHOR },
   { "_COPYRIGHT",  0, IM_COPYRIGHT },
-  { "_VERSION",  0, IM_VERSION },
-  { "_VERSION_NUMBER",  IM_VERSION_NUMBER, NULL },
   { "_VERSION_DATE",  0, IM_VERSION_DATE },
   { "_DESCRIPTION",  0, IM_DESCRIPTION },
   { "_NAME",  0, IM_NAME },
@@ -206,6 +204,14 @@ void imlua_regconstants (lua_State *L, const imlua_constant *imconst)
       lua_pushnumber(L, l->value);
     lua_settable(L, -3);
   }
+
+  lua_pushstring(L, "_VERSION");
+  lua_pushstring(L, imVersion());
+  lua_settable(L, -3);
+
+  lua_pushstring(L, "_VERSION_NUMBER");
+  lua_pushnumber(L, imVersionNumber());
+  lua_settable(L, -3);
 }
 
 static const luaL_reg im_lib[] = {