Start merging change from svn trunk
This commit is contained in:
Mathieu Malaterre
parent
ecd70f033c
commit
5badc82fa9
|
|
@ -38,11 +38,12 @@ IF(NOT BUILD_SHARED_LIBS)
|
|||
ENDIF(NOT BUILD_SHARED_LIBS)
|
||||
|
||||
FIND_PACKAGE(TIFF REQUIRED)
|
||||
FIND_PACKAGE(PNG REQUIRED)
|
||||
|
||||
# Loop over all executables:
|
||||
FOREACH(exe j2k_to_image image_to_j2k)
|
||||
ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
|
||||
TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES} ${PNG_LIBRARIES})
|
||||
ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
|
||||
# calling those exe without option will make them fail always:
|
||||
SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)
|
||||
|
|
|
|||
362
codec/convert.c
362
codec/convert.c
|
|
@ -32,8 +32,14 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "openjpeg.h"
|
||||
#ifdef WIN32
|
||||
#include "../libs/libtiff/tiffio.h"
|
||||
#include "../libs/libpng/png.h"
|
||||
#else
|
||||
#include <tiffio.h>
|
||||
#include <png.h>
|
||||
#endif /* WIN32 */
|
||||
#include "openjpeg.h"
|
||||
#include "convert.h"
|
||||
|
||||
/*
|
||||
|
|
@ -2157,3 +2163,357 @@ int imagetoraw(opj_image_t * image, const char *outfile)
|
|||
fclose(rawFile);
|
||||
return 0;
|
||||
}
|
||||
|
||||
opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
|
||||
#ifdef WIN32
|
||||
{
|
||||
printf("Error. PNG format is not yet handled under windows\n");
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
{
|
||||
png_bytep row;
|
||||
png_structp png;
|
||||
png_infop info;
|
||||
double gamma, display_exponent;
|
||||
int bit_depth, interlace_type, compression_type, filter_type;
|
||||
int unit, pass, nr_passes;
|
||||
png_uint_32 resx, resy;
|
||||
unsigned int i, max, src_w;
|
||||
png_uint_32 width, height;
|
||||
int color_type, has_alpha;
|
||||
unsigned char *png_buf, *s;
|
||||
FILE *reader;
|
||||
/* j2k: */
|
||||
opj_image_t *image;
|
||||
opj_image_cmptparm_t cmptparm[4];
|
||||
int sub_dx, sub_dy;
|
||||
unsigned int nr_comp;
|
||||
int *r, *g, *b, *a;
|
||||
|
||||
if ((reader = fopen(read_idf, "rb")) == NULL) {
|
||||
fprintf(stderr, "pngtoimage: can not open %s\n", read_idf);
|
||||
return NULL;
|
||||
}
|
||||
nr_passes = 0;
|
||||
png_buf = NULL;
|
||||
|
||||
/* libpng-VERSION/example.c:
|
||||
* PC : screen_gamma = 2.2;
|
||||
* Mac: screen_gamma = 1.7 or 1.0;
|
||||
*/
|
||||
display_exponent = 2.2;
|
||||
|
||||
if ((png = png_create_read_struct(PNG_LIBPNG_VER_STRING,
|
||||
NULL, NULL, NULL)) == NULL)
|
||||
goto fin;
|
||||
if ((info = png_create_info_struct(png)) == NULL)
|
||||
goto fin;
|
||||
|
||||
if (setjmp(png_jmpbuf(png)))
|
||||
goto fin;
|
||||
|
||||
png_init_io(png, reader);
|
||||
png_read_info(png, info);
|
||||
|
||||
png_get_IHDR(png, info, &width, &height,
|
||||
&bit_depth, &color_type, &interlace_type,
|
||||
&compression_type, &filter_type);
|
||||
|
||||
if (color_type == PNG_COLOR_TYPE_PALETTE)
|
||||
png_set_expand(png);
|
||||
else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
|
||||
png_set_expand(png);
|
||||
|
||||
if (png_get_valid(png, info, PNG_INFO_tRNS))
|
||||
png_set_expand(png);
|
||||
|
||||
if (bit_depth == 16)
|
||||
png_set_strip_16(png);
|
||||
|
||||
/* GRAY => RGB; GRAY_ALPHA => RGBA
|
||||
*/
|
||||
if (color_type == PNG_COLOR_TYPE_GRAY
|
||||
|| color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
|
||||
png_set_gray_to_rgb(png);
|
||||
color_type =
|
||||
(color_type == PNG_COLOR_TYPE_GRAY ? PNG_COLOR_TYPE_RGB :
|
||||
PNG_COLOR_TYPE_RGB_ALPHA);
|
||||
}
|
||||
if (!png_get_gAMA(png, info, &gamma))
|
||||
gamma = 0.45455;
|
||||
|
||||
png_set_gamma(png, display_exponent, gamma);
|
||||
|
||||
nr_passes = png_set_interlace_handling(png);
|
||||
|
||||
png_read_update_info(png, info);
|
||||
|
||||
png_get_pHYs(png, info, &resx, &resy, &unit);
|
||||
|
||||
color_type = png_get_color_type(png, info);
|
||||
|
||||
has_alpha = (color_type == PNG_COLOR_TYPE_RGB_ALPHA);
|
||||
|
||||
if (has_alpha)
|
||||
nr_comp = 4;
|
||||
else
|
||||
nr_comp = 3;
|
||||
|
||||
src_w = width * nr_comp;
|
||||
png_buf = (unsigned char *) malloc(src_w * height);
|
||||
|
||||
if (nr_passes == 0)
|
||||
nr_passes = 1;
|
||||
|
||||
for (pass = 0; pass < nr_passes; pass++) {
|
||||
s = png_buf;
|
||||
|
||||
for (i = 0; i < height; i++) {
|
||||
/* libpng.3:
|
||||
* If you want the "sparkle" effect, just call png_read_rows() as
|
||||
* normal, with the third parameter NULL.
|
||||
*/
|
||||
png_read_rows(png, &s, NULL, 1);
|
||||
|
||||
s += src_w;
|
||||
}
|
||||
}
|
||||
memset(&cmptparm, 0, 4 * sizeof(opj_image_cmptparm_t));
|
||||
|
||||
sub_dx = params->subsampling_dx;
|
||||
sub_dy = params->subsampling_dy;
|
||||
|
||||
for (i = 0; i < nr_comp; ++i) {
|
||||
cmptparm[i].prec = 8;
|
||||
cmptparm[i].bpp = 8;
|
||||
cmptparm[i].sgnd = 0;
|
||||
cmptparm[i].dx = sub_dx;
|
||||
cmptparm[i].dy = sub_dy;
|
||||
cmptparm[i].w = width;
|
||||
cmptparm[i].h = height;
|
||||
}
|
||||
|
||||
image = opj_image_create(nr_comp, &cmptparm[0], CLRSPC_SRGB);
|
||||
|
||||
if (image == NULL)
|
||||
goto fin;
|
||||
|
||||
image->x0 = params->image_offset_x0;
|
||||
image->y0 = params->image_offset_y0;
|
||||
image->x1 =
|
||||
params->image_offset_x0 + (width - 1) * sub_dx + 1 + image->x0;
|
||||
image->y1 =
|
||||
params->image_offset_y0 + (height - 1) * sub_dy + 1 + image->y0;
|
||||
|
||||
r = image->comps[0].data;
|
||||
g = image->comps[1].data;
|
||||
b = image->comps[2].data;
|
||||
a = image->comps[3].data;
|
||||
s = png_buf;
|
||||
|
||||
max = width * height;
|
||||
|
||||
for (i = 0; i < max; ++i) {
|
||||
*r++ = *s++;
|
||||
*g++ = *s++;
|
||||
*b++ = *s++;
|
||||
|
||||
if (has_alpha)
|
||||
*a++ = *s++;
|
||||
}
|
||||
|
||||
fin:
|
||||
if (png)
|
||||
png_destroy_read_struct(&png, &info, NULL);
|
||||
if (png_buf)
|
||||
free(png_buf);
|
||||
|
||||
fclose(reader);
|
||||
|
||||
return image;
|
||||
|
||||
} /* pngtoimage() */
|
||||
#endif
|
||||
|
||||
int imagetopng(opj_image_t * image, const char *write_idf)
|
||||
#ifdef WIN32
|
||||
{
|
||||
printf("Error. PNG format is not yet handled under windows\n");
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
{
|
||||
FILE *writer;
|
||||
png_structp png_ptr;
|
||||
png_infop info_ptr;
|
||||
int *rs, *gs, *bs, *as;
|
||||
unsigned char *row_buf, *d;
|
||||
int fails, mono, graya, rgb, rgba;
|
||||
int width, height, nr_colors, color_type;
|
||||
int bit_depth, adjust, x, y;
|
||||
png_color_8 sig_bit;
|
||||
|
||||
writer = fopen(write_idf, "wb");
|
||||
|
||||
if (writer == NULL)
|
||||
return 1;
|
||||
|
||||
info_ptr = NULL;
|
||||
fails = 1;
|
||||
|
||||
/* Create and initialize the png_struct with the desired error handler
|
||||
* functions. If you want to use the default stderr and longjump method,
|
||||
* you can supply NULL for the last three parameters. We also check that
|
||||
* the library version is compatible with the one used at compile time,
|
||||
* in case we are using dynamically linked libraries. REQUIRED.
|
||||
*/
|
||||
png_ptr =
|
||||
png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||
/*png_voidp user_error_ptr, user_error_fn, user_warning_fn); */
|
||||
|
||||
if (png_ptr == NULL)
|
||||
goto fin;
|
||||
|
||||
/* Allocate/initialize the image information data. REQUIRED
|
||||
*/
|
||||
info_ptr = png_create_info_struct(png_ptr);
|
||||
|
||||
if (info_ptr == NULL)
|
||||
goto fin;
|
||||
|
||||
/* Set error handling. REQUIRED if you are not supplying your own
|
||||
* error handling functions in the png_create_write_struct() call.
|
||||
*/
|
||||
if (setjmp(png_jmpbuf(png_ptr)))
|
||||
goto fin;
|
||||
|
||||
/* I/O initialization functions is REQUIRED
|
||||
*/
|
||||
png_init_io(png_ptr, writer);
|
||||
|
||||
/* Set the image information here. Width and height are up to 2^31,
|
||||
* bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
|
||||
* the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
|
||||
* PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
|
||||
* or PNG_COLOR_TYPE_RGB_ALPHA. interlace is either PNG_INTERLACE_NONE or
|
||||
* PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
|
||||
* currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE.
|
||||
* REQUIRED
|
||||
*/
|
||||
png_set_compression_level(png_ptr, Z_BEST_COMPRESSION);
|
||||
|
||||
mono = graya = rgb = rgba = adjust = 0;
|
||||
|
||||
nr_colors = image->numcomps;
|
||||
width = image->comps[0].w;
|
||||
height = image->comps[0].h;
|
||||
rs = image->comps[0].data;
|
||||
|
||||
if (nr_colors == 2) {
|
||||
graya = 1;
|
||||
color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
|
||||
sig_bit.gray = image->comps[0].prec;
|
||||
bit_depth = image->comps[0].prec;
|
||||
as = image->comps[1].data;
|
||||
} else if (nr_colors == 3) {
|
||||
rgb = 1;
|
||||
color_type = PNG_COLOR_TYPE_RGB;
|
||||
sig_bit.red = image->comps[0].prec;
|
||||
sig_bit.green = image->comps[1].prec;
|
||||
sig_bit.blue = image->comps[2].prec;
|
||||
bit_depth = image->comps[0].prec;
|
||||
gs = image->comps[1].data;
|
||||
bs = image->comps[2].data;
|
||||
if (image->comps[0].sgnd)
|
||||
adjust = 1 << (image->comps[0].prec - 1);
|
||||
} else if (nr_colors == 4) {
|
||||
rgb = rgba = 1;
|
||||
color_type = PNG_COLOR_TYPE_RGB_ALPHA;
|
||||
sig_bit.red = image->comps[0].prec;
|
||||
sig_bit.green = image->comps[1].prec;
|
||||
sig_bit.blue = image->comps[2].prec;
|
||||
sig_bit.alpha = image->comps[3].prec;
|
||||
bit_depth = image->comps[0].prec;
|
||||
gs = image->comps[1].data;
|
||||
bs = image->comps[2].data;
|
||||
as = image->comps[3].data;
|
||||
if (image->comps[0].sgnd)
|
||||
adjust = 1 << (image->comps[0].prec - 1);
|
||||
} else {
|
||||
mono = 1;
|
||||
color_type = PNG_COLOR_TYPE_GRAY;
|
||||
sig_bit.gray = image->comps[0].prec;
|
||||
bit_depth = image->comps[0].prec;
|
||||
}
|
||||
png_set_sBIT(png_ptr, info_ptr, &sig_bit);
|
||||
|
||||
png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
|
||||
color_type,
|
||||
PNG_INTERLACE_NONE,
|
||||
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
|
||||
|
||||
#ifdef HIDDEN_CODE
|
||||
/* Optional gamma chunk is strongly suggested if you have any guess
|
||||
* as to the correct gamma of the image.
|
||||
*/
|
||||
|
||||
if (gamma > 0.0) {
|
||||
png_set_gAMA(png_ptr, info_ptr, gamma);
|
||||
}
|
||||
#endif /* HIDDEN_CODE */
|
||||
#ifdef HIDDEN_CODE
|
||||
if (have_bg) {
|
||||
png_color_16 background;
|
||||
|
||||
background.red = bg_red;
|
||||
background.green = bg_green;
|
||||
background.blue = bg_blue;
|
||||
|
||||
png_set_bKGD(png_ptr, info_ptr, &background);
|
||||
}
|
||||
#endif /* HIDDEN_CODE */
|
||||
png_write_info(png_ptr, info_ptr);
|
||||
|
||||
png_set_packing(png_ptr);
|
||||
|
||||
row_buf = (unsigned char *) malloc(width * nr_colors);
|
||||
|
||||
for (y = 0; y < height; ++y) {
|
||||
d = row_buf;
|
||||
|
||||
for (x = 0; x < width; ++x) {
|
||||
if (mono) {
|
||||
*d++ = (unsigned char) *rs++;
|
||||
}
|
||||
if (graya) {
|
||||
*d++ = (unsigned char) *rs++;
|
||||
*d++ = (unsigned char) *as++;
|
||||
} else if (rgb) {
|
||||
*d++ = (unsigned char) (*rs++ + adjust);
|
||||
*d++ = (unsigned char) (*gs++ + adjust);
|
||||
*d++ = (unsigned char) (*bs++ + adjust);
|
||||
|
||||
if (rgba)
|
||||
*d++ = (unsigned char) (*as++ + adjust);
|
||||
}
|
||||
} /* for(x) */
|
||||
|
||||
png_write_row(png_ptr, row_buf);
|
||||
|
||||
} /* for(y) */
|
||||
|
||||
png_write_end(png_ptr, info_ptr);
|
||||
|
||||
fails = 0;
|
||||
|
||||
fin:
|
||||
|
||||
if (png_ptr) {
|
||||
png_destroy_write_struct(&png_ptr, &info_ptr);
|
||||
}
|
||||
fclose(writer);
|
||||
|
||||
return fails;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#define __USE_BSD
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
|
|
@ -43,6 +42,7 @@
|
|||
#include "index.h"
|
||||
|
||||
#ifndef WIN32
|
||||
#include <strings.h>
|
||||
#define _stricmp strcasecmp
|
||||
#define _strnicmp strncasecmp
|
||||
#endif
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
#define TIF_DFMT 14
|
||||
#define RAW_DFMT 15
|
||||
#define TGA_DFMT 16
|
||||
|
||||
#define PNG_DFMT 17
|
||||
/* ----------------------------------------------------------------------- */
|
||||
#define CINEMA_24_CS 1302083 /*Codestream length for 24fps*/
|
||||
#define CINEMA_48_CS 651041 /*Codestream length for 48fps*/
|
||||
|
|
@ -210,6 +210,9 @@ void encode_help_display() {
|
|||
fprintf(stdout,"\n");
|
||||
fprintf(stdout,"-I : use the irreversible DWT 9-7 (-I) \n");
|
||||
fprintf(stdout,"\n");
|
||||
fprintf(stdout,"-F : characteristics of the raw input image\n");
|
||||
fprintf(stdout," -F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
|
||||
fprintf(stdout," Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
|
||||
fprintf(stdout,"-m : use array-based MCT, values are coma separated, line by line\n");
|
||||
fprintf(stdout," no specific separators between lines, no space allowed between values\n");
|
||||
fprintf(stdout,"\n");
|
||||
|
|
@ -390,10 +393,10 @@ int load_images(dircnt_t *dirptr, char *imgdirpath){
|
|||
int get_file_format(char *filename) {
|
||||
unsigned int i;
|
||||
static const char *extension[] = {
|
||||
"pgx", "pnm", "pgm", "ppm", "bmp", "tif", "raw", "tga", "j2k", "jp2", "j2c", "jpc"
|
||||
"pgx", "pnm", "pgm", "ppm", "bmp", "tif", "raw", "tga", "png", "j2k", "jp2", "j2c", "jpc"
|
||||
};
|
||||
static const int format[] = {
|
||||
PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT
|
||||
PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT
|
||||
};
|
||||
char * ext = strrchr(filename, '.');
|
||||
if (ext == NULL)
|
||||
|
|
@ -617,6 +620,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
|
|||
case TIF_DFMT:
|
||||
case RAW_DFMT:
|
||||
case TGA_DFMT:
|
||||
case PNG_DFMT:
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr,
|
||||
|
|
@ -674,6 +678,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
|
|||
case 'r': /* rates rates/distorsion */
|
||||
{
|
||||
char *s = optarg;
|
||||
parameters->tcp_numlayers = 0;
|
||||
while (sscanf(s, "%f", ¶meters->tcp_rates[parameters->tcp_numlayers]) == 1) {
|
||||
parameters->tcp_numlayers++;
|
||||
while (*s && *s != ',') {
|
||||
|
|
@ -1132,7 +1137,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
|
|||
int hprot, pprot, sens, addr, size, range;
|
||||
|
||||
/* we need to enable indexing */
|
||||
if (!indexfilename) {
|
||||
if (!indexfilename || !*indexfilename) {
|
||||
strncpy(indexfilename, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN);
|
||||
}
|
||||
|
||||
|
|
@ -1200,7 +1205,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
|
|||
/* search packet error protection method */
|
||||
if (*token == 'p') {
|
||||
|
||||
static int pack = 0, tile = 0, packspec = 0, lastpackno = 0;
|
||||
static int pack = 0, tile = 0, packspec = 0;
|
||||
|
||||
pprot = 1; /* predefined method */
|
||||
|
||||
|
|
@ -1356,7 +1361,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
|
|||
/* search addressing size */
|
||||
if (*token == 'a') {
|
||||
|
||||
static int tile = 0, tilespec = 0, lasttileno = 0;
|
||||
|
||||
addr = 0; /* predefined: auto */
|
||||
|
||||
|
|
@ -1382,7 +1386,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
|
|||
/* search sensitivity size */
|
||||
if (*token == 'z') {
|
||||
|
||||
static int tile = 0, tilespec = 0, lasttileno = 0;
|
||||
|
||||
size = 1; /* predefined: 1 byte */
|
||||
|
||||
|
|
@ -1408,7 +1411,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
|
|||
/* search range method */
|
||||
if (*token == 'g') {
|
||||
|
||||
static int tile = 0, tilespec = 0, lasttileno = 0;
|
||||
|
||||
range = 0; /* predefined: 0 (packet) */
|
||||
|
||||
|
|
@ -1653,6 +1655,8 @@ int main(int argc, char **argv) {
|
|||
break;
|
||||
case TGA_DFMT:
|
||||
break;
|
||||
case PNG_DFMT:
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr,"skipping file...\n");
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Reference in New Issue