summaryrefslogtreecommitdiff
path: root/im/include
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2010-09-09 01:06:43 +0200
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2010-09-09 01:06:47 +0200
commit92efe73791d0998536042bfab5a1babc67d168c7 (patch)
tree6c5f7e9d9a8e5b439f50821f498ae6f6df776f36 /im/include
parentf23d91bd3ba87c8fe6691af9ebd1a5210e2fbaec (diff)
Upgrading to IM 3.6.2, and doing some cleanup at the same time.
Diffstat (limited to 'im/include')
-rwxr-xr-xim/include/im_capture.h6
-rwxr-xr-xim/include/im_format_all.h2
-rwxr-xr-xim/include/im_image.h2
-rwxr-xr-xim/include/im_lib.h2
4 files changed, 9 insertions, 3 deletions
diff --git a/im/include/im_capture.h b/im/include/im_capture.h
index bc5f732..ae8e2c2 100755
--- a/im/include/im_capture.h
+++ b/im/include/im_capture.h
@@ -68,6 +68,12 @@ const char* IM_DECL imVideoCaptureDeviceVendorInfo(int device);
* \ingroup capture */
int IM_DECL imVideoCaptureReloadDevices(void);
+/** Release the device list. Usefull is you need to track leak erros in your application.
+ *
+ * \verbatim im.imVideoCaptureReleaseDevices() [in Lua 5] \endverbatim
+ * \ingroup capture */
+void IM_DECL imVideoCaptureReleaseDevices(void);
+
/** Creates a new imVideoCapture object. \n
* Returns NULL if there is no capture device available. \n
* In Windows returns NULL if DirectX version is older than 8. \n
diff --git a/im/include/im_format_all.h b/im/include/im_format_all.h
index 8ebe938..4122d71 100755
--- a/im/include/im_format_all.h
+++ b/im/include/im_format_all.h
@@ -283,7 +283,7 @@ void imFormatRegisterPNM(void);
Color Spaces: RGB, MAP and Binary (Gray saved as MAP)
Compressions:
NONE - no compression [default]
- Can have more than one image. But writing is limited to 5 images,
+ Can have more than one image. But reading and writing is limited to 10 images max,
and all images must have different sizes and bpp.
Can have an alpha channel (only for RGB)
Internally the components are always packed.
diff --git a/im/include/im_image.h b/im/include/im_image.h
index 6a325c1..e795479 100755
--- a/im/include/im_image.h
+++ b/im/include/im_image.h
@@ -41,7 +41,7 @@ typedef struct _imImage
int height; /**< Number of lines. image:Height() -> height: number [in Lua 5]. */
int color_space; /**< Color space descriptor. See also \ref imColorSpace. image:ColorSpace() -> color_space: number [in Lua 5]. */
int data_type; /**< Data type descriptor. See also \ref imDataType. image:DataType() -> data_type: number [in Lua 5]. */
- int has_alpha; /**< Indicates that there is an extra channel with alpha. image:HasAlpha() -> has_alpha: number [in Lua 5]. \n
+ int has_alpha; /**< Indicates that there is an extra channel with alpha. image:HasAlpha() -> has_alpha: boolean [in Lua 5]. \n
It will not affect the secondary parameters, i.e. the number of planes will be in fact depth+1. \n
It is always 0 unless imImageAddAlpha is called, this is done in image load functions. */
diff --git a/im/include/im_lib.h b/im/include/im_lib.h
index 964faee..dc842af 100755
--- a/im/include/im_lib.h
+++ b/im/include/im_lib.h
@@ -33,7 +33,7 @@ extern "C" {
#define IM_COPYRIGHT "Copyright (C) 1994-2010 Tecgraf, PUC-Rio."
#define IM_VERSION "3.6" /* bug fixes are reported only by imVersion functions */
#define IM_VERSION_NUMBER 306000
-#define IM_VERSION_DATE "2010/01/26"
+#define IM_VERSION_DATE "2010/01/26" /* does not include bug fix releases */
#define IM_DESCRIPTION "Image Representation, Storage, Capture and Processing"
#define IM_NAME "IM - An Imaging Toolkit"
/** @} */