diff options
| -rw-r--r-- | html/en/history.html | 352 | ||||
| -rw-r--r-- | mak.vc9/imlua5.vcproj | 4 | ||||
| -rw-r--r-- | mak.vc9/imlua_fftw5.vcproj | 4 | ||||
| -rw-r--r-- | mak.vc9/imlua_process5.vcproj | 4 | ||||
| -rw-r--r-- | src/imlua5.mak | 3 | ||||
| -rw-r--r-- | src/imlua_avi.mak | 10 | ||||
| -rw-r--r-- | src/imlua_capture5.mak | 10 | ||||
| -rw-r--r-- | src/imlua_fftw5.mak | 3 | ||||
| -rw-r--r-- | src/imlua_jp2.mak | 10 | ||||
| -rw-r--r-- | src/imlua_process5.mak | 3 | ||||
| -rw-r--r-- | src/imlua_wmv.mak | 10 | ||||
| -rw-r--r-- | src/lua5/loh51/le32/im_process.loh | 317 |
12 files changed, 387 insertions, 343 deletions
diff --git a/html/en/history.html b/html/en/history.html index f25b10f..14716d8 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -6,6 +6,20 @@ <meta http-equiv="Content-Language" content="en-us"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link rel="stylesheet" type="text/css" href="../style.css"> +<style type="text/css"> +.hist_changed { + color: #008000; + font-weight: bold; +} +.hist_new { + color: #0000FF; + font-weight: bold; +} + .hist_fixed { + color: #FF0000; + font-weight: bold; +} + </style> </head> <body> @@ -14,15 +28,25 @@ <h3 dir="ltr"> CVS (25/Apr/2010)</h3> <ul dir="ltr"> - <li dir="ltr"><span style="color: #008000"> - <span - style="color: #000000"> <span style="color: #0000FF">New:</span> + <li dir="ltr"><span class="hist_new">New:</span><span style="color: #008000"><span + style="color: #000000"> function <strong>imVideoCaptureReleaseDevices</strong>.</span></span></li> <li dir="ltr"> - <span style="color: #008000">Changed:</span> ICON format now supports + <span class="hist_changed">Changed:</span> ICON format now supports writing up to 10 images.</li> <li dir="ltr"> - <span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <span class="hist_changed">Changed:</span> + replaced old "arg" usage for "..." to improve better compatibility with + LuaJIT.</li> + <li dir="ltr"> + <span class="hist_changed">Changed:</span> + control of LOHs inclusion moved from the source code to the makefile.</li> + <li dir="ltr"> + <span class="hist_changed">Changed:</span> + removed compatibility with require"imlua51", now LuaBinaries must be used + or LUA_CPATH must be set.</li> + <li dir="ltr"> + <span class="hist_fixed">Fixed:</span><span style="color: #008000"><span style="color: #000000"> image:<strong>HasAlpha</strong>() method in Lua was returning a number instead of a boolean, so <strong>im</strong>.<strong>ImageCreateBased</strong> was adding an alpha channel to all new images.</span></span></li> @@ -30,110 +54,110 @@ <h3 dir="ltr"> <a href="http://sourceforge.net/projects/imtoolkit/files/3.6.1/">Version 3.6.1</a> (23/Apr/2010)</h3> <ul dir="ltr"> - <li dir="ltr"><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li dir="ltr"><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> invalid memory access in <strong> imProcessResize</strong> when one dimension is equal to the original.</span></span></li> - <li dir="ltr"><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li dir="ltr"><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> <strong>imProcessCompose</strong> parameter parsing in Lua.</span></span></li> - <li dir="ltr"><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li dir="ltr"><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> invalid memory access when saving an image with the JPEG 2000 format.</span></span></li> </ul> <h3 dir="ltr"> <a href="http://sourceforge.net/projects/imtoolkit/files/3.6/">Version 3.6</a> (26/Jan/2010)</h3> <ul dir="ltr"> - <li><span style="color: #0000FF">New:</span> function <strong> + <li><span class="hist_new">New:</span> function <strong> imImageCopyPlane</strong>.</li> - <li><span style="color: #0000FF">New:</span> function <strong> + <li><span class="hist_new">New:</span> function <strong> imProcessCompose</strong>.</li> - <li><span style="color: #0000FF">New:</span> function <strong> + <li><span class="hist_new">New:</span> function <strong> imImageSetAlpha</strong>.</li> <li dir="ltr"> - <span style="color: #008000">Changed:</span> libTIFF downgraded to version + <span class="hist_changed">Changed:</span> libTIFF downgraded to version 3.8.2 because of the JPEG support in TIFF not working on the newer versions.</li> <li dir="ltr"> - <span style="color: #008000">Changed:</span> + <span class="hist_changed">Changed:</span> <span style="color: #008000"><span style="color: #000000"> included alpha support in <strong> imProcessSplitComponents</strong> and <strong>imProcessMergeComponents</strong>. Included alpha support in all geometric and size operations.</span></span></li> - <li dir="ltr"><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li dir="ltr"><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> invalid memory access in <strong> imAnalyzeFindRegions</strong> when more than 16k regions where found.</span></span></li> - <li dir="ltr"><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li dir="ltr"><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> memory leak in <strong>imFileOpen</strong>.</span></span></li> - <li dir="ltr"><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li dir="ltr"><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> alpha support in image:<strong>CopyPlane</strong>() and in channel indexing in Lua.</span></span></li> - <li dir="ltr"><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li dir="ltr"><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> incomplete initialization of the array in <strong>imAnalyzeMeasureArea</strong>.</span></span></li> - <li dir="ltr"><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li dir="ltr"><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> <strong>imProcessRemoveByArea</strong> inside/outside logic.</span></span></li> </ul> <h3 dir="ltr"> <a href="http://sourceforge.net/projects/imtoolkit/files/3.5/">Version 3.5</a> (02/Oct/2009)</h3> <ul> - <li><span style="color: #0000FF">New:</span> functions <strong> + <li><span class="hist_new">New:</span> functions <strong> imProcessUnsharp</strong> and <strong>imProcessSharp</strong>.</li> - <li><span style="color: #0000FF">New:</span> function <strong> + <li><span class="hist_new">New:</span> function <strong> imImageGetOpenGLData</strong>.</li> - <li><span style="color: #0000FF">New:</span> functions <strong> + <li><span class="hist_new">New:</span> functions <strong> im.ConvertDataTypeNew</strong>, <strong>im.ConvertColorSpaceNew</strong> and <strong>im.ConvertToBitmapNew</strong> in Lua.</li> - <li><span style="color: #0000FF">New:</span> file attributes + <li><span class="hist_new">New:</span> file attributes "FileFormat", "FileCompression" and "FileImageCount" when reading from file. Available for all formats.</li> - <li><span style="color: #0000FF">New:</span> ASCII compression for RAW + <li><span class="hist_new">New:</span> ASCII compression for RAW format to access text data instead of binary.</li> - <li><span style="color: #008000">Changed:</span> libPNG updated to version + <li><span class="hist_changed">Changed:</span> libPNG updated to version 1.2.39. Removed changes to the library that made it incompatible with other libPNG distributions.</li> - <li><span style="color: #008000">Changed:</span> libLZF updated to + <li><span class="hist_changed">Changed:</span> libLZF updated to version 3.5.</li> - <li><span style="color: #008000">Changed:</span> libJPEG updated to + <li><span class="hist_changed">Changed:</span> libJPEG updated to version 7.</li> - <li><span style="color: #008000">Changed:</span> libEXIF updated to version 0.6.17.</li> - <li><span style="color: #008000">Changed:</span> libTIFF updated to version + <li><span class="hist_changed">Changed:</span> libEXIF updated to version 0.6.17.</li> + <li><span class="hist_changed">Changed:</span> libTIFF updated to version 3.9.1.</li> - <li><span style="color: #008000">Changed:</span> library im_fftw3 to use + <li><span class="hist_changed">Changed:</span> library im_fftw3 to use an external library.</li> - <li><span style="color: #008000">Changed: <span + <li><span class="hist_changed">Changed:</span><span style="color: #008000"> <span style="color: #000000"> <strong>imImageCreateBased</strong> and <strong>imConvertColorSpace</strong> now also consider the alpha plane.</span></span></li> - <li><span style="color: #008000">Changed: </span><strong>imProcessPrune</strong> + <li><span class="hist_changed">Changed:</span><span style="color: #008000"> </span><strong>imProcessPrune</strong> renamed to <strong>imProcessRemoveByArea</strong>, and added a new parameter to select inside or outside the interval.</li> - <li><span style="color: #008000">Changed: </span>removed IM_UN_INC operation from <strong>imProcessUnArithmeticOp</strong>. + <li><span class="hist_changed">Changed:</span><span style="color: #008000"> </span>removed IM_UN_INC operation from <strong>imProcessUnArithmeticOp</strong>. It was not an unary operation. Can simply be done in place by <strong> imProcessArithmeticOp</strong> and IM_BIN_ADD. </li> - <li><span style="color: #008000">Changed: </span>now<strong> imProcessUnArithmeticOp</strong>, + <li><span class="hist_changed">Changed:</span><span style="color: #008000"> </span>now<strong> imProcessUnArithmeticOp</strong>, <strong>imProcessArithmeticConstOp</strong> and <strong> imProcessArithmeticOp</strong> willl crop the result to 0-255 if destiny has data type byte.</li> - <li><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> PNG attribute TransparencyIndex. new PNG attribute TransparencyMap. TransparentColor renamed to TransparencyColor.</span></span></li> - <li><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> invalid convertion from MAP to GRAY when loading <strong>imImages</strong>.</span></span></li> - <li><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> new image size computation of <strong>im.ProcessCropNew</strong> in Lua.</span></span> </li> - <li><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> loading of RAW data.</span></span></li> - <li><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> <strong>imImageClear</strong> to initialize data just like <strong>imImageCreate</strong> does. </span></span></li> - <li><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> <strong>imImageReshape</strong> when the image has an alpha plane. Image is not cleared anymore. </span></span></li> - <li><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> boolean parameters in <strong> file:ReadImageData, im.ConvertDataType, im.ConvertToBitmap, im.ProcessSplitComplex, im.ProcessQuantizeRGBUniform, im.ProcessBitPlane, im.ProcessRotateRef, @@ -141,298 +165,298 @@ im.CalcHistogram, im.CalcGrayHistogram </strong>and <strong> im.AnalyzeFindRegions</strong> in Lua. Changed <strong>im.Capture*</strong> functions to use boolean values in Lua.</span></span></li> - <li><span style="color: #008000"><span style="color: #ff0000">Fixed:</span><span + <li><span style="color: #008000"><span class="hist_fixed">Fixed:</span><span style="color: #000000"> RAW format initialization.</span></span></li> </ul> <h3 dir="ltr"> <a href="http://sourceforge.net/projects/imtoolkit/files/3.4.2/">Version 3.4.2</a> (26/Jun/2009)</h3> <ul> - <li><span style="color: #008000">Changed:</span> + <li><span class="hist_changed">Changed:</span> removed "lua5.1.so" dependency in UNIX.</li> - <li><span style="color: #FF0000">Fixed:</span> AVI format when reading 32 + <li><span class="hist_fixed">Fixed:</span> AVI format when reading 32 and 16 bpp frames.</li> - <li><span style="color: #FF0000">Fixed:</span> xmin and ymin check in + <li><span class="hist_fixed">Fixed:</span> xmin and ymin check in im.ProcessCrop and in im.ProcessInsert in Lua.</li> </ul> <h3 dir="ltr"><a href="http://sourceforge.net/projects/imtoolkit/files/3.4.1/">Version 3.4.1</a> (15/Dec/2008)</h3> <ul> - <li><span style="color: #008000">Changed:</span> function <strong> + <li><span class="hist_changed">Changed:</span> function <strong> imColorHSI_Smax</strong> removed from public, now it is used only internally. HSI space now uses S already normalized between 0-Smax.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imColorHSI2RGB</strong> + <li><span class="hist_fixed">Fixed:</span> <strong>imColorHSI2RGB</strong> conversion.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imConvertDataType</strong> + <li><span class="hist_fixed">Fixed:</span> <strong>imConvertDataType</strong> when converting a floating point to integer, there were rounding problems.</li> - <li><span style="color: #FF0000">Fixed:</span> loading and saving two or more files of the same format at the same time.</li> + <li><span class="hist_fixed">Fixed:</span> loading and saving two or more files of the same format at the same time.</li> </ul> <h3 dir="ltr"><a href="http://sourceforge.net/projects/imtoolkit/files/3.4/">Version 3.4</a> (14/Oct/2008)</h3> <ul> - <li><span style="color: #0000FF">New:</span> imlua_avi, imlua_wmv and imlua_jp2 libraries so the + <li><span class="hist_new">New:</span> imlua_avi, imlua_wmv and imlua_jp2 libraries so the respective formats can be dynamically loaded using require.</li> - <li><span style="color: #0000FF"><span style="color: #008000">Changed</span>:</span> + <li><span class="hist_changed">Changed:</span> <strong> <span style="color: #FF0000">IMPORTANT</span></strong> - the "imlua_cd" library moved from IM to CD under the name "cdluaim".</li> - <li><span style="color: #0000FF"><span style="color: #008000">Changed</span>:</span> + <li><span class="hist_changed">Changed:</span> <strong> <span style="color: #FF0000">IMPORTANT</span></strong> - the support services (Downloads, Mailing List and CVS) moved from LuaForge to SourceForge.</li> - <li><span style="color: #008000">Changed:</span> All dll8 and dll9 DLLs now + <li><span class="hist_changed">Changed:</span> All dll8 and dll9 DLLs now have a Manifest file that specifies the correct MSVCR*.DLL.</li> - <li><span style="color: #008000">Changed:</span> + <li><span class="hist_changed">Changed:</span> Makefiles for UNIX now uses a compact version of Tecmake that does not need any installation, just type "make".</li> - <li><span style="color: #008000">Changed</span>: premake files are used now + <li><span class="hist_changed">Changed:</span> premake files are used now only internally and were removed from the distribution.</li> - <li><span style="color: #0000FF"><span style="color: #008000">Changed</span>:</span> + <li><span class="hist_changed">Changed:</span> Copyright notice modified to reflect the registration at INPI (National Institute of Intellectual Property in Brazil). License continues under the same terms.</li> - <li><span style="color: #FF0000">Fixed:</span> reviewed and fixed the parameter + <li><span class="hist_fixed">Fixed:</span> reviewed and fixed the parameter checking of all IMLua processing functions. Also reviewed all IMLua parameter checking. Thanks to Lucas Lorensi.</li> - <li><span style="color: #FF0000">Fixed:</span> loading of TIFF format with + <li><span class="hist_fixed">Fixed:</span> loading of TIFF format with old JPEG compression.</li> - <li><span style="color: #FF0000">Fixed:</span> loading and saving of PNM + <li><span class="hist_fixed">Fixed:</span> loading and saving of PNM format when data in textual format and gray values are greatter than 255.</li> - <li><span style="color: #FF0000">Fixed:</span> Bicubic and Zero order + <li><span class="hist_fixed">Fixed:</span> Bicubic and Zero order interpolation for all geometric operations for pixels near the image border when increasing image size.</li> - <li><span style="color: #FF0000">Fixed:</span> Lua samples.</li> - <li><span style="color: #FF0000">Fixed:</span> ICON format in 64 bits Linux.</li> + <li><span class="hist_fixed">Fixed:</span> Lua samples.</li> + <li><span class="hist_fixed">Fixed:</span> ICON format in 64 bits Linux.</li> </ul> <h3 dir="ltr">Version 3.3 (26/Nov/2007)</h3> <ul> - <li><span style="color: #0000FF">New:</span> read support for ECW using the + <li><span class="hist_new">New:</span> read support for ECW using the ERMapper ECW JPEG 2000 SDK.</li> - <li><span style="color: #008000">Changed:</span> libTIFF updated to version + <li><span class="hist_changed">Changed:</span> libTIFF updated to version 3.8.2.</li> - <li><span style="color: #008000">Changed:</span> libPNG updated to version + <li><span class="hist_changed">Changed:</span> libPNG updated to version 1.2.22.</li> - <li><span style="color: #008000">Changed:</span> libJasper updated to + <li><span class="hist_changed">Changed:</span> libJasper updated to libGeoJasper 1.4.0 (using Jasper version 1.900.1). Better support for counter progress, Geo tags and several speed improvements. New GeoTIFFBox and XMLPacket attributes.</li> - <li><span style="color: #008000">Changed:</span> renamed macro <b>imPutImage</b> + <li><span class="hist_changed">Changed:</span> renamed macro <b>imPutImage</b> to <b>imcdCanvasPutImage</b>, and added canvas as the first parameter. </li> - <li><span style="color: #008000">Changed:</span> renamed + <li><span class="hist_changed">Changed:</span> renamed the <b>imImage</b> Lua methods to <i><strong>image</strong></i><b>:cdCanvasPutImageRect</b>, <i> <strong>image</strong></i><b>:wdCanvasPutImageRect</b> and <i><strong>image</strong></i><b>:cdCanvasGetImage</b>, and added canvas as the first parameter. Now <i>imlua_cd</i> depends on <i>cdlua</i> from CD version 5.0.</li> - <li><span style="color: #008000">Changed:</span> metatable names in Lua are + <li><span class="hist_changed">Changed:</span> metatable names in Lua are now the same as the C struct names.</li> - <li><span style="color: #008000">Changed:</span> new read EXIF tags support + <li><span class="hist_changed">Changed:</span> new read EXIF tags support in TIFF format (no write support yet). Renamed attributes "GeoTransMatrix" and "IntergraphMatrix", to "GeoTransformationMatrix" and "Intergraph TransformationMatrix" for libGeoTIFF compatibility. Better support for known TIFF tags. New support for reading one band of a multiband gray image in TIFF format. New support for DNG files.</li> - <li><span style="color: #FF0000">Fixed:</span><strong> imConvertDataType</strong> + <li><span class="hist_fixed">Fixed:</span><strong> imConvertDataType</strong> gamma function when converting real to/from integer.</li> - <li><span style="color: #FF0000">Fixed:</span><strong> </strong>small error at + <li><span class="hist_fixed">Fixed:</span><strong> </strong>small error at the image border when resampling, rotating or other geometric operations.</li> - <li><span style="color: #FF0000">Fixed:</span><strong> </strong> + <li><span class="hist_fixed">Fixed:</span><strong> </strong> <b>imProcessCanny</b> invalid division by zero when input image is all zero.</li> - <li><span style="color: #FF0000">Fixed:</span><strong> </strong> + <li><span class="hist_fixed">Fixed:</span><strong> </strong> <b>imFileReadImageInfo</b> when loading MAP images with a scrambled gray palette. They were incorrectly converted to GREY.</li> - <li><span style="color: #FF0000">Fixed:</span><strong> </strong> + <li><span class="hist_fixed">Fixed:</span><strong> </strong> support for IM_ALPHA and 32 bpp in ICO format.</li> - <li><span style="color: #FF0000">Fixed:</span><strong> </strong> + <li><span class="hist_fixed">Fixed:</span><strong> </strong> number of lines returned in <b>imProcessHoughLinesDraw</b>.</li> </ul> <h3 dir="ltr">Version 3.2 (24/Nov/2006)</h3> <ul> - <li><span style="color: #0000FF">New:</span> <strong>imProcessRotateRef</strong> to rotate relative to a reference point.</li> - <li><span style="color: #0000FF">New:</span> geometric distortion <strong>imProcessSwirl</strong>.</li> - <li><span style="color: #0000FF">New:</span> <strong>imProcessInterlaceSplit</strong>.</li> - <li><span style="color: #0000FF">New:</span> function <strong>imGaussianKernelSize2StdDev</strong>.</li> - <li><span style="color: #0000FF">New:</span> convolutions <strong>imProcessBarlettConvolve</strong>, + <li><span class="hist_new">New:</span> <strong>imProcessRotateRef</strong> to rotate relative to a reference point.</li> + <li><span class="hist_new">New:</span> geometric distortion <strong>imProcessSwirl</strong>.</li> + <li><span class="hist_new">New:</span> <strong>imProcessInterlaceSplit</strong>.</li> + <li><span class="hist_new">New:</span> function <strong>imGaussianKernelSize2StdDev</strong>.</li> + <li><span class="hist_new">New:</span> convolutions <strong>imProcessBarlettConvolve</strong>, <strong>imProcessPrewittConvolve</strong>, <strong>imProcessSplineEdgeConvolve</strong>, <strong>imProcessConvolveDual</strong> and <strong>imProcessConvolveSep</strong>. </li> - <li><span style="color: #0000FF">New:</span> "im_kernel.h" module with simple functions to create know pre-defined kernels like sobel, laplacian, gaussian, + <li><span class="hist_new">New:</span> "im_kernel.h" module with simple functions to create know pre-defined kernels like sobel, laplacian, gaussian, etc.</li> - <li><span style="color: #0000FF">New:</span> <strong>imVideoCaptureSetInOut</strong> to control input and output in capture devices.</li> - <li><span style="color: #0000FF">New:</span> function <strong>imBinMemoryRelease</strong> to release internal memory allocated + <li><span class="hist_new">New:</span> <strong>imVideoCaptureSetInOut</strong> to control input and output in capture devices.</li> + <li><span class="hist_new">New:</span> function <strong>imBinMemoryRelease</strong> to release internal memory allocated by the BinMemory file when saving.</li> - <li><span style="color: #0000FF">New:</span> functions for capture device information: + <li><span class="hist_new">New:</span> functions for capture device information: <strong>imVideoCaptureDeviceExDesc</strong>, <strong>imVideoCaptureDevicePath</strong> and <strong>imVideoCaptureDeviceVendorInfo</strong>.</li> - <li><span style="color: #0000FF">New:</span> function <strong>imFileOpenAs</strong> + <li><span class="hist_new">New:</span> function <strong>imFileOpenAs</strong> to open a file of a specific format.</li> - <li><span style="color: #0000FF">New:</span> functions <strong> + <li><span class="hist_new">New:</span> functions <strong> imFormatRegisterInternal</strong> and <strong>imFormatRemoveAll</strong> to control format registration.</li> - <li><span style="color: #008000">Changed:</span> <strong>imProcessGaussianConvolve</strong> to used separable convolution and now is stddev is negative will use its + <li><span class="hist_changed">Changed:</span> <strong>imProcessGaussianConvolve</strong> to used separable convolution and now is stddev is negative will use its magnitude as the kernel size. Removed Rep functions <strong>imProcessGaussianConvolveRep</strong>, <strong>imProcessDiffOfGaussianConvolveRep</strong> and <strong>imGaussianStdDev2Repetitions</strong>.</li> - <li><span style="color: #008000">Changed:</span> <strong>imProcessBlend</strong> + <li><span class="hist_changed">Changed:</span> <strong>imProcessBlend</strong> to use an image instead of a constant. Old function renamed to <strong> imProcessBlendConst</strong>.</li> - <li><span style="color: #008000">Changed:</span> <strong>imFileHandle</strong> prototype. Now the function has an index parameter to specify which handle it should return. + <li><span class="hist_changed">Changed:</span> <strong>imFileHandle</strong> prototype. Now the function has an index parameter to specify which handle it should return. index=0 is always an imBinFile* handle. Use index=1 or greater to return other internal handles that are format dependent.</li> - <li><span style="color: #008000">Changed:</span> the Removed the include "im.h" + <li><span class="hist_changed">Changed:</span> the Removed the include "im.h" to not include "im_lib.h". "im_lib.h" must be included when necessary.</li> - <li><span style="color: #008000">Changed:</span> <strong>imAnalyzeMeasureArea</strong> and + <li><span class="hist_changed">Changed:</span> <strong>imAnalyzeMeasureArea</strong> and <strong>imAnalyzeMeasurePerimeter</strong> prototypes to include the number of regions as a parameter. Fixed: these functions to internally initialize the results array to zero (this was necessary and not documented).</li> - <li><span style="color: #008000">Changed:</span> <strong>imProcessFlip</strong> + <li><span class="hist_changed">Changed:</span> <strong>imProcessFlip</strong> and <strong>imProcessMirror</strong> so they can be done in-place.</li> - <li><span style="color: #FF0000">Fixed:</span> missing implementation of + <li><span class="hist_fixed">Fixed:</span> missing implementation of <strong>imVideoCaptureOneFrame</strong> in Lua 5.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imAnalyzeFindRegions</strong> when pixel is at the width-1 column.</li> - <li><span style="color: #FF0000">Fixed:</span> file format identification when + <li><span class="hist_fixed">Fixed:</span> <strong>imAnalyzeFindRegions</strong> when pixel is at the width-1 column.</li> + <li><span class="hist_fixed">Fixed:</span> file format identification when <strong>TIFF</strong> identification failed was not closing the file.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imAnalyzeMeasurePerimeter</strong> when perimeter line is at the first or last lines. Thanks to Takeshi Mitsunaga.</li> - <li><span style="color: #FF0000">Fixed:</span> invalid return value in <strong>imVideoCaptureConnect</strong> in Lua 5.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imProcessRotate</strong> for IM_MAP images.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>Lua</strong> binding of + <li><span class="hist_fixed">Fixed:</span> <strong>imAnalyzeMeasurePerimeter</strong> when perimeter line is at the first or last lines. Thanks to Takeshi Mitsunaga.</li> + <li><span class="hist_fixed">Fixed:</span> invalid return value in <strong>imVideoCaptureConnect</strong> in Lua 5.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>imProcessRotate</strong> for IM_MAP images.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>Lua</strong> binding of <strong>imFileImageSave</strong>, wrong parameters order. New: image:Save(filename, format) alias for imImage objects.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>BMP</strong> format implementation when reading and writing RGBA 32 bits images.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imFileLoadImageFrame</strong> and + <li><span class="hist_fixed">Fixed:</span> <strong>BMP</strong> format implementation when reading and writing RGBA 32 bits images.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>imFileLoadImageFrame</strong> and <strong>imFileLoadBitmapFrame</strong> index parameter in Lua.</li> - <li><span style="color: #FF0000">Fixed:</span> alpha channel allocation in imImage.</li> + <li><span class="hist_fixed">Fixed:</span> alpha channel allocation in imImage.</li> </ul> <h3>Version 3.1 (12/Dez/2005)</h3> <ul> - <li><span style="color: #0000FF">New:</span> Download, Discussion List, Submission of Bugs, Support Requests and Feature Requests, are now available thanks + <li><span class="hist_new">New:</span> Download, Discussion List, Submission of Bugs, Support Requests and Feature Requests, are now available thanks to the LuaForge site.</li> - <li><span style="color: #0000FF">New:</span> Binding for Lua 5</li> - <li><span style="color: #0000FF">New:</span> support for alpha in imImage.</li> - <li><span style="color: #0000FF">New:</span> organization of the documentation.</li> - <li><span style="color: #0000FF">New:</span> in ICON format the TransparencyIndex is used to for IM_MAP images without an alpha + <li><span class="hist_new">New:</span> Binding for Lua 5</li> + <li><span class="hist_new">New:</span> support for alpha in imImage.</li> + <li><span class="hist_new">New:</span> organization of the documentation.</li> + <li><span class="hist_new">New:</span> in ICON format the TransparencyIndex is used to for IM_MAP images without an alpha channel.</li> - <li><span style="color: #0000FF">New:</span> video capture functions: <strong>imVideoCaptureFormatCount</strong>, + <li><span class="hist_new">New:</span> video capture functions: <strong>imVideoCaptureFormatCount</strong>, <strong>imVideoCaptureGetFormat</strong> and <strong>imVideoCaptureSetFormat</strong>, to access the available capture video formats.</li> - <li><span style="color: #0000FF">New:</span> functions <strong>imFileLoadImageFrame</strong> and + <li><span class="hist_new">New:</span> functions <strong>imFileLoadImageFrame</strong> and <strong>imFileLoadBitmapFrame</strong> to reuse the image data when loading.</li> - <li><span style="color: #0000FF">New:</span> function <strong>imFileImageSave</strong>.</li> - <li><span style="color: #0000FF">New:</span> function <strong>imImageCreateBased</strong>.</li> - <li><span style="color: #0000FF">New:</span> <strong>imProcessInsert</strong>.</li> - <li><span style="color: #0000FF">New:</span> compression functions <strong>imCompressDataLZF</strong> and + <li><span class="hist_new">New:</span> function <strong>imFileImageSave</strong>.</li> + <li><span class="hist_new">New:</span> function <strong>imImageCreateBased</strong>.</li> + <li><span class="hist_new">New:</span> <strong>imProcessInsert</strong>.</li> + <li><span class="hist_new">New:</span> compression functions <strong>imCompressDataLZF</strong> and <strong>imCompressDataUnLZF</strong>, using libLZF.</li> - <li><span style="color: #0000FF">New:</span> module for imBinFile, <strong>IM_FILEHANDLE</strong> that allows to access an already opened file using the + <li><span class="hist_new">New:</span> module for imBinFile, <strong>IM_FILEHANDLE</strong> that allows to access an already opened file using the system file handle as file name. Thanks to Frederico Abraham.</li> - <li><span style="color: #008000">Changed:</span> in JPEG file format YcbCr are now automatically converted to RGB when loaded. RGB images were already + <li><span class="hist_changed">Changed:</span> in JPEG file format YcbCr are now automatically converted to RGB when loaded. RGB images were already automatically converted to YCbCr when saved. Now this behavior can be controlled by the AutoYCbCr attribute.</li> - <li><span style="color: #008000">Changed:</span> the <strong>imAnalyzeFindRegions</strong> to include an additional parameter that control if regions + <li><span class="hist_changed">Changed:</span> the <strong>imAnalyzeFindRegions</strong> to include an additional parameter that control if regions touching the border are computed or not. The function <strong>imProcessPrune</strong> now will only eliminate the regions in the selected size range.</li> - <li><span style="color: #008000">Changed:</span> third party libraries, updated to newest versions: libExif, libTIFF, libPNG and zlib. Added OLD JPEG + <li><span class="hist_changed">Changed:</span> third party libraries, updated to newest versions: libExif, libTIFF, libPNG and zlib. Added OLD JPEG support in libTIFF.</li> <li> - <span style="color: #008000">Changed:</span> optimization flags to ON when building the library in all platforms.</li> - <li><span style="color: #008000">Changed:</span> <strong>imProcessPerimeterLine</strong>, + <span class="hist_changed">Changed:</span> optimization flags to ON when building the library in all platforms.</li> + <li><span class="hist_changed">Changed:</span> <strong>imProcessPerimeterLine</strong>, <strong>imAnalyzeMeasurePerimeter</strong>, <strong>imAnalyzeMeasurePerimArea</strong>, <strong>imAnalyzeMeasureCentroid</strong> and <strong>imAnalyzeMeasurePrincipalAxis</strong> to consider pixels that touch the borders.</li> - <li><span style="color: #008000">Changed:</span> macro name <strong>cdPutBitmap</strong> to + <li><span class="hist_changed">Changed:</span> macro name <strong>cdPutBitmap</strong> to <strong>imPutBitmap</strong>.</li> - <li><span style="color: #008000">Changed:</span> function names imImageLoad and + <li><span class="hist_changed">Changed:</span> function names imImageLoad and <strong>imImageLoadBitmap</strong>, to <strong>imFileImageLoad</strong> and <strong>imFileImageLoadBitmap</strong>.</li> - <li><span style="color: #FF0000">Fixed:</span> overflow in <strong>imCalcImageStatistics</strong> fo IM_INT and IM_USHORT images.</li> - <li><span style="color: #FF0000">Fixed:</span> error management in system file I/O in + <li><span class="hist_fixed">Fixed:</span> overflow in <strong>imCalcImageStatistics</strong> fo IM_INT and IM_USHORT images.</li> + <li><span class="hist_fixed">Fixed:</span> error management in system file I/O in <strong>UNIX</strong>.</li> - <li><span style="color: #FF0000">Fixed:</span> some small defines for 64-bits compatibility in libExif, libPNG and libJPEG.</li> - <li><span style="color: #FF0000">Fixed:</span> incorrect interpretation of 16 bit data from + <li><span class="hist_fixed">Fixed:</span> some small defines for 64-bits compatibility in libExif, libPNG and libJPEG.</li> + <li><span class="hist_fixed">Fixed:</span> incorrect interpretation of 16 bit data from <strong>PNG</strong> files.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imFileReadImageInfo</strong> can be called many times with the same index that will return the + <li><span class="hist_fixed">Fixed:</span> <strong>imFileReadImageInfo</strong> can be called many times with the same index that will return the correct result without accessing the file again.</li> - <li><span style="color: #FF0000">Fixed:</span> small bug in sample <strong>iupglcap</strong>.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>TIFF</strong> format read for images with multiple bands in ExtraSamples.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>ICON</strong> format can_sequence was 0.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imProcessMergeHSI</strong> and + <li><span class="hist_fixed">Fixed:</span> small bug in sample <strong>iupglcap</strong>.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>TIFF</strong> format read for images with multiple bands in ExtraSamples.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>ICON</strong> format can_sequence was 0.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>imProcessMergeHSI</strong> and <strong>imProcessSplitHSI</strong> documentation, and implementation for <strong>IM_BYTE</strong> images.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imProcessRangeContrastThreshold</strong>, + <li><span class="hist_fixed">Fixed:</span> <strong>imProcessRangeContrastThreshold</strong>, <strong>imProcessLocalMaxThreshold</strong> and <strong>imProcessRankClosestConvolve</strong> when processing near the border.</li> - <li><span style="color: #FF0000">Fixed:</span> invalid file permissions in UNIX when saving a new file.</li> - <li><span style="color: #FF0000">Fixed:</span> name for <strong>imProcessLocalMaxThresEstimate</strong>.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imProcessReduceBy4</strong> for images with odd width and/or height.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imAttribTableSet</strong> when replacing an attribute (thanks to Takeshi Mitsunaga).</li> - <li><span style="color: #FF0000">Fixed:</span> memory leaks in <strong>imConvertToBitmap</strong> and + <li><span class="hist_fixed">Fixed:</span> invalid file permissions in UNIX when saving a new file.</li> + <li><span class="hist_fixed">Fixed:</span> name for <strong>imProcessLocalMaxThresEstimate</strong>.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>imProcessReduceBy4</strong> for images with odd width and/or height.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>imAttribTableSet</strong> when replacing an attribute (thanks to Takeshi Mitsunaga).</li> + <li><span class="hist_fixed">Fixed:</span> memory leaks in <strong>imConvertToBitmap</strong> and <strong>imConvertDataType</strong> (thanks to Takeshi Mitsunaga).</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imProcessZeroCrossing</strong> for the last pixel column (thanks to Takeshi Mitsunaga). Also + <li><span class="hist_fixed">Fixed:</span> <strong>imProcessZeroCrossing</strong> for the last pixel column (thanks to Takeshi Mitsunaga). Also fixed for some crossings that were lost.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imProcessGrayMorphConvolve</strong> for + <li><span class="hist_fixed">Fixed:</span> <strong>imProcessGrayMorphConvolve</strong> for <strong>IM_FLOAT</strong> images with <strong>IM_FLOAT</strong> kernel (thanks to Takeshi Mitsunaga).</li> </ul> <h3>Version 3.0.3 (14/Oct/2004)</h3> <ul> - <li><span style="color: #0000FF">New:</span> Image Transform <strong>imProcessDistanceTransform</strong>.</li> - <li><span style="color: #0000FF">New:</span> group of functions Image Analysis: + <li><span class="hist_new">New:</span> Image Transform <strong>imProcessDistanceTransform</strong>.</li> + <li><span class="hist_new">New:</span> group of functions Image Analysis: <strong>imAnalyzeFindRegions</strong>, <strong>imAnalyzeMeasureArea</strong>, <strong>imAnalyzeMeasurePerimArea</strong>, <strong>imAnalyzeMeasureCentroid</strong>, <strong>imAnalyzeMeasurePrincipalAxis</strong>, <strong>imAnalyzeMeasureHoles</strong>, imProcessPerimeterLine, <strong>imAnalyzeMeasurePerimeter</strong>, <strong>imProcessPrune</strong>, <strong>imProcessFillHoles</strong>.</li> - <li><span style="color: #0000FF">New:</span> <strong>imConvertMapToRGB</strong> to help loading data as RGB.</li> - <li><span style="color: #0000FF">New:</span> sample iupglcap.</li> - <li><span style="color: #0000FF">New:</span> <strong>imProcessRenderChessboard</strong> and + <li><span class="hist_new">New:</span> <strong>imConvertMapToRGB</strong> to help loading data as RGB.</li> + <li><span class="hist_new">New:</span> sample iupglcap.</li> + <li><span class="hist_new">New:</span> <strong>imProcessRenderChessboard</strong> and <strong>imProcessRenderGrid</strong>.</li> - <li><span style="color: #008000">Changed:</span> <strong>imProcessThreshold</strong>, + <li><span class="hist_changed">Changed:</span> <strong>imProcessThreshold</strong>, <strong>imProcessRangeContrastThreshold</strong> and <strong>imProcessLocalMaxThreshold</strong> now also supports <strong>IM_USHORT</strong> and <strong>IM_INT</strong> data types. </li> - <li><span style="color: #008000">Changed:</span> the default color conversion to binary + <li><span class="hist_changed">Changed:</span> the default color conversion to binary so it can be done for all color spaces.</li> - <li><span style="color: #008000">Changed:</span> im_process.h to split into 4 files: im_process_pont.h, + <li><span class="hist_changed">Changed:</span> im_process.h to split into 4 files: im_process_pont.h, im_process_loc.h, im_process_glo.h, im_process_ana.h. But it still exists and includes the new files for compatibility.</li> - <li><span style="color: #008000">Changed:</span> the border extensions in several types of convolution. Rank convolution do not extend the borders. Binary + <li><span class="hist_changed">Changed:</span> the border extensions in several types of convolution. Rank convolution do not extend the borders. Binary morphology use zero extension. Gray morphology do not extend the borders.</li> - <li><span style="color: #FF0000">Fixed:</span> file read with bitmap conversion when original data changes only data type. </li> - <li><span style="color: #FF0000">Fixed:</span> rank convolution operations that did not accept even kernel sizes.</li> - <li><span style="color: #FF0000">Fixed:</span> <strong>imProcessHoughLinesDraw</strong> that was ignoring some lines.</li> + <li><span class="hist_fixed">Fixed:</span> file read with bitmap conversion when original data changes only data type. </li> + <li><span class="hist_fixed">Fixed:</span> rank convolution operations that did not accept even kernel sizes.</li> + <li><span class="hist_fixed">Fixed:</span> <strong>imProcessHoughLinesDraw</strong> that was ignoring some lines.</li> </ul> <h3>Version 3.0.2 (25/Aug/2004)</h3> - <p>- <span style="color: #0000FF">New:</span> utility functions <b><b>imPaletteHighContrast</b></b>, <b> + <p>- <span class="hist_new">New:</span> utility functions <b><b>imPaletteHighContrast</b></b>, <b> <b>imImageLoadImage</b></b> and <b> <b>imImageLoadBitmap</b></b>. <br> - - <span style="color: #0000FF">New:</span> operation <b><b>imProcessNormalizeComponents</b></b>.<br> - - <span style="color: #008000">Changed:</span> name <b><b>imProcessGaussianConvolve</b></b> to <b> + - <span class="hist_new">New:</span> operation <b><b>imProcessNormalizeComponents</b></b>.<br> + - <span class="hist_changed">Changed:</span> name <b><b>imProcessGaussianConvolve</b></b> to <b> <b>imProcessGaussianConvolveRep</b></b>. New: operation <b><b>imProcessGaussianConvolve</b></b> that uses a float kernel. New: utility functions <b> <b>imGaussianStdDev2Repetitions</b></b> and <b><b>imGaussianStdDev2KernelSize</b></b>.<br> - - <span style="color: #008000">Changed:</span> name <b><b>imProcessDiffOfGaussianConvolve</b></b> to <b> + - <span class="hist_changed">Changed:</span> name <b><b>imProcessDiffOfGaussianConvolve</b></b> to <b> <b>imProcessDiffOfGaussianConvolveRep</b></b>. New: operation <b><b>imProcessDiffOfGaussianConvolve</b></b> that uses a float kernel. <br> - - <span style="color: #008000">Changed:</span> <b>IM_GAMUT_BRIGHTCONT</b> + - <span class="hist_changed">Changed:</span> <b>IM_GAMUT_BRIGHTCONT</b> parameters to the interval [-100,100]. Fixed: <b> <b>IM_GAMUT_EXPAND</b></b> and <b><b>IM_GAMUT_BRIGHTCONT</b></b> normalization.<br> - - <span style="color: #008000">Changed:</span> logical operations, flag <b> <b>IM_BIT_NOT </b> + - <span class="hist_changed">Changed:</span> logical operations, flag <b> <b>IM_BIT_NOT </b> </b>replaced by operation <b><b>imProcessBitwiseNot</b></b>.<br> - - <span style="color: #008000">Changed:</span> <b>imImageSetAttribute</b> count can be -1 for zero terminated data.<br> - - <span style="color: #FF0000">Fixed:</span> operations <b><b>imProcessBitwiseNot</b></b> and <b> + - <span class="hist_changed">Changed:</span> <b>imImageSetAttribute</b> count can be -1 for zero terminated data.<br> + - <span class="hist_fixed">Fixed:</span> operations <b><b>imProcessBitwiseNot</b></b> and <b> <b>imProcessNegative</b></b> for <b><b>IM_BINARY</b></b> images.<br> - - <span style="color: #FF0000">Fixed:</span> the <b><b>color_mode_flags</b></b> parameter interpretation by <b> + - <span class="hist_fixed">Fixed:</span> the <b><b>color_mode_flags</b></b> parameter interpretation by <b> <b>imFileReadImageData</b></b>. <br> - - <span style="color: #FF0000">Fixed:</span> <b>imProcessEqualizeHistogram</b> and <b> + - <span class="hist_fixed">Fixed:</span> <b>imProcessEqualizeHistogram</b> and <b> <b>imProcessExpandHistogram</b></b> for color images. <br> - - <span style="color: #FF0000">Fixed:</span> <b>imProcessMultipleStdDev</b>.<br> - - <span style="color: #FF0000">Fixed:</span> <b>imProcessDifusionErrThreshold</b> for <b> + - <span class="hist_fixed">Fixed:</span> <b>imProcessMultipleStdDev</b>.<br> + - <span class="hist_fixed">Fixed:</span> <b>imProcessDifusionErrThreshold</b> for <b> <b>IM_GRAY</b></b> images.<br> - - <span style="color: #FF0000">Fixed:</span> "<b><b>KRN</b></b>" format, internal format is topdown.<br> - - <span style="color: #FF0000">Fixed:</span> initialization of TGA image_count.</p> + - <span class="hist_fixed">Fixed:</span> "<b><b>KRN</b></b>" format, internal format is topdown.<br> + - <span class="hist_fixed">Fixed:</span> initialization of TGA image_count.</p> <h3>Version 3.0.1 (22/Apr/2004)</h3> diff --git a/mak.vc9/imlua5.vcproj b/mak.vc9/imlua5.vcproj index 20ab587..a750c8c 100644 --- a/mak.vc9/imlua5.vcproj +++ b/mak.vc9/imlua5.vcproj @@ -42,8 +42,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../include;../src;../../lua5.1/include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="../include;../src;..\src\lua5\loh51\le32;../../lua5.1/include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;IMLUA_USELOH" ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/mak.vc9/imlua_fftw5.vcproj b/mak.vc9/imlua_fftw5.vcproj index bd0ae2a..ab843e1 100644 --- a/mak.vc9/imlua_fftw5.vcproj +++ b/mak.vc9/imlua_fftw5.vcproj @@ -42,8 +42,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../include;../src;../../lua5.1/include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="../include;../src;..\src\lua5\loh51\le32;../../lua5.1/include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;IMLUA_USELOH" ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/mak.vc9/imlua_process5.vcproj b/mak.vc9/imlua_process5.vcproj index e80ba7d..e7a1f8b 100644 --- a/mak.vc9/imlua_process5.vcproj +++ b/mak.vc9/imlua_process5.vcproj @@ -42,8 +42,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../include;../src;../../lua5.1/include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="../include;../src;..\src\lua5\loh51\le32;../../lua5.1/include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;IMLUA_USELOH" ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/imlua5.mak b/src/imlua5.mak index 031595d..aff1935 100644 --- a/src/imlua5.mak +++ b/src/imlua5.mak @@ -4,7 +4,6 @@ LIBNAME = imlua OPT = YES USE_LOH_SUBDIR = Yes -LOHDIR = lua5/loh SRC = lua5/imlua.c lua5/imlua_aux.c lua5/imlua_convert.c lua5/imlua_file.c lua5/imlua_image.c lua5/imlua_palette.c lua5/imlua_util.c DEF_FILE = lua5/imlua.def @@ -15,9 +14,11 @@ INCLUDES = lua5 ifdef USE_LUA52 LIBNAME := $(LIBNAME)52 + LOHDIR = lua5/loh52 else USE_LUA51 = Yes LIBNAME := $(LIBNAME)51 + LOHDIR = lua5/loh51 endif USE_IM = YES diff --git a/src/imlua_avi.mak b/src/imlua_avi.mak index b05656f..e870be5 100644 --- a/src/imlua_avi.mak +++ b/src/imlua_avi.mak @@ -1,5 +1,5 @@ PROJNAME = im -LIBNAME = imlua_avi51 +LIBNAME = imlua_avi DEF_FILE = imlua_avi.def OPT = YES @@ -12,7 +12,13 @@ LIBS = im_avi INCLUDES = lua5 +ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +else + USE_LUA51 = Yes + LIBNAME := $(LIBNAME)51 +endif + USE_IMLUA = Yes -USE_LUA51 = Yes NO_LUALINK = Yes IM = .. diff --git a/src/imlua_capture5.mak b/src/imlua_capture5.mak index a4fe97c..2f5128b 100644 --- a/src/imlua_capture5.mak +++ b/src/imlua_capture5.mak @@ -1,5 +1,5 @@ PROJNAME = im -LIBNAME = imlua_capture51 +LIBNAME = imlua_capture DEF_FILE = imlua_capture.def OPT = YES @@ -12,7 +12,13 @@ LIBS = im_capture INCLUDES = lua5 +ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +else + USE_LUA51 = Yes + LIBNAME := $(LIBNAME)51 +endif + USE_IMLUA = Yes -USE_LUA51 = Yes NO_LUALINK = Yes IM = .. diff --git a/src/imlua_fftw5.mak b/src/imlua_fftw5.mak index 91d5f40..d4763a2 100644 --- a/src/imlua_fftw5.mak +++ b/src/imlua_fftw5.mak @@ -5,7 +5,6 @@ DEF_FILE = imlua_fftw.def OPT = YES USE_LOH_SUBDIR = Yes -LOHDIR = lua5/loh SRC = lua5/imlua_fftw.c DEF_FILE = lua5/imlua_fftw.def @@ -17,9 +16,11 @@ INCLUDES = lua5 ifdef USE_LUA52 LIBNAME := $(LIBNAME)52 + LOHDIR = lua5/loh52 else USE_LUA51 = Yes LIBNAME := $(LIBNAME)51 + LOHDIR = lua5/loh51 endif USE_IMLUA = YES diff --git a/src/imlua_jp2.mak b/src/imlua_jp2.mak index 71a5853..8afd596 100644 --- a/src/imlua_jp2.mak +++ b/src/imlua_jp2.mak @@ -1,5 +1,5 @@ PROJNAME = im -LIBNAME = imlua_jp251 +LIBNAME = imlua_jp2 DEF_FILE = imlua_jp2.def OPT = YES @@ -12,7 +12,13 @@ LIBS = im_jp2 INCLUDES = lua5 +ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +else + USE_LUA51 = Yes + LIBNAME := $(LIBNAME)51 +endif + USE_IMLUA = Yes -USE_LUA51 = Yes NO_LUALINK = Yes IM = .. diff --git a/src/imlua_process5.mak b/src/imlua_process5.mak index bed58fa..25296e3 100644 --- a/src/imlua_process5.mak +++ b/src/imlua_process5.mak @@ -4,7 +4,6 @@ LIBNAME = imlua_process OPT = YES USE_LOH_SUBDIR = Yes -LOHDIR = lua5/loh SRC = lua5/imlua_process.c lua5/imlua_kernel.c DEF_FILE = lua5/imlua_process.def @@ -16,9 +15,11 @@ INCLUDES = lua5 ifdef USE_LUA52 LIBNAME := $(LIBNAME)52 + LOHDIR = lua5/loh52 else USE_LUA51 = Yes LIBNAME := $(LIBNAME)51 + LOHDIR = lua5/loh51 endif USE_IMLUA = YES diff --git a/src/imlua_wmv.mak b/src/imlua_wmv.mak index f487075..1b076f5 100644 --- a/src/imlua_wmv.mak +++ b/src/imlua_wmv.mak @@ -1,5 +1,5 @@ PROJNAME = im -LIBNAME = imlua_wmv51 +LIBNAME = imlua_wmv DEF_FILE = imlua_wmv.def OPT = YES @@ -12,6 +12,12 @@ LIBS = im_wmv INCLUDES = lua5 +ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +else + USE_LUA51 = Yes + LIBNAME := $(LIBNAME)51 +endif + USE_IMLUA = Yes -USE_LUA51 = Yes IM = .. diff --git a/src/lua5/loh51/le32/im_process.loh b/src/lua5/loh51/le32/im_process.loh index e207002..db3ff1a 100644 --- a/src/lua5/loh51/le32/im_process.loh +++ b/src/lua5/loh51/le32/im_process.loh @@ -236,195 +236,188 @@ static const unsigned char B1[]={ 0, 0, 0, 2, 0, 0,128, 2,137, 1,130, 3, 30, 0,128, 0, 3, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, 4, 7, 0, 0, 0, 97,115,115,101,114,116, 0, 4, 4, 0, 0, 0, 78,101,119, 0, 1, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, - 0, 24, 0, 0, 0, 5, 1, 7, 8, 23, 0, 0, 0,133, 0, 0, 0,134, 64, 64, + 0, 24, 0, 0, 0, 5, 1, 3, 8, 21, 0, 0, 0,133, 0, 0, 0,134, 64, 64, 1,192, 0, 0, 0, 4, 1, 0, 0, 68, 1,128, 0,132, 1, 0, 1,196, 1,128, - 1,156,128, 0, 3,196, 0, 0, 2, 0, 1, 0, 0, 64, 1, 0, 1,133,129, 0, - 0,192, 1,128, 0,156, 1, 0, 1,220,128, 0, 0,218, 0, 0, 0, 22,192, 0, -128, 0, 1,128, 1, 64, 1, 0, 1, 30, 1,128, 1, 22, 0, 0,128,158, 0, 0, - 1, 30, 0,128, 0, 3, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, 4, 17, 0, - 0, 0, 73,109, 97,103,101, 67,114,101, 97,116,101, 66, 97,115,101,100, 0, 4, - 7, 0, 0, 0,117,110,112, 97, 99,107, 0, 0, 0, 0, 0, 23, 0, 0, 0, 15, + 1,156,128, 0, 3,196, 0, 0, 2, 0, 1, 0, 0, 64, 1, 0, 1,165, 1, 0, + 0,220,128, 0, 0,218, 0, 0, 0, 22,192, 0,128, 0, 1,128, 1, 64, 1, 0, + 1, 30, 1,128, 1, 22, 0, 0,128,158, 0, 0, 1, 30, 0,128, 0, 2, 0, 0, + 0, 4, 3, 0, 0, 0,105,109, 0, 4, 17, 0, 0, 0, 73,109, 97,103,101, 67, +114,101, 97,116,101, 66, 97,115,101,100, 0, 0, 0, 0, 0, 21, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, - 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 19, - 0, 0, 0, 19, 0, 0, 0, 20, 0, 0, 0, 20, 0, 0, 0, 20, 0, 0, 0, 20, - 0, 0, 0, 22, 0, 0, 0, 24, 0, 0, 0, 4, 0, 0, 0, 10, 0, 0, 0,115, -114, 99, 95,105,109, 97,103,101, 0, 0, 0, 0, 0, 22, 0, 0, 0, 4, 0, 0, + 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 19, 0, 0, 0, 19, 0, 0, 0, 20, + 0, 0, 0, 20, 0, 0, 0, 20, 0, 0, 0, 20, 0, 0, 0, 22, 0, 0, 0, 24, + 0, 0, 0, 4, 0, 0, 0, 10, 0, 0, 0,115,114, 99, 95,105,109, 97,103,101, + 0, 0, 0, 0, 0, 20, 0, 0, 0, 4, 0, 0, 0, 97,114,103, 0, 0, 0, 0, + 0, 20, 0, 0, 0, 10, 0, 0, 0,100,115,116, 95,105,109, 97,103,101, 0, 8, + 0, 0, 0, 20, 0, 0, 0, 4, 0, 0, 0,114,101,116, 0, 13, 0, 0, 0, 20, + 0, 0, 0, 5, 0, 0, 0, 6, 0, 0, 0,119,105,100,116,104, 0, 7, 0, 0, + 0,104,101,105,103,104,116, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, + 97, 99,101, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121,112,101, 0, 5, 0, + 0, 0,102,117,110, 99, 0, 17, 0, 0, 0, 9, 0, 0, 0, 9, 0, 0, 0, 10, + 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, + 0, 0, 0, 13, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, + 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 25, 0, 0, 0, 6, + 0, 0, 0, 9, 0, 0, 0,102,117,110, 99,110, 97,109,101, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 6, 0, 0, 0,119,105,100,116,104, 0, 0, 0, 0, 0, 16, 0, + 0, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, 0, 0, 0, 0, 16, 0, 0, + 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, 97, 99,101, 0, 0, 0, 0, + 0, 16, 0, 0, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121,112,101, 0, 0, + 0, 0, 0, 16, 0, 0, 0, 5, 0, 0, 0,102,117,110, 99, 0, 2, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 50, 0, 0, 0, + 0, 5, 0, 11, 22, 0, 0, 0, 69, 1, 0, 0, 70, 1,128, 2,133, 65, 0, 0, +192, 1,128, 2, 5,130, 0, 0, 6,194, 64, 4, 65, 2, 1, 0,128, 2, 0, 0, + 28, 2,128, 1,156, 65, 0, 0,133, 1, 0, 0,192, 1, 0, 0, 1, 66, 1, 0, +213, 1,130, 3, 36, 2, 0, 0, 0, 0,128, 0, 0, 0, 0, 1, 0, 0,128, 1, + 0, 0, 0, 2, 0, 0,128, 2,137, 1,130, 3, 30, 0,128, 0, 6, 0, 0, 0, + 4, 3, 0, 0, 0,105,109, 0, 4, 7, 0, 0, 0, 97,115,115,101,114,116, 0, + 4, 7, 0, 0, 0,115,116,114,105,110,103, 0, 4, 7, 0, 0, 0,102,111,114, +109, 97,116, 0, 4, 24, 0, 0, 0,117,110,100,101,102,105,110,101,100, 32,102, +117,110, 99,116,105,111,110, 32, 96, 37,115, 39, 0, 4, 4, 0, 0, 0, 78,101, +119, 0, 1, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 49, 0, 0, 0, 5, 2, + 3, 9, 22, 0, 0, 0,197, 0, 0, 0,198, 64,192, 1, 0, 1, 0, 0, 68, 1, + 0, 0,132, 1,128, 0,196, 1, 0, 1, 4, 2,128, 1,220,128, 0, 3, 4, 1, + 0, 2, 64, 1, 0, 0,128, 1,128, 0,192, 1,128, 1, 37, 2, 0, 0, 28,129, + 0, 0, 26, 1, 0, 0, 22,192, 0,128, 64, 1, 0, 2,128, 1,128, 1, 94, 1, +128, 1, 22, 0, 0,128,222, 0, 0, 1, 30, 0,128, 0, 2, 0, 0, 0, 4, 3, + 0, 0, 0,105,109, 0, 4, 17, 0, 0, 0, 73,109, 97,103,101, 67,114,101, 97, +116,101, 66, 97,115,101,100, 0, 0, 0, 0, 0, 22, 0, 0, 0, 40, 0, 0, 0, + 40, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, + 40, 0, 0, 0, 40, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, + 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, 44, 0, 0, 0, 44, 0, 0, 0, + 45, 0, 0, 0, 45, 0, 0, 0, 45, 0, 0, 0, 45, 0, 0, 0, 47, 0, 0, 0, + 49, 0, 0, 0, 5, 0, 0, 0, 11, 0, 0, 0,115,114, 99, 95,105,109, 97,103, +101, 49, 0, 0, 0, 0, 0, 21, 0, 0, 0, 11, 0, 0, 0,115,114, 99, 95,105, +109, 97,103,101, 50, 0, 0, 0, 0, 0, 21, 0, 0, 0, 4, 0, 0, 0, 97,114, +103, 0, 0, 0, 0, 0, 21, 0, 0, 0, 10, 0, 0, 0,100,115,116, 95,105,109, + 97,103,101, 0, 8, 0, 0, 0, 21, 0, 0, 0, 4, 0, 0, 0,114,101,116, 0, + 14, 0, 0, 0, 21, 0, 0, 0, 5, 0, 0, 0, 6, 0, 0, 0,119,105,100,116, +104, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, 12, 0, 0, 0, 99,111,108, +111,114, 95,115,112, 97, 99,101, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121, +112,101, 0, 5, 0, 0, 0,102,117,110, 99, 0, 22, 0, 0, 0, 32, 0, 0, 0, + 32, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, + 35, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, 38, 0, 0, 0, + 38, 0, 0, 0, 38, 0, 0, 0, 38, 0, 0, 0, 49, 0, 0, 0, 49, 0, 0, 0, + 49, 0, 0, 0, 49, 0, 0, 0, 49, 0, 0, 0, 49, 0, 0, 0, 49, 0, 0, 0, + 50, 0, 0, 0, 6, 0, 0, 0, 9, 0, 0, 0,102,117,110, 99,110, 97,109,101, + 0, 0, 0, 0, 0, 21, 0, 0, 0, 6, 0, 0, 0,119,105,100,116,104, 0, 0, + 0, 0, 0, 21, 0, 0, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, 0, 0, + 0, 0, 21, 0, 0, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, 97, 99, +101, 0, 0, 0, 0, 0, 21, 0, 0, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116, +121,112,101, 0, 0, 0, 0, 0, 21, 0, 0, 0, 5, 0, 0, 0,102,117,110, 99, + 0, 2, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, + 0, 73, 0, 0, 0, 0, 5, 0, 9, 17, 0, 0, 0, 69, 1, 0, 0, 70, 1,128, + 2,133, 65, 0, 0,192, 1,128, 2,156, 65, 0, 1,133, 1, 0, 0,192, 1, 0, + 0, 1,130, 0, 0,213, 1,130, 3, 36, 2, 0, 0, 0, 0,128, 0, 0, 0, 0, + 1, 0, 0,128, 1, 0, 0, 0, 2, 0, 0,128, 2,137, 1,130, 3, 30, 0,128, + 0, 3, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, 4, 7, 0, 0, 0, 97,115, +115,101,114,116, 0, 4, 4, 0, 0, 0, 78,101,119, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 61, 0, 0, 0, 72, 0, 0, 0, 5, 3, 3, 11, 23, 0, 0, 0, 5, 1, + 0, 0, 6, 65, 64, 2, 64, 1, 0, 0,132, 1, 0, 0,196, 1,128, 0, 4, 2, + 0, 1, 68, 2,128, 1, 28,129, 0, 3, 68, 1, 0, 2,128, 1, 0, 0,192, 1, +128, 0, 0, 2, 0, 1, 64, 2, 0, 2,165, 2, 0, 0, 92,129, 0, 0, 90, 1, + 0, 0, 22,192, 0,128,128, 1,128, 2,192, 1, 0, 2,158, 1,128, 1, 22, 0, + 0,128, 30, 1, 0, 1, 30, 0,128, 0, 2, 0, 0, 0, 4, 3, 0, 0, 0,105, +109, 0, 4, 17, 0, 0, 0, 73,109, 97,103,101, 67,114,101, 97,116,101, 66, 97, +115,101,100, 0, 0, 0, 0, 0, 23, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, + 63, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, + 63, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, + 66, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 67, 0, 0, 0, 67, 0, 0, 0, + 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 70, 0, 0, 0, + 72, 0, 0, 0, 6, 0, 0, 0, 11, 0, 0, 0,115,114, 99, 95,105,109, 97,103, +101, 49, 0, 0, 0, 0, 0, 22, 0, 0, 0, 11, 0, 0, 0,115,114, 99, 95,105, +109, 97,103,101, 50, 0, 0, 0, 0, 0, 22, 0, 0, 0, 11, 0, 0, 0,115,114, + 99, 95,105,109, 97,103,101, 51, 0, 0, 0, 0, 0, 22, 0, 0, 0, 4, 0, 0, 0, 97,114,103, 0, 0, 0, 0, 0, 22, 0, 0, 0, 10, 0, 0, 0,100,115,116, 95,105,109, 97,103,101, 0, 8, 0, 0, 0, 22, 0, 0, 0, 4, 0, 0, 0,114, 101,116, 0, 15, 0, 0, 0, 22, 0, 0, 0, 5, 0, 0, 0, 6, 0, 0, 0,119, 105,100,116,104, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, 97, 99,101, 0, 10, 0, 0, 0,100, 97,116, 97, - 95,116,121,112,101, 0, 5, 0, 0, 0,102,117,110, 99, 0, 17, 0, 0, 0, 9, - 0, 0, 0, 9, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0, 13, - 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 24, 0, 0, 0, 24, - 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, - 0, 0, 0, 25, 0, 0, 0, 6, 0, 0, 0, 9, 0, 0, 0,102,117,110, 99,110, + 95,116,121,112,101, 0, 5, 0, 0, 0,102,117,110, 99, 0, 17, 0, 0, 0, 57, + 0, 0, 0, 57, 0, 0, 0, 58, 0, 0, 0, 58, 0, 0, 0, 58, 0, 0, 0, 61, + 0, 0, 0, 61, 0, 0, 0, 61, 0, 0, 0, 61, 0, 0, 0, 72, 0, 0, 0, 72, + 0, 0, 0, 72, 0, 0, 0, 72, 0, 0, 0, 72, 0, 0, 0, 72, 0, 0, 0, 72, + 0, 0, 0, 73, 0, 0, 0, 6, 0, 0, 0, 9, 0, 0, 0,102,117,110, 99,110, 97,109,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 6, 0, 0, 0,119,105,100,116, 104, 0, 0, 0, 0, 0, 16, 0, 0, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115, 112, 97, 99,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121,112,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 5, 0, 0, 0,102, 117,110, 99, 0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 31, 0, 0, 0, 50, 0, 0, 0, 0, 5, 0, 11, 22, 0, 0, 0, 69, 1, 0, 0, - 70, 1,128, 2,133, 65, 0, 0,192, 1,128, 2, 5,130, 0, 0, 6,194, 64, 4, - 65, 2, 1, 0,128, 2, 0, 0, 28, 2,128, 1,156, 65, 0, 0,133, 1, 0, 0, -192, 1, 0, 0, 1, 66, 1, 0,213, 1,130, 3, 36, 2, 0, 0, 0, 0,128, 0, + 79, 0, 0, 0, 97, 0, 0, 0, 0, 5, 0, 9, 17, 0, 0, 0, 69, 1, 0, 0, + 70, 1,128, 2,133, 65, 0, 0,192, 1,128, 2,156, 65, 0, 1,133, 1, 0, 0, +192, 1, 0, 0, 1,130, 0, 0,213, 1,130, 3, 36, 2, 0, 0, 0, 0,128, 0, 0, 0, 0, 1, 0, 0,128, 1, 0, 0, 0, 2, 0, 0,128, 2,137, 1,130, 3, - 30, 0,128, 0, 6, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, 4, 7, 0, 0, - 0, 97,115,115,101,114,116, 0, 4, 7, 0, 0, 0,115,116,114,105,110,103, 0, - 4, 7, 0, 0, 0,102,111,114,109, 97,116, 0, 4, 24, 0, 0, 0,117,110,100, -101,102,105,110,101,100, 32,102,117,110, 99,116,105,111,110, 32, 96, 37,115, 39, - 0, 4, 4, 0, 0, 0, 78,101,119, 0, 1, 0, 0, 0, 0, 0, 0, 0, 38, 0, - 0, 0, 49, 0, 0, 0, 5, 2, 7, 10, 24, 0, 0, 0,197, 0, 0, 0,198, 64, -192, 1, 0, 1, 0, 0, 68, 1, 0, 0,132, 1,128, 0,196, 1, 0, 1, 4, 2, -128, 1,220,128, 0, 3, 4, 1, 0, 2, 64, 1, 0, 0,128, 1,128, 0,192, 1, -128, 1, 5,130, 0, 0, 64, 2, 0, 1, 28, 2, 0, 1, 28,129, 0, 0, 26, 1, - 0, 0, 22,192, 0,128, 64, 1, 0, 2,128, 1,128, 1, 94, 1,128, 1, 22, 0, - 0,128,222, 0, 0, 1, 30, 0,128, 0, 3, 0, 0, 0, 4, 3, 0, 0, 0,105, -109, 0, 4, 17, 0, 0, 0, 73,109, 97,103,101, 67,114,101, 97,116,101, 66, 97, -115,101,100, 0, 4, 7, 0, 0, 0,117,110,112, 97, 99,107, 0, 0, 0, 0, 0, - 24, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, - 40, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, 43, 0, 0, 0, - 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, - 43, 0, 0, 0, 43, 0, 0, 0, 44, 0, 0, 0, 44, 0, 0, 0, 45, 0, 0, 0, - 45, 0, 0, 0, 45, 0, 0, 0, 45, 0, 0, 0, 47, 0, 0, 0, 49, 0, 0, 0, - 5, 0, 0, 0, 11, 0, 0, 0,115,114, 99, 95,105,109, 97,103,101, 49, 0, 0, - 0, 0, 0, 23, 0, 0, 0, 11, 0, 0, 0,115,114, 99, 95,105,109, 97,103,101, - 50, 0, 0, 0, 0, 0, 23, 0, 0, 0, 4, 0, 0, 0, 97,114,103, 0, 0, 0, - 0, 0, 23, 0, 0, 0, 10, 0, 0, 0,100,115,116, 95,105,109, 97,103,101, 0, - 8, 0, 0, 0, 23, 0, 0, 0, 4, 0, 0, 0,114,101,116, 0, 16, 0, 0, 0, - 23, 0, 0, 0, 5, 0, 0, 0, 6, 0, 0, 0,119,105,100,116,104, 0, 7, 0, - 0, 0,104,101,105,103,104,116, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115, -112, 97, 99,101, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121,112,101, 0, 5, - 0, 0, 0,102,117,110, 99, 0, 22, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, - 35, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, - 35, 0, 0, 0, 35, 0, 0, 0, 35, 0, 0, 0, 38, 0, 0, 0, 38, 0, 0, 0, - 38, 0, 0, 0, 38, 0, 0, 0, 49, 0, 0, 0, 49, 0, 0, 0, 49, 0, 0, 0, - 49, 0, 0, 0, 49, 0, 0, 0, 49, 0, 0, 0, 49, 0, 0, 0, 50, 0, 0, 0, - 6, 0, 0, 0, 9, 0, 0, 0,102,117,110, 99,110, 97,109,101, 0, 0, 0, 0, - 0, 21, 0, 0, 0, 6, 0, 0, 0,119,105,100,116,104, 0, 0, 0, 0, 0, 21, - 0, 0, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, 0, 0, 0, 0, 21, 0, - 0, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, 97, 99,101, 0, 0, 0, - 0, 0, 21, 0, 0, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121,112,101, 0, - 0, 0, 0, 0, 21, 0, 0, 0, 5, 0, 0, 0,102,117,110, 99, 0, 2, 0, 0, - 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 73, 0, 0, - 0, 0, 5, 0, 9, 17, 0, 0, 0, 69, 1, 0, 0, 70, 1,128, 2,133, 65, 0, - 0,192, 1,128, 2,156, 65, 0, 1,133, 1, 0, 0,192, 1, 0, 0, 1,130, 0, - 0,213, 1,130, 3, 36, 2, 0, 0, 0, 0,128, 0, 0, 0, 0, 1, 0, 0,128, - 1, 0, 0, 0, 2, 0, 0,128, 2,137, 1,130, 3, 30, 0,128, 0, 3, 0, 0, - 0, 4, 3, 0, 0, 0,105,109, 0, 4, 7, 0, 0, 0, 97,115,115,101,114,116, - 0, 4, 4, 0, 0, 0, 78,101,119, 0, 1, 0, 0, 0, 0, 0, 0, 0, 61, 0, - 0, 0, 72, 0, 0, 0, 5, 3, 7, 12, 25, 0, 0, 0, 5, 1, 0, 0, 6, 65, - 64, 2, 64, 1, 0, 0,132, 1, 0, 0,196, 1,128, 0, 4, 2, 0, 1, 68, 2, -128, 1, 28,129, 0, 3, 68, 1, 0, 2,128, 1, 0, 0,192, 1,128, 0, 0, 2, - 0, 1, 64, 2, 0, 2,133,130, 0, 0,192, 2,128, 1,156, 2, 0, 1, 92,129, - 0, 0, 90, 1, 0, 0, 22,192, 0,128,128, 1,128, 2,192, 1, 0, 2,158, 1, -128, 1, 22, 0, 0,128, 30, 1, 0, 1, 30, 0,128, 0, 3, 0, 0, 0, 4, 3, - 0, 0, 0,105,109, 0, 4, 17, 0, 0, 0, 73,109, 97,103,101, 67,114,101, 97, -116,101, 66, 97,115,101,100, 0, 4, 7, 0, 0, 0,117,110,112, 97, 99,107, 0, - 0, 0, 0, 0, 25, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, - 63, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, 63, 0, 0, 0, - 66, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, - 66, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 67, 0, 0, 0, - 67, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, - 70, 0, 0, 0, 72, 0, 0, 0, 6, 0, 0, 0, 11, 0, 0, 0,115,114, 99, 95, -105,109, 97,103,101, 49, 0, 0, 0, 0, 0, 24, 0, 0, 0, 11, 0, 0, 0,115, -114, 99, 95,105,109, 97,103,101, 50, 0, 0, 0, 0, 0, 24, 0, 0, 0, 11, 0, - 0, 0,115,114, 99, 95,105,109, 97,103,101, 51, 0, 0, 0, 0, 0, 24, 0, 0, - 0, 4, 0, 0, 0, 97,114,103, 0, 0, 0, 0, 0, 24, 0, 0, 0, 10, 0, 0, - 0,100,115,116, 95,105,109, 97,103,101, 0, 8, 0, 0, 0, 24, 0, 0, 0, 4, - 0, 0, 0,114,101,116, 0, 17, 0, 0, 0, 24, 0, 0, 0, 5, 0, 0, 0, 6, - 0, 0, 0,119,105,100,116,104, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, - 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, 97, 99,101, 0, 10, 0, 0, 0, -100, 97,116, 97, 95,116,121,112,101, 0, 5, 0, 0, 0,102,117,110, 99, 0, 17, - 0, 0, 0, 57, 0, 0, 0, 57, 0, 0, 0, 58, 0, 0, 0, 58, 0, 0, 0, 58, - 0, 0, 0, 61, 0, 0, 0, 61, 0, 0, 0, 61, 0, 0, 0, 61, 0, 0, 0, 72, - 0, 0, 0, 72, 0, 0, 0, 72, 0, 0, 0, 72, 0, 0, 0, 72, 0, 0, 0, 72, - 0, 0, 0, 72, 0, 0, 0, 73, 0, 0, 0, 6, 0, 0, 0, 9, 0, 0, 0,102, -117,110, 99,110, 97,109,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 6, 0, 0, 0, -119,105,100,116,104, 0, 0, 0, 0, 0, 16, 0, 0, 0, 7, 0, 0, 0,104,101, -105,103,104,116, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 0, 0, 0, 99,111,108, -111,114, 95,115,112, 97, 99,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, - 0,100, 97,116, 97, 95,116,121,112,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 5, - 0, 0, 0,102,117,110, 99, 0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 79, 0, 0, 0, 97, 0, 0, 0, 0, 5, 0, 9, 17, 0, 0, 0, - 69, 1, 0, 0, 70, 1,128, 2,133, 65, 0, 0,192, 1,128, 2,156, 65, 0, 1, -133, 1, 0, 0,192, 1, 0, 0, 1,130, 0, 0,213, 1,130, 3, 36, 2, 0, 0, - 0, 0,128, 0, 0, 0, 0, 1, 0, 0,128, 1, 0, 0, 0, 2, 0, 0,128, 2, -137, 1,130, 3, 30, 0,128, 0, 3, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, - 4, 7, 0, 0, 0, 97,115,115,101,114,116, 0, 4, 4, 0, 0, 0, 78,101,119, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 96, 0, 0, 0, 5, 1, 7, - 10, 35, 0, 0, 0,133, 0, 0, 0,134, 64, 64, 1,192, 0, 0, 0, 4, 1, 0, - 0, 68, 1,128, 0,132, 1, 0, 1,196, 1,128, 1,156,128, 0, 3,197, 0, 0, - 0,198, 64,192, 1, 0, 1, 0, 0, 68, 1, 0, 0,132, 1,128, 0,196, 1, 0, - 1, 4, 2,128, 1,220,128, 0, 3, 4, 1, 0, 2, 64, 1, 0, 0,128, 1, 0, - 1,192, 1,128, 1, 5,130, 0, 0, 64, 2,128, 0, 28, 2, 0, 1, 28,129, 0, - 0, 26, 1, 0, 0, 22, 0, 1,128, 64, 1, 0, 2,128, 1, 0, 1,192, 1,128, - 1, 94, 1, 0, 2, 22,128, 0,128, 64, 1, 0, 1,128, 1,128, 1, 94, 1,128, - 1, 30, 0,128, 0, 3, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, 4, 17, 0, - 0, 0, 73,109, 97,103,101, 67,114,101, 97,116,101, 66, 97,115,101,100, 0, 4, - 7, 0, 0, 0,117,110,112, 97, 99,107, 0, 0, 0, 0, 0, 35, 0, 0, 0, 86, + 30, 0,128, 0, 3, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, 4, 7, 0, 0, + 0, 97,115,115,101,114,116, 0, 4, 4, 0, 0, 0, 78,101,119, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 84, 0, 0, 0, 96, 0, 0, 0, 5, 1, 3, 9, 33, 0, 0, + 0,133, 0, 0, 0,134, 64, 64, 1,192, 0, 0, 0, 4, 1, 0, 0, 68, 1,128, + 0,132, 1, 0, 1,196, 1,128, 1,156,128, 0, 3,197, 0, 0, 0,198, 64,192, + 1, 0, 1, 0, 0, 68, 1, 0, 0,132, 1,128, 0,196, 1, 0, 1, 4, 2,128, + 1,220,128, 0, 3, 4, 1, 0, 2, 64, 1, 0, 0,128, 1, 0, 1,192, 1,128, + 1, 37, 2, 0, 0, 28,129, 0, 0, 26, 1, 0, 0, 22, 0, 1,128, 64, 1, 0, + 2,128, 1, 0, 1,192, 1,128, 1, 94, 1, 0, 2, 22,128, 0,128, 64, 1, 0, + 1,128, 1,128, 1, 94, 1,128, 1, 30, 0,128, 0, 2, 0, 0, 0, 4, 3, 0, + 0, 0,105,109, 0, 4, 17, 0, 0, 0, 73,109, 97,103,101, 67,114,101, 97,116, +101, 66, 97,115,101,100, 0, 0, 0, 0, 0, 33, 0, 0, 0, 86, 0, 0, 0, 86, 0, 0, 0, 86, 0, 0, 0, 86, 0, 0, 0, 86, 0, 0, 0, 86, 0, 0, 0, 86, - 0, 0, 0, 86, 0, 0, 0, 86, 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 87, - 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 87, + 0, 0, 0, 86, 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 87, + 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 87, 0, 0, 0, 90, 0, 0, 0, 90, 0, 0, 0, 90, 0, 0, 0, 90, 0, 0, 0, 90, 0, 0, 0, 90, - 0, 0, 0, 90, 0, 0, 0, 90, 0, 0, 0, 90, 0, 0, 0, 91, 0, 0, 0, 91, - 0, 0, 0, 92, 0, 0, 0, 92, 0, 0, 0, 92, 0, 0, 0, 92, 0, 0, 0, 92, - 0, 0, 0, 94, 0, 0, 0, 94, 0, 0, 0, 94, 0, 0, 0, 96, 0, 0, 0, 5, - 0, 0, 0, 10, 0, 0, 0,115,114, 99, 95,105,109, 97,103,101, 0, 0, 0, 0, - 0, 34, 0, 0, 0, 4, 0, 0, 0, 97,114,103, 0, 0, 0, 0, 0, 34, 0, 0, - 0, 11, 0, 0, 0,100,115,116, 95,105,109, 97,103,101, 49, 0, 8, 0, 0, 0, - 34, 0, 0, 0, 11, 0, 0, 0,100,115,116, 95,105,109, 97,103,101, 50, 0, 16, - 0, 0, 0, 34, 0, 0, 0, 4, 0, 0, 0,114,101,116, 0, 24, 0, 0, 0, 34, - 0, 0, 0, 5, 0, 0, 0, 6, 0, 0, 0,119,105,100,116,104, 0, 7, 0, 0, - 0,104,101,105,103,104,116, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, - 97, 99,101, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121,112,101, 0, 5, 0, - 0, 0,102,117,110, 99, 0, 17, 0, 0, 0, 80, 0, 0, 0, 80, 0, 0, 0, 81, - 0, 0, 0, 81, 0, 0, 0, 81, 0, 0, 0, 84, 0, 0, 0, 84, 0, 0, 0, 84, - 0, 0, 0, 84, 0, 0, 0, 96, 0, 0, 0, 96, 0, 0, 0, 96, 0, 0, 0, 96, - 0, 0, 0, 96, 0, 0, 0, 96, 0, 0, 0, 96, 0, 0, 0, 97, 0, 0, 0, 6, - 0, 0, 0, 9, 0, 0, 0,102,117,110, 99,110, 97,109,101, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 6, 0, 0, 0,119,105,100,116,104, 0, 0, 0, 0, 0, 16, 0, - 0, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, 0, 0, 0, 0, 16, 0, 0, - 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, 97, 99,101, 0, 0, 0, 0, - 0, 16, 0, 0, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121,112,101, 0, 0, - 0, 0, 0, 16, 0, 0, 0, 5, 0, 0, 0,102,117,110, 99, 0, 2, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,103, 0, 0, 0,122, 0, 0, 0, - 0, 5, 0, 9, 17, 0, 0, 0, 69, 1, 0, 0, 70, 1,128, 2,133, 65, 0, 0, -192, 1,128, 2,156, 65, 0, 1,133, 1, 0, 0,192, 1, 0, 0, 1,130, 0, 0, -213, 1,130, 3, 36, 2, 0, 0, 0, 0,128, 0, 0, 0, 0, 1, 0, 0,128, 1, - 0, 0, 0, 2, 0, 0,128, 2,137, 1,130, 3, 30, 0,128, 0, 3, 0, 0, 0, - 4, 3, 0, 0, 0,105,109, 0, 4, 7, 0, 0, 0, 97,115,115,101,114,116, 0, - 4, 4, 0, 0, 0, 78,101,119, 0, 1, 0, 0, 0, 0, 0, 0, 0,108, 0, 0, - 0,121, 0, 0, 0, 5, 1, 7, 12, 46, 0, 0, 0,133, 0, 0, 0,134, 64, 64, - 1,192, 0, 0, 0, 4, 1, 0, 0, 68, 1,128, 0,132, 1, 0, 1,196, 1,128, - 1,156,128, 0, 3,197, 0, 0, 0,198, 64,192, 1, 0, 1, 0, 0, 68, 1, 0, - 0,132, 1,128, 0,196, 1, 0, 1, 4, 2,128, 1,220,128, 0, 3, 5, 1, 0, - 0, 6, 65, 64, 2, 64, 1, 0, 0,132, 1, 0, 0,196, 1,128, 0, 4, 2, 0, - 1, 68, 2,128, 1, 28,129, 0, 3, 68, 1, 0, 2,128, 1, 0, 0,192, 1, 0, - 1, 0, 2,128, 1, 64, 2, 0, 2,133,130, 0, 0,192, 2,128, 0,156, 2, 0, - 1, 92,129, 0, 0, 90, 1, 0, 0, 22, 64, 1,128,128, 1,128, 2,192, 1, 0, + 0, 0, 0, 91, 0, 0, 0, 91, 0, 0, 0, 92, 0, 0, 0, 92, 0, 0, 0, 92, + 0, 0, 0, 92, 0, 0, 0, 92, 0, 0, 0, 94, 0, 0, 0, 94, 0, 0, 0, 94, + 0, 0, 0, 96, 0, 0, 0, 5, 0, 0, 0, 10, 0, 0, 0,115,114, 99, 95,105, +109, 97,103,101, 0, 0, 0, 0, 0, 32, 0, 0, 0, 4, 0, 0, 0, 97,114,103, + 0, 0, 0, 0, 0, 32, 0, 0, 0, 11, 0, 0, 0,100,115,116, 95,105,109, 97, +103,101, 49, 0, 8, 0, 0, 0, 32, 0, 0, 0, 11, 0, 0, 0,100,115,116, 95, +105,109, 97,103,101, 50, 0, 16, 0, 0, 0, 32, 0, 0, 0, 4, 0, 0, 0,114, +101,116, 0, 22, 0, 0, 0, 32, 0, 0, 0, 5, 0, 0, 0, 6, 0, 0, 0,119, +105,100,116,104, 0, 7, 0, 0, 0,104,101,105,103,104,116, 0, 12, 0, 0, 0, + 99,111,108,111,114, 95,115,112, 97, 99,101, 0, 10, 0, 0, 0,100, 97,116, 97, + 95,116,121,112,101, 0, 5, 0, 0, 0,102,117,110, 99, 0, 17, 0, 0, 0, 80, + 0, 0, 0, 80, 0, 0, 0, 81, 0, 0, 0, 81, 0, 0, 0, 81, 0, 0, 0, 84, + 0, 0, 0, 84, 0, 0, 0, 84, 0, 0, 0, 84, 0, 0, 0, 96, 0, 0, 0, 96, + 0, 0, 0, 96, 0, 0, 0, 96, 0, 0, 0, 96, 0, 0, 0, 96, 0, 0, 0, 96, + 0, 0, 0, 97, 0, 0, 0, 6, 0, 0, 0, 9, 0, 0, 0,102,117,110, 99,110, + 97,109,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 6, 0, 0, 0,119,105,100,116, +104, 0, 0, 0, 0, 0, 16, 0, 0, 0, 7, 0, 0, 0,104,101,105,103,104,116, + 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115, +112, 97, 99,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, 0,100, 97,116, + 97, 95,116,121,112,101, 0, 0, 0, 0, 0, 16, 0, 0, 0, 5, 0, 0, 0,102, +117,110, 99, 0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +103, 0, 0, 0,122, 0, 0, 0, 0, 5, 0, 9, 17, 0, 0, 0, 69, 1, 0, 0, + 70, 1,128, 2,133, 65, 0, 0,192, 1,128, 2,156, 65, 0, 1,133, 1, 0, 0, +192, 1, 0, 0, 1,130, 0, 0,213, 1,130, 3, 36, 2, 0, 0, 0, 0,128, 0, + 0, 0, 0, 1, 0, 0,128, 1, 0, 0, 0, 2, 0, 0,128, 2,137, 1,130, 3, + 30, 0,128, 0, 3, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, 4, 7, 0, 0, + 0, 97,115,115,101,114,116, 0, 4, 4, 0, 0, 0, 78,101,119, 0, 1, 0, 0, + 0, 0, 0, 0, 0,108, 0, 0, 0,121, 0, 0, 0, 5, 1, 3, 11, 44, 0, 0, + 0,133, 0, 0, 0,134, 64, 64, 1,192, 0, 0, 0, 4, 1, 0, 0, 68, 1,128, + 0,132, 1, 0, 1,196, 1,128, 1,156,128, 0, 3,197, 0, 0, 0,198, 64,192, + 1, 0, 1, 0, 0, 68, 1, 0, 0,132, 1,128, 0,196, 1, 0, 1, 4, 2,128, + 1,220,128, 0, 3, 5, 1, 0, 0, 6, 65, 64, 2, 64, 1, 0, 0,132, 1, 0, + 0,196, 1,128, 0, 4, 2, 0, 1, 68, 2,128, 1, 28,129, 0, 3, 68, 1, 0, + 2,128, 1, 0, 0,192, 1, 0, 1, 0, 2,128, 1, 64, 2, 0, 2,165, 2, 0, + 0, 92,129, 0, 0, 90, 1, 0, 0, 22, 64, 1,128,128, 1,128, 2,192, 1, 0, 1, 0, 2,128, 1, 64, 2, 0, 2,158, 1,128, 2, 22,192, 0,128,128, 1, 0, - 1,192, 1,128, 1, 0, 2, 0, 2,158, 1, 0, 2, 30, 0,128, 0, 3, 0, 0, + 1,192, 1,128, 1, 0, 2, 0, 2,158, 1, 0, 2, 30, 0,128, 0, 2, 0, 0, 0, 4, 3, 0, 0, 0,105,109, 0, 4, 17, 0, 0, 0, 73,109, 97,103,101, 67, -114,101, 97,116,101, 66, 97,115,101,100, 0, 4, 7, 0, 0, 0,117,110,112, 97, - 99,107, 0, 0, 0, 0, 0, 46, 0, 0, 0,110, 0, 0, 0,110, 0, 0, 0,110, +114,101, 97,116,101, 66, 97,115,101,100, 0, 0, 0, 0, 0, 44, 0, 0, 0,110, 0, 0, 0,110, 0, 0, 0,110, 0, 0, 0,110, 0, 0, 0,110, 0, 0, 0,110, + 0, 0, 0,110, 0, 0, 0,110, 0, 0, 0,111, 0, 0, 0,111, 0, 0, 0,111, 0, 0, 0,111, 0, 0, 0,111, 0, 0, 0,111, 0, 0, 0,111, 0, 0, 0,111, - 0, 0, 0,111, 0, 0, 0,111, 0, 0, 0,111, 0, 0, 0,112, 0, 0, 0,112, 0, 0, 0,112, 0, 0, 0,112, 0, 0, 0,112, 0, 0, 0,112, 0, 0, 0,112, - 0, 0, 0,112, 0, 0, 0,115, 0, 0, 0,115, 0, 0, 0,115, 0, 0, 0,115, + 0, 0, 0,112, 0, 0, 0,112, 0, 0, 0,112, 0, 0, 0,115, 0, 0, 0,115, 0, 0, 0,115, 0, 0, 0,115, 0, 0, 0,115, 0, 0, 0,115, 0, 0, 0,115, 0, 0, 0,116, 0, 0, 0,116, 0, 0, 0,117, 0, 0, 0,117, 0, 0, 0,117, 0, 0, 0,117, 0, 0, 0,117, 0, 0, 0,117, 0, 0, 0,119, 0, 0, 0,119, 0, 0, 0,119, 0, 0, 0,119, 0, 0, 0,121, 0, 0, 0, 6, 0, 0, 0, 10, - 0, 0, 0,115,114, 99, 95,105,109, 97,103,101, 0, 0, 0, 0, 0, 45, 0, 0, - 0, 4, 0, 0, 0, 97,114,103, 0, 0, 0, 0, 0, 45, 0, 0, 0, 11, 0, 0, - 0,100,115,116, 95,105,109, 97,103,101, 49, 0, 8, 0, 0, 0, 45, 0, 0, 0, - 11, 0, 0, 0,100,115,116, 95,105,109, 97,103,101, 50, 0, 16, 0, 0, 0, 45, + 0, 0, 0,115,114, 99, 95,105,109, 97,103,101, 0, 0, 0, 0, 0, 43, 0, 0, + 0, 4, 0, 0, 0, 97,114,103, 0, 0, 0, 0, 0, 43, 0, 0, 0, 11, 0, 0, + 0,100,115,116, 95,105,109, 97,103,101, 49, 0, 8, 0, 0, 0, 43, 0, 0, 0, + 11, 0, 0, 0,100,115,116, 95,105,109, 97,103,101, 50, 0, 16, 0, 0, 0, 43, 0, 0, 0, 11, 0, 0, 0,100,115,116, 95,105,109, 97,103,101, 51, 0, 24, 0, - 0, 0, 45, 0, 0, 0, 4, 0, 0, 0,114,101,116, 0, 33, 0, 0, 0, 45, 0, + 0, 0, 43, 0, 0, 0, 4, 0, 0, 0,114,101,116, 0, 31, 0, 0, 0, 43, 0, 0, 0, 5, 0, 0, 0, 6, 0, 0, 0,119,105,100,116,104, 0, 7, 0, 0, 0, 104,101,105,103,104,116, 0, 12, 0, 0, 0, 99,111,108,111,114, 95,115,112, 97, 99,101, 0, 10, 0, 0, 0,100, 97,116, 97, 95,116,121,112,101, 0, 5, 0, 0, |