From e91dd4dedeef0863cdfbc0be48f6c8a5ecd7c8df Mon Sep 17 00:00:00 2001 From: scuri Date: Fri, 3 Jul 2009 17:45:12 +0000 Subject: *** empty log message *** --- html/en/history.html | 10 +++- include/im_format_all.h | 126 +++++++++++++++++++++++------------------------ src/lua5/im_process.lua | 10 ++-- src/lua5/imlua_process.c | 110 ++++++++++++++++++++--------------------- 4 files changed, 132 insertions(+), 124 deletions(-) diff --git a/html/en/history.html b/html/en/history.html index f94f668..f09f0a1 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -11,7 +11,15 @@

History of Changes

Version 3.4.2 (26/Jun/2009)

+ CVS (02/Jul/2009)

Fixed: new image size computation of im.ProcessCropNew + in Lua.

+ Version 3.4.2 (26/Jun/2009)

Changed: removed "lua5.1.so" dependency in UNIX.

Color Spaces: Gray, RGB, CMYK, YCbCr, Lab, XYZ, Map and Binary. - Compressions: + Compressions: NONE - no compression [default for IEEE Floating Point Data] CCITTRLE - CCITT modified Huffman RLE (binary only) [default for Binary] CCITTFAX3 - CCITT Group 3 fax (binary only) CCITTFAX4 - CCITT Group 4 fax (binary only) LZW - Lempel-Ziv & Welch [default] - JPEG - ISO JPEG [default for YCBCR] + JPEG - ISO JPEG [default for YCBCR] NEXT - NeXT 2-bit RLE (2 bpp only) CCITTRLEW - CCITT modified Huffman RLE with word alignment (binary only) RLE - Packbits (Macintosh RLE) [default for MAP] THUNDERSCAN - ThunderScan 4-bit RLE (only for 2 or 4 bpp) PIXARLOG - Pixar companded 11-bit ZIP (only byte, ushort and float) - DEFLATE - LZ77 variation (ZIP) + DEFLATE - LZ77 variation (ZIP) ADOBE_DEFLATE - Adobe LZ77 variation SGILOG - SGI Log Luminance RLE for L and Luv (only byte, ushort and float) [default for XYZ] SGILOG24 - SGI Log 24-bit packed for Luv (only byte, ushort and float) @@ -55,7 +55,7 @@ extern "C" { Components can be packed or not. Lines arranged from top down to bottom or bottom up to top. Handle(1) returns a TIFF* libTIFF structure. - + Attributes: Photometric IM_USHORT (1) (when writing this will complement the color_mode information, for Mask, MinIsWhite, ITULab and ICCLab) ExtraSampleInfo IM_USHORT (1) (description of alpha channel: 0- uknown, 1- pre-multiplied, 2-normal) @@ -63,7 +63,7 @@ extern "C" { ZIPQuality IM_INT (1) [1-9, default 6] (write only) ResolutionUnit (string) ["DPC", "DPI"] XResolution, YResolution IM_FLOAT (1) - Description, Author, Copyright, DateTime, DocumentName, + Description, Author, Copyright, DateTime, DocumentName, PageName, TargetPrinter, Make, Model, Software, HostComputer (string) InkNames (strings separated by '0's) InkSet IM_USHORT (1) @@ -77,7 +77,7 @@ extern "C" { YCbCrSubSampling IM_USHORT (2) YCbCrPositioning IM_USHORT (1) PageNumber IM_USHORT (2) - StoNits IM_FLOAT (1) + StoNits IM_FLOAT (1) XPosition, YPosition IM_FLOAT (1) SMinSampleValue, SMaxSampleValue IM_FLOAT (1) HalftoneHints IM_USHORT (2) @@ -102,7 +102,7 @@ extern "C" { SubIFD is handled only for DNG. Since LZW patent expired, LZW compression is enabled. LZW Copyright Unisys. libGeoTIFF can be used without XTIFF initialization. Use Handle(1) to obtain a TIFF*. - + Changes: "tiff_jpeg.c" - commented "downsampled_output = TRUE" in 2 places. New file "tif_config.h" to match our needs. @@ -113,7 +113,7 @@ void imFormatRegisterTIFF(void); /** \defgroup jpeg JPEG - JPEG File Interchange Format * \section Description - * + * * \par * ISO/IEC 10918 (1994, 1995, 1997, 1999)\n * http://www.jpeg.org/ @@ -132,31 +132,31 @@ void imFormatRegisterTIFF(void); \verbatim Data Types: Byte Color Spaces: Gray, RGB, CMYK and YCbCr (Binary Saved as Gray) - Compressions: + Compressions: JPEG - ISO JPEG [default] Only one image. No alpha channel. Internally the components are always packed. Internally the lines are arranged from top down to bottom. - Handle(1) returns jpeg_decompress_struct* when reading, and + Handle(1) returns jpeg_decompress_struct* when reading, and jpeg_compress_struct* when writing (libJPEG structures). - + Attributes: AutoYCbCr IM_INT (1) (controls YCbCr auto conversion) default 1 JPEGQuality IM_INT (1) [0-100, default 75] (write only) ResolutionUnit (string) ["DPC", "DPI"] XResolution, YResolution IM_FLOAT (1) - Interlaced (same as Progressive) IM_INT (1 | 0) default 0 + Interlaced (same as Progressive) IM_INT (1 | 0) default 0 Description (string) (lots of Exif tags) - + Changes to libJPEG: jdatadst.c - fflush and ferror replaced by macros JFFLUSH and JFERROR. jinclude.h - standard JFFLUSH and JFERROR definitions, and new macro HAVE_JFIO. jmorecfg.h - changed definition of INT32 to JINT32 for better compatibility. jdhuf.c - added support for OJPEG_SUPPORT in libTIFF. new file created: jconfig.h - + Changes to libEXIF: new file config.h changed "exif-tag.c" to add new function @@ -166,15 +166,15 @@ void imFormatRegisterTIFF(void); Comments: Other APPx markers are ignored. No thumbnail support. - RGB images are automatically converted to YCbCr when saved. - Also YcbCr are converted to RGB when loaded. Use AutoYCbCr=0 to disable this behavior. + RGB images are automatically converted to YCbCr when saved. + Also YcbCr are converted to RGB when loaded. Use AutoYCbCr=0 to disable this behavior. \endverbatim * \ingroup format */ void imFormatRegisterJPEG(void); /** \defgroup png PNG - Portable Network Graphic Format * \section Description - * + * * \par * Access to the PNG file format uses libPNG version 1.2.22. \n * http://www.libpng.org \n @@ -185,19 +185,19 @@ void imFormatRegisterJPEG(void); \verbatim Data Types: Byte and UShort Color Spaces: Gray, RGB, MAP and Binary - Compressions: + Compressions: DEFLATE - LZ77 variation (ZIP) [default] Only one image. Can have an alpha channel. Internally the components are always packed. Internally the lines are arranged from top down to bottom. Handle(1) returns png_structp libPNG structure. - + Attributes: ZIPQuality IM_INT (1) [1-9, default 6] (write only) ResolutionUnit (string) ["DPC", "DPI"] XResolution, YResolution IM_FLOAT (1) - Interlaced (same as Progressive) IM_INT (1 | 0) default 0 + Interlaced (same as Progressive) IM_INT (1 | 0) default 0 Gamma IM_FLOAT (1) WhitePoint IMFLOAT (2) PrimaryChromaticities IMFLOAT (6) @@ -206,7 +206,7 @@ void imFormatRegisterJPEG(void); TransparencyIndex IM_BYTE (1 or N) TransparentColor IM_BYTE (3) CalibrationName, CalibrationUnits (string) - CalibrationLimits IM_INT (2) + CalibrationLimits IM_INT (2) CalibrationEquation IM_BYTE (1) [0-Linear,1-Exponential,2-Arbitrary,3-HyperbolicSine)] CalibrationParam (string) [params separated by '\\n'] Title, Author, Description, Copyright, DateTime (string) @@ -232,7 +232,7 @@ void imFormatRegisterPNG(void); /** \defgroup gif GIF - Graphics Interchange Format * \section Description - * + * * \par * Copyright (c) 1987,1988,1989,1990 CompuServe Incorporated. \n * GIF is a Service Mark property of CompuServe Incorporated. \n @@ -248,27 +248,27 @@ void imFormatRegisterPNG(void); \verbatim Data Types: Byte Color Spaces: MAP only, (Gray and Binary saved as MAP) - Compressions: + Compressions: LZW - Lempel-Ziv & Welch [default] Can have more than one image. No alpha channel. Internally the lines are arranged from top down to bottom. - + Attributes: ScreenHeight, ScreenWidth IM_USHORT (1) screen size [default to the first image size] - Interlaced IM_INT (1 | 0) default 0 + Interlaced IM_INT (1 | 0) default 0 Description (string) TransparencyIndex IM_BYTE (1) XScreen, YScreen IM_USHORT (1) screen position UserInput IM_BYTE (1) [1, 0] Disposal (string) [UNDEF, LEAVE, RBACK, RPREV] - Delay IM_USHORT (1) - Iterations IM_USHORT (1) (NETSCAPE2.0 Application Extension) + Delay IM_USHORT (1) [time to wait betweed frames in 1/100 of a second] + Iterations IM_USHORT (1) (NETSCAPE2.0 Application Extension) [The number of times to repeat the animation. 0 means to repeat forever. ] Comments: Attributes after the last image are ignored. Reads GIF87 and GIF89, but writes GIF89 always. - Ignored attributes: Background Color Index, Pixel Aspect Ratio, + Ignored attributes: Background Color Index, Pixel Aspect Ratio, Plain Text Extensions, Application Extensions... \endverbatim * \ingroup format */ @@ -276,7 +276,7 @@ void imFormatRegisterGIF(void); /** \defgroup bmp BMP - Windows Device Independent Bitmap * \section Description - * + * * \par * Windows Copyright Microsoft Corporation. * \par @@ -287,14 +287,14 @@ void imFormatRegisterGIF(void); \verbatim Data Types: Byte Color Spaces: RGB, MAP and Binary (Gray saved as MAP) - Compressions: + Compressions: NONE - no compression [default] RLE - Run Lenght Encoding (only for MAP and Gray) Only one image. Can have an alpha channel (only for RGB) Internally the components are always packed. Lines arranged from top down to bottom or bottom up to top. But are saved always as bottom up. - + Attributes: ResolutionUnit (string) ["DPC", "DPI"] XResolution, YResolution IM_FLOAT (1) @@ -308,7 +308,7 @@ void imFormatRegisterBMP(void); /** \defgroup ras RAS - Sun Raster File * \section Description - * + * * \par * Copyright Sun Corporation. * \par @@ -319,14 +319,14 @@ void imFormatRegisterBMP(void); \verbatim Data Types: Byte Color Spaces: Gray, RGB, MAP and Binary - Compressions: + Compressions: NONE - no compression [default] RLE - Run Lenght Encoding Only one image. Can have an alpha channel (only for IM_RGB) Internally the components are always packed. Internally the lines are arranged from top down to bottom. - + Attributes: none \endverbatim @@ -335,7 +335,7 @@ void imFormatRegisterRAS(void); /** \defgroup led LED - IUP image in LED * \section Description - * + * * \par * Copyright Tecgraf/PUC-Rio and PETROBRAS/CENPES. * \par @@ -346,12 +346,12 @@ void imFormatRegisterRAS(void); \verbatim Data Types: Byte Color Spaces: MAP only (Gray and Binary saved as MAP) - Compressions: + Compressions: NONE - no compression [default] - Only one image. + Only one image. No alpha channel. Internally the lines are arranged from top down to bottom. - + Attributes: none @@ -363,7 +363,7 @@ void imFormatRegisterLED(void); /** \defgroup sgi SGI - Silicon Graphics Image File Format * \section Description - * + * * \par * SGI is a trademark of Silicon Graphics, Inc. * \par @@ -374,14 +374,14 @@ void imFormatRegisterLED(void); \verbatim Data Types: Byte and UShort Color Spaces: Gray and RGB (Binary saved as Gray, MAP with fixed palette when reading only) - Compressions: + Compressions: NONE - no compression [default] RLE - Run Lenght Encoding Only one image. Can have an alpha channel (only for IM_RGB) Internally the components are always packed. Internally the lines are arranged from bottom up to top. - + Attributes: Description (string) \endverbatim @@ -390,7 +390,7 @@ void imFormatRegisterSGI(void); /** \defgroup pcx PCX - ZSoft Picture * \section Description - * + * * \par * Copyright ZSoft Corporation. \n * ZSoft (1988) PCX Technical Reference Manual. @@ -402,14 +402,14 @@ void imFormatRegisterSGI(void); \verbatim Data Types: Byte Color Spaces: RGB, MAP and Binary (Gray saved as MAP) - Compressions: - NONE - no compression + Compressions: + NONE - no compression RLE - Run Lenght Encoding [default - since uncompressed PCX is not well supported] Only one image. No alpha channel. Internally the components are always packed. Internally the lines are arranged from top down to bottom. - + Attributes: ResolutionUnit (string) ["DPC", "DPI"] XResolution, YResolution IM_FLOAT (1) @@ -423,7 +423,7 @@ void imFormatRegisterPCX(void); /** \defgroup tga TGA - Truevision Graphics Adapter File * \section Description - * + * * \par * Truevision TGA File Format Specification Version 2.0 \n * Technical Manual Version 2.2 January, 1991 \n @@ -436,14 +436,14 @@ void imFormatRegisterPCX(void); \verbatim Supports 8 bits per component only. Data type is always Byte. Color Spaces: Gray, RGB and MAP (Binary saved as Gray) - Compressions: + Compressions: NONE - no compression [default] RLE - Run Lenght Encoding Only one image. No alpha channel. Internally the components are always packed. Internally the lines are arranged from bottom up to top or from top down to bottom. - + Attributes: XScreen, YScreen IM_USHORT (1) screen position Title, Author, Description, JobName, Software (string) @@ -456,7 +456,7 @@ void imFormatRegisterTGA(void); /** \defgroup pnm PNM - Netpbm Portable Image Map * \section Description - * + * * \par * PNM formats Copyright Jef Poskanzer * \par @@ -467,14 +467,14 @@ void imFormatRegisterTGA(void); \verbatim Data Types: Byte and UShort Color Spaces: Gray, RGB and Binary - Compressions: + Compressions: NONE - no compression [default] ASCII (textual data) Can have more than one image, but sequencial access only. No alpha channel. Internally the components are always packed. Internally the lines are arranged from top down to bottom. - + Attributes: Description (string) @@ -486,7 +486,7 @@ void imFormatRegisterPNM(void); /** \defgroup ico ICO - Windows Icon * \section Description - * + * * \par * Windows Copyright Microsoft Corporation. * \par @@ -497,21 +497,21 @@ void imFormatRegisterPNM(void); \verbatim Data Types: Byte Color Spaces: RGB, MAP and Binary (Gray saved as MAP) - Compressions: + Compressions: NONE - no compression [default] Can have more than one image. But writing is limited to 5 images, and all images must have different sizes and bpp. Can have an alpha channel (only for RGB) Internally the components are always packed. Internally the lines are arranged from bottom up to top. - + Attributes: TransparencyIndex IM_BYTE (1 or N) Comments: If the user specifies an alpha channel, the AND mask is loaded as alpha if the file color mode does not contain the IM_ALPHA flag. - For MAP imagens, if the user does not specifies an alpha channel + For MAP imagens, if the user does not specifies an alpha channel the TransparencyIndex is used to initialize the AND mask when writing, and if the user does specifies an alpha channel the most repeated index with transparency will be the transparent index. @@ -524,7 +524,7 @@ void imFormatRegisterICO(void); /** \defgroup krn KRN - IM Kernel File Format * \section Description - * + * * \par * Textual format to provied a simple way to create kernel convolution images. * \par @@ -535,12 +535,12 @@ void imFormatRegisterICO(void); \verbatim Data Types: Byte, Int Color Spaces: Gray - Compressions: + Compressions: NONE - no compression [default] Only one image. No alpha channel. Internally the lines are arranged from top down to bottom. - + Attributes: Description (string) @@ -561,9 +561,9 @@ void imFormatRegisterICO(void); Gradian 3 3 0 - 0 -1 0 - 0 1 0 - 0 0 0 + 0 -1 0 + 0 1 0 + 0 0 0 \endverbatim * \ingroup format */ void imFormatRegisterKRN(void); diff --git a/src/lua5/im_process.lua b/src/lua5/im_process.lua index 1d91d5e..fbe9534 100644 --- a/src/lua5/im_process.lua +++ b/src/lua5/im_process.lua @@ -30,7 +30,7 @@ end local function TwoSourcesOneDest (funcname, width, height, color_space, data_type) local func = im[funcname] - + -- see if function is really defined assert(func, string.format("undefined function `%s'", funcname)) @@ -148,12 +148,12 @@ function im.ProcessResizeNew (src_image, width, height) return im.ProcessResize(src_image, dst_image), dst_image end -OneSourceOneDest("ProcessReduceBy4", function (image) return image:Width() / 2 end, +OneSourceOneDest("ProcessReduceBy4", function (image) return image:Width() / 2 end, function (image) return image:Height() / 2 end) function im.ProcessCropNew (src_image, xmin, xmax, ymin, ymax) local width = xmax - xmin + 1 - local height = xmax - ymin + 1 + local height = ymax - ymin + 1 local dst_image = im.ImageCreateBased(src_image, width, height) im.ProcessCrop(src_image, dst_image, xmin, ymin) return dst_image @@ -163,7 +163,7 @@ TwoSourcesOneDest("ProcessInsert") function im.ProcessAddMarginsNew (src_image, xmin, xmax, ymin, ymax) local width = xmax - xmin + 1 - local height = xmax - ymin + 1 + local height = ymax - ymin + 1 local dst_image = im.ImageCreateBased(src_image, width, height) im.ProcessAddMargins(src_image, dst_image, xmin, ymin) return dst_image @@ -217,7 +217,7 @@ function im.ProcessInterlaceSplitNew(src_image) if math.mod(src_image:Height(), 2) then dst_height1 = dst_height1 + 1 end - + local dst_image1 = im.ImageCreateBased(src_image, nil, dst_height1) local dst_image2 = im.ImageCreateBased(src_image, nil, src_image:Height()/2) diff --git a/src/lua5/imlua_process.c b/src/lua5/imlua_process.c index 1c77dac..6f08588 100644 --- a/src/lua5/imlua_process.c +++ b/src/lua5/imlua_process.c @@ -2,7 +2,7 @@ * \brief IM Lua 5 Binding * * See Copyright Notice in im_lib.h - * $Id: imlua_process.c,v 1.3 2009/06/24 20:42:29 scuri Exp $ + * $Id: imlua_process.c,v 1.4 2009/07/03 17:45:13 scuri Exp $ */ #include @@ -606,8 +606,8 @@ static int imluaProcessReduceBy4 (lua_State *L) imImage* dst_image = imlua_checkimage(L, 2); imlua_matchcolor(L, src_image, dst_image); - luaL_argcheck(L, - dst_image->width == (src_image->width / 2) && + luaL_argcheck(L, + dst_image->width == (src_image->width / 2) && dst_image->height == (src_image->height / 2), 3, "destiny image size must be source image width/2, height/2"); imProcessReduceBy4(src_image, dst_image); @@ -626,9 +626,9 @@ static int imluaProcessCrop (lua_State *L) imlua_matchcolor(L, src_image, dst_image); luaL_argcheck(L, xmin >= 0 && xmin < src_image->width, 3, "xmin must be >= 0 and < width"); - luaL_argcheck(L, ymin >= 0 && ymin < src_image->height, 3, "ymin must be >= 0 and < height"); - luaL_argcheck(L, dst_image->width <= (src_image->width - xmin), 2, "destiny image size must be smaller than source image width-xmin, height-ymin"); - luaL_argcheck(L, dst_image->height <= (src_image->height - ymin), 2, "destiny image size must be smaller than source image width-xmin, height-ymin"); + luaL_argcheck(L, ymin >= 0 && ymin < src_image->height, 4, "ymin must be >= 0 and < height"); + luaL_argcheck(L, dst_image->width <= (src_image->width - xmin), 2, "destiny image size must be smaller than source image width-xmin"); + luaL_argcheck(L, dst_image->height <= (src_image->height - ymin), 2, "destiny image size must be smaller than source image height-ymin"); imProcessCrop(src_image, dst_image, xmin, ymin); return 0; @@ -722,9 +722,9 @@ static int imluaProcessRotateRef (lua_State *L) imImage *dst_image = imlua_checkimage(L, 2); double cos0 = (double) luaL_checknumber(L, 3); double sin0 = (double) luaL_checknumber(L, 4); - int x = luaL_checkint(L, 5); - int y = luaL_checkint(L, 6); - int to_origin = luaL_checkint(L, 7); + int x = luaL_checkint(L, 5); + int y = luaL_checkint(L, 6); + int to_origin = luaL_checkint(L, 7); int order = luaL_checkint(L, 8); imlua_matchcolor(L, src_image, dst_image); @@ -741,8 +741,8 @@ static int imluaProcessRotate90 (lua_State *L) { imImage *src_image = imlua_checkimage(L, 1); imImage *dst_image = imlua_checkimage(L, 2); - int dir = luaL_checkint(L, 3); - + int dir = luaL_checkint(L, 3); + imlua_matchcolor(L, src_image, dst_image); luaL_argcheck(L, dst_image->width == src_image->height && dst_image->height == src_image->width, 2, "destiny width and height must have the source height and width"); luaL_argcheck(L, (dir == -1 || dir == 1), 3, "invalid dir, can be -1 or 1 only"); @@ -1234,7 +1234,7 @@ static int imluaProcessConvolve (lua_State *L) lua_pushboolean(L, imProcessConvolve(src_image, dst_image, kernel)); return 1; } - + /*****************************************************************************\ im.ProcessConvolveDual \*****************************************************************************/ @@ -1494,7 +1494,7 @@ static int imluaGaussianStdDev2KernelSize (lua_State *L) /*****************************************************************************\ - Arithmetic Operations + Arithmetic Operations \*****************************************************************************/ /*****************************************************************************\ @@ -1529,34 +1529,34 @@ static int imluaProcessArithmeticOp (lua_State *L) switch (src_image1->data_type) { case IM_BYTE: - luaL_argcheck(L, - dst_image->data_type == IM_BYTE || - dst_image->data_type == IM_USHORT || - dst_image->data_type == IM_INT || - dst_image->data_type == IM_FLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_BYTE || + dst_image->data_type == IM_USHORT || + dst_image->data_type == IM_INT || + dst_image->data_type == IM_FLOAT, 2, "source image is byte, destiny image data type can be byte, ushort, int and float only."); break; case IM_USHORT: - luaL_argcheck(L, - dst_image->data_type == IM_USHORT || - dst_image->data_type == IM_INT || - dst_image->data_type == IM_FLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_USHORT || + dst_image->data_type == IM_INT || + dst_image->data_type == IM_FLOAT, 2, "source image is ushort, destiny image data type can be ushort, int and float only."); break; case IM_INT: - luaL_argcheck(L, - dst_image->data_type == IM_INT || - dst_image->data_type == IM_FLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_INT || + dst_image->data_type == IM_FLOAT, 2, "source image is int, destiny image data type can be int and float only."); break; case IM_FLOAT: - luaL_argcheck(L, - dst_image->data_type == IM_FLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_FLOAT, 2, "source image is float, destiny image data type can be float only."); break; case IM_CFLOAT: - luaL_argcheck(L, - dst_image->data_type == IM_CFLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_CFLOAT, 2, "source image is cfloat, destiny image data type can be cfloat only."); break; } @@ -1580,34 +1580,34 @@ static int imluaProcessArithmeticConstOp (lua_State *L) switch (src_image->data_type) { case IM_BYTE: - luaL_argcheck(L, - dst_image->data_type == IM_BYTE || - dst_image->data_type == IM_USHORT || - dst_image->data_type == IM_INT || - dst_image->data_type == IM_FLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_BYTE || + dst_image->data_type == IM_USHORT || + dst_image->data_type == IM_INT || + dst_image->data_type == IM_FLOAT, 2, "source image is byte, destiny image data type can be byte, ushort, int and float only."); break; case IM_USHORT: - luaL_argcheck(L, - dst_image->data_type == IM_USHORT || - dst_image->data_type == IM_INT || - dst_image->data_type == IM_FLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_USHORT || + dst_image->data_type == IM_INT || + dst_image->data_type == IM_FLOAT, 2, "source image is ushort, destiny image data type can be ushort, int and float only."); break; case IM_INT: - luaL_argcheck(L, - dst_image->data_type == IM_INT || - dst_image->data_type == IM_FLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_INT || + dst_image->data_type == IM_FLOAT, 2, "source image is int, destiny image data type can be int and float only."); break; case IM_FLOAT: - luaL_argcheck(L, - dst_image->data_type == IM_FLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_FLOAT, 2, "source image is float, destiny image data type can be float only."); break; case IM_CFLOAT: - luaL_argcheck(L, - dst_image->data_type == IM_CFLOAT, + luaL_argcheck(L, + dst_image->data_type == IM_CFLOAT, 2, "source image is cfloat, destiny image data type can be cfloat only."); break; } @@ -2299,16 +2299,16 @@ static int imluaProcessRenderConstant (lua_State *L) int count = image->depth; imlua_checknotcfloat(L, image, 1); - + if (lua_istable(L, 2)) { value = (float*) malloc (sizeof(float) * count); - + for (i = 0; i < count; i++) { lua_rawgeti(L, 2, i+1); value[i] = (float) lua_tonumber(L, -1); - lua_pop(L, 1); + lua_pop(L, 1); } } @@ -2536,10 +2536,10 @@ static int imluaProcessDirectConv (lua_State *L) imImage *src_image = imlua_checkimage(L, 1); imImage *dst_image = imlua_checkimage(L, 2); - luaL_argcheck(L, - src_image->data_type == IM_USHORT || + luaL_argcheck(L, + src_image->data_type == IM_USHORT || src_image->data_type == IM_INT || - src_image->data_type == IM_FLOAT, + src_image->data_type == IM_FLOAT, 1, "data type can be ushort, int or float only"); imlua_checkdatatype(L, 2, dst_image, IM_BYTE); imlua_matchsize(L, src_image, dst_image); @@ -3063,18 +3063,18 @@ int imlua_open_process(lua_State *L) #include "loh/im_process_be64.loh" #else #include "loh/im_process_be32.loh" -#endif +#endif #else #ifdef TEC_64 #ifdef WIN64 #include "loh/im_process_le64w.loh" #else #include "loh/im_process_le64.loh" -#endif +#endif #else #include "loh/im_process.loh" -#endif -#endif +#endif +#endif imlua_open_kernel(L); return 1; } -- cgit v1.2.3