phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Minor TIFF updates 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3971 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2011-09-22 21:34:40 +00:00
parent 3467540b68
commit d23b1583fe
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/graphics/tiff/tiff_initialize.c
View File

@ -203,14 +203,18 @@
#define TIFF_RGB_STRIPBCOFFSET 248
/* Debug *******************************************************************/
/* CONFIG_DEBUG_TIFFOFFSETS may be defined (along with CONFIG_DEBUG and
* CONFIG_DEBUG_GRAPHICS) in order to verify the pre-determined TIFF file
* offsets.
*/
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_GRAPHICS
#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_GRAPHICS)
# undef CONFIG_DEBUG_TIFFOFFSETS
#endif
#ifdef CONFIG_DEBUG_GRAPHICS
#ifdef CONFIG_DEBUG_TIFFOFFSETS
# define tiff_offset(o,l) (o) += (l)
# define tiff_checkoffs(o,x) ASSERT((o) == (x));
# define tiff_checkoffs(o,x) ASSERT((o) == (x))
#else
# define tiff_offset(o,l)
# define tiff_checkoffs(o,x)
@ -307,7 +311,7 @@ static inline int tiff_putheader(FAR struct tiff_info_s *info)
/* 4-7: Offset to the first IFD */
tiff_put16(hdr.offset, TIFF_IFD_OFFSET);
tiff_put32(hdr.offset, TIFF_IFD_OFFSET);
/* Write the header to the output file */
@ -446,7 +450,7 @@ static int tiff_datetime(FAR char *timbuf, unsigned int buflen)
int tiff_initialize(FAR struct tiff_info_s *info)
{
uint16_t val16;
#if CONFIG_DEBUG_GRAPHICS
#if CONFIG_DEBUG_TIFFOFFSETS
off_t offset = 0;
#endif
char timbuf[TIFF_DATETIME_STRLEN + 8];

2
apps/graphics/tiff/tiff_utils.c
View File

@ -378,4 +378,4 @@ ssize_t tiff_wordalign(int fd, size_t size)
size += nbytes;
}
return size;
}
}