walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

*Patch from Callum Lewick. Clean up of j2klib.h for the aligned malloc stuff. 

*convert.c: Changed some error comments for TIFF images
This commit is contained in:
Francois-Olivier Devaux 2007-10-10 06:17:28 +00:00
parent 4b60f17bba
commit ab0473aa42
3 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -5,6 +5,11 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
October 10, 2007
* [FOD] Patch from Callum Lewick. Clean up of j2klib.h for the aligned malloc stuff.
It makes it work right with mingw, as _mm_malloc() isn't a macro, attempts to pave the way to using cmake to check for this stuff and combines a patch from Dana Fagerstrom at Sun that makes it use memalign() on Solaris
convert.c: Changed some error comments for TIFF images
September 27, 2007 September 27, 2007
* [FOD] Patch from Callum Lewick. Fixed dwt.c where an alignment in buffer was problematic under x86_64. * [FOD] Patch from Callum Lewick. Fixed dwt.c where an alignment in buffer was problematic under x86_64.

10
codec/convert.c
View File

@ -1714,7 +1714,7 @@ int imagetotif(opj_image_t * image, const char *outfile) {
break; break;
} }
}else{ }else{
fprintf(stderr,"Bits=%d, Only 8,12,16 bits implemented\n",image->comps[0].prec); fprintf(stderr,"TIFF file creation. Bits=%d, Only 8,12,16 bits implemented\n",image->comps[0].prec);
fprintf(stderr,"Aborting\n"); fprintf(stderr,"Aborting\n");
return 1; return 1;
} }
@ -1723,7 +1723,7 @@ int imagetotif(opj_image_t * image, const char *outfile) {
_TIFFfree(buf); _TIFFfree(buf);
TIFFClose(tif); TIFFClose(tif);
}else{ }else{
fprintf(stderr,"False color format. Only RGB & Grayscale has been implemented\n"); fprintf(stderr,"TIFF file creation. Bad color format. Only RGB & Grayscale has been implemented\n");
fprintf(stderr,"Aborting\n"); fprintf(stderr,"Aborting\n");
return 1; return 1;
} }
@ -1858,7 +1858,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
} }
} }
else{ else{
fprintf(stderr,"Bits=%d, Only 8,12,16 bits implemented\n",Info.tiBps); fprintf(stderr,"TIFF file creation. Bits=%d, Only 8,12,16 bits implemented\n",Info.tiBps);
fprintf(stderr,"Aborting\n"); fprintf(stderr,"Aborting\n");
return NULL; return NULL;
} }
@ -1936,7 +1936,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
} }
} }
else{ else{
fprintf(stderr,"Bits=%d, Only 8,12,16 bits implemented\n",Info.tiBps); fprintf(stderr,"TIFF file creation. Bits=%d, Only 8,12,16 bits implemented\n",Info.tiBps);
fprintf(stderr,"Aborting\n"); fprintf(stderr,"Aborting\n");
return NULL; return NULL;
} }
@ -1945,7 +1945,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
_TIFFfree(buf); _TIFFfree(buf);
TIFFClose(tif); TIFFClose(tif);
}else{ }else{
fprintf(stderr,"False color format. Only RGB & Grayscale has been implemented\n"); fprintf(stderr,"TIFF file creation. Bad color format. Only RGB & Grayscale has been implemented\n");
fprintf(stderr,"Aborting\n"); fprintf(stderr,"Aborting\n");
return NULL; return NULL;
} }

76
libopenjpeg/j2k_lib.h
View File

@ -61,43 +61,57 @@ Allocate memory aligned to a 16 byte boundry
@param size Bytes to allocate @param size Bytes to allocate
@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
*/ */
/* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
#ifdef WIN32 #ifdef WIN32
/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
#ifdef __GNUC__ #ifdef __GNUC__
#include <mm_malloc.h> #include <mm_malloc.h>
#else /* MSVC, Intel C++ */ #define HAVE_MM_MALLOC
#include <malloc.h> #else /* MSVC, Intel C++ */
#endif #include <malloc.h>
#ifdef _mm_malloc
#ifdef _mm_malloc #define HAVE_MM_MALLOC
#define opj_aligned_malloc(size) _mm_malloc(size, 16) #endif
#else #endif
#define opj_aligned_malloc(size) malloc(size)
#endif
#ifdef _mm_free
#define opj_aligned_free(m) _mm_free(m)
#else
#define opj_aligned_free(m) free(m)
#endif
#else /* Not WIN32 */ #else /* Not WIN32 */
#if defined(__sun)
/* Linux x86_64 and OSX always align allocations to 16 bytes */ #define HAVE_MEMALIGN
#if defined(__amd64__) || defined(__APPLE__) /* Linux x86_64 and OSX always align allocations to 16 bytes */
#define opj_aligned_malloc(size) malloc(size) #elif !defined(__amd64__) && !defined(__APPLE__)
#else /* FIXME: Yes, this is a big assumption */
extern int posix_memalign (void **, size_t, size_t); #define HAVE_POSIX_MEMALIGN
#endif
static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){
void* mem = NULL;
posix_memalign(&mem, 16, size);
return mem;
}
#endif #endif
#define opj_aligned_malloc(size) malloc(size)
#define opj_aligned_free(m) free(m) #define opj_aligned_free(m) free(m)
#ifdef HAVE_MM_MALLOC
#undef opj_aligned_malloc
#define opj_aligned_malloc(size) _mm_malloc(size, 16)
#undef opj_aligned_free
#define opj_aligned_free(m) _mm_free(m)
#endif
#ifdef HAVE_MEMALIGN
extern void* memalign(size_t, size_t);
#undef opj_aligned_malloc
#define opj_aligned_malloc(size) memalign(16, (size))
#undef opj_aligned_free
#define opj_aligned_free(m) free(m)
#endif
#ifdef HAVE_POSIX_MEMALIGN
#undef opj_aligned_malloc
extern int posix_memalign(void**, size_t, size_t);
static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){
void* mem = NULL;
posix_memalign(&mem, 16, size);
return mem;
}
#undef opj_aligned_free
#define opj_aligned_free(m) free(m)
#endif #endif
/** /**