diff options
| author | scuri <scuri> | 2009-06-14 17:02:34 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2009-06-14 17:02:34 +0000 |
| commit | faa9be421c99bc6d7057f87809a5e1530755ca63 (patch) | |
| tree | c621a862346b73cb29ceb6da81b7e19a4d5e00bb | |
| parent | 0743c3f4a24b3a6d8df39bc08412444f9ae25921 (diff) | |
*** empty log message ***
| -rw-r--r-- | html/en/history.html | 4 | ||||
| -rw-r--r-- | src/im_format_avi.cpp | 5 | ||||
| -rw-r--r-- | test/im_view.vcproj | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/html/en/history.html b/html/en/history.html index 4967ed2..a8037f6 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -11,10 +11,10 @@ <body> <h1>History of Changes</h1> -<h3 dir="ltr">Version 3.4.2 (XX/XX/2009)</h3> +<h3 dir="ltr">CVS (14/Jun/2009)</h3> <ul> <li><span style="color: #FF0000">Fixed:</span> AVI format when reading 32 - bpp frames.</li> + and 16 bpp frames.</li> </ul> <h3 dir="ltr">Version 3.4.1 (15/Dec/2008)</h3> <ul> diff --git a/src/im_format_avi.cpp b/src/im_format_avi.cpp index dcb4898..a825f19 100644 --- a/src/im_format_avi.cpp +++ b/src/im_format_avi.cpp @@ -2,7 +2,7 @@ * \brief AVI - Windows Audio-Video Interleaved RIFF * * See Copyright Notice in im_lib.h - * $Id: im_format_avi.cpp,v 1.3 2009/06/08 20:14:53 scuri Exp $ + * $Id: im_format_avi.cpp,v 1.4 2009/06/14 17:02:34 scuri Exp $ */ #include "im_format.h" @@ -282,7 +282,7 @@ int imFileFormatAVI::ReadImageInfo(int index) this->line_buffer_extra = 4; // room enough for padding /* prepares to read data from the stream */ - if (bpp == 32) + if (bpp == 32 || bpp == 16) { BITMAPINFOHEADER info; memset(&info, 0, sizeof(BITMAPINFOHEADER)); @@ -295,6 +295,7 @@ int imFileFormatAVI::ReadImageInfo(int index) } else frame = AVIStreamGetFrameOpen(stream, NULL); + if (!frame) return IM_ERR_ACCESS; diff --git a/test/im_view.vcproj b/test/im_view.vcproj index 12cd0ba..458793d 100644 --- a/test/im_view.vcproj +++ b/test/im_view.vcproj @@ -48,7 +48,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="0" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="false" @@ -186,6 +186,13 @@ <File RelativePath=".\im_view.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> </Filter> </Files> |